| Message ID | 20240314230104.19624-1-jamrial@gmail.com |
|---|---|
| State | Accepted |
| Commit | 136f1cdf0f5eb65505b03f7eee8492e94321a85d |
| Headers | show |
| Series | [FFmpeg-devel,01/26] fate/aac: add missing aresample filter dependency | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
On 3/14/2024 8:00 PM, James Almer wrote: > Signed-off-by: James Almer <jamrial@gmail.com> > --- > tests/fate/aac.mak | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak > index 4f8d1cdcea..817944773d 100644 > --- a/tests/fate/aac.mak > +++ b/tests/fate/aac.mak > @@ -243,17 +243,17 @@ fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 > 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) > -FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM) += $(FATE_AAC_LATM) > -FATE_AAC-$(call DEMDEC, AAC, AAC_FIXED)+= $(FATE_AAC_FIXED) > +FATE_AAC-$(call DEMDEC, AAC, AAC, ARESAMPLE_FILTER) += $(FATE_AAC_CT_RAW) > +FATE_AAC-$(call DEMDEC, MOV, AAC, ARESAMPLE_FILTER) += $(FATE_AAC) > +FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM, ARESAMPLE_FILTER) += $(FATE_AAC_LATM) > +FATE_AAC-$(call DEMDEC, AAC, AAC_FIXED, ARESAMPLE_FILTER) += $(FATE_AAC_FIXED) > > FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes) > > $(FATE_AAC_ALL): CMP = oneoff > $(FATE_AAC_ALL): FUZZ = 2 > > -FATE_AAC_ENCODE-$(call ENCMUX, AAC, ADTS) += $(FATE_AAC_ENCODE) > +FATE_AAC_ENCODE-$(call ENCMUX, AAC, ADTS, ARESAMPLE_FILTER) += $(FATE_AAC_ENCODE) > > FATE_AAC_BSF-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc Will apply the set soon since it's trivial and fixes running fate with libswresample disabled.
diff --git a/tests/fate/aac.mak b/tests/fate/aac.mak index 4f8d1cdcea..817944773d 100644 --- a/tests/fate/aac.mak +++ b/tests/fate/aac.mak @@ -243,17 +243,17 @@ fate-aac-latm_stereo_to_51: REF = $(SAMPLES)/aac/latm_stereo_to_51_ref.s16 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) -FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM) += $(FATE_AAC_LATM) -FATE_AAC-$(call DEMDEC, AAC, AAC_FIXED)+= $(FATE_AAC_FIXED) +FATE_AAC-$(call DEMDEC, AAC, AAC, ARESAMPLE_FILTER) += $(FATE_AAC_CT_RAW) +FATE_AAC-$(call DEMDEC, MOV, AAC, ARESAMPLE_FILTER) += $(FATE_AAC) +FATE_AAC_LATM-$(call DEMDEC, MPEGTS, AAC_LATM, ARESAMPLE_FILTER) += $(FATE_AAC_LATM) +FATE_AAC-$(call DEMDEC, AAC, AAC_FIXED, ARESAMPLE_FILTER) += $(FATE_AAC_FIXED) FATE_AAC_ALL = $(FATE_AAC-yes) $(FATE_AAC_LATM-yes) $(FATE_AAC_FIXED-yes) $(FATE_AAC_ALL): CMP = oneoff $(FATE_AAC_ALL): FUZZ = 2 -FATE_AAC_ENCODE-$(call ENCMUX, AAC, ADTS) += $(FATE_AAC_ENCODE) +FATE_AAC_ENCODE-$(call ENCMUX, AAC, ADTS, ARESAMPLE_FILTER) += $(FATE_AAC_ENCODE) FATE_AAC_BSF-$(call ALLYES, AAC_DEMUXER AAC_ADTSTOASC_BSF MATROSKA_MUXER) += fate-aac-autobsf-adtstoasc
Signed-off-by: James Almer <jamrial@gmail.com> --- tests/fate/aac.mak | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)