FFmpeg

Commit Graph

Author	SHA1	Message	Date
Limin Wang	96e5e6abb9	avformat/mux: Set AV_PKT_FLAG_KEY for is_intra_only packet The patch will make audio and subtitle packets be marked as AV_PKT_FLAG_KEY. For audio, it'll caused the audio sample to be sync sample. To verify ref/fate/movenc results: 1. Get the movenc test data [lmwang@vpn ffmpeg]$ libavformat/tests/movenc -w && mkdir -p audio_old && mv .mp4 audio_old_ After applied the patch: [lmwang@vpn ffmpeg]$ make fate-movenc SAMPLES=../fate-suite [lmwang@vpn ffmpeg]$ libavformat/tests/movenc -w && mkdir -p audio_key && mv .mp4 audio_key 2. Get l-smash and build boxdumper https://github.com/l-smash/l-smash.git 3. dump the box of crc change mp4 and diff -u [lmwang@vpn ffmpeg]$ ../l-smash/cli/boxdumper --box audio_key/non-empty-moov-no-elst.mp4 > audio_key/non-empty-moov-no-elst.log [lmwang@vpn ffmpeg]$ ../l-smash/cli/boxdumper --box audio_old/non-empty-moov-no-elst.mp4 > audio_old/non-empty-moov-no-elst.log [lmwang@vpn ffmpeg]$ diff -u audio_key/non-empty-moov-no-elst.log audio_old/non-empty-moov-no-elst.log - default_sample_flags = 0x02000000 - independent - sync sample + default_sample_flags = 0x01010000 + dependent + non-sync sample 4. have checked the change of crc are caused by default_sample_flags non-empty-moov.mp4, non-empty-moov-elst.mp4, non-empty-moov-no-elst.mp4, empty-moov.mp4, delay-moov-content.mp4, empty-moov-second-frag.mp4, empty-moov-second-frag-discont.mp4, delay-moov-second-frag-discont.mp4, delay-moov-elst-second-frag.mp4 etc 5 For subtitle, it'll effect for tests/ref/fate/binsub-movtextenc and tests/ref/fate/sub2video, that's expecting result for the subtitle is marked as keyframe. Below is the checking result of binsub-movtextenc: [lmwang@vpn ffmpeg]$ ./ffmpeg -i ../fate-suite/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov audio_key/binsub-movtextenc.mp4 [lmwang@vpn ffmpeg]$ ./ffmpeg -i ../fate-suite/sub/MovText_capability_tester.mp4 -map 0 -scodec mov_text -f mp4 -flags +bitexact -fflags +bitexact -movflags frag_keyframe+empty_moov audio_old/binsub-movtextenc.mp4 [lmwang@vpn ffmpeg]$../l-smash/cli/boxdumper audio_key/binsub-movtextenc.mp4 > audio_key/binsub-movtextenc.log [lmwang@vpn ffmpeg]$../l-smash/cli/boxdumper audio_old/binsub-movtextenc.mp4 > audio_old/binsub-movtextenc.log [lmwang@vpn ffmpeg]$ diff -u audio_key/binsub-movtextenc.log audio_old/binsub-movtextenc.log .... // the key difference is the flag for sync sample - flags = 0x000701 + flags = 0x000301 data-offset-present sample-duration-present sample-size-present - sample-flags-present sample_count = 6 - data_offset = 188 + data_offset = 164 sample[0] sample_duration = 1570000 sample_size = 21 - sample_flags = 0x02000000 - independent - sync sample - degradation_priority = 0 sample[1] sample_duration = 510000 sample_size = 2 - sample_flags = 0x01010000 - dependent - non-sync sample - degradation_priority = 0 sample[2] sample_duration = 1690000 sample_size = 9 - sample_flags = 0x02000000 - independent - sync sample - degradation_priority = 0 Suggested-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> Suggested-by: Nicolas George <george@nsup.org> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>	5 years ago
James Almer	245ace4e2d	avformat/movenc: ensure we don't write the major brand as a compatible brand more than once Signed-off-by: James Almer <jamrial@gmail.com>	5 years ago
James Almer	58ac760816	avformat/movenc: write the major brand also as the first compatible brand Signed-off-by: James Almer <jamrial@gmail.com>	5 years ago
Gyan Doshi	830695be36	avformat/movenc: read track title from correct key `da9cc22d5b` allowed the MOV muxer to relay a custom stream handler name, whether populated from the input stream or user-set. However, the entry key didn't match the key set by the MOV demuxer, so it wasn't effective. Fixed. Due to the change, four FATE refs have to be updated. Verified that the target payload of the tests hasn't changed in terms of CRC.	7 years ago
Anton Khirnov	4ee5aed122	ffmpeg: do packet ts rescaling in write_packet() This will be useful in the following commit, after which the muxer timebase is not always available when encoding. This merges Libav commit `3e265ca`. It was previously skipped. There are some changes with how/when the mux_timebase field is set, because the Libav approach often causes a too imprecise time base to be set. This is hard, because the muxer's write_header function can readjust the timebase, at which point we might already have encoded packets buffered. (It might be better to buffer them after the encoder, instead of after all the timestamp handling logic before muxing.) The two FATE tests change because the output time base is raised for subtitles. (Needed to avoid certain rounding issues in other cases.) Includes a minor merge fix by Mark Thompson, and avconv: Move rescale to stream timebase before monotonisation also by Mark Thompson <sw@jkqxz.net>. Signed-off-by: wm4 <nfxjfg@googlemail.com>	8 years ago
Clément Bœsch	2879a4ecb9	tests: make sure subtitles tests are run with a rawdiff This will test properly CRLF with make fate, make fate-subtitles and any make fate-sub-* test. Before this commit, the rawdiff was triggered only by make fate-subtitles. Also make sure fate-sub-* only match the tests relying on fmtstdout command, to at least avoid failing on MingW. See https://ffmpeg.org/pipermail/ffmpeg-devel/2015-April/172395.html	10 years ago
Michael Niedermayer	a17ee4117d	avformat/movenc: only ommit encoder tag of the metadata for bitexact mode Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Michael Niedermayer	717ec57c7e	avformat/movenc: shift positive timestamps to 0 if edit lists cannot be used Fix handling of timestamps which start far away from 0 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	11 years ago
Nicolas George	690ef618b1	ffmpeg: copy subtitles frame dimensions. The sub-movtextenc ref file changes because the dimensions (400×60) are stored by the format.	12 years ago
Michael Niedermayer	d106ffd942	fate: add bitexact flag to fate-sub-movtextenc Signed-off-by: Michael Niedermayer <michaelni@gmx.at>	12 years ago
Philip Langdale	2daaf77698	movtextenc: 3GPP TS 26.245 Timed Text Encoder. This change introduces a basic encoder for 3GPP Timed Text subtitles, also known as TX3G, Quicktime subtitles, or "movtext" in the existing code. This initial change doesn't attempt to write styling information, and just writes the plain text of the subtitles. I intend to add support for styles eventually, but it's challenging due to a lack of existing players that support them. Note that an additional change is required to the mov/mp4 muxer to write empty subtitle packets to indicate subtitle duration. Signed-off-by: Philip Langdale <philipl@overt.org>	12 years ago

6 Commits (5441699f8392bc3442f32137d8128d98a3b7b812)