Message ID | 1606616411-2082-1-git-send-email-lance.lmwang@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [FFmpeg-devel] avdevice/decklink: remove the duplicated warning message | expand |
Context | Check | Description |
---|---|---|
andriy/x86_make | success | Make finished |
andriy/x86_make_fate | success | Make fate finished |
On Sun, 29 Nov 2020, lance.lmwang@gmail.com wrote: > From: Limin Wang <lance.lmwang@gmail.com> > > ./ffmpeg -list_devices true -f decklink -i dummy > [Blackmagic DeckLink indev @ 0x2f96d00] The "list_devices" option is deprecated: list available devices > [decklink @ 0x2f96400] The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead. > -> > [Blackmagic DeckLink indev @ 0x306ed00] The "list_devices" option is deprecated: use -sources decklink instead Well, OK. It still feels a little strange to me that we are substituting the descripion text with the depracation text but I can see some other deprecation options also do this. I suggest you keep the "ffmpeg" in the deprecation text because -sinks/-sources is an option of the ffmpeg command line, not an option of decklink. So change the description to "use ffmpeg -sources instead" and similarly for the sinks. LGTM otherwise. Thanks, Marton > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > --- > libavdevice/decklink_dec.cpp | 1 - > libavdevice/decklink_dec_c.c | 2 +- > libavdevice/decklink_enc.cpp | 1 - > libavdevice/decklink_enc_c.c | 2 +- > 4 files changed, 2 insertions(+), 4 deletions(-) > > diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp > index 2e41b58..072f8a1 100644 > --- a/libavdevice/decklink_dec.cpp > +++ b/libavdevice/decklink_dec.cpp > @@ -1179,7 +1179,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) > > /* List available devices. */ > if (ctx->list_devices) { > - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead.\n"); > ff_decklink_list_devices_legacy(avctx, 1, 0); > return AVERROR_EXIT; > } > diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c > index 60b7186..7e2f03f 100644 > --- a/libavdevice/decklink_dec_c.c > +++ b/libavdevice/decklink_dec_c.c > @@ -30,7 +30,7 @@ > #define DEC AV_OPT_FLAG_DECODING_PARAM > > static const AVOption options[] = { > - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, > + { "list_devices", "use -sources decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, > { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, DEC }, > { "format_code", "set format by fourcc" , OFFSET(format_code), AV_OPT_TYPE_STRING, { .str = NULL}, 0, 0, DEC }, > { "raw_format", "pixel format to be returned by the card when capturing" , OFFSET(raw_format), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 5, DEC, "raw_format" }, > diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp > index 883fdea..04b06ae 100644 > --- a/libavdevice/decklink_enc.cpp > +++ b/libavdevice/decklink_enc.cpp > @@ -568,7 +568,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) > > /* List available devices and exit. */ > if (ctx->list_devices) { > - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sinks decklink instead.\n"); > ff_decklink_list_devices_legacy(avctx, 0, 1); > return AVERROR_EXIT; > } > diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c > index 6cc0743..5a052c8 100644 > --- a/libavdevice/decklink_enc_c.c > +++ b/libavdevice/decklink_enc_c.c > @@ -28,7 +28,7 @@ > #define OFFSET(x) offsetof(struct decklink_cctx, x) > #define ENC AV_OPT_FLAG_ENCODING_PARAM > static const AVOption options[] = { > - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, > + { "list_devices", "use -sinks decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, > { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, ENC }, > { "preroll" , "video preroll in seconds", OFFSET(preroll ), AV_OPT_TYPE_DOUBLE, { .dbl = 0.5 }, 0, 5, ENC }, > { "duplex_mode" , "duplex mode" , OFFSET(duplex_mode ), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 2, ENC, "duplex_mode"}, > -- > 1.8.3.1 > > _______________________________________________ > 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 Sun, Nov 29, 2020 at 12:42:10PM +0100, Marton Balint wrote: > > > On Sun, 29 Nov 2020, lance.lmwang@gmail.com wrote: > > > From: Limin Wang <lance.lmwang@gmail.com> > > > > ./ffmpeg -list_devices true -f decklink -i dummy > > [Blackmagic DeckLink indev @ 0x2f96d00] The "list_devices" option is deprecated: list available devices > > [decklink @ 0x2f96400] The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead. > > -> > > [Blackmagic DeckLink indev @ 0x306ed00] The "list_devices" option is deprecated: use -sources decklink instead > > Well, OK. It still feels a little strange to me that we are substituting the > descripion text with the depracation text but I can see some other > deprecation options also do this. > > I suggest you keep the "ffmpeg" in the deprecation text because > -sinks/-sources is an option of the ffmpeg command line, not an option of > decklink. So change the description to "use ffmpeg -sources instead" and > similarly for the sinks. OK, have updated locally as suggestion. > > LGTM otherwise. > > Thanks, > Marton > > > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com> > > --- > > libavdevice/decklink_dec.cpp | 1 - > > libavdevice/decklink_dec_c.c | 2 +- > > libavdevice/decklink_enc.cpp | 1 - > > libavdevice/decklink_enc_c.c | 2 +- > > 4 files changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp > > index 2e41b58..072f8a1 100644 > > --- a/libavdevice/decklink_dec.cpp > > +++ b/libavdevice/decklink_dec.cpp > > @@ -1179,7 +1179,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) > > > > /* List available devices. */ > > if (ctx->list_devices) { > > - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead.\n"); > > ff_decklink_list_devices_legacy(avctx, 1, 0); > > return AVERROR_EXIT; > > } > > diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c > > index 60b7186..7e2f03f 100644 > > --- a/libavdevice/decklink_dec_c.c > > +++ b/libavdevice/decklink_dec_c.c > > @@ -30,7 +30,7 @@ > > #define DEC AV_OPT_FLAG_DECODING_PARAM > > > > static const AVOption options[] = { > > - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, > > + { "list_devices", "use -sources decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, > > { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, DEC }, > > { "format_code", "set format by fourcc" , OFFSET(format_code), AV_OPT_TYPE_STRING, { .str = NULL}, 0, 0, DEC }, > > { "raw_format", "pixel format to be returned by the card when capturing" , OFFSET(raw_format), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 5, DEC, "raw_format" }, > > diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp > > index 883fdea..04b06ae 100644 > > --- a/libavdevice/decklink_enc.cpp > > +++ b/libavdevice/decklink_enc.cpp > > @@ -568,7 +568,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) > > > > /* List available devices and exit. */ > > if (ctx->list_devices) { > > - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sinks decklink instead.\n"); > > ff_decklink_list_devices_legacy(avctx, 0, 1); > > return AVERROR_EXIT; > > } > > diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c > > index 6cc0743..5a052c8 100644 > > --- a/libavdevice/decklink_enc_c.c > > +++ b/libavdevice/decklink_enc_c.c > > @@ -28,7 +28,7 @@ > > #define OFFSET(x) offsetof(struct decklink_cctx, x) > > #define ENC AV_OPT_FLAG_ENCODING_PARAM > > static const AVOption options[] = { > > - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, > > + { "list_devices", "use -sinks decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, > > { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, ENC }, > > { "preroll" , "video preroll in seconds", OFFSET(preroll ), AV_OPT_TYPE_DOUBLE, { .dbl = 0.5 }, 0, 5, ENC }, > > { "duplex_mode" , "duplex mode" , OFFSET(duplex_mode ), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 2, ENC, "duplex_mode"}, > > -- > > 1.8.3.1 > > > > _______________________________________________ > > 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". > _______________________________________________ > 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/libavdevice/decklink_dec.cpp b/libavdevice/decklink_dec.cpp index 2e41b58..072f8a1 100644 --- a/libavdevice/decklink_dec.cpp +++ b/libavdevice/decklink_dec.cpp @@ -1179,7 +1179,6 @@ av_cold int ff_decklink_read_header(AVFormatContext *avctx) /* List available devices. */ if (ctx->list_devices) { - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sources decklink instead.\n"); ff_decklink_list_devices_legacy(avctx, 1, 0); return AVERROR_EXIT; } diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c index 60b7186..7e2f03f 100644 --- a/libavdevice/decklink_dec_c.c +++ b/libavdevice/decklink_dec_c.c @@ -30,7 +30,7 @@ #define DEC AV_OPT_FLAG_DECODING_PARAM static const AVOption options[] = { - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, + { "list_devices", "use -sources decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, DEC | AV_OPT_FLAG_DEPRECATED}, { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, DEC }, { "format_code", "set format by fourcc" , OFFSET(format_code), AV_OPT_TYPE_STRING, { .str = NULL}, 0, 0, DEC }, { "raw_format", "pixel format to be returned by the card when capturing" , OFFSET(raw_format), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 5, DEC, "raw_format" }, diff --git a/libavdevice/decklink_enc.cpp b/libavdevice/decklink_enc.cpp index 883fdea..04b06ae 100644 --- a/libavdevice/decklink_enc.cpp +++ b/libavdevice/decklink_enc.cpp @@ -568,7 +568,6 @@ av_cold int ff_decklink_write_header(AVFormatContext *avctx) /* List available devices and exit. */ if (ctx->list_devices) { - av_log(avctx, AV_LOG_WARNING, "The -list_devices option is deprecated and will be removed. Please use ffmpeg -sinks decklink instead.\n"); ff_decklink_list_devices_legacy(avctx, 0, 1); return AVERROR_EXIT; } diff --git a/libavdevice/decklink_enc_c.c b/libavdevice/decklink_enc_c.c index 6cc0743..5a052c8 100644 --- a/libavdevice/decklink_enc_c.c +++ b/libavdevice/decklink_enc_c.c @@ -28,7 +28,7 @@ #define OFFSET(x) offsetof(struct decklink_cctx, x) #define ENC AV_OPT_FLAG_ENCODING_PARAM static const AVOption options[] = { - { "list_devices", "list available devices" , OFFSET(list_devices), AV_OPT_TYPE_BOOL , { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, + { "list_devices", "use -sinks decklink instead", OFFSET(list_devices), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC | AV_OPT_FLAG_DEPRECATED}, { "list_formats", "list supported formats" , OFFSET(list_formats), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 1, ENC }, { "preroll" , "video preroll in seconds", OFFSET(preroll ), AV_OPT_TYPE_DOUBLE, { .dbl = 0.5 }, 0, 5, ENC }, { "duplex_mode" , "duplex mode" , OFFSET(duplex_mode ), AV_OPT_TYPE_INT , { .i64 = 0 }, 0, 2, ENC, "duplex_mode"},