| Message ID | AS8P250MB0744BBA654FCCAFE5649A4868FEEA@AS8P250MB0744.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Withdrawn |
| Headers | show |
| Series | [FFmpeg-devel,v2,01/22] fate/demux, lavf-container: Workaround for AV1-aspect ratio issue | expand |
Andreas Rheinhardt: > This is a workaround for an issue introduced in commit > 1652f2492f88434010053289d946dab6a57e4d58. It is not meant to be applied > to the tree. > > Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> > --- > tests/fate-run.sh | 2 +- > tests/fate/demux.mak | 2 +- > tests/fate/lavf-container.mak | 4 ++-- > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/fate-run.sh b/tests/fate-run.sh > index 5a71ac001e..276f97489d 100755 > --- a/tests/fate-run.sh > +++ b/tests/fate-run.sh > @@ -383,7 +383,7 @@ lavf_container_fate() > file=${outdir}/lavf.$t > cleanfiles="$cleanfiles $file" > input="${target_samples}/$1" > - do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy > + do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" $4 -vcodec copy -acodec copy > do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3 > } > > diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak > index ace8fa0b52..7a091de851 100644 > --- a/tests/fate/demux.mak > +++ b/tests/fate/demux.mak > @@ -14,7 +14,7 @@ FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux > fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy > > FATE_SAMPLES_DEMUX-$(call DEMDEC, AV1, AV1) += fate-av1-annexb-demux > -fate-av1-annexb-demux: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy > +fate-av1-annexb-demux: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy -sar 1:1 > > FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast > fate-ast: CMD = crc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast -c copy > diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak > index 0d4a224601..047dd1d7f4 100644 > --- a/tests/fate/lavf-container.mak > +++ b/tests/fate/lavf-container.mak > @@ -86,8 +86,8 @@ FATE_LAVF_CONTAINER_FATE = $(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%) > $(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%) > $(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF) > > -fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" > -fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" > +fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" "-sar 1:1" > +fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" "-sar 1:1" > fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "-c:v copy" > fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "-c:v copy" > fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto" Will apply patches 4-15 as well as 22-25 tonight unless there are objections. - Andreas
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 5a71ac001e..276f97489d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -383,7 +383,7 @@ lavf_container_fate() file=${outdir}/lavf.$t cleanfiles="$cleanfiles $file" input="${target_samples}/$1" - do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy + do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" "$ENC_OPTS -metadata title=lavftest" $4 -vcodec copy -acodec copy do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i $target_path/$file $3 } diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak index ace8fa0b52..7a091de851 100644 --- a/tests/fate/demux.mak +++ b/tests/fate/demux.mak @@ -14,7 +14,7 @@ FATE_SAMPLES_DEMUX-$(CONFIG_AEA_DEMUXER) += fate-aea-demux fate-aea-demux: CMD = crc -i $(TARGET_SAMPLES)/aea/chirp.aea -c:a copy FATE_SAMPLES_DEMUX-$(call DEMDEC, AV1, AV1) += fate-av1-annexb-demux -fate-av1-annexb-demux: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy +fate-av1-annexb-demux: CMD = framecrc -c:v av1 -i $(TARGET_SAMPLES)/av1/annexb.obu -c:v copy -sar 1:1 FATE_SAMPLES_DEMUX-$(CONFIG_AST_DEMUXER) += fate-ast fate-ast: CMD = crc -i $(TARGET_SAMPLES)/ast/demo11_02_partial.ast -c copy diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak index 0d4a224601..047dd1d7f4 100644 --- a/tests/fate/lavf-container.mak +++ b/tests/fate/lavf-container.mak @@ -86,8 +86,8 @@ FATE_LAVF_CONTAINER_FATE = $(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%) $(FATE_LAVF_CONTAINER_FATE): REF = $(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%) $(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF) -fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" -fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" +fate-lavf-fate-av1.mp4: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" "-sar 1:1" +fate-lavf-fate-av1.mkv: CMD = lavf_container_fate "av1-test-vectors/av1-1-b8-05-mv.ivf" "" "-c:v copy" "-sar 1:1" fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "-c:v copy" fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264" "" "-c:v copy" fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" "-idct auto"
This is a workaround for an issue introduced in commit 1652f2492f88434010053289d946dab6a57e4d58. It is not meant to be applied to the tree. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- tests/fate-run.sh | 2 +- tests/fate/demux.mak | 2 +- tests/fate/lavf-container.mak | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)