Message ID | 20210703061632.570-1-ffmpeg@gyani.pro |
---|---|
State | Accepted |
Commit | b7ba472f43e7f1ab4d4268f4f1cc77d70ae405d7 |
Headers | show |
Series | [FFmpeg-devel] avfilter/fps: remove unconventional acronyms | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
andriy/PPC64_make | success | Make finished |
andriy/PPC64_make_fate | success | Make fate finished |
Plan to push tomorrow. On 2021-07-03 11:46, Gyan Doshi wrote: > In dd770883e9, support for expressions was added. Among the constants > added were labels of qnstc, qpal, sntsc & spal. > > These were added in ba2a8cb40b to represent parameter permutations where > only the resolution is different. They don't have any usage currency and > don't represent any industry standards or convention in terms of framerate. > --- > doc/filters.texi | 4 ++-- > libavfilter/vf_fps.c | 16 ---------------- > 2 files changed, 2 insertions(+), 18 deletions(-) > > diff --git a/doc/filters.texi b/doc/filters.texi > index eaf23e3736..d991c06628 100644 > --- a/doc/filters.texi > +++ b/doc/filters.texi > @@ -12341,10 +12341,10 @@ constants: > @item source_fps > The input's frame rate > > -@item ntsc, qntsc, sntsc > +@item ntsc > NTSC frame rate of @code{30000/1001} > > -@item pal, qpal, spal > +@item pal > PAL frame rate of @code{25.0} > > @item film > diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c > index 29588a5f6e..fbc845da1b 100644 > --- a/libavfilter/vf_fps.c > +++ b/libavfilter/vf_fps.c > @@ -47,10 +47,6 @@ static const char *const var_names[] = { > "source_fps", > "ntsc", > "pal", > - "qntsc", > - "qpal", > - "sntsc", > - "spal", > "film", > "ntsc_film", > NULL > @@ -60,10 +56,6 @@ enum var_name { > VAR_SOURCE_FPS, > VAR_FPS_NTSC, > VAR_FPS_PAL, > - VAR_FPS_QNTSC, > - VAR_FPS_QPAL, > - VAR_FPS_SNTSC, > - VAR_FPS_SPAL, > VAR_FPS_FILM, > VAR_FPS_NTSC_FILM, > VARS_NB > @@ -71,10 +63,6 @@ enum var_name { > > static const double ntsc_fps = 30000.0 / 1001.0; > static const double pal_fps = 25.0; > -static const double qntsc_fps = 30000.0 / 1001.0; > -static const double qpal_fps = 25.0; > -static const double sntsc_fps = 30000.0 / 1001.0; > -static const double spal_fps = 25.0; > static const double film_fps = 24.0; > static const double ntsc_film_fps = 24000.0 / 1001.0; > > @@ -194,10 +182,6 @@ static int config_props(AVFilterLink* outlink) > var_values[VAR_SOURCE_FPS] = av_q2d(inlink->frame_rate); > var_values[VAR_FPS_NTSC] = ntsc_fps; > var_values[VAR_FPS_PAL] = pal_fps; > - var_values[VAR_FPS_QNTSC] = qntsc_fps; > - var_values[VAR_FPS_QPAL] = qpal_fps; > - var_values[VAR_FPS_SNTSC] = sntsc_fps; > - var_values[VAR_FPS_SPAL] = spal_fps; > var_values[VAR_FPS_FILM] = film_fps; > var_values[VAR_FPS_NTSC_FILM] = ntsc_film_fps; > ret = av_expr_parse_and_eval(&res, s->framerate,
Pushed as b7ba472f43e7f1ab4d4268f4f1cc77d70ae405d7 On 2021-07-05 20:27, Gyan Doshi wrote: > Plan to push tomorrow. > > On 2021-07-03 11:46, Gyan Doshi wrote: >> In dd770883e9, support for expressions was added. Among the constants >> added were labels of qnstc, qpal, sntsc & spal. >> >> These were added in ba2a8cb40b to represent parameter permutations where >> only the resolution is different. They don't have any usage currency and >> don't represent any industry standards or convention in terms of >> framerate. >> --- >> doc/filters.texi | 4 ++-- >> libavfilter/vf_fps.c | 16 ---------------- >> 2 files changed, 2 insertions(+), 18 deletions(-) >> >> diff --git a/doc/filters.texi b/doc/filters.texi >> index eaf23e3736..d991c06628 100644 >> --- a/doc/filters.texi >> +++ b/doc/filters.texi >> @@ -12341,10 +12341,10 @@ constants: >> @item source_fps >> The input's frame rate >> -@item ntsc, qntsc, sntsc >> +@item ntsc >> NTSC frame rate of @code{30000/1001} >> -@item pal, qpal, spal >> +@item pal >> PAL frame rate of @code{25.0} >> @item film >> diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c >> index 29588a5f6e..fbc845da1b 100644 >> --- a/libavfilter/vf_fps.c >> +++ b/libavfilter/vf_fps.c >> @@ -47,10 +47,6 @@ static const char *const var_names[] = { >> "source_fps", >> "ntsc", >> "pal", >> - "qntsc", >> - "qpal", >> - "sntsc", >> - "spal", >> "film", >> "ntsc_film", >> NULL >> @@ -60,10 +56,6 @@ enum var_name { >> VAR_SOURCE_FPS, >> VAR_FPS_NTSC, >> VAR_FPS_PAL, >> - VAR_FPS_QNTSC, >> - VAR_FPS_QPAL, >> - VAR_FPS_SNTSC, >> - VAR_FPS_SPAL, >> VAR_FPS_FILM, >> VAR_FPS_NTSC_FILM, >> VARS_NB >> @@ -71,10 +63,6 @@ enum var_name { >> static const double ntsc_fps = 30000.0 / 1001.0; >> static const double pal_fps = 25.0; >> -static const double qntsc_fps = 30000.0 / 1001.0; >> -static const double qpal_fps = 25.0; >> -static const double sntsc_fps = 30000.0 / 1001.0; >> -static const double spal_fps = 25.0; >> static const double film_fps = 24.0; >> static const double ntsc_film_fps = 24000.0 / 1001.0; >> @@ -194,10 +182,6 @@ static int config_props(AVFilterLink* outlink) >> var_values[VAR_SOURCE_FPS] = av_q2d(inlink->frame_rate); >> var_values[VAR_FPS_NTSC] = ntsc_fps; >> var_values[VAR_FPS_PAL] = pal_fps; >> - var_values[VAR_FPS_QNTSC] = qntsc_fps; >> - var_values[VAR_FPS_QPAL] = qpal_fps; >> - var_values[VAR_FPS_SNTSC] = sntsc_fps; >> - var_values[VAR_FPS_SPAL] = spal_fps; >> var_values[VAR_FPS_FILM] = film_fps; >> var_values[VAR_FPS_NTSC_FILM] = ntsc_film_fps; >> ret = av_expr_parse_and_eval(&res, s->framerate, > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/doc/filters.texi b/doc/filters.texi index eaf23e3736..d991c06628 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12341,10 +12341,10 @@ constants: @item source_fps The input's frame rate -@item ntsc, qntsc, sntsc +@item ntsc NTSC frame rate of @code{30000/1001} -@item pal, qpal, spal +@item pal PAL frame rate of @code{25.0} @item film diff --git a/libavfilter/vf_fps.c b/libavfilter/vf_fps.c index 29588a5f6e..fbc845da1b 100644 --- a/libavfilter/vf_fps.c +++ b/libavfilter/vf_fps.c @@ -47,10 +47,6 @@ static const char *const var_names[] = { "source_fps", "ntsc", "pal", - "qntsc", - "qpal", - "sntsc", - "spal", "film", "ntsc_film", NULL @@ -60,10 +56,6 @@ enum var_name { VAR_SOURCE_FPS, VAR_FPS_NTSC, VAR_FPS_PAL, - VAR_FPS_QNTSC, - VAR_FPS_QPAL, - VAR_FPS_SNTSC, - VAR_FPS_SPAL, VAR_FPS_FILM, VAR_FPS_NTSC_FILM, VARS_NB @@ -71,10 +63,6 @@ enum var_name { static const double ntsc_fps = 30000.0 / 1001.0; static const double pal_fps = 25.0; -static const double qntsc_fps = 30000.0 / 1001.0; -static const double qpal_fps = 25.0; -static const double sntsc_fps = 30000.0 / 1001.0; -static const double spal_fps = 25.0; static const double film_fps = 24.0; static const double ntsc_film_fps = 24000.0 / 1001.0; @@ -194,10 +182,6 @@ static int config_props(AVFilterLink* outlink) var_values[VAR_SOURCE_FPS] = av_q2d(inlink->frame_rate); var_values[VAR_FPS_NTSC] = ntsc_fps; var_values[VAR_FPS_PAL] = pal_fps; - var_values[VAR_FPS_QNTSC] = qntsc_fps; - var_values[VAR_FPS_QPAL] = qpal_fps; - var_values[VAR_FPS_SNTSC] = sntsc_fps; - var_values[VAR_FPS_SPAL] = spal_fps; var_values[VAR_FPS_FILM] = film_fps; var_values[VAR_FPS_NTSC_FILM] = ntsc_film_fps; ret = av_expr_parse_and_eval(&res, s->framerate,