From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2D0F8420D8 for ; Sat, 15 Jan 2022 12:50:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E2BD868B428; Sat, 15 Jan 2022 14:50:10 +0200 (EET) Received: from mout-p-103.mailbox.org (mout-p-103.mailbox.org [80.241.56.161]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 31B5568B26C for ; Sat, 15 Jan 2022 14:50:04 +0200 (EET) Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4JbdL31PwfzQkFM for ; Sat, 15 Jan 2022 13:50:03 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Message-ID: <0ef00170-548d-889a-dfff-42b2b9a7e8b1@gyani.pro> Date: Sat, 15 Jan 2022 18:19:45 +0530 MIME-Version: 1.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220112152755.1319-1-ffmpeg@gyani.pro> From: Gyan Doshi In-Reply-To: <20220112152755.1319-1-ffmpeg@gyani.pro> Subject: Re: [FFmpeg-devel] [PATCH v2] avformat/mpegts: add option max_packet_size 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Plan to push tomorrow. On 2022-01-12 08:57 pm, Gyan Doshi wrote: > Makes maximum size of emitted packet user-tunable. > --- > doc/demuxers.texi | 4 ++++ > libavformat/mpegts.c | 9 ++++++--- > 2 files changed, 10 insertions(+), 3 deletions(-) > > diff --git a/doc/demuxers.texi b/doc/demuxers.texi > index 26ae768d7a..aef5976551 100644 > --- a/doc/demuxers.texi > +++ b/doc/demuxers.texi > @@ -775,6 +775,10 @@ disabled). Default value is -1. > @item merge_pmt_versions > Re-use existing streams when a PMT's version is updated and elementary > streams move to different PIDs. Default value is 0. > + > +@item max_packet_size > +Set maximum size, in bytes, of packet emitted by the demuxer. Payloads above this size > +are split across multiple packets. Range is 1 to INT_MAX. Default is 204800 bytes. > @end table > > @section mpjpeg > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c > index 2479cb6f7d..6ff1a54706 100644 > --- a/libavformat/mpegts.c > +++ b/libavformat/mpegts.c > @@ -162,6 +162,7 @@ struct MpegTSContext { > > int resync_size; > int merge_pmt_versions; > + int max_packet_size; > > /******************************************/ > /* private mpegts data */ > @@ -198,6 +199,8 @@ static const AVOption options[] = { > {.i64 = 0}, 0, 1, 0 }, > {"skip_clear", "skip clearing programs", offsetof(MpegTSContext, skip_clear), AV_OPT_TYPE_BOOL, > {.i64 = 0}, 0, 1, 0 }, > + {"max_packet_size", "maximum size of emitted packet", offsetof(MpegTSContext, max_packet_size), AV_OPT_TYPE_INT, > + {.i64 = MAX_PES_PAYLOAD}, 1, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, > { NULL }, > }; > > @@ -1121,7 +1124,7 @@ static AVBufferRef *buffer_pool_get(MpegTSContext *ts, int size) > { > int index = av_log2(size + AV_INPUT_BUFFER_PADDING_SIZE); > if (!ts->pools[index]) { > - int pool_size = FFMIN(MAX_PES_PAYLOAD + AV_INPUT_BUFFER_PADDING_SIZE, 2 << index); > + int pool_size = FFMIN(ts->max_packet_size + AV_INPUT_BUFFER_PADDING_SIZE, 2 << index); > ts->pools[index] = av_buffer_pool_init(pool_size, NULL); > if (!ts->pools[index]) > return NULL; > @@ -1368,7 +1371,7 @@ skip: > break; > case MPEGTS_PAYLOAD: > do { > - int max_packet_size = MAX_PES_PAYLOAD; > + int max_packet_size = ts->max_packet_size; > if (pes->PES_packet_length && pes->PES_packet_length + PES_START_SIZE > pes->pes_header_size) > max_packet_size = pes->PES_packet_length + PES_START_SIZE - pes->pes_header_size; > > @@ -1378,7 +1381,7 @@ skip: > if (ret < 0) > return ret; > pes->PES_packet_length = 0; > - max_packet_size = MAX_PES_PAYLOAD; > + max_packet_size = ts->max_packet_size; > ts->stop_parse = 1; > } else if (pes->data_index == 0 && > buf_size > max_packet_size) { _______________________________________________ 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".