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 8262C45B83 for ; Fri, 24 Mar 2023 12:34:39 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4398068C7A1; Fri, 24 Mar 2023 14:34:36 +0200 (EET) Received: from mail-oo1-f41.google.com (mail-oo1-f41.google.com [209.85.161.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E872768C52F for ; Fri, 24 Mar 2023 14:34:29 +0200 (EET) Received: by mail-oo1-f41.google.com with SMTP id a23-20020a4ad5d7000000b005250867d3d9so249489oot.10 for ; Fri, 24 Mar 2023 05:34:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679661268; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=sQYPzqbsO4AcF0SpfEVEGgbfZMNNe0Xc5hvrUwu270E=; b=l1O1wuvLcr8W+DdyjIbJhBRy2O0+6FYp1ctbuoVZ2PQLs0qPrS+SvwjNPC43M4RrmS ZV2Kp4zEJui/h/gwwSMQB31/6Qr4Xv+E2YAZB9sKk7jRabk/GqYO82WVMGiFAMlR6e9V sWQk7+I/t4lDAzNgtaKup0/gOg8ufBtQ48fomWR8/Yo40uKtEccH4AzoNpvJnWZ1g/3J END373phOLmimLgfhDz/NKctwAzX2dkLX/wOXE+gkVxDie15mi0IixORnBWpRTh/32Hr 1lXOBt8gcItAX0CnevwlswjIp7C6+l/mbSl2AoDTLNsw2vHOn18BtVUv+TCTH9LbZW0r rjgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679661268; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sQYPzqbsO4AcF0SpfEVEGgbfZMNNe0Xc5hvrUwu270E=; b=3iaMEbAr40sP6Ppxo4J0fSEVNlHnK2dyZVzcjPI80WQJ4u8GJlZ5ha32QhEEfR1OKi LnFWom0TOwMxzqDZ8T/sqhSqL62+dO+K3YIFzmTUFT8n085ywZGxHPj7cAmyYvC2/Zum vDfhR1G2pCHiYSwW5RQv1+Viaf222TDdhMPHKEG4fYx+koQh0qIAsYGzgHrmfl3ddJvi bJbQ9LSHZ/01KJDwaw3XdGu2BJVjE8gdA/lvKWgyKPcttjcFLtrZ9uJntJ3XdCUAP0qL wReUmJmuq7csGxx29uKeGUVi4yhc2/zr2YFclnt8PHbGN+9vxgMVi3RiKqPcYvuQ6pvO U99A== X-Gm-Message-State: AO0yUKUASz9SR67Yf46Kt4B99CyXN/sONFt2znkPrbBi4hxNWWP4K+jU gE9ZtFQbbkUFiz2HUtvuvwJbt613Eks= X-Google-Smtp-Source: AK7set+/q0rASgFu+zwWzS4X6VZHum/nY5Z4twACXjP8KZp//ejmNinTt0fMRRH5VwHcLjUUqIFnyA== X-Received: by 2002:a4a:3794:0:b0:525:58f7:cbef with SMTP id r142-20020a4a3794000000b0052558f7cbefmr1612350oor.2.1679661268037; Fri, 24 Mar 2023 05:34:28 -0700 (PDT) Received: from [192.168.0.14] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id j4-20020a4aab44000000b0052569fb1cfesm8218759oon.28.2023.03.24.05.34.26 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Mar 2023 05:34:27 -0700 (PDT) Message-ID: Date: Fri, 24 Mar 2023 09:34:34 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.9.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230321170637.10907-1-jamrial@gmail.com> <20230321170637.10907-3-jamrial@gmail.com> <167965671325.27013.3780588815943637840@lain.khirnov.net> <167965802714.27013.15342364649864490343@lain.khirnov.net> From: James Almer In-Reply-To: <167965802714.27013.15342364649864490343@lain.khirnov.net> 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-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 3/24/2023 8:40 AM, Anton Khirnov wrote: > 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. Ok, will do. _______________________________________________ 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".