[FFmpeg-devel] [Patch] beautified + accelerated vf_fillborders – Please review

Paul B Mahol onemda at gmail.com
Wed Apr 3 12:22:36 EEST 2019


On 4/3/19, Ulf Zibis <Ulf.Zibis at cosoco.de> wrote:
>
> Am 03.04.19 um 00:32 schrieb Carl Eugen Hoyos:
>>> So please throw away the old one and use the new
>>> patch 11.
>> That patch does not apply:
> At my machine  all patches work fine:
>
> ich at T500:~/Projects/ffmpeg/test$ git clone git://source.ffmpeg.org/ffmpeg .
> Klone nach '.' ...
> remote: Counting objects: 565208, done.
> remote: Compressing objects: 100% (117011/117011), done.
> remote: Total 565208 (delta 453761), reused 556701 (delta 447046)
> Empfange Objekte: 100% (565208/565208), 100.39 MiB | 1.04 MiB/s, Fertig.
> Löse Unterschiede auf: 100% (453761/453761), Fertig.
> ich at T500:~/Projects/ffmpeg/test$ git checkout -b vf_fillborders
> Zu neuem Branch 'vf_fillborders' gewechselt
> ich at T500:~/Projects/ffmpeg/test$ git status
> Auf Branch vf_fillborders
> Unversionierte Dateien:
>   (benutzen Sie "git add <Datei>...", um die Änderungen zum Commit
> vorzumerken)
>
>     vf_fillborders_1.patch
>     vf_fillborders_10.patch
>     vf_fillborders_11.patch
>     vf_fillborders_12.patch
>     vf_fillborders_2.patch
>     vf_fillborders_3.patch
>     vf_fillborders_4.patch
>     vf_fillborders_5.patch
>     vf_fillborders_6.patch
>     vf_fillborders_7.patch
>     vf_fillborders_8.patch
>     vf_fillborders_9.patch
>
> nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien
> (benutzen Sie "git add" zum Versionieren)
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_1.patch
> Wende an: avfilter/fillborders: corrected indentations on
> line-continuation to 8
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_2.patch
> Wende an: avfilter/fillborders: added comments; removed separation in
> commented blocks
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_3.patch
> Wende an: avfilter/fillborders: named more descriptive
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_4.patch
> Wende an: avfilter/fillborders: moved fillborders_options[] more up,
> needed for STOP_TIMER(testcase);
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_5.patch
> Wende an: avfilter/fillborders: removed obsolete includes
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_6.patch
> Wende an: avfilter/fillborders: reduced scope of local variables, also
> saves code lines
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_7.patch
> Wende an: avfilter/fillborders:renamed config_props; avoid needless
> calculations there and order more logical
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_8.patch
> Wende an: avfilter/fillborders: aligned pointer to array addressing style
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_9.patch
> Wende an: avfilter/fillborders: enhanced readability;
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_10.patch
> Wende an: avfilter/fillborders: shortened linesize name to allow more
> 1-line code; removed braces
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_11.patch
> Wende an: avfilter/fillborders: move definitions to their context, also
> to reduce their scope
> ich at T500:~/Projects/ffmpeg/test$ git am vf_fillborders_12.patch
> Wende an: avfilter/fillborders: moved multiplication with linesize out
> of for loop for performance;
> ich at T500:~/Projects/ffmpeg/test$
>
>> The patch wants to remove "enum" from line 27, but that is an include in
>> current FFmpeg.
> If you already have applied the old version of vf_fillborders_11.patch
> you may first remove it from the repository with:
> git reset --hard HEAD~1
>
> ... and then apply the new patch again.

You obviously lack git skills.


More information about the ffmpeg-devel mailing list