aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/segment.c
Commit message (Collapse)AuthorAgeFilesLines
* lavf/segment: simplify logic and fix !=0 check on segment_end return valueStefano Sabatini2013-10-151-5/+3
| | | | A successfull return value can be > 0.
* lavf/segment: log segments as they end to AV_LOG_VERBOSEBilly Shambrook2013-10-151-0/+4
| | | | Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavf/segment: simplify segment_count updateStefano Sabatini2013-10-151-6/+4
| | | | Now segment_count mark the segment_count of the current segment.
* Reinstate proper FFmpeg license for all files.Thilo Borgmann2013-08-301-4/+4
|
* lavf/segment: use AV_OPT_TIME_DURATION for time_deltaStefano Sabatini2013-07-111-11/+1
| | | | Simplify.
* lavf/segment: reindent after last commitStefano Sabatini2013-07-111-18/+17
|
* lavf/segment: add initial_offset optionStefano Sabatini2013-07-111-5/+9
| | | | Should address trac ticket #2224.
* segment: copy metadataMichael Niedermayer2013-03-181-0/+1
| | | | | | Fixes Ticket2230 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lavf/segment: add support to ffconcat segment listStefano Sabatini2013-03-071-3/+21
|
* lavf/segment: fix DTS inconsistencies with -reset_timestampsStefano Sabatini2013-02-061-6/+3
| | | | | | | | | | | The DTS needs to be resynched against the segment start PTS, or the resulting DTS may result < PTS. Reported-by: Owen Jones <riots6@gmail.com> See thread: Subject: [FFmpeg-user] pts/dts error using reset_timestamps while splitting a DVD Date: Sat, 19 Jan 2013 08:58:27 +0000
* lavf/segment: extend PTS debugging log with -reset_timestampsStefano Sabatini2013-02-061-5/+9
|
* lavf/segment: use correct spelling and value for EXT-X-ALLOW-CACHE tagCarl Eugen Hoyos2013-02-031-2/+2
| | | | | | | | | Replace wrong "EXT-X-ALLOWCACHE" with "EXT-X-ALLOW-CACHE", and value 1/0 with YES/NO, as per spec. Fix trac ticket #2228. Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
* lavf/segment: exit immediately in case of invalid stream specifierStefano Sabatini2013-01-231-1/+1
| | | | | Avoid duplicated confusing error message, and propagate error code from the failing avformat_match_stream_specifier() call.
* lavf/segment: avoid failure in case -flags +live and -segment_times/frames ↵Stefano Sabatini2013-01-231-7/+0
| | | | | | | are specified The conflict does not apply any longer, since the M3U8 segment target duration is re-computed every time a new segment is added to the list.
* lavf/segment: drop now pointless segment_list_close() functionStefano Sabatini2013-01-231-9/+3
|
* lavf/segment: mark #EXT-X-ENDLIST in M3U8 only at the end of streamStefano Sabatini2013-01-231-5/+5
| | | | | | Should fix immediate playback termination. In particular, should fix trac ticket #2172.
* lavf/segment: provide link to HTML M3U8 draft, also fix mentioned version in ↵Stefano Sabatini2013-01-221-1/+1
| | | | docs
* lavf/segment: do not auto-select a video stream with attached_pic dispositionStefano Sabatini2013-01-191-1/+3
| | | | In particular, fix trac ticket #2138.
* lavf/segment: move reference stream selection code to a dedicated functionStefano Sabatini2013-01-191-48/+57
|
* lavf/segment: remove now unused field list_max_segment_timeStefano Sabatini2013-01-191-4/+0
|
* lavf/segment: add support to segment list file entries sliding window listingStefano Sabatini2013-01-191-18/+51
| | | | In particular, should fix trac ticket #1842.
* lavf/segment: add SegmentListEntry and use itStefano Sabatini2013-01-191-22/+47
| | | | | This patch is propedeutic to the incoming patch which adds support to sliding window segment listing.
* lavf/segment: add segment_frames optionStefano Sabatini2012-12-281-13/+99
| | | | This is meant to address trac ticket #1483.
* lavf/segment: add reference_stream optionStefano Sabatini2012-12-281-10/+55
|
* lavf/segment: provide more debug feedback when a new segment startsStefano Sabatini2012-12-141-4/+10
|
* lavf/segment: add missing flags to segmenter option constantsStefano Sabatini2012-12-141-5/+7
|
* lavf/segment: add segment_start_number optionStefano Sabatini2012-12-131-0/+1
| | | | Consistent with the image2 muxer.
* lavf/segment: add function set_segment_filename()Stefano Sabatini2012-12-131-12/+18
| | | | Factorize.
* lavf/segment: add reset_timestamps optionStefano Sabatini2012-12-111-0/+25
| | | | | | | The new options reset the timestamps at each new segment, so that the generated segments will have timestamps starting close to 0. It is meant to address trac ticket #1425.
* lavf/segment: remove silly assert(), improve feedbackStefano Sabatini2012-12-091-3/+7
| | | | | The code should not assert in case of invalid user input. Fails gracefully instead.
* lavf/segment: fix value for the M3U8 EXT-X-MEDIAStefano Sabatini2012-11-201-3/+1
| | | | | | | | | From the M3U8 specification: |The EXT-X-MEDIA-SEQUENCE tag indicates the sequence number of the first |URI that appears in a Playlist file. Previously it was using the list index number. Also remove now unused list_count field.
* lavf/segment: do not pre-increment segment_idx valueStefano Sabatini2012-11-201-2/+3
| | | | | Increment the value just when a new segment with the given index is started. Simplify logic, improve readability.
* lavf/segment: unbreak behavior for segment muxerStefano Sabatini2012-11-201-1/+1
| | | | | | | | The segment muxer presumes the use of AVFMT_GLOBALHEADER, ssegment should be use in case of formats which requires no global headers. Regression introduced when merging 0826d8513d14f54da0b519360813327d5836b7fc.
* lavf/segment: consistently use "seg" in segment_start()Stefano Sabatini2012-11-201-8/+8
|
* lavf/segment: do not copy codec_tag when not availableChanMin Kim2012-11-201-1/+12
| | | | | | | | | | | | | | Some muxers do not allow stream if codec_tag is incompatible. Sometimes the passed input codec's codec_tag is not compatible with the output muxer. Because the codec_tag field of the segment muxer cannot be set, ffmpeg.c doesn't know how to handle these cases. Signed-off-by: ChanMin Kim <kcm1700@gmail.com> Signed-off-by: Stefano Sabatini <stefasab@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* segment: fix null ptr derefMichael Niedermayer2012-11-051-1/+1
| | | | | Fixes CID732220 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c'Michael Niedermayer2012-10-111-2/+5
|\ | | | | | | | | | | | | | | | | | | | | * commit '88058d9a994f42e4e9ed4e67baf696bbfe53128c': vc1dec: Set chroma reference field from REFFIELD for 1REF field pictures segment: support applehttp style list Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: support applehttp style listLuca Barbato2012-10-101-13/+72
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-10-081-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: x86: vc1: call ff_vc1dsp_init_x86() under if (ARCH_X86) x86: cavs: call ff_cavsdsp_init_x86() under if (ARCH_X86) x86: call most of the x86 dsp init functions under if (ARCH_X86) doc: support the new website layout doc: remove a warning from filters.texi doc: initial nut documentation segment: drop global headers setting lavu: fix typo in Makefile Conflicts: doc/Makefile doc/filters.texi doc/t2h.init libavcodec/fmtconvert.c libavcodec/proresdsp.c libavcodec/x86/Makefile libavcodec/x86/vc1dsp_mmx.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: drop global headers settingLuca Barbato2012-10-081-1/+1
| | | | | | | | | | | | | | | | avconv provides an option to set it externally and there isn't a way for the outer demuxer to report the inner demuxer flag. Solves a bad interaction between mpegts and x264, but requires additional setting for the user.
* | segment: reverse pass avoid_negative_ts from the muxerMichael Niedermayer2012-10-061-0/+3
| | | | | | | | | | | | This fixes failures with formats not supporting negative TS Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '65d12900432ac880d764edbbd36818431484a76e'Michael Niedermayer2012-10-051-6/+50
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '65d12900432ac880d764edbbd36818431484a76e': configure: add --enable-lto option x86: cpu: Break out test for cpuid capabilities into separate function x86: ff_get_cpu_flags_x86(): Avoid a pointless variable indirection build: Factor out mpegaudio dependencies to CONFIG_MPEGAUDIO segment: Add comments about calls that only are relevant for some muxers segment: Add an option for omitting the first header and final trailer Conflicts: configure libavcodec/Makefile libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add comments about calls that only are relevant for some muxersMartin Storsjö2012-10-041-2/+2
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
| * segment: Add an option for omitting the first header and final trailerMartin Storsjö2012-10-041-4/+48
| | | | | | | | | | | | | | This allows writing totally bare segments, without any header/trailer included anywhere. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace'Michael Niedermayer2012-10-051-0/+1
|\| | | | | | | | | | | | | * commit 'a854362b40f0e458db5a1fb0d2612a5702ee0ace': segment: Flush buffered data before finishing a segment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Flush buffered data before finishing a segmentMartin Storsjö2012-10-041-0/+1
| | | | | | | | | | | | | | This makes sure any buffered data is written to the segment, for muxers that buffer up data internally (e.g. fragmented mp4). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f7b240434c015056bc6319ddbdb8483757cc13e2'Michael Niedermayer2012-10-051-0/+3
|\| | | | | | | | | | | | | * commit 'f7b240434c015056bc6319ddbdb8483757cc13e2': segment: Set the resend_headers flag for each segment Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Set the resend_headers flag for each segmentMartin Storsjö2012-10-041-0/+3
| | | | | | | | | | | | | | | | | | This makes sure new inline headers are emitted when the next packet is written. This allows segmenting mpegts without calling write_header/write_trailer (nor freeing/reiniting the muxer) for each segment. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e'Michael Niedermayer2012-10-051-13/+24
|\| | | | | | | | | | | | | | | | | | | * commit '378a6315b7c48195ffd94e6aa9aa6d663d42b35e': segment: Add an option for disabling writing of a header/trailer to each segment Conflicts: libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * segment: Add an option for disabling writing of a header/trailer to each segmentMartin Storsjö2012-10-041-12/+19
| | | | | | | | | | | | | | | | Some segmented formats (such as fragmented mp4) are "bare", as in, the segment files do not have the same headers/trailers as full normal files of that format have. Signed-off-by: Martin Storsjö <martin@martin.st>