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 33C8842160 for ; Sat, 15 Jan 2022 20:09:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1E9D268A744; Sat, 15 Jan 2022 22:09:51 +0200 (EET) Received: from iq.passwd.hu (iq.passwd.hu [217.27.212.140]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 295DA68A631 for ; Sat, 15 Jan 2022 22:09:45 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by iq.passwd.hu (Postfix) with ESMTP id 5E137E676E for ; Sat, 15 Jan 2022 21:09:44 +0100 (CET) X-Virus-Scanned: amavisd-new at passwd.hu Received: from iq.passwd.hu ([127.0.0.1]) by localhost (iq.passwd.hu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eX97Jq65kdeN for ; Sat, 15 Jan 2022 21:09:39 +0100 (CET) Received: from iq (iq [217.27.212.140]) by iq.passwd.hu (Postfix) with ESMTPS id 766A5E676D for ; Sat, 15 Jan 2022 21:09:39 +0100 (CET) Date: Sat, 15 Jan 2022 21:09:39 +0100 (CET) From: Marton Balint To: FFmpeg development discussions and patches In-Reply-To: <0ef00170-548d-889a-dfff-42b2b9a7e8b1@gyani.pro> Message-ID: References: <20220112152755.1319-1-ffmpeg@gyani.pro> <0ef00170-548d-889a-dfff-42b2b9a7e8b1@gyani.pro> MIME-Version: 1.0 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: On Sat, 15 Jan 2022, Gyan Doshi wrote: > 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 }, INT_MAX/2 might be better to avoid possible overflows with padding or pes header. Or simply 1 GiB, after all, a corrupt PID might consume RAM up to this amount, so preferably it should not be too big... Docs needs update accordingly. Also since MAX_PES_PAYLOAD define is no longer used in the code, I'd just remove it and put its value directly here as the default. Thanks, Marton >> { 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". > > _______________________________________________ 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".