From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
	by master.gitmailbox.com (Postfix) with ESMTPS id 17A234C416
	for <ffmpegdev@gitmailbox.com>; Tue,  8 Apr 2025 13:16:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
	by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A3FE9687CF8;
	Tue,  8 Apr 2025 16:16:27 +0300 (EEST)
Received: from out203-205-221-205.mail.qq.com (out203-205-221-205.mail.qq.com
 [203.205.221.205])
 by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4569D687CA9
 for <ffmpeg-devel@ffmpeg.org>; Tue,  8 Apr 2025 16:16:18 +0300 (EEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com;
 s=s201512; t=1744118170;
 bh=Wq9CWN7JZ2nZl1GMQpBGT3dEydoC2BTAtwN4zQ2lDyM=;
 h=Subject:From:In-Reply-To:Date:Cc:References:To;
 b=ZNnZ2r3mbe4xGxv9m+DVib/mZd2XfYcoFUB69oVoe2l4SeR54h1jjE6D1xZGqf53G
 dMWrVgiNcXdRxECaI06V0LMTCGnI3wi5EykBeb+g2k69hmT7h9klB5z77R+p8ahXae
 YjR3q/MByXU1x+q/E7pwHSDNVuAGyeq2NftOCbFI=
Received: from smtpclient.apple ([119.147.10.242])
 by newxmesmtplogicsvrszb21-0.qq.com (NewEsmtp) with SMTP
 id 2803C2FE; Tue, 08 Apr 2025 21:10:00 +0800
X-QQ-mid: xmsmtpt1744117800taxdmrbnd
Message-ID: <tencent_FCCD7EA03ACDE7CFC55571273438F6163007@qq.com>
X-QQ-XMAILINFO: MRMtjO3A6C9XSl0+ls0SN71ixCRKPkw6NO5I2eY2Y8hVkHssOceC2keK/qQv3L
 cUUlZ8Dl5heh7HvrLdVHLAJaJwl2KyDKZaO9XehGIAAtCH6dC2/ILme7aGHigw/oKMAJ7LBkA+z6
 xUoMwa/1wGmdDofVZn3RtxUXqVkIdF77gEvpdN5XC1d8oyXe10B5xnSGwOzIzF/0aNtDu9LDeoMQ
 7tdLHT/sijTN6D7B30gmSREVII4gA0HGexBN3F0rh/ddlD6xB9w4aowaBOai4SJzHNgbZ3iiSUxQ
 dYpZi1lrBGfKQz3vIyVKL09wG9b+2o3ZXT2a9qUDT7ocgIRJyKrBEJNrwMfEIxr9aYcsuNbhmd0m
 qIM5rqWbJJeDdytXRObS8avK1+SA6z1ymojpjHeIyyWrtc01B0j80D2pNHo4AVprBQur7uyNoAYF
 4mllvYJPJEUVOEjZfykWJmGARVElLd6blV4qeGiS9HTUia3Uv/Qhobq/j5Os3cnKXMvFqsJMyGrB
 03VJKMoiOK0agIv3bEwTfq2tAmm/Vp+5yU1gVL2G1bUY2c5tbMJPBUMFg34uGzf8TvJ1BiHyGZ6k
 JPS9G3b60XPkd49v1JuDUHP2neDU5uvDIYwiuoOb1FUuTgHlrIpHcBwuZNUVggUMg8RCkAyRUZfB
 TAzd3LjmSxEKUFOcJ2zres6kvEejMs84CuArxNnxHYy0vN17hzkoe+uvEeEnHL1tRdvzgfOeYt/F
 /x10qAZOvMmI7zbknwmsuieofHXMpNxGC7cVdonicHnehRuQ3QlqF3vGX41niar8nyQDZbqXrawf
 wVtqz8DrSz3W/dTpnDuoknDbkAx5a3bsSjNjLSm+l1cn+ury1PUw2ThMZSXTSNYlEZJzRMFExyU+
 82Kaxxjf+tszgHY0xRiMqkz6vLynLYkdIh1CuUgiJnaqNSM9SvhO3StknfWgNqlbPjzlxk8x0xq4
 xAaXJA1zsTUETZ9Ij170ntrSjl5ftzYuqK/Wd4PHd5otkypn5PWQHGvvBqegpguPnj4pW/To/7Dz
 qc9M1LIuGDrt/IPHO6pCzWpEKot+I=
X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU=
Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3818.100.11.1.3\))
From: Zhao Zhili <quinkblack-at-foxmail.com@ffmpeg.org>
In-Reply-To: <20250323-h264-reorder-v1-1-0428fd25c620@gmail.com>
Date: Tue, 8 Apr 2025 21:09:50 +0800
X-OQ-MSGID: <DD03CF17-148F-4A19-B726-41C8171A98FB@foxmail.com>
References: <20250323-h264-reorder-v1-1-0428fd25c620@gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
X-Mailer: Apple Mail (2.3818.100.11.1.3)
Subject: Re: [FFmpeg-devel] [PATCH] h264: fix reference reordering
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
 <mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Cc: Lynne <dev@lynne.ee>, averne <averne381@gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/tencent_FCCD7EA03ACDE7CFC55571273438F6163007@qq.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>



> On Mar 24, 2025, at 04:15, averne <averne381@gmail.com> wrote:
> 
> Fixes hardware decoders depending on long_term_pic_idx.
> Relevant ITU conformance test vectors: MR6_BT_B, MR8_BT_B
> 
> ---
> According to the specification (8.2.4.3 Modification process for
> reference picture lists), the reference reordering process does not
> affect frame indices (PicNum for short refs and LongTermPicNum for long
> ones).
> 
> Hardware decoders commonly use this values in order to identify refs,
> so modifying the frame idx passed to the the hardware would throw off
> the decode engine.
> 
> Fixes: two ITU conformance test samples (MR6_BT_B and MR8_BT_B, found at
> https://www.itu.int/net/itu-t/sigdb/spevideo/VideoForm-s.aspx?val=102002641),
> on my WIP hwaccel backend (https://github.com/averne/FFmpeg/tree/envideo).
> Potentially fixes more hwaccels using this value (dxva2, vaapi, vdpau,
> vulkan).

The patch indeed fixed vdpau decoding of the two samples. Pushed, thanks!

Cc Lynne. Vulkan decoding still failed for the two samples. My machine is Nvidia
GeForce RTX 3060 with driver version 535.183.01.

> 
> This patch was verified to not cause any regression of the software
> decoder.
> 
> Signed-off-by: averne <averne381@gmail.com>
> ---
> libavcodec/h264_refs.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
> index 050ca9229218d68c1f1c5acb8fed8e24c61fd5a1..74840e5909212d6a750518acc416221ffe90f722 100644
> --- a/libavcodec/h264_refs.c
> +++ b/libavcodec/h264_refs.c
> @@ -337,7 +337,7 @@ int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl)
>                         break;
>                 }
>                 if (i >= 0)
> -                    ref->pic_id = pred;
> +                    pic_id = pred;
>                 break;
>             }
>             case 2: {
> @@ -354,7 +354,6 @@ int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl)
>                 ref = h->long_ref[long_idx];
>                 assert(!(ref && !ref->reference));
>                 if (ref && (ref->reference & pic_structure)) {
> -                    ref->pic_id = pic_id;
>                     assert(ref->long_ref);
>                     i = 0;
>                 } else {
> @@ -376,7 +375,7 @@ int ff_h264_build_ref_list(H264Context *h, H264SliceContext *sl)
>                 for (i = index; i + 1 < sl->ref_count[list]; i++) {
>                     if (sl->ref_list[list][i].parent &&
>                         ref->long_ref == sl->ref_list[list][i].parent->long_ref &&
> -                        ref->pic_id   == sl->ref_list[list][i].pic_id)
> +                        pic_id        == sl->ref_list[list][i].pic_id)
>                         break;
>                 }
>                 for (; i > index; i--) {
> 
> ---
> base-commit: 26f2f03e0de278f296fbd1e8a09c43245b65f5e3
> change-id: 20250323-h264-reorder-38465068ea4e
> 
> Best regards,
> -- 
> averne <averne381@gmail.com>
> 
> _______________________________________________
> 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".