diff mbox series

[FFmpeg-devel,2/4] avdevice/decklink: add AV_OPT_FLAG_DEPRECATED flag for list_devices

Message ID 1605924448-26279-2-git-send-email-lance.lmwang@gmail.com
State Superseded
Headers show
Series [FFmpeg-devel,1/4] avdevice/decklink: use boolean for list_devices option | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Lance Wang Nov. 21, 2020, 2:07 a.m. UTC 
From: Limin Wang <lance.lmwang@gmail.com>

and claim the option deprecated in the description.

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavdevice/decklink_dec_c.c | 3 ++-
 libavdevice/decklink_enc_c.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

Engi Gang Nov. 21, 2020, 11:09 a.m. UTC | #1 
unsubscribe

On Sat, Nov 21, 2020 at 4:08 AM <lance.lmwang@gmail.com> wrote:

> From: Limin Wang <lance.lmwang@gmail.com>
>
> and claim the option deprecated in the description.
>
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
>  libavdevice/decklink_dec_c.c | 3 ++-
>  libavdevice/decklink_enc_c.c | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c
> index 53a4774..c6b38d2 100644
> --- a/libavdevice/decklink_dec_c.c
> +++ b/libavdevice/decklink_dec_c.c
> @@ -30,7 +30,8 @@
>  #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 },
> +    { "list_devices", "list available devices(deprecated, 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_c.c b/libavdevice/decklink_enc_c.c
> index e7b0117..ce99220 100644
> --- a/libavdevice/decklink_enc_c.c
> +++ b/libavdevice/decklink_enc_c.c
> @@ -28,7 +28,8 @@
>  #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 },
> +    { "list_devices", "list available devices(deprecated, 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".
Marton Balint Nov. 21, 2020, 11:21 a.m. UTC | #2 
On Sat, 21 Nov 2020, lance.lmwang@gmail.com wrote:

> From: Limin Wang <lance.lmwang@gmail.com>
>
> and claim the option deprecated in the description.

No, the description should stay as is. Adding the flag is enough, the 
deprecation will be printed if the user asks for the list of options based 
on the flag.

Regards,
Marton

>
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> ---
> libavdevice/decklink_dec_c.c | 3 ++-
> libavdevice/decklink_enc_c.c | 3 ++-
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c
> index 53a4774..c6b38d2 100644
> --- a/libavdevice/decklink_dec_c.c
> +++ b/libavdevice/decklink_dec_c.c
> @@ -30,7 +30,8 @@
> #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 },
> +    { "list_devices", "list available devices(deprecated, 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_c.c b/libavdevice/decklink_enc_c.c
> index e7b0117..ce99220 100644
> --- a/libavdevice/decklink_enc_c.c
> +++ b/libavdevice/decklink_enc_c.c
> @@ -28,7 +28,8 @@
> #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 },
> +    { "list_devices", "list available devices(deprecated, 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".
Reto Kromer Nov. 21, 2020, 12:56 p.m. UTC | #3 
Engi Gang wrote:

>unsubscribe

Please follow the instruction given at the end of each single
message:

>> To unsubscribe, visit link above, or email
>> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

>To unsubscribe, visit link above, or email
>ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Engi Gang Nov. 21, 2020, 1:27 p.m. UTC | #4 
im stupid sorry

On Sat, Nov 21, 2020 at 2:57 PM Reto Kromer <lists@reto.ch> wrote:

> Engi Gang wrote:
>
> >unsubscribe
>
> Please follow the instruction given at the end of each single
> message:
>
> >> To unsubscribe, visit link above, or email
> >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
>
> >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".
Lance Wang Nov. 22, 2020, 1:26 p.m. UTC | #5 
On Sat, Nov 21, 2020 at 12:21:10PM +0100, Marton Balint wrote:
> 
> 
> On Sat, 21 Nov 2020, lance.lmwang@gmail.com wrote:
> 
> > From: Limin Wang <lance.lmwang@gmail.com>
> > 
> > and claim the option deprecated in the description.
> 
> No, the description should stay as is. Adding the flag is enough, the
> deprecation will be printed if the user asks for the list of options based
> on the flag.

thanks, will update the patch and add the flag only.

> 
> Regards,
> Marton
> 
> > 
> > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > ---
> > libavdevice/decklink_dec_c.c | 3 ++-
> > libavdevice/decklink_enc_c.c | 3 ++-
> > 2 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c
> > index 53a4774..c6b38d2 100644
> > --- a/libavdevice/decklink_dec_c.c
> > +++ b/libavdevice/decklink_dec_c.c
> > @@ -30,7 +30,8 @@
> > #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 },
> > +    { "list_devices", "list available devices(deprecated, 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_c.c b/libavdevice/decklink_enc_c.c
> > index e7b0117..ce99220 100644
> > --- a/libavdevice/decklink_enc_c.c
> > +++ b/libavdevice/decklink_enc_c.c
> > @@ -28,7 +28,8 @@
> > #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 },
> > +    { "list_devices", "list available devices(deprecated, 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".
Lance Wang Nov. 29, 2020, 2:16 a.m. UTC | #6 
On Sat, Nov 21, 2020 at 12:21:10PM +0100, Marton Balint wrote:
> 
> 
> On Sat, 21 Nov 2020, lance.lmwang@gmail.com wrote:
> 
> > From: Limin Wang <lance.lmwang@gmail.com>
> > 
> > and claim the option deprecated in the description.
> 
> No, the description should stay as is. Adding the flag is enough, the
> deprecation will be printed if the user asks for the list of options based
> on the flag.
Sorry, after add the flag, it'll print "The "list_devices" option is deprecated:", 
I still prefer to change the description like below to avoid the duplicated warning message,
how do you think? I'll send a updated patch for review.

./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

> 
> Regards,
> Marton
> 
> > 
> > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > ---
> > libavdevice/decklink_dec_c.c | 3 ++-
> > libavdevice/decklink_enc_c.c | 3 ++-
> > 2 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c
> > index 53a4774..c6b38d2 100644
> > --- a/libavdevice/decklink_dec_c.c
> > +++ b/libavdevice/decklink_dec_c.c
> > @@ -30,7 +30,8 @@
> > #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 },
> > +    { "list_devices", "list available devices(deprecated, 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_c.c b/libavdevice/decklink_enc_c.c
> > index e7b0117..ce99220 100644
> > --- a/libavdevice/decklink_enc_c.c
> > +++ b/libavdevice/decklink_enc_c.c
> > @@ -28,7 +28,8 @@
> > #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 },
> > +    { "list_devices", "list available devices(deprecated, 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 mbox series

Patch

diff --git a/libavdevice/decklink_dec_c.c b/libavdevice/decklink_dec_c.c
index 53a4774..c6b38d2 100644
--- a/libavdevice/decklink_dec_c.c
+++ b/libavdevice/decklink_dec_c.c
@@ -30,7 +30,8 @@ 
 #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 },
+    { "list_devices", "list available devices(deprecated, 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_c.c b/libavdevice/decklink_enc_c.c
index e7b0117..ce99220 100644
--- a/libavdevice/decklink_enc_c.c
+++ b/libavdevice/decklink_enc_c.c
@@ -28,7 +28,8 @@ 
 #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 },
+    { "list_devices", "list available devices(deprecated, 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"},