From patchwork Wed Apr 6 12:52:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yubo Xie X-Patchwork-Id: 35228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c05:b0:7a:e998:b410 with SMTP id bw5csp878716pzb; Wed, 6 Apr 2022 05:53:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxOFnm6wkdRuKjHDjcgELVUYE6RAjoTPZ4tBmj+BLatB/t0QIQ4UCv+S04c1Y50FZTo6+B0 X-Received: by 2002:a05:6402:51d2:b0:419:7d2e:9d0 with SMTP id r18-20020a05640251d200b004197d2e09d0mr8654931edd.82.1649249595347; Wed, 06 Apr 2022 05:53:15 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c10-20020a50cf0a000000b00418c2b5bd35si11658166edk.23.2022.04.06.05.52.51; Wed, 06 Apr 2022 05:53:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AD49268B2AE; Wed, 6 Apr 2022 15:52:47 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10olkn2102.outbound.protection.outlook.com [40.92.41.102]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D97BE68B159 for ; Wed, 6 Apr 2022 15:52:41 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=X+BP8s7rtMFkRZaQBnul+oN/hdmPRAeBJbuns1y3d7ZhF1NL5Ncdmn7Qz0j/gl3E1msK73BQ1ZDG3sI4PE+iUYZlEbyg7xcDWmZA/dD3yW4clrdy8nwlFvZTSXOrMqJrIfbeSgDMupNP8/ezCr0xj6Da8l8CRBqvvCYM4iCObV9if7lHx4JIoxuam85Y8m53b0/HKYWPqBblLPhXW4GwlceH9nush8xnIcQZ/EGGvQRvC0FF16D2Rb7/4Fd4Sf0T7997uTBb8JqjvMIHl3JtSFpNABUVInM7wZPa0LBCH4uAY0OLnO+7WgtH9GgESW4rU3W6zuO+bU2m9tl5F2UfaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=fRQwJiWssM76jCfiFygMtCINae36s80BUC2CD8dBbMs=; b=gG/TYGioVWLSH03tdfOSuL2VXQ4lR/3Oob7QyYzsJ4arKv+NMJ4zxleFqIQVvxG4PaTbNg43mMjuNUyPG5XR6IJStOX2qxQwIZH52OBMNXTKnY2nk7mbjn9CWdZJn7MwvUnn5jRUV1oDo4tY9xgcp1vV7xahmBn0+evO2smfCB43AGsp4kNvyuNePpLAuu6HiU0lVUa2tePcRQp8dwZqeqNN12llGTQLXbL5if9fGWrxW+LU4Mn/FTQzL50qgtuU7MOWmJG6hhqCTj0zlIg9qy9ETDCfLxoN9Kn/+9IkhyI59fgxm8Koal1/RPEr8cQivN1PIgPnDOiUbQfLii5ajQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from CO6PR17MB5025.namprd17.prod.outlook.com (2603:10b6:5:35f::24) by SJ0PR17MB5464.namprd17.prod.outlook.com (2603:10b6:a03:397::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5123.31; Wed, 6 Apr 2022 12:52:38 +0000 Received: from CO6PR17MB5025.namprd17.prod.outlook.com ([fe80::88c3:b7dc:afd1:7f63]) by CO6PR17MB5025.namprd17.prod.outlook.com ([fe80::88c3:b7dc:afd1:7f63%5]) with mapi id 15.20.5144.021; Wed, 6 Apr 2022 12:52:38 +0000 From: Yubo Xie To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/rtsp: pkt_size option is not honored in rtsp Thread-Index: AQHYSbUjAHNHC4eQR0O26OmeITFC3A== Date: Wed, 6 Apr 2022 12:52:38 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: suggested_attachment_session_id: 6baf1d31-17e8-b6ea-ecea-11d8375b50d4 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [YpHLtzIJ0cgu5VJeLgu9Wo7ACpf9X0fmv6DgPnmH41U+TTzxDtnapyf8I3C4cZCH] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 915a14f8-d1d8-419a-0ca5-08da17cc5457 x-ms-traffictypediagnostic: SJ0PR17MB5464:EE_ x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Q/xtUxNUK9DwSgfXRoIZeFBuJtJjnNPYMe3HzR7oWPOis09f0v2eW6mCrCaTsB/75eNUzOoI0kqUzdGtaxbcGjR4dVlA+R/N/fLBr++eDVf3oJsU7ZmN1STN8pLwp7bIC5QF5bhIXuV/1uoAc2KEDoOeLuJ3rKiP4GCiWnPMceAWvlF/Q2hRLPlYYZWh9f3Y5MkbOtj1oTRe/KPolmYt7d5yeOLLTVU4elOc4YgNFornn2axQKtWfAHyjd397qhx8c1UbbWKqxkKzEA2ExMtdPMxiWGt3+CrsUh4eVrHR3WS4a5lSFc6smnMSw965xHz/8urm0CQ/MNr3/qAextTRCI16j9q4KbdLhK9Hw3L+3+jzqHm7/DtShMQQwQ1IrW82DgQD/qaOdNIkE8Ltujg7NFqSM3f2RyHvjldk7NqVdO5ajSFgAdu/q+1rIlCcZHIhAGVHms6OGjOKEKo7RjXmecryReRJV9PDNwoY7WYj53Npy2u97B6S2cjMdwKQlWpmJ3LyEQx+C/1b+/neg94neE7gqURwwZ2pBo978mBp3/tGjnS5TvtPt6rjknNfJ4ovv8OiGVZEBVUw0g1hffxgg== x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?EXTO06wJqwlJJl7XU2pTqdJ?= =?iso-8859-1?q?r9lsUWD2GxV2pycgEiIaKFt1A7s1b7s3JEjSxrPlvYBG6p9GWvm2MTwBu4A6?= =?iso-8859-1?q?3qwuatTkchEP4d2/2diBv9AuGjfsBpdKWlO+Hdmux9gKbdXpv/Ow7s2q7nuu?= =?iso-8859-1?q?xGoTOovHx8PVjLRUGd4iW4DZVPa8gQRdYWO/JRZbpQOiBOweFW9A0UAbhoTH?= =?iso-8859-1?q?TMRMWAYVcRXFxw6Xpivj08LrGmdOBmidarjfojRku4S9h7z4Oo+omNrW1wH3?= =?iso-8859-1?q?xlRwzARkSTEPwQq1vdpGxe26dlMtS3Bd7gMbYfhNPZbgO9JBROpvfItkzEAJ?= =?iso-8859-1?q?clI5XuW7PJ8ZaB2jC4tl/46TkJ29mErUJDoBUSw6wulJukfNMXV4txFvNsDv?= =?iso-8859-1?q?GP5sN+XHjtXdpMlVXTpuBjatw+DJwHMmNEk9s0GMWcWozdt2yGQPFPbw9iYy?= =?iso-8859-1?q?vJfI7/p6NzOuEgwqDPfEW8I/VoEUr536ovCnKzg0EfXmgBzH2RkAI3kRtoMY?= =?iso-8859-1?q?JJpXdVHWxgNBR0+YdGtIGAg996PBDNO3doG8T851RWgeCHFRJBRR4nLQyCHi?= =?iso-8859-1?q?4DMHXsXnPiDcIxnMQKPaf54h2nK7fxmHT8lShU3y1RpOz04DxJrYGhXXyG3E?= =?iso-8859-1?q?l9pHlV1RnHCjp3ApJYDHi09ILhFJ/qijxs2yxQMUcXp+emcDH1I/KHe3V5WW?= =?iso-8859-1?q?F78G9wiZ65KhN+ecxCS/YtXR1VbqmCDYIVN9vfvsFBSmn3nNuv1DpIClK8xo?= =?iso-8859-1?q?ugtlYY4SdTfJeyZvUn/rZFKHDcIzUxHWoX5hBrU2Tp2kRv0zGt7NBk4UcLEl?= =?iso-8859-1?q?8DUoKEq5fdJiYlSv3tHl/52NU1zaqvDTyXewgkIKtSFvPn39LsDW0QeYvsJW?= =?iso-8859-1?q?a18Acc8Eyr2WB0QpZmExV8lQSxmvrKu3IeQUk/9/J1xbwodVS/CnCX+5a0d1?= =?iso-8859-1?q?L3ciuxYLNie36abbltfknrdFq5Wnoe1NtX/15z11ATTkwtSICiCUuhmjoFZx?= =?iso-8859-1?q?RAZrbSR3tGgI9e22QuFrTILsRHRtALUtaWgAfF2SxtC7ipVp/MYDBTvnCoAL?= =?iso-8859-1?q?9v0ztfG1iUErawPpVypXlJ2AVjeJ2Unhyfl+ZGMeJbEJgSN1/dE7zWtBH8b1?= =?iso-8859-1?q?JyfYYvOWXDmfWuwbGLfpi+ulXSFvG6obTbKScteMRck1xFmplvyZ/5BALK9h?= =?iso-8859-1?q?Y4iZREFhN7hy03JiicqKZJdsYjqwMMXGoW6Xgcd0NH+rc/28C1ipJCoPP/Rm?= =?iso-8859-1?q?FvSdoUDa4bRrgvk0oP/2Xsl8nCMQ+QWgGOJHqgmGA/USbGQjdjD4nU6sbdDz?= =?iso-8859-1?q?HWkRYOpYGoV+oQ8Q/IyusBFEYHUjtgJGuCaEEt7OYg2Ng/k22rwYn/FQ1lnV?= =?iso-8859-1?q?1xkmmxJ0fE4LVpmQjpb5qwsRXfolG5zpacoLVrw627aOlQsIqImCWko/+lNg?= =?iso-8859-1?q?iD2/a3xntL5azkCH5WIvq9IkATmLzR+hw8TPYIW2NP0DscLAJGQvM6yHYGjl?= =?iso-8859-1?q?UDUk+aft/?= MIME-Version: 1.0 X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-c704e.templateTenant X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO6PR17MB5025.namprd17.prod.outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-CrossTenant-Network-Message-Id: 915a14f8-d1d8-419a-0ca5-08da17cc5457 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Apr 2022 12:52:38.1152 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR17MB5464 Subject: [FFmpeg-devel] [PATCH] libavformat/rtsp: pkt_size option is not honored in rtsp X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ef9BhffkJkn0 Signed-off-by: xyb --- libavformat/rtsp.c | 4 ++-- libavformat/rtsp.h | 1 - libavformat/rtspenc.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) 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)