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 D1B7E48049
for <ffmpegdev@gitmailbox.com>; Sun, 23 Mar 2025 20:15:33 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9B9FD687A19;
Sun, 23 Mar 2025 22:15:29 +0200 (EET)
Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com
[209.85.221.41])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DE706802C1
for <ffmpeg-devel@ffmpeg.org>; Sun, 23 Mar 2025 22:15:23 +0200 (EET)
Received: by mail-wr1-f41.google.com with SMTP id
ffacd0b85a97d-3912d2c89ecso3497434f8f.2
for <ffmpeg-devel@ffmpeg.org>; Sun, 23 Mar 2025 13:15:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742760922; x=1743365722; darn=ffmpeg.org;
h=cc:to:message-id:content-transfer-encoding:mime-version:subject
:date:from:from:to:cc:subject:date:message-id:reply-to;
bh=oT940ifXuL+6OW1MYVmFkNgbjcoaYZyRMfeP5gZp6/g=;
b=ZpERwni55Gj6YWbx9SyExZuCDro/xBzbKdQp4Eg1XlJAK/ZjP1WBresYnBfSDBGmcm
z7JVNYt1uGD76/Hxz5bfQQEhaVL7tcjWsCWDPAATbZ0hJTA9IZ4mFEbMlz/Fh+FLRV6j
VNCRZ7nfGl4NekYgbbZ4lxAR6M8vr0dj44Sb2mxXFQizSTkNoKYFGpO+ANFafFlIYxcd
s/UKwAskYpuxxSvIO2kLexlCcKRTM2zKNW3MJ3ZQHgYPqY7OVEBdPkSulYwqHOQT+2tz
/aTDb1vnHe4LxZ6BaV29Ko/pXEQYyfsE0JzwOXLoH78CsTtpiXf8mdlk2oiluOZ33vZs
Sp/g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742760922; x=1743365722;
h=cc:to:message-id:content-transfer-encoding:mime-version:subject
:date:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=oT940ifXuL+6OW1MYVmFkNgbjcoaYZyRMfeP5gZp6/g=;
b=SUO45+266BhiTRMBPkYU8eozX7orsr9yS+OlbAGYIQtSBVI5m27Bdxz8f9n5qyJHQA
Eyc5FUTqqrs0BuCOFfkd4d33bKx+Ww2tS57bIG9nJHrPbbuQiGpVNI3epiUNWcChVYtw
WEAEj/RIKDdH3Y+8+FHfEgcg+X2o1HlfAYmnpkTaECOv1BJNhNbmZZ08+MN04MeoxjhO
1TXGLGy3vAETTomDsOJ5dD1qXPXnwXthI0Ms9/bDDwRI164BIh/SeGnoYLgTRMlgAnAT
rrKKeDns0vb+lB8WzcEWY0nz1aJ/RkNlKPv6u1BQxfg+1g3Vo9lCnnJ4c9CRLO3Ka0EH
MeHg==
X-Gm-Message-State: AOJu0Yx4w8XmSS0cciJFb75pyx6KEsmAN3gDeef1fC5r/VCJJBRzeZwA
EDKCznWhTwPJ2FHdlpzfOkiQAXvV8tGo4owLB4P64dkP736eXqJr
X-Gm-Gg: ASbGnctKD2Kml+V2CHcYhpnEzS+5K2nQPgF2G2FE/AOktnqywR3DcliQnTBOVDMTlkd
FNFmzmrXjjbFw2qIxXjG8HDO5RcapJHav29omBDfSOhZc8nabU3hr0bzTVFoFDpF3WjaOkpBNv0
ywxU/cJRELb7xvxCNRrwRXXyiWBH4ndh7TyHGVJbjqfrX0EKdoNSoUnUrk0hshf6uvdR9PqjLXF
jKOpgUYmXs7hlHjrHlH/mFCNte+F+mSc6oQwLq7Q/DqS6iGKApHcB0SLMtPRHR0UMggmsy73A3y
vJAjXcqR3ZQIF3dBdr8u68FvPhrQPHUpsOKV/aBycMVkpyzxgsbct3Bg5aDzxRL/5PVsdu4BTBq
5OjrcVIjQvOFpm30=
X-Google-Smtp-Source: AGHT+IEwdhA5uXJypQ3YoXG2hc6Ng6mGzRveM6TgrMTBdwpxevgTNkSBHqHpKDXiVdS2o9g9aPWYTQ==
X-Received: by 2002:a05:6000:4014:b0:391:2d61:4561 with SMTP id
ffacd0b85a97d-3997f8f9178mr7615976f8f.6.1742760922245;
Sun, 23 Mar 2025 13:15:22 -0700 (PDT)
Received: from [127.0.0.1] (lfbn-rei-1-167-132.w86-225.abo.wanadoo.fr.
[86.225.132.132]) by smtp.gmail.com with ESMTPSA id
ffacd0b85a97d-3997f99579bsm8786603f8f.19.2025.03.23.13.15.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sun, 23 Mar 2025 13:15:21 -0700 (PDT)
From: averne <averne381@gmail.com>
Date: Sun, 23 Mar 2025 21:15:18 +0100
MIME-Version: 1.0
Message-Id: <20250323-h264-reorder-v1-1-0428fd25c620@gmail.com>
X-B4-Tracking: v=1; b=H4sIANZr4GcC/x3MQQqAIBBG4avIrBNMTaSrRAvJv5pNxQgRSHdPW
n6L9yoVCKPQqCoJbi58Hg19p2jZ07FBc24ma+xgnHV6t8FrwSkZol30YTAhInlQSy7Bys+/m+b
3/QC5uZ8AXgAAAA==
X-Change-ID: 20250323-h264-reorder-38465068ea4e
To: ffmpeg-devel@ffmpeg.org
X-Mailer: b4 0.14.2
Subject: [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: 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/20250323-h264-reorder-v1-1-0428fd25c620@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
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).
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".