Merge branch 'master' of ssh://git.radiophotonics.ru:2222/awe/radar_frontend
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,4 @@
|
|||||||
*.venv
|
*.venv
|
||||||
*.pyc
|
*.pyc
|
||||||
|
*segment*
|
||||||
|
*playlist*
|
||||||
@ -289,7 +289,7 @@ async def stream_video_from_fifo():
|
|||||||
# Start ffmpeg to convert raw H.264 to HLS format
|
# Start ffmpeg to convert raw H.264 to HLS format
|
||||||
# -probesize 32 -analyzeduration 0: minimal probing for low latency startup
|
# -probesize 32 -analyzeduration 0: minimal probing for low latency startup
|
||||||
# -f h264: input format is raw H.264 byte-stream (Annex B from GStreamer)
|
# -f h264: input format is raw H.264 byte-stream (Annex B from GStreamer)
|
||||||
# -r 10: input framerate (from config.ini StreamFps)
|
# -r 30: input framerate (from config.ini StreamFps)
|
||||||
# -i pipe:0: read from stdin
|
# -i pipe:0: read from stdin
|
||||||
# -c:v copy: copy video codec without re-encoding (use hardware-encoded H.264)
|
# -c:v copy: copy video codec without re-encoding (use hardware-encoded H.264)
|
||||||
# -f hls: output HLS format
|
# -f hls: output HLS format
|
||||||
@ -303,7 +303,7 @@ async def stream_video_from_fifo():
|
|||||||
'-probesize', '32',
|
'-probesize', '32',
|
||||||
'-analyzeduration', '0',
|
'-analyzeduration', '0',
|
||||||
'-f', 'h264',
|
'-f', 'h264',
|
||||||
'-r', '10', # Must match GStreamer StreamFps from config.ini
|
'-r', '30', # Must match GStreamer StreamFps from config.ini
|
||||||
'-i', 'pipe:0',
|
'-i', 'pipe:0',
|
||||||
'-c:v', 'copy',
|
'-c:v', 'copy',
|
||||||
'-f', 'hls',
|
'-f', 'hls',
|
||||||
|
|||||||
@ -1,14 +1,14 @@
|
|||||||
#EXTM3U
|
#EXTM3U
|
||||||
#EXT-X-VERSION:3
|
#EXT-X-VERSION:3
|
||||||
#EXT-X-TARGETDURATION:1
|
#EXT-X-TARGETDURATION:1
|
||||||
#EXT-X-MEDIA-SEQUENCE:716
|
#EXT-X-MEDIA-SEQUENCE:1097
|
||||||
#EXTINF:1.000000,
|
#EXTINF:1.000000,
|
||||||
segment_716.ts
|
segment_1097.ts
|
||||||
#EXTINF:1.000000,
|
#EXTINF:1.000000,
|
||||||
segment_717.ts
|
segment_1098.ts
|
||||||
#EXTINF:1.000000,
|
#EXTINF:1.000000,
|
||||||
segment_718.ts
|
segment_1099.ts
|
||||||
#EXTINF:1.000000,
|
#EXTINF:1.000000,
|
||||||
segment_719.ts
|
segment_1100.ts
|
||||||
#EXTINF:1.000000,
|
#EXTINF:0.400000,
|
||||||
segment_720.ts
|
segment_1101.ts
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user