dilim/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-08-07 16:41:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "avfilter/avfiltergraph: always retry format negotiation after auto-filters"

Browse Source 
This reverts commit 978a0821ee.

The stability of the negotiation process has never been studied
with multiple rounds.

It has always been documented to users that scale was the filter
to insert to manage format conversions. A second filter for
a specific type of conversion should never have been added:
the proper fix for the issue that this commit tried to fix is
to give scale the ability to handle premultiplication too.
This commit is contained in:
Nicolas George
2026-04-25 19:25:41 +02:00
parent 7058900614
commit cd9d265344
3 changed files with 4 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavfilter/avfiltergraph.c
View File

@@ -701,11 +701,10 @@ retry:
}
}
/* if there is an auto filter, we may need another round to fully
* settle formats due to possible cross-incompatibilities between
* the auto filters themselves, or between the auto filters and
* a different attribute of the filter they are modifying */
if (num_conv)
/* if there is more than one auto filter, we may need another round
* to fully settle formats due to possible cross-incompatibilities
* between the auto filters themselves */
if (num_conv > 1)
goto retry;
}
}

3
tests/fate/filter-video.mak
View File

@@ -888,9 +888,6 @@ FATE_FILTER-$(call ALLYES, TESTSRC2_FILTER SPLIT_FILTER AVGBLUR_FILTER \
METADATA_FILTER WRAPPED_AVFRAME_ENCODER NULL_MUXER \
PIPE_PROTOCOL) += $(FATE_FILTER_REFCMP_METADATA-yes)
FATE_FILTER-$(call FILTERFRAMECRC, TESTSRC SCALE PREMULTIPLY, LAVFI_INDEV) += fate-filter-scale-premultiply
fate-filter-scale-premultiply: CMD = framecrc -auto_conversion_filters -lavfi "testsrc,format=rgba,setparams=alpha_mode=premultiplied,format=rgba:alpha_modes=straight" -frames:v 10
FATE_SAMPLES_FFPROBE += $(FATE_METADATA_FILTER-yes)
FATE_SAMPLES_FFMPEG += $(FATE_FILTER_SAMPLES-yes)
FATE_FFPROBE += $(FATE_FILTER_FFPROBE-yes)

15
tests/ref/fate/filter-scale-premultiply
View File

@@ -1,15 +0,0 @@
#tb 0: 1/25
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 320x240
#sar 0: 1/1
0, 0, 0, 1, 307200, 0x73a3b71f
0, 1, 1, 1, 307200, 0x3f05f047
0, 2, 2, 1, 307200, 0x50382370
0, 3, 3, 1, 307200, 0x41a15136
0, 4, 4, 1, 307200, 0xbc8c78ee
0, 5, 5, 1, 307200, 0x19839e1b
0, 6, 6, 1, 307200, 0x8545b93b
0, 7, 7, 1, 307200, 0x4a4acf07
0, 8, 8, 1, 307200, 0xefa1dee4
0, 9, 9, 1, 307200, 0x22dae9ca