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 AAABA45B5D for ; Fri, 24 Mar 2023 11:40:37 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2DED668C74B; Fri, 24 Mar 2023 13:40:34 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 14CAD68C737 for ; Fri, 24 Mar 2023 13:40:27 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id A456D2404EA for ; Fri, 24 Mar 2023 12:40:27 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id tOnu2Wl4LYS2 for ; Fri, 24 Mar 2023 12:40:27 +0100 (CET) Received: from lain.khirnov.net (lain.khirnov.net [IPv6:2001:67c:1138:4306::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "lain.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3DDB2240178 for ; Fri, 24 Mar 2023 12:40:27 +0100 (CET) Received: by lain.khirnov.net (Postfix, from userid 1000) id 2A5F61601B2; Fri, 24 Mar 2023 12:40:27 +0100 (CET) From: Anton Khirnov To: FFmpeg development discussions and patches In-Reply-To: References: <20230321170637.10907-1-jamrial@gmail.com> <20230321170637.10907-3-jamrial@gmail.com> <167965671325.27013.3780588815943637840@lain.khirnov.net> Mail-Followup-To: FFmpeg development discussions and patches Date: Fri, 24 Mar 2023 12:40:27 +0100 Message-ID: <167965802714.27013.15342364649864490343@lain.khirnov.net> User-Agent: alot/0.8.1 MIME-Version: 1.0 Subject: Re: [FFmpeg-devel] [PATCH 3/7] avformat/matroskadec: export Dynamic HDR10+ packet side data 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Quoting James Almer (2023-03-24 12:28:41) > On 3/24/2023 8:18 AM, Anton Khirnov wrote: > > Quoting James Almer (2023-03-21 18:06:33) > >> @@ -3615,12 +3635,54 @@ static int matroska_parse_webvtt(MatroskaDemuxContext *matroska, > >> } > >> > >> static int matroska_parse_block_additional(MatroskaDemuxContext *matroska, > >> - AVPacket *pkt, > >> + MatroskaTrack *track, AVPacket *pkt, > >> const uint8_t *data, int size, uint64_t id) > >> { > >> - uint8_t *side_data = av_packet_new_side_data(pkt, > >> - AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, > >> - size + 8); > >> + uint8_t *side_data; > >> + int res; > >> + > >> + switch (id) { > >> + case 4: { > >> + int country_code, provider_code; > >> + int provider_oriented_code, application_identifier; > >> + size_t hdrplus_size; > >> + AVDynamicHDRPlus *hdrplus; > >> + > >> + if (!track->blockaddid_itu_t_t35) > >> + break; //ignore > >> + > >> + /* ITU-T T.35 metadata */ > >> + country_code = bytestream_get_byte(&data); > >> + provider_code = bytestream_get_be16(&data); > >> + > >> + if (country_code != 0xB5 || provider_code != 0x3C) > >> + break; // ignore > >> + > >> + provider_oriented_code = bytestream_get_be16(&data); > >> + application_identifier = bytestream_get_byte(&data); > > > > Does something guarantee data is large enough for all thse > > bytestream_*()? > > I can add a check for size >= 6 for them. The rest of the payload will > be checked by av_dynamic_hdr_plus_from_t35(). My preference is bytestream2 to avoid explicit checks completely, but as you like. -- Anton Khirnov _______________________________________________ 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".