From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BB093C3A5A5 for ; Thu, 5 Sep 2019 10:15:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9842B21743 for ; Thu, 5 Sep 2019 10:15:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732779AbfIEKPn (ORCPT ); Thu, 5 Sep 2019 06:15:43 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:58015 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732504AbfIEKPm (ORCPT ); Thu, 5 Sep 2019 06:15:42 -0400 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.pengutronix.de.) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1i5onl-0001qT-Ag; Thu, 05 Sep 2019 12:15:41 +0200 From: Philipp Zabel To: linux-media@vger.kernel.org Cc: Hans Verkuil , Ezequiel Garcia , Nicolas Dufresne , Tomasz Figa , Jonas Karlman , Paul Kocialkowski , Boris Brezillon , kernel@pengutronix.de Subject: [PATCH 1/2] media: uapi: h264: Add num_ref_idx_active_override_flag Date: Thu, 5 Sep 2019 12:15:32 +0200 Message-Id: <20190905101533.525-1-p.zabel@pengutronix.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org This flag tells the kernel whether the slice header contained the num_ref_idx_l[01]_active_minus1 syntax elements, or whether the num_ref_idx_l[01]_default_active_minus1 from PPS should be used instead. Signed-off-by: Philipp Zabel --- Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 3 +++ include/media/h264-ctrls.h | 1 + 2 files changed, 4 insertions(+) diff --git a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst index bc5dd8e76567..451a5b0f2a35 100644 --- a/Documentation/media/uapi/v4l/ext-ctrls-codec.rst +++ b/Documentation/media/uapi/v4l/ext-ctrls-codec.rst @@ -1860,6 +1860,9 @@ enum v4l2_mpeg_video_h264_hierarchical_coding_type - * - ``V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH`` - 0x00000008 - + * - ``V4L2_H264_SLICE_FLAG_NUM_REF_IDX_ACTIVE_OVERRIDE + - 0x00000010 + - Corresponds to the num_ref_idx_active_override_flag syntax element. ``Prediction Weight Table`` diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h index e877bf1d537c..dab519aea9bf 100644 --- a/include/media/h264-ctrls.h +++ b/include/media/h264-ctrls.h @@ -133,6 +133,7 @@ struct v4l2_h264_pred_weight_table { #define V4L2_H264_SLICE_FLAG_BOTTOM_FIELD 0x02 #define V4L2_H264_SLICE_FLAG_DIRECT_SPATIAL_MV_PRED 0x04 #define V4L2_H264_SLICE_FLAG_SP_FOR_SWITCH 0x08 +#define V4L2_H264_SLICE_FLAG_NUM_REF_IDX_ACTIVE_OVERRIDE 0x10 struct v4l2_ctrl_h264_slice_params { /* Size in bytes, including header */ -- 2.20.1