virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

libavformat/rtsp: pkt_size option is not honored in rtsp

Browse Source 
Signed-off-by: xyb <xyb@xyb.name>
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
This commit is contained in:
Yubo Xie
2022-04-06 12:52:38 +00:00
committed by Zhao Zhili
parent d114f064c6
commit 7795f045a0
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtsp.c
View File

@@ -77,7 +77,7 @@
#define COMMON_OPTS() \ #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 }, \ { "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 }, \ { "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[] = { 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) { if (CONFIG_RTSP_MUXER && s->oformat && st) {
int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv, int ret = ff_rtp_chain_mux_open((AVFormatContext **)&rtsp_st->transport_priv,
s, st, rtsp_st->rtp_handle, s, st, rtsp_st->rtp_handle,
RTSP_TCP_MAX_PACKET_SIZE, rt->pkt_size,
rtsp_st->stream_index); rtsp_st->stream_index);
/* Ownership of rtp_handle is passed to the rtp mux context */ /* Ownership of rtp_handle is passed to the rtp mux context */
rtsp_st->rtp_handle = NULL; rtsp_st->rtp_handle = NULL;

1
libavformat/rtsp.h
View File

@@ -74,7 +74,6 @@ enum RTSPControlTransport {
#define RTSP_DEFAULT_PORT 554 #define RTSP_DEFAULT_PORT 554
#define RTSPS_DEFAULT_PORT 322 #define RTSPS_DEFAULT_PORT 322
#define RTSP_MAX_TRANSPORTS 8 #define RTSP_MAX_TRANSPORTS 8
#define RTSP_TCP_MAX_PACKET_SIZE 1472
#define RTSP_DEFAULT_AUDIO_SAMPLERATE 44100 #define RTSP_DEFAULT_AUDIO_SAMPLERATE 44100
#define RTSP_RTP_PORT_MIN 5000 #define RTSP_RTP_PORT_MIN 5000
#define RTSP_RTP_PORT_MAX 65000 #define RTSP_RTP_PORT_MAX 65000

2
libavformat/rtspenc.c
View File

@@ -174,7 +174,7 @@ int ff_rtsp_tcp_write_packet(AVFormatContext *s, RTSPStream *rtsp_st)
size -= packet_len; size -= packet_len;
} }
av_free(buf); 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) static int rtsp_write_packet(AVFormatContext *s, AVPacket *pkt)