| Message ID | CO6PR17MB50254784A4A75A4766B51ACAD3E79@CO6PR17MB5025.namprd17.prod.outlook.com |
|---|---|
| State | Accepted |
| Commit | 7795f045a06fe95c3af95f70928088443747c85d |
| Headers | show |
| Series | [FFmpeg-devel] libavformat/rtsp: pkt_size option is not honored in rtsp | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_aarch64_jetson | fail | Make failed |
> On Apr 6, 2022, at 8:52 PM, Yubo Xie <xyb@xyb.name> wrote: > > Signed-off-by: xyb <xyb@xyb.name> > --- > libavformat/rtsp.c | 4 ++-- > libavformat/rtsp.h | 1 - > libavformat/rtspenc.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > […] > > diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c > index 2a00b3e18d..5c7e0b4e8b 100644 > --- a/libavformat/rtspenc.c > +++ b/libavformat/rtspenc.c > @@ -174,7 +174,7 @@ int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st) > size -= packet_len; > } > av_free(buf); > - return ffio_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE); > + return ffio_open_dyn_packet_buf(&rtpctx->pb, rt->pkt_size); There is no more reference to RTSP_TCP_MAX_PACKET_SIZE now, it would be better be removed.
Yes, I've removed it already. ________________________________ From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> on behalf of "zhilizhao(赵志立)" <quinkblack@foxmail.com> Sent: Wednesday, April 6, 2022 6:28 AM To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH] libavformat/rtsp: pkt_size option is not honored in rtsp > On Apr 6, 2022, at 8:52 PM, Yubo Xie <xyb@xyb.name> wrote: > > Signed-off-by: xyb <xyb@xyb.name> > --- > libavformat/rtsp.c | 4 ++-- > libavformat/rtsp.h | 1 - > libavformat/rtspenc.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > […] > > diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c > index 2a00b3e18d..5c7e0b4e8b 100644 > --- a/libavformat/rtspenc.c > +++ b/libavformat/rtspenc.c > @@ -174,7 +174,7 @@ int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st) > size -= packet_len; > } > av_free(buf); > - return ffio_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE); > + return ffio_open_dyn_packet_buf(&rtpctx->pb, rt->pkt_size); There is no more reference to RTSP_TCP_MAX_PACKET_SIZE now, it would be better be removed. _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmpeg-devel&data=04%7C01%7C%7C999d4c6c586540d2b47708da17d171ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637848485562446851%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=m1TPJnGtWKd6ESBlhlsv9lwPEGJS0N8iXQAJsYpM9o0%3D&reserved=0 To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> 在 2022年4月6日，下午9:49，Yubo Xie <xyb@xyb.name> 写道： > > Yes, I've removed it already. Sorry I missed that. LGTM. > ________________________________ > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> on behalf of "zhilizhao(赵志立)" <quinkblack@foxmail.com> > Sent: Wednesday, April 6, 2022 6:28 AM > To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> > Subject: Re: [FFmpeg-devel] [PATCH] libavformat/rtsp: pkt_size option is not honored in rtsp > > >> On Apr 6, 2022, at 8:52 PM, Yubo Xie <xyb@xyb.name> wrote: >> >> Signed-off-by: xyb <xyb@xyb.name> >> --- >> libavformat/rtsp.c | 4 ++-- >> libavformat/rtsp.h | 1 - >> libavformat/rtspenc.c | 2 +- >> 3 files changed, 3 insertions(+), 4 deletions(-) >> > […] >> >> diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c >> index 2a00b3e18d..5c7e0b4e8b 100644 >> --- a/libavformat/rtspenc.c >> +++ b/libavformat/rtspenc.c >> @@ -174,7 +174,7 @@ int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st) >> size -= packet_len; >> } >> av_free(buf); >> - return ffio_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE); >> + return ffio_open_dyn_packet_buf(&rtpctx->pb, rt->pkt_size); > > There is no more reference to RTSP_TCP_MAX_PACKET_SIZE now, it would > be better be removed. > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmpeg-devel&data=04%7C01%7C%7C999d4c6c586540d2b47708da17d171ab%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637848485562446851%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=m1TPJnGtWKd6ESBlhlsv9lwPEGJS0N8iXQAJsYpM9o0%3D&reserved=0 > > 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
On Wed, Apr 6, 2022 at 10:04 AM Zhao Zhili <quinkblack@foxmail.com> wrote: > > > 在 2022年4月6日，下午9:49，Yubo Xie <xyb@xyb.name> 写道： > > > > Yes, I've removed it already. > > Sorry I missed that. LGTM. > Nice catch, I guess this bug only impacted using TCP as the media-transport? I'm guessing I only tested UDP at the time. Best, Tristan
Yes, only impact using TCP as the transport. ________________________________ From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> on behalf of Tristan Matthews <tmatth@videolan.org> Sent: Tuesday, April 19, 2022 7:03 AM To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org> Subject: Re: [FFmpeg-devel] [PATCH] libavformat/rtsp: pkt_size option is not honored in rtsp On Wed, Apr 6, 2022 at 10:04 AM Zhao Zhili <quinkblack@foxmail.com> wrote: > > > 在 2022年4月6日，下午9:49，Yubo Xie <xyb@xyb.name> 写道： > > > > Yes, I've removed it already. > > Sorry I missed that. LGTM. > Nice catch, I guess this bug only impacted using TCP as the media-transport? I'm guessing I only tested UDP at the time. Best, Tristan _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmpeg-devel&data=05%7C01%7C%7C67d43f7f7013450b099d08da220d704a%7C84df9e7fe9f640afb435aaaaaaaaaaaa%7C1%7C0%7C637859738357962087%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&sdata=SlNeWN0R58SKEfBvkqphfltqo9xEFvIft4glZHmuomk%3D&reserved=0 To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> On Apr 6, 2022, at 8:52 PM, Yubo Xie <xyb@xyb.name> wrote: > > Signed-off-by: xyb <xyb@xyb.name> > --- > libavformat/rtsp.c | 4 ++-- > libavformat/rtsp.h | 1 - > libavformat/rtspenc.c | 2 +- > 3 files changed, 3 insertions(+), 4 deletions(-) > Applied, thanks!
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index e22b744535..88e9ef5226 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -77,7 +77,7 @@ #define COMMON_OPTS() \ { "reorder_queue_size", "set number of packets to buffer for handling of reordered packets", OFFSET(reordering_queue_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, DEC }, \ { "buffer_size", "Underlying protocol send/receive buffer size", OFFSET(buffer_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, DEC|ENC }, \ - { "pkt_size", "Underlying protocol send packet size", OFFSET(pkt_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, ENC } \ + { "pkt_size", "Underlying protocol send packet size", OFFSET(pkt_size), AV_OPT_TYPE_INT, { .i64 = 1472 }, -1, INT_MAX, ENC } \ const AVOption ff_rtsp_options[] = { @@ -843,7 +843,7 @@ int ff_rtsp_open_transport_ctx(AVFormatContext *s, RTSPStream *rtsp_st) if (CONFIG_RTSP_MUXER && s->oformat && st) { int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv, s, st, rtsp_st->rtp_handle, - RTSP_TCP_MAX_PACKET_SIZE, + rt->pkt_size, rtsp_st->stream_index); /* Ownership of rtp_handle is passed to the rtp mux context */ rtsp_st->rtp_handle = NULL; diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index 3133bf61c1..6e500fd56a 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -74,7 +74,6 @@ enum RTSPControlTransport { #define RTSP_DEFAULT_PORT 554 #define RTSPS_DEFAULT_PORT 322 #define RTSP_MAX_TRANSPORTS 8 -#define RTSP_TCP_MAX_PACKET_SIZE 1472 #define RTSP_DEFAULT_AUDIO_SAMPLERATE 44100 #define RTSP_RTP_PORT_MIN 5000 #define RTSP_RTP_PORT_MAX 65000 diff --git a/libavformat/rtspenc.c b/libavformat/rtspenc.c index 2a00b3e18d..5c7e0b4e8b 100644 --- a/libavformat/rtspenc.c +++ b/libavformat/rtspenc.c @@ -174,7 +174,7 @@ int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st) size -= packet_len; } av_free(buf); - return ffio_open_dyn_packet_buf(&rtpctx->pb, RTSP_TCP_MAX_PACKET_SIZE); + return ffio_open_dyn_packet_buf(&rtpctx->pb, rt->pkt_size); } static int rtsp_write_packet(AVFormatContext *s, AVPacket *pkt)
Signed-off-by: xyb <xyb@xyb.name> --- libavformat/rtsp.c | 4 ++-- libavformat/rtsp.h | 1 - libavformat/rtspenc.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)