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

[Andriy Gelman]

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 at gmail.com> wrote:
> > 
> > On Sun, 15. Nov 13:20, Andriy Gelman wrote:
> >> From: Andriy Gelman <andriy.gelman at gmail.com>
> >> 
> >> Signed-off-by: Andriy Gelman <andriy.gelman at 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