Received: by 2002:a05:6602:2086:0:0:0:0 with SMTP id a6csp3652581ioa; Tue, 26 Apr 2022 07:35:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwEKe3TRD9ZQNvc2dpFqHgX+FQy4hFoWVxKkaN3ZNmyQ4QyZKd8fRIulndZm0aynwCy0AAC X-Received: by 2002:a17:902:d54c:b0:15d:16a4:66e2 with SMTP id z12-20020a170902d54c00b0015d16a466e2mr10499104plf.65.1650983715684; Tue, 26 Apr 2022 07:35:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650983715; cv=none; d=google.com; s=arc-20160816; b=vafVq3xYZlf0LHSOfxasRTZkg7oyQsREghEQeQ6zDvPTKPp8e6CxKpDyV3hDbbj9AJ sul3Wbom94p6bvSZQqMHIoFwH7Y+SYmHvK8KziE4yE7qH0P+aDAZX1MlHwDHusF7dyuf GVNTvrF8T07gTqwLUmxBanxtygcCdKkTGNnvA8ZCl5ccxang9WI706lyYD+G7rm76mno huwZ1AJAeJzk5PcRjd+7iGmwZ35kbOrHfeAoVRg+m4GS+fVgL2K3EpvlxNHFhg1numiU ii0vsuhy9PmCwT91AfBZl7+JBtmgE9LhX970IRpiGOr6qpfdUU7HltPWTtDmUpzjJsd1 rN6A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4Gjblylx4/oZ9Tr25X7N7r1/VrZPqJm+a1DR5dOrWLk=; b=g/zYIns6cIqpi0zTgcC3XVpgm4yPb41AM7XCl6UeQLHNSBVyZAwwzwWJq8kLY3yPpC dx8SFUe7B0hs61u56BAoFeKnXC9aYl72V6+BkX53mNqT8jlWepsNAHj0wQa7AUkjmeHq 8ifdKa3KRbkRJCbZ0t6Y7u9Hp7MY4A/ff83LnR2SQZbIoYeATquDSuPSKOWep+2UjVDI WRAqPp+H6VqcPBjBx218BVcfR+rI60bQZ0rN/tvbmUEJ+bCXlxx5Xziu3mtUOhElc+Re rHlK/6DaLJUgWDZkVWv35k6bTBRUH8PxZyvFS2Hv7BQ4PSAwqKpwT57vfYRKoTr2+q5K NBYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SD2dBeBE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e10-20020a63d94a000000b0039d300cade6si20100576pgj.679.2022.04.26.07.34.56; Tue, 26 Apr 2022 07:35:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=SD2dBeBE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350332AbiDZNBT (ORCPT + 99 others); Tue, 26 Apr 2022 09:01:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45192 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349620AbiDZNBJ (ORCPT ); Tue, 26 Apr 2022 09:01:09 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BDEAE177D42; Tue, 26 Apr 2022 05:58:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: nicolas) with ESMTPSA id E17851F4398D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650977880; bh=9s/jwY2vdLbXyetN/42aw11t+0XH2cY1iw+Tw9pwgjM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SD2dBeBEPnw4SkKggKXX/LgBYHxa0D6QIbxvHQ8/1wQl/7UOkD6cR0nng3rxHTK4G n7TTUOrZIfzBJtD567KrT5hA1/ysn1AD9ftnij4IGMB74FEfkJY628zjIOAiPXvc2r SP4xE6HTr9ibOgOhPGCaXkm79eH2w5A7+VjhJOwzZB8TcsGE5juocOfezPv1eOHO4o fR2Cs1deoXfdrCXcPkP86lfYe1L0gy82ntgKY65xgtPKF/ZgNRkQmxg5rlU13xEBOx KeUDK5Qba1zszzOL2QfBobU9Ah45QbrHelGSBaTW4W672qEaMl2ELZOvSxr8oKFXNC Xl/rppY7ZHQDA== From: Nicolas Dufresne To: Mauro Carvalho Chehab Cc: nicolas@ndufresne.ca, linux-media@vger.kernel.org, Sebastian Fricke , linux-kernel@vger.kernel.org Subject: [PATCH v4 01/24] media: doc: Document dual use of H.264 pic_num/frame_num Date: Tue, 26 Apr 2022 08:57:27 -0400 Message-Id: <20220426125751.108293-2-nicolas.dufresne@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220426125751.108293-1-nicolas.dufresne@collabora.com> References: <20220426125751.108293-1-nicolas.dufresne@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_PASS,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org These two fields need documentation as they have dual meaning. It is also confusing since pic_num is a derived value from frame_num, so this should help application developers. If we ever need to make a V2 of this API, I would suggest to remove pic_num entirely. Signed-off-by: Nicolas Dufresne Reviewed-by: Sebastian Fricke --- .../media/v4l/ext-ctrls-codec-stateless.rst | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst index 6541e4c32b26..bee73065e993 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec-stateless.rst @@ -649,10 +649,16 @@ Stateless Codec Control ID :c:type:`timeval` in struct :c:type:`v4l2_buffer` to a __u64. * - __u32 - ``pic_num`` - - + - For short term references, this must match the derived value PicNum + (8-28) and for long term references it must match the derived value + LongTermPicNum (8-29). When decoding frames (as opposed to fields) + pic_num is the same as FrameNumWrap. * - __u16 - ``frame_num`` - - + - For short term references, this must match the frame_num value from + the slice header syntax (the driver will wrap the value if needed). For + long term references, this must be set to the value of + long_term_frame_idx described in the dec_ref_pic_marking() syntax. * - __u8 - ``fields`` - Specifies how the DPB entry is referenced. See :ref:`Reference Fields ` -- 2.34.1