aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/movenc.c
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge commit '4f7723cb3b913c577842a5bb088c804ddacac8df'Hendrik Leppkes2016-11-171-3/+26
|\| | | | | | | | | | | | | * commit '4f7723cb3b913c577842a5bb088c804ddacac8df': movenc: Add an option for skipping writing the mfra/tfra/mfro trailer Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Add an option for skipping writing the mfra/tfra/mfro trailerMartin Storsjö2016-07-081-3/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When writing a fragmented file, we by default write an index pointing to all the fragments at the end of the file. This causes constantly increasing memory usage during the muxing. For live streams, the index might not be useful at all. A similar fragment index is written (but at the start of the file) if the global_sidx flag is set. If ism_lookahead is set, we need to keep data about the last ism_lookahead+1 fragments. If no fragment index is to be written, we don't need to store information about all fragments, avoiding increasing the memory consumption linearly with the muxing runtime. This fixes out of memory situations with long live mp4 streams. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05'Hendrik Leppkes2016-11-131-8/+6
|\| | | | | | | | | | | | | * commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05': movenc: Apply offsets on timestamps when peeking into interleaving queues Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * movenc: Apply offsets on timestamps when peeking into interleaving queuesMartin Storsjö2016-06-281-6/+6
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | lavf/movenc: Do not print an error when muxing gray8 rawvideo.Carl Eugen Hoyos2016-11-051-0/+1
| | | | | | | | This was fixed in 9a2778082121ea44d06a2f00f822ea99109c7fd8
* | lavf/movenc+dashenc: add automatic bitstream filteringRodger Combs2016-10-241-24/+83
| | | | | | | | This is disabled by default when the empty_moov flag is enabled
* | lavf/movenc: add deinit functionRodger Combs2016-10-241-44/+32
| |
* | avformat/movenc: Skip duration check for discontinuous fragmentsMichael Niedermayer2016-10-191-1/+2
| | | | | | | | | | Found-by: Daemon404 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: Check frame rate in mov_write_uuidprof_tag()Michael Niedermayer2016-10-101-2/+9
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: Switch mov_write_uuidprof_tag() to avg_frame_rateMichael Niedermayer2016-10-101-2/+1
| | | | | | | | | | | | | | Using the stream timebase simply overflows Fix integer overflow in psp framerate computation Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/movenc: Put correct display aspect ratio in ARES atom.Carl Eugen Hoyos2016-09-291-1/+5
| |
* | movenc: Add support for writing language codes into ISML manifestsJan Ekström2016-09-291-0/+4
| | | | | | | | | | | | | | Streaming servers appear to ignore all other language metadata. Signed-off-by: Jan Ekström <jeebjp@gmail.com> Signed-off-by: Josh de Kock <josh@itanimul.li>
* | movenc: use similar logic to DASH when writing bit rate to ISMLJan Ekström2016-09-281-2/+14
| | | | | | | | | | | | | | | | | | | | This way, in case of bit rate not being set, max_bitrate will be used instead. This enables, for example, re-using max_bitrate information from the input or doing transcoding with a rate control mode that is not bit rate based. Signed-off-by: Jan Ekström <jeebjp@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/movenc: Allow to disable writing the timecode track.Carl Eugen Hoyos2016-09-261-2/+4
| | | | | | | | Fixes ticket #5492.
* | avformat/movenc: write pasp atom even if sar.num == sar.denPaul B Mahol2016-09-221-2/+1
| | | | | | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* | avformat/movenc: Make the packet check more tolerantMichael Niedermayer2016-09-161-15/+16
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: Check packet in mov_write_single_packet() tooMichael Niedermayer2016-09-161-0/+4
| | | | | | | | | | | | | | | | Fixes assertion failure Found-by: durandal117 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: Factor check_pkt() outMichael Niedermayer2016-09-161-6/+18
| | | | | | | | | | Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: Check first DTS similar to dts differenceMichael Niedermayer2016-09-101-0/+7
| | | | | | | | | | | | | | | | Fixes assertion failure Fixes: b84b53855a0b74560e64c6f45f505a13/signal_sigabrt_7ffff6ae7c37_3837_ef4e243ea5b4fa8d0becf4afe9166604.avi Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: added ability to use original stream ids as track ids ↵Erkki Seppälä2016-09-011-6/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of regenerating them Sometimes it's useful to be able to define the exact track numbers in the generated track, instead of always beginning at track id 1. Using the option use_stream_ids_as_track_ids now copies the use stream ids to track ids. Dynamically generated tracks (ie. tmcd) have their track numbers defined as continuing from the highest numbered stream id. Signed-off-by: Erkki Seppälä <erkki.seppala.ext@nokia.com> Signed-off-by: OZOPlayer <OZOPL@nokia.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/movenc: Add a missing assignment if memory allocation fails.Carl Eugen Hoyos2016-08-241-1/+1
| | | | | | | | | | Fixes a warning: libavformat/movenc.c:5947:17: warning: statement with no effect [-Wunused-value]
* | avformat/movenc: Free extradata after successfull allocation of new instead ↵Michael Niedermayer2016-08-191-4/+4
| | | | | | | | | | | | | | | | of before This avoids erroring out with extradata lost and extradata size mismatching Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: allow rewriting extradataUmair Khan2016-08-191-0/+31
| | | | | | | | | | Signed-off-by: Umair Khan <omerjerk@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dnxhddata: move avpriv_dnxhd_parse_header_prefix to a headerJames Almer2016-07-251-1/+1
| | | | | | | | | | | | | | | | | | It's a small and simple function that can be inlined. This removes one private symbol and should reduce object dependencies with the next major bump Signed-off-by: James Almer <jamrial@gmail.com>
* | libavformat/movenc: add dnxhr compatibility for apple playersMark Reid2016-07-231-5/+26
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: add option to use keys/mdta atoms for metadataDavid Murmann2016-06-251-4/+77
| | | | | | | | | | | | | | | | Add -movflags use_metadata_tags to the mov muxer. This will cause the muxer to write all metadata to the file in the keys and mtda atoms. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | movenc: mark astronomical_body const string as staticClément Bœsch2016-06-251-1/+1
| |
* | avformat: Fix ff_interleaved_peek()Michael Niedermayer2016-06-251-2/+4
| | | | | | | | | | | | Fixes assertion failures in movenc Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'b84f3a40034d28828c4ca639d012479a7eaace28'Clément Bœsch2016-06-241-0/+53
|\| | | | | | | | | | | | | * commit 'b84f3a40034d28828c4ca639d012479a7eaace28': movenc: Write 'loci' geotag metadata for 3gp and mp4 Merged-by: Clément Bœsch <clement@stupeflix.com>
| * movenc: Write 'loci' geotag metadata for 3gp and mp4Martin Storsjö2016-05-191-0/+53
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'f12a705ee570e16ca692c66b62821a2dbdf82566'Clément Bœsch2016-06-241-7/+19
|\| | | | | | | | | | | | | * commit 'f12a705ee570e16ca692c66b62821a2dbdf82566': movenc: Factorize a function for finding a metadata entry and the associated language Merged-by: Clément Bœsch <clement@stupeflix.com>
| * movenc: Factorize a function for finding a metadata entry and the associated ↵Martin Storsjö2016-05-191-7/+19
| | | | | | | | | | | | language Signed-off-by: Martin Storsjö <martin@martin.st>
| * movenc: Write ?xyz geotag metadata for mov filesMichael Niedermayer2016-05-191-0/+1
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '72d621069fc301b431fac36b5281699a362562f2'Matthieu Bouron2016-06-231-1/+1
|\| | | | | | | | | | | | | * commit '72d621069fc301b431fac36b5281699a362562f2': movenc: Add a missed const Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| * movenc: Add a missed constMartin Storsjö2016-05-181-1/+1
| | | | | | | | | | | | | | This was missed in e1eb0fc9601, when ff_interleaved_peek was changed to include const during the evolution of the patch. Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'e1eb0fc960163402bbb4e630185790488f7d28ed'Matthieu Bouron2016-06-231-0/+22
|\| | | | | | | | | | | | | * commit 'e1eb0fc960163402bbb4e630185790488f7d28ed': movenc: Use packets in interleaving queues for the duration at the end of fragments Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| * movenc: Use packets in interleaving queues for the duration at the end of ↵Martin Storsjö2016-05-181-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fragments As long as caller only writes packets using av_interleaved_write_frame with no manual flushing, this should allow us to always have accurate durations at the end of fragments, since there should be at least one queued packet in each stream (except for the stream where the current packet is being written, but if the muxer itself does the cutting of fragments, it also has info about the next packet for that stream). Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401'Matthieu Bouron2016-06-231-0/+16
|\| | | | | | | | | | | | | * commit 'dbbaad32e36b9046cd19d6e3329e2ca7ab49b401': movenc: Provide output bytestream markers for fragmented content Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
| * movenc: Provide output bytestream markers for fragmented contentMartin Storsjö2016-05-181-0/+16
| | | | | | | | Signed-off-by: Martin Storsjö <martin@martin.st>
* | Merge commit '5afb94c817abffad030c6b94d7003dca8aace3d5'Clément Bœsch2016-06-211-1/+1
|\| | | | | | | | | | | | | * commit '5afb94c817abffad030c6b94d7003dca8aace3d5': Mark read-only tables as static Merged-by: Clément Bœsch <u@pkh.me>
| * Mark read-only tables as staticDiego Biurrun2016-05-051-4/+4
| |
* | Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-211-3/+3
|\| | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-041-3/+3
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
| * Drop pointless assert.h #includesDiego Biurrun2016-05-031-3/+0
| |
* | Add experimental support for vp9 in iso-bmffKongqun Yang2016-06-171-0/+26
| | | | | | | | | | | | | | | | | | | | Implemented according to the draft specification "VP Codec ISO Media File Format Binding": http://www.webmproject.org/vp9/#draft-vp-codec-iso-media-file-format-binding '-strict -2' is required to use this feature. Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
* | avformat/movenc: Skip unsupported video tracks in timecode generationMichael Niedermayer2016-06-061-10/+22
| | | | | | | | | | | | Fixes Ticket5414 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: remove useless if and reindentMarton Balint2016-05-311-12/+9
| | | | | | | | | | Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avformat/movenc: propagate shift_data errors properlyMarton Balint2016-05-311-0/+4
| | | | | | | | | | | | | | | | The second one is not explicitly needed, as res is not reset, but it is there for consistency. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Marton Balint <cus@passwd.hu>
* | libavformat/movenc: remove unnecessary null checkMark Reid2016-05-301-3/+1
| | | | | | | | | | | | Fixes CID1361955 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/movenc: Fix potential track width/height overflowsMichael Niedermayer2016-05-291-9/+13
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>