diff mbox series

[FFmpeg-devel,1/4] avformat/rtsp: set AV_OPT_FLAG_DEPRECATED on depracated options

Message ID 20201115182005.24702-1-andriy.gelman@gmail.com
State Accepted
Commit 207658112bbe7bcc33696a68596b3223c4c82185
Headers show
Series [FFmpeg-devel,1/4] avformat/rtsp: set AV_OPT_FLAG_DEPRECATED on depracated options
Related show

Checks

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

Commit Message

Andriy Gelman Nov. 15, 2020, 6:20 p.m. UTC
From: Andriy Gelman <andriy.gelman@gmail.com>

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
---
 libavformat/rtsp.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Andriy Gelman Dec. 8, 2020, 4:08 a.m. UTC | #1
On Sun, 15. Nov 13:20, Andriy Gelman wrote:
> From: Andriy Gelman <andriy.gelman@gmail.com>
> 
> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
> ---
>  libavformat/rtsp.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> index d9832bbf1f..2ef75f50e3 100644
> --- a/libavformat/rtsp.c
> +++ b/libavformat/rtsp.c
> @@ -94,7 +94,7 @@ const AVOption ff_rtsp_options[] = {
>      { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
>      { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
>  #if FF_API_OLD_RTSP_OPTIONS
> -    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
> +    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED },
>      { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
>  #else
>      { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
> @@ -102,7 +102,7 @@ const AVOption ff_rtsp_options[] = {
>      COMMON_OPTS(),
>      { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
>  #if FF_API_OLD_RTSP_OPTIONS
> -    { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
> +    { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED },
>  #endif
>      { NULL },
>  };
> -- 
> 2.28.0
> 

ping for the series.

Thanks,
zhilizhao(赵志立) Dec. 8, 2020, 5:25 a.m. UTC | #2
> On Dec 8, 2020, at 12:08 PM, Andriy Gelman <andriy.gelman@gmail.com> wrote:
> 
> On Sun, 15. Nov 13:20, Andriy Gelman wrote:
>> From: Andriy Gelman <andriy.gelman@gmail.com>
>> 
>> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
>> ---
>> libavformat/rtsp.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
>> index d9832bbf1f..2ef75f50e3 100644
>> --- a/libavformat/rtsp.c
>> +++ b/libavformat/rtsp.c
>> @@ -94,7 +94,7 @@ const AVOption ff_rtsp_options[] = {
>>     { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
>>     { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
>> #if FF_API_OLD_RTSP_OPTIONS
>> -    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
>> +    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED },
>>     { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },

Looks good to me, although it’s a little weird that after major bump “timeout”
will have a different meaning instead of being dropped. “stimeout” is
deprecated, since there is not other option to replace it at the current time,
it cannot be marked as AV_OPT_FLAG_DEPRECATED.

>> #else
>>     { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
>> @@ -102,7 +102,7 @@ const AVOption ff_rtsp_options[] = {
>>     COMMON_OPTS(),
>>     { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
>> #if FF_API_OLD_RTSP_OPTIONS
>> -    { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
>> +    { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED },
>> #endif
>>     { NULL },
>> };
>> -- 
>> 2.28.0
>> 
> 
> ping for the series.
> 
> Thanks,
> -- 
> Andriy
> _______________________________________________
> 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".
Andriy Gelman Dec. 9, 2020, 3:35 a.m. UTC | #3
Hi Zhao, 

Thanks for reviewing.

On Tue, 08. Dec 13:25, "zhilizhao(赵志立)" wrote:
> 
> 
> > On Dec 8, 2020, at 12:08 PM, Andriy Gelman <andriy.gelman@gmail.com> wrote:
> > 
> > On Sun, 15. Nov 13:20, Andriy Gelman wrote:
> >> From: Andriy Gelman <andriy.gelman@gmail.com>
> >> 
> >> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
> >> ---
> >> libavformat/rtsp.c | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >> 
> >> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> >> index d9832bbf1f..2ef75f50e3 100644
> >> --- a/libavformat/rtsp.c
> >> +++ b/libavformat/rtsp.c
> >> @@ -94,7 +94,7 @@ const AVOption ff_rtsp_options[] = {
> >>     { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
> >>     { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
> >> #if FF_API_OLD_RTSP_OPTIONS
> >> -    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
> >> +    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED },
> >>     { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
> 
> Looks good to me, although it’s a little weird that after major bump “timeout”
> will have a different meaning instead of being dropped. “stimeout” is
> deprecated, since there is not other option to replace it at the current time,
> it cannot be marked as AV_OPT_FLAG_DEPRECATED.
> 

Right, after the major bump timeout will become the suggested alternative for
stimeout, and stimeout will have the deprecated label.
I think the idea is to get away from timeout option implying the listen mode.
Andriy Gelman Dec. 17, 2020, 3:42 p.m. UTC | #4
On Tue, 08. Dec 22:35, Andriy Gelman wrote:
> Hi Zhao, 
> 
> Thanks for reviewing.
> 
> On Tue, 08. Dec 13:25, "zhilizhao(赵志立)" wrote:
> > 
> > 
> > > On Dec 8, 2020, at 12:08 PM, Andriy Gelman <andriy.gelman@gmail.com> wrote:
> > > 
> > > On Sun, 15. Nov 13:20, Andriy Gelman wrote:
> > >> From: Andriy Gelman <andriy.gelman@gmail.com>
> > >> 
> > >> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
> > >> ---
> > >> libavformat/rtsp.c | 4 ++--
> > >> 1 file changed, 2 insertions(+), 2 deletions(-)
> > >> 
> > >> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> > >> index d9832bbf1f..2ef75f50e3 100644
> > >> --- a/libavformat/rtsp.c
> > >> +++ b/libavformat/rtsp.c
> > >> @@ -94,7 +94,7 @@ const AVOption ff_rtsp_options[] = {
> > >>     { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
> > >>     { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
> > >> #if FF_API_OLD_RTSP_OPTIONS
> > >> -    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
> > >> +    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED },
> > >>     { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
> > 
> > Looks good to me, although it’s a little weird that after major bump “timeout”
> > will have a different meaning instead of being dropped. “stimeout” is
> > deprecated, since there is not other option to replace it at the current time,
> > it cannot be marked as AV_OPT_FLAG_DEPRECATED.
> > 
> 
> Right, after the major bump timeout will become the suggested alternative for
> stimeout, and stimeout will have the deprecated label.
> I think the idea is to get away from timeout option implying the listen mode.

Will apply this patch.

Ping for patches 2-4.

--
Andriy
Andriy Gelman Jan. 10, 2021, 3:57 p.m. UTC | #5
On Thu, 17. Dec 10:42, Andriy Gelman wrote:
> On Tue, 08. Dec 22:35, Andriy Gelman wrote:
> > Hi Zhao, 
> > 
> > Thanks for reviewing.
> > 
> > On Tue, 08. Dec 13:25, "zhilizhao(赵志立)" wrote:
> > > 
> > > 
> > > > On Dec 8, 2020, at 12:08 PM, Andriy Gelman <andriy.gelman@gmail.com> wrote:
> > > > 
> > > > On Sun, 15. Nov 13:20, Andriy Gelman wrote:
> > > >> From: Andriy Gelman <andriy.gelman@gmail.com>
> > > >> 
> > > >> Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
> > > >> ---
> > > >> libavformat/rtsp.c | 4 ++--
> > > >> 1 file changed, 2 insertions(+), 2 deletions(-)
> > > >> 
> > > >> diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
> > > >> index d9832bbf1f..2ef75f50e3 100644
> > > >> --- a/libavformat/rtsp.c
> > > >> +++ b/libavformat/rtsp.c
> > > >> @@ -94,7 +94,7 @@ const AVOption ff_rtsp_options[] = {
> > > >>     { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
> > > >>     { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
> > > >> #if FF_API_OLD_RTSP_OPTIONS
> > > >> -    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
> > > >> +    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED },
> > > >>     { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
> > > 
> > > Looks good to me, although it’s a little weird that after major bump “timeout”
> > > will have a different meaning instead of being dropped. “stimeout” is
> > > deprecated, since there is not other option to replace it at the current time,
> > > it cannot be marked as AV_OPT_FLAG_DEPRECATED.
> > > 
> > 
> > Right, after the major bump timeout will become the suggested alternative for
> > stimeout, and stimeout will have the deprecated label.
> > I think the idea is to get away from timeout option implying the listen mode.
> 
> Will apply this patch.
> 
> Ping for patches 2-4.
> 

ping
diff mbox series

Patch

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index d9832bbf1f..2ef75f50e3 100644
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -94,7 +94,7 @@  const AVOption ff_rtsp_options[] = {
     { "max_port", "set maximum local UDP port", OFFSET(rtp_port_max), AV_OPT_TYPE_INT, {.i64 = RTSP_RTP_PORT_MAX}, 0, 65535, DEC|ENC },
     { "listen_timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
 #if FF_API_OLD_RTSP_OPTIONS
-    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC },
+    { "timeout", "set maximum timeout (in seconds) to wait for incoming connections (-1 is infinite, imply flag listen) (deprecated, use listen_timeout)", OFFSET(initial_timeout), AV_OPT_TYPE_INT, {.i64 = -1}, INT_MIN, INT_MAX, DEC|AV_OPT_FLAG_DEPRECATED },
     { "stimeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
 #else
     { "timeout", "set timeout (in microseconds) of socket TCP I/O operations", OFFSET(stimeout), AV_OPT_TYPE_INT, {.i64 = 0}, INT_MIN, INT_MAX, DEC },
@@ -102,7 +102,7 @@  const AVOption ff_rtsp_options[] = {
     COMMON_OPTS(),
     { "user_agent", "override User-Agent header", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
 #if FF_API_OLD_RTSP_OPTIONS
-    { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC },
+    { "user-agent", "override User-Agent header (deprecated, use user_agent)", OFFSET(user_agent), AV_OPT_TYPE_STRING, {.str = LIBAVFORMAT_IDENT}, 0, 0, DEC|AV_OPT_FLAG_DEPRECATED },
 #endif
     { NULL },
 };