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 14F084AEED for ; Thu, 23 May 2024 12:38:45 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C90A668D392; Thu, 23 May 2024 15:38:42 +0300 (EEST) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28D3C68A0CD for ; Thu, 23 May 2024 15:38:36 +0300 (EEST) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-6f45f1179c3so2193555b3a.3 for ; Thu, 23 May 2024 05:38:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716467914; x=1717072714; darn=ffmpeg.org; 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=oohh4nA/BH4+s4uCfp9p1NjmXSGHTe5cbFS2x9FvGIo=; b=SKNZbKwDca4g2E8leRpxm0moWbIQo2+kX29uezlf8aJUUAa4QO5o2wDYZwRB1gkHdi SVn9pPGiuTzeDyK3tKUZZ4Q9ll4BLwVqsBLho1CmHtQH8laZw3m8dCZazEZws45XAuSE o+40Ea8tMYyTIW6ixK3h72tGexB7x4opZysquwenO1TxP7ektPr/uKbVK/mLgxiVCnVp Mw6wA9wbbQMimIcpxU91Z1Ez+JUnZ7T0mWZG7eWWzOMDICQ/7ZHN/htcFoX/sS84fkvD OhVfqKaJkppmBlV10zKA8Rka5HMy11N3s2PZqql8N2uoOFl8A9KqiWxoWSE6ZA0nK72m gFlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716467914; x=1717072714; 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=oohh4nA/BH4+s4uCfp9p1NjmXSGHTe5cbFS2x9FvGIo=; b=hjdNHnwHm1DWgdVTlEHlLM8ctXta0vi6b80LovsKjcExUuinu/lFVOXCER9gTnPfMG KI6/VzGp/1N/GzMmDzpri+bmehFffyWQ42XM29E4BUQUe/pCbPivQeZ+LM+RI3UcfPoc Gl9xh9cH8AHTC0TtDgVlVk6EdH/zKDyX2acdGgNloXttCm0W1ChwqofUVDe2cNmz1NDK hlBhzSYYrhUOXEg+LXTK6mmgUEBbPz0EuWBg2cggcOdHTt7LO4a+fCqXJJfsb07mTBQA ulylzq1p/RLS2mJuuGRCQt44ta6378VVDEvbilz0tNVwZjeYgGfCfc8gcqaJAU2CaIC0 6eXA== X-Gm-Message-State: AOJu0YweZH4JrZ562uEnjQo6e8Nm/S6Ar7sRjBNrQNXThVkvJVsQRME4 czmdj2fnaDGrfaZ2s4RG3UUtAwQr7G2b8gcrKIy4rYfBH713TI3+T3xFTQ== X-Google-Smtp-Source: AGHT+IHM3dCPx4vfKINsFTXjcsI4MKRnkkbMPkXUpV1YufC2NUX1PxvfOIvfBgdrk8lxLiQ7sGWeNg== X-Received: by 2002:a05:6a20:d49b:b0:1b1:d591:d29 with SMTP id adf61e73a8af0-1b1f88a6bcamr6309935637.15.1716467913782; Thu, 23 May 2024 05:38:33 -0700 (PDT) Received: from [192.168.0.10] ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-65ce6d51606sm9624720a12.94.2024.05.23.05.38.32 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 23 May 2024 05:38:33 -0700 (PDT) Message-ID: <66c850ea-69f6-43af-840c-0617c16fc751@gmail.com> Date: Thu, 23 May 2024 09:38:36 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240522155031.33491-1-cosmin@cosmin.at> <20240522155031.33491-3-cosmin@cosmin.at> <0101018fa0ff6c48-f1f4e7e8-6933-4a4b-ac8e-12d0c7811a4e-000000@us-west-2.amazonses.com> Content-Language: en-US From: James Almer In-Reply-To: <0101018fa0ff6c48-f1f4e7e8-6933-4a4b-ac8e-12d0c7811a4e-000000@us-west-2.amazonses.com> Subject: Re: [FFmpeg-devel] [PATCH v3 2/2] avcodec/dovi - correctly read el_bit_depth_minus8 and ext_mapping_idc 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 5/22/2024 12:50 PM, Cosmin Stejerean via ffmpeg-devel wrote: > From: Cosmin Stejerean > > These two fields are coded together into a single 16 bit integer with upper 8 > bits for ext_mapping_idc and lower 8 bits for el_bit_depth_minus8. > > Furthermore ext_mapping_idc has two components, upper 3 bits and lower 5 bits. > --- > libavcodec/dovi_rpudec.c | 7 ++++++- > libavcodec/dovi_rpuenc.c | 4 +++- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c > index 7c7eda9d09..af41ab5827 100644 > --- a/libavcodec/dovi_rpudec.c > +++ b/libavcodec/dovi_rpudec.c > @@ -411,13 +411,18 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, > > if ((hdr->rpu_format & 0x700) == 0) { > int bl_bit_depth_minus8 = get_ue_golomb_31(gb); > - int el_bit_depth_minus8 = get_ue_golomb_31(gb); > + int el_bit_depth_minus8_and_ext_mapping_idc = get_ue_golomb_long(gb); > + int el_bit_depth_minus8 = el_bit_depth_minus8_and_ext_mapping_idc & 0xFF; // lowest 8 bits > + int ext_mapping_idc = (el_bit_depth_minus8_and_ext_mapping_idc & 0xFF00) >> 8; // upper 8 bits nit: we usually do (foo >> 8) & 0xFF. Also, coding two (maybe three) values in a single golomb code is evil. > + > int vdr_bit_depth_minus8 = get_ue_golomb_31(gb); > VALIDATE(bl_bit_depth_minus8, 0, 8); > VALIDATE(el_bit_depth_minus8, 0, 8); > VALIDATE(vdr_bit_depth_minus8, 0, 8); > hdr->bl_bit_depth = bl_bit_depth_minus8 + 8; > hdr->el_bit_depth = el_bit_depth_minus8 + 8; > + hdr->ext_mapping_idc_0_4 = ext_mapping_idc & 0x1F; // lowest 5 bits of ext_mapping_idc > + hdr->ext_mapping_idc_5_7 = (ext_mapping_idc & 0xE0) >> 5; // upper 3 bits of ext_mapping_idc Ditto. > hdr->vdr_bit_depth = vdr_bit_depth_minus8 + 8; > hdr->spatial_resampling_filter_flag = get_bits1(gb); > skip_bits(gb, 3); /* reserved_zero_3bits */ > diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c > index 3c3e0f84c0..91c0a85050 100644 > --- a/libavcodec/dovi_rpuenc.c > +++ b/libavcodec/dovi_rpuenc.c > @@ -444,6 +444,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, > int vdr_dm_metadata_changed, vdr_rpu_id, use_prev_vdr_rpu, profile, > buffer_size, rpu_size, pad, zero_run; > int num_ext_blocks_v1, num_ext_blocks_v2; > + uint8_t ext_mapping_idc; > uint32_t crc; > uint8_t *dst; > if (!metadata) { > @@ -551,7 +552,8 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, > put_bits(pb, 1, hdr->bl_video_full_range_flag); > if ((hdr->rpu_format & 0x700) == 0) { > set_ue_golomb(pb, hdr->bl_bit_depth - 8); > - set_ue_golomb(pb, hdr->el_bit_depth - 8); > + ext_mapping_idc = (hdr->ext_mapping_idc_5_7 << 5) | hdr->ext_mapping_idc_0_4; > + set_ue_golomb(pb, (ext_mapping_idc << 8) | hdr->el_bit_depth - 8); > set_ue_golomb(pb, hdr->vdr_bit_depth - 8); > put_bits(pb, 1, hdr->spatial_resampling_filter_flag); > put_bits(pb, 3, 0); /* reserved_zero_3bits */ _______________________________________________ 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".