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 CA39A457DB for ; Fri, 24 Mar 2023 11:28:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ECF4A68C738; Fri, 24 Mar 2023 13:28:42 +0200 (EET) Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A948E68C37A for ; Fri, 24 Mar 2023 13:28:36 +0200 (EET) Received: by mail-oi1-f178.google.com with SMTP id s8so1041103ois.2 for ; Fri, 24 Mar 2023 04:28:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679657314; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=O7zTSLnJ7m51k4AJJjMvcXMsFusU/tSHK38A3bR0S8g=; b=CTpdq00l6f8g8mlsNN6+GJUwRjbed4mGRRztptlJ66AdElgxTVoNxwJMC+jsIMPODk rah8z/iHXirQc4zAIq9unhPNZIW4v/iA2Cc7WTWlEz7TEFXci25bxsf9w69H9KMiYp98 XNj5JEMJD8H7g7/Q6IBanCODurIDXfQHwbdc9bIIsUy4JI5EdUb+1d88f73pRShZTrTK IvWBmIdohRTSdleP99eL9ctD3cFpKHjXitaHffBU+sq/Road22a7c1jtZsXi3C2+q0Er opzkY+OcFhxpWXZI1jStQrSkcuzqTJABi0vKglhhrTUkIR0QpU4CMyjvh27+byc6ZCXT SXrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679657314; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=O7zTSLnJ7m51k4AJJjMvcXMsFusU/tSHK38A3bR0S8g=; b=xrTEOX86geczaMgCry2kvVWeVitTlAZHFXuCNb5IrXTXyhP/coRuf9Opq9IbVRd6Oo dbG45iw4zMGmoDHl0C7FKMQyiertNbGo9Tr7xOTlG8J/OHpY7OYt+74ImaS9oEkkp5Cn AzVbqKJDhtwistLOLvPBaj7zV2qSN+wQeVoChzQLqpNgp2/LNecCoHc6D/stzBPZnMqp /TtJl8CBszk3TZDAEs4Ug1V/zZCPkXPfswJDkRZ5azVYj1DErVYlXuRTJBTIBaK8deK+ 7v8vJAgi6Mwkhat53QbSHUgSInJ+X+gNUcuuo+8KEgbJXJQH1SuSfhfjBwbYI3/bMO7P NtQA== X-Gm-Message-State: AO0yUKXTk1NWtTzpLTUFJPSoLO0KhdEziVmJuQShyVRw1oN5Fsl8lv+F UwTaPVrVMhJKVN9dYfNkaHqytSv8TWo= X-Google-Smtp-Source: AK7set8TnXwY8O3X3gL/TgwtyMOu1zpwSyYsNoBcJ9r0pLfmfl+xf/2bud/aewd7CE6NYr9qyWIqIQ== X-Received: by 2002:a05:6808:c8:b0:384:1e0c:fbbf with SMTP id t8-20020a05680800c800b003841e0cfbbfmr766413oic.40.1679657314527; Fri, 24 Mar 2023 04:28:34 -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 u4-20020a4aae84000000b005264a1472adsm8105974oon.15.2023.03.24.04.28.33 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 24 Mar 2023 04:28:34 -0700 (PDT) Message-ID: Date: Fri, 24 Mar 2023 08:28:41 -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 To: ffmpeg-devel@ffmpeg.org References: <20230321170637.10907-1-jamrial@gmail.com> <20230321170637.10907-3-jamrial@gmail.com> <167965671325.27013.3780588815943637840@lain.khirnov.net> Content-Language: en-US From: James Almer In-Reply-To: <167965671325.27013.3780588815943637840@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: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(). _______________________________________________ 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".