mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-12 19:18:44 +02:00
129c7bf53f
Currently those are set in different ways depending on whether the stream is decoded or not, using some values from the decoder if it is. This is wrong, because there may be arbitrary amount of delay between input packets and output frames (depending e.g. on the thread count when frame threading is used). Always use the path that was previously used only for streamcopy. This should not cause any issues, because these values are now used only for streamcopy and discontinuity handling. This change will allow to decouple discontinuity processing from decoding and move it to ffmpeg_demux. It also makes the code simpler. Changes output in fate-cover-art-aiff-id3v2-remux and fate-cover-art-mp3-id3v2-remux, where attached pictures are now written in the correct order. This happens because InputStream.dts is no longer reset to AV_NOPTS_VALUE after decoding, so streamcopy actually sees valid dts values.
82 lines
1.8 KiB
Plaintext
82 lines
1.8 KiB
Plaintext
330ad2bf538e91a31752b38024461df1 *tests/data/fate/cover-art-aiff-id3v2-remux.aiff
|
|
608914 tests/data/fate/cover-art-aiff-id3v2-remux.aiff
|
|
#tb 0: 1/44100
|
|
#media_type 0: audio
|
|
#codec_id 0: pcm_s16be
|
|
#sample_rate 0: 44100
|
|
#channel_layout_name 0: stereo
|
|
#tb 1: 1/90000
|
|
#media_type 1: video
|
|
#codec_id 1: mjpeg
|
|
#dimensions 1: 350x350
|
|
#sar 1: 1/1
|
|
#tb 2: 1/90000
|
|
#media_type 2: video
|
|
#codec_id 2: png
|
|
#dimensions 2: 350x350
|
|
#sar 2: 1/1
|
|
#tb 3: 1/90000
|
|
#media_type 3: video
|
|
#codec_id 3: bmp
|
|
#dimensions 3: 350x350
|
|
#sar 3: 0/1
|
|
#tb 4: 1/90000
|
|
#media_type 4: video
|
|
#codec_id 4: mjpeg
|
|
#dimensions 4: 350x350
|
|
#sar 4: 1/1
|
|
0, 0, 0, 1024, 4096, 0xdac4695d
|
|
1, 0, 0, 0, 19650, 0xd5662610
|
|
2, 0, 0, 0, 184497, 0xc33f8d44
|
|
3, 0, 0, 0, 368254, 0xfa7f4bd8
|
|
4, 0, 0, 0, 19650, 0xd5662610
|
|
0, 1024, 1024, 1024, 4096, 0xad05c909
|
|
0, 2048, 2048, 1024, 4096, 0x97e3b8f8
|
|
0, 3072, 3072, 1024, 4096, 0xb08180fa
|
|
[STREAM]
|
|
index=0
|
|
codec_name=pcm_s16be
|
|
DISPOSITION:attached_pic=0
|
|
[/STREAM]
|
|
[STREAM]
|
|
index=1
|
|
codec_name=mjpeg
|
|
DISPOSITION:attached_pic=1
|
|
TAG:title=first
|
|
TAG:comment=Other
|
|
[/STREAM]
|
|
[STREAM]
|
|
index=2
|
|
codec_name=png
|
|
DISPOSITION:attached_pic=1
|
|
TAG:title=second
|
|
TAG:comment=Illustration
|
|
[/STREAM]
|
|
[STREAM]
|
|
index=3
|
|
codec_name=bmp
|
|
DISPOSITION:attached_pic=1
|
|
TAG:title=third
|
|
TAG:comment=Conductor
|
|
[/STREAM]
|
|
[STREAM]
|
|
index=4
|
|
codec_name=mjpeg
|
|
DISPOSITION:attached_pic=1
|
|
TAG:title=fourth
|
|
TAG:comment=Composer
|
|
[/STREAM]
|
|
[FORMAT]
|
|
TAG:artist=Мельница
|
|
TAG:RATING=0
|
|
TAG:album=Ангелофрения
|
|
TAG:title=Дороги
|
|
TAG:tracktotal=11
|
|
TAG:totaltracks=11
|
|
TAG:genre=Folk
|
|
TAG:date=2012
|
|
TAG:track=2
|
|
TAG:unknown_key=unknown_value
|
|
TAG:compilation=foo
|
|
[/FORMAT]
|