| Message ID | 20200511193522.31206-4-cus@passwd.hu |
|---|---|
| State | Accepted |
| Commit | d55f1cc58b75bca4ed45c5320b83b93e752f0833 |
| Headers | show |
| Series | [FFmpeg-devel,1/6] avutil/opt: add AV_OPT_FLAG_CHILD_CONSTS | expand |
| Context | Check | Description |
|---|---|---|
| andriy/default | pending | |
| andriy/make | success | Make finished |
| andriy/make_fate | success | Make fate finished |
On 5/11/2020 4:35 PM, Marton Balint wrote: > We don't have a dts encoder. We do, but it's called dca, same as the decoder. > > Signed-off-by: Marton Balint <cus@passwd.hu> > --- > doc/codecs.texi | 10 ---------- > libavcodec/options_table.h | 5 ----- > 2 files changed, 15 deletions(-) > > diff --git a/doc/codecs.texi b/doc/codecs.texi > index 8f62cfaace..c08229ba7e 100644 > --- a/doc/codecs.texi > +++ b/doc/codecs.texi > @@ -849,16 +849,6 @@ Possible values: > > @item mpeg4_asp > > -@item dts > - > -@item dts_es > - > -@item dts_96_24 > - > -@item dts_hd_hra > - > -@item dts_hd_ma > - > @end table > > Encoder specific profiles are documented in the relevant encoder documentation. > diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h > index 6683a38f2e..cc3224b01a 100644 > --- a/libavcodec/options_table.h > +++ b/libavcodec/options_table.h > @@ -262,11 +262,6 @@ static const AVOption avcodec_options[] = { > {"skip_bottom", "number of macroblock rows at the bottom which are skipped", OFFSET(skip_bottom), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, > {"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E|CC, "avctx.profile"}, > {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "avctx.profile"}, > -{"dts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, > -{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_ES }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, > -{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, > -{"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_HRA }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, > -{"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_MA }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, > {"mpeg4_sp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_SIMPLE }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, > {"mpeg4_core", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_CORE }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, > {"mpeg4_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_MAIN }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, >
On Mon, 11 May 2020, James Almer wrote: > On 5/11/2020 4:35 PM, Marton Balint wrote: >> We don't have a dts encoder. > > We do, but it's called dca, same as the decoder. Indeed. But as far as I see it does not use avctx->profile, so it still seems OK to remove these, right? Thanks, Marton > >> >> Signed-off-by: Marton Balint <cus@passwd.hu> >> --- >> doc/codecs.texi | 10 ---------- >> libavcodec/options_table.h | 5 ----- >> 2 files changed, 15 deletions(-) >> >> diff --git a/doc/codecs.texi b/doc/codecs.texi >> index 8f62cfaace..c08229ba7e 100644 >> --- a/doc/codecs.texi >> +++ b/doc/codecs.texi >> @@ -849,16 +849,6 @@ Possible values: >> >> @item mpeg4_asp >> >> -@item dts >> - >> -@item dts_es >> - >> -@item dts_96_24 >> - >> -@item dts_hd_hra >> - >> -@item dts_hd_ma >> - >> @end table >> >> Encoder specific profiles are documented in the relevant encoder documentation. >> diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h >> index 6683a38f2e..cc3224b01a 100644 >> --- a/libavcodec/options_table.h >> +++ b/libavcodec/options_table.h >> @@ -262,11 +262,6 @@ static const AVOption avcodec_options[] = { >> {"skip_bottom", "number of macroblock rows at the bottom which are skipped", OFFSET(skip_bottom), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, >> {"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E|CC, "avctx.profile"}, >> {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "avctx.profile"}, >> -{"dts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, >> -{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_ES }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, >> -{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, >> -{"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_HRA }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, >> -{"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_MA }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, >> {"mpeg4_sp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_SIMPLE }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, >> {"mpeg4_core", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_CORE }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, >> {"mpeg4_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_MAIN }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, >> > > _______________________________________________ > 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".
On 5/11/2020 6:27 PM, Marton Balint wrote: > > > On Mon, 11 May 2020, James Almer wrote: > >> On 5/11/2020 4:35 PM, Marton Balint wrote: >>> We don't have a dts encoder. >> >> We do, but it's called dca, same as the decoder. > > Indeed. But as far as I see it does not use avctx->profile, so it still > seems OK to remove these, right? I don't know if anyone has plans to improve or extend the encoder, so i guess it's fine. They can be properly readded once that happens. Just make sure to bump micro version as well, either in the last patch of the set, or in this one.
diff --git a/doc/codecs.texi b/doc/codecs.texi index 8f62cfaace..c08229ba7e 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -849,16 +849,6 @@ Possible values: @item mpeg4_asp -@item dts - -@item dts_es - -@item dts_96_24 - -@item dts_hd_hra - -@item dts_hd_ma - @end table Encoder specific profiles are documented in the relevant encoder documentation. diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index 6683a38f2e..cc3224b01a 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -262,11 +262,6 @@ static const AVOption avcodec_options[] = { {"skip_bottom", "number of macroblock rows at the bottom which are skipped", OFFSET(skip_bottom), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX, V|D}, {"profile", NULL, OFFSET(profile), AV_OPT_TYPE_INT, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E|CC, "avctx.profile"}, {"unknown", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_UNKNOWN }, INT_MIN, INT_MAX, V|A|E, "avctx.profile"}, -{"dts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, -{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_ES }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, -{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, -{"dts_hd_hra", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_HRA }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, -{"dts_hd_ma", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_HD_MA }, INT_MIN, INT_MAX, A|E, "avctx.profile"}, {"mpeg4_sp", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_SIMPLE }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, {"mpeg4_core", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_CORE }, INT_MIN, INT_MAX, V|E, "avctx.profile"}, {"mpeg4_main", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG4_MAIN }, INT_MIN, INT_MAX, V|E, "avctx.profile"},
We don't have a dts encoder. Signed-off-by: Marton Balint <cus@passwd.hu> --- doc/codecs.texi | 10 ---------- libavcodec/options_table.h | 5 ----- 2 files changed, 15 deletions(-)