diff options
| author | James Almer <jamrial@gmail.com> | 2017-04-10 13:36:19 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-05-24 20:28:00 -0300 |
| commit | f63c3516577d605e51cf16358cbdfa0bc97565d8 (patch) | |
| tree | 008a031e9a2b1531ccbc0c32db4bfb5e6f2e1f11 /tests/fate | |
| parent | 210388a1979d70d024ef4ebf1d97df56ce56b0c1 (diff) | |
avcodec/aac_adtstoasc: propagate new extradata using packet side data
This removes the current API violating behavior of overwritting the stream's
extradata during packet filtering, something that should not happen after the
av_bsf_init() call.
The bitstream filter generated extradata is no longer available during
write_header(), and as such not usable with non seekable output. The FATE
tests are updated to reflect this.
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'tests/fate')
| -rw-r--r-- | tests/fate/aac.mak | 5 | ||||
| -rw-r--r-- | tests/fate/avformat.mak | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 1fbf7c955a..5ef8ddc2b9 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -245,9 +245,8 @@ FATE_AAC_LATM += fate-aac-latm_stereo_to_51 fate-aac-latm_stereo_to_51: CMD = pcm -i $(TARGET_SAMPLES)/aac/latm_stereo_to_51.ts -channel_layout 5.1 fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 -fate-aac-autobsf-adtstoasc: CMD = md5 -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts -acodec copy -fflags +bitexact -f matroska -fate-aac-autobsf-adtstoasc: CMP = oneline -fate-aac-autobsf-adtstoasc: REF = 8c76732bd04d9eb3468f9f842439774d +fate-aac-autobsf-adtstoasc: CMD = transcode "aac" $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts \ + matroska "-c:a copy" "-c:a copy" FATE_AAC-$(call DEMDEC, AAC, AAC) += $(FATE_AAC_CT_RAW) FATE_AAC-$(call DEMDEC, MOV, AAC) += $(FATE_AAC) diff --git a/tests/fate/avformat.mak b/tests/fate/avformat.mak index 10702ec8e2..82a531c7a5 100644 --- a/tests/fate/avformat.mak +++ b/tests/fate/avformat.mak @@ -93,14 +93,14 @@ tests/data/mp4-to-ts.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data tests/data/adts-to-mkv.m3u8: TAG = GEN tests/data/adts-to-mkv.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ - -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts \ + -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \ -f segment -segment_time 1 -map 0 -flags +bitexact -codec copy -segment_format_options live=1 \ -segment_list $(TARGET_PATH)/$@ -y $(TARGET_PATH)/tests/data/adts-to-mkv-%03d.mkv 2>/dev/null tests/data/adts-to-mkv-header.mkv: TAG = GEN tests/data/adts-to-mkv-header.mkv: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \ - -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.adts \ + -i $(TARGET_SAMPLES)/audiomatch/tones_afconvert_16000_mono_aac_lc.m4a \ -f segment -segment_time 1 -map 0 -flags +bitexact -codec copy -segment_format_options live=1 \ -segment_header_filename $(TARGET_PATH)/tests/data/adts-to-mkv-header.mkv \ -y $(TARGET_PATH)/tests/data/adts-to-mkv-header-%03d.mkv 2>/dev/null |