From patchwork Mon Apr 17 14:39:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 41226 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp2409921pzb; Mon, 17 Apr 2023 07:40:22 -0700 (PDT) X-Google-Smtp-Source: AKy350bixNxeWl/AmaT6/ch1j7DYop9WcxHdDk/Ut9XHv1pwno/QRyF8pJIDSbEos0Pe0zwaMAo3 X-Received: by 2002:a17:906:524f:b0:94a:4eba:45d3 with SMTP id y15-20020a170906524f00b0094a4eba45d3mr9010322ejm.30.1681742422272; Mon, 17 Apr 2023 07:40:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681742422; cv=none; d=google.com; s=arc-20160816; b=U4+DtJfxdDuMbnz1vdrqWQEjkSSZCwyjq2OUwjynsBrGg7MQwhmhqdIHlqNa3mrRTf nkcX06M3dGaiZcBE5c4NEu8L7u76ulESGRgYnGhIBwQECqiAINuKl9BjgTmwB+QkYp+w 8TFadKxKG+oyx859/clZq/UH9MHeMkR9no6iyLNuaBC8KC34AoGJSPSkEZTFkuzVdWFw JByUwM0a+95Qrc5u1zIXQUsJg7iH5LjWcC4tWs0/+6rF/Vxir6JIX6EsKcmhQ/3LzI7k hw5w/hiBEBBbwhKaDNAmmT/CnQmQYmdcP6tPepUOg5lxATp/4QjgzYwnw82xM1s83Yw2 Ebig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=7X2cROrU/C0u7c/WXshBDRqHHF2JBFEcEKtYJnZV18o=; b=GeWUDYY7m7oKoRA0+Pnt7cSxm55OBMCj+xN5k3VQQV4BIdZEcGI4yIB/GOKmuBTcRo eNX/D08//ExOQ/v8bdwHAXKcvVcKbfvj62FNj36wx82aHj5zgSWyWSVepJvZ4/37F/2v FvxLmpwsBLnhz4aIybaltEuF4KW7B6DNu2DNI+Lgo9Vke9vFWkhFT6D/vnet20zd8K/2 rRGzCcVJ0bR9GuBi8rwtP9WaVJVQwDPbzQmykvSkCQF3TTjEfIfFpx8yike72dxuP1Qq o2DgaMPXbLhxVLeRAcoR1xT9nRX7JT54hZBPz6u4z7p7OabZPXnV673NJUtW5LAEeQqT 1s/Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ZIv1zKsc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gh15-20020a1709073c0f00b0094edd69e7f8si8517345ejc.899.2023.04.17.07.40.21; Mon, 17 Apr 2023 07:40:22 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ZIv1zKsc; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 300E468BE2A; Mon, 17 Apr 2023 17:40:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2CD0768ADD8 for ; Mon, 17 Apr 2023 17:40:11 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id q1so3018225oiw.6 for ; Mon, 17 Apr 2023 07:40:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681742409; x=1684334409; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=qgZwwj7ao54YQ7qqj0HpDSjU6iz7h11XuRTkJ7RNMYE=; b=ZIv1zKscRwszW2TsyjV3PgPcoCpGyrYgTy7kN5oQHCutRmFY+kO3y7nlXUmhIkyb5+ OL9dR3bvtr889CbyCCGGvxqD67jxw03hGH4SusBeYC00+I6ryCp2Cgwk76c66OzjpjVh HilSSBhGntGg59nHcXnK0vmw65HM2pPKWDKJpKwz2eo2gHD/iJjSZ0fgWU8CWTGmWKKI CWoE3ld0a+anzPIOkSdTFIW02bwWF6h8vhDIIno7twhFmeJJw40x4MWOW8SHAkOa4ABQ CnbFfqfOy+NtrxlpVtodF2axVc+Jd2wT3gtYP0GOc3zvkXYrJVCBLpESKA6uhGkCR+U7 JtVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681742409; x=1684334409; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qgZwwj7ao54YQ7qqj0HpDSjU6iz7h11XuRTkJ7RNMYE=; b=hPkN8InGQPI/30MSXy1GTWR2vF8fxa3DfsQrr8K/X6denu4pw4Uc5EK/erdMhyFxZU 5mT4wV+HZZiDCdD7o/70JVmCNyW0Yh0SGohG2OPxjLFwSWJn27TSgF4FRnTrrikKzqlG BPU6xcpYiOPn4QN++shp5nyOA1TUhJWdnveJtvbe3GY3EKpDzGZao8B5YsmUmc4sUG5k AC9vH6MdKZhBcrNqUutanHW7zyuxRUdRaKW7ZfXUt5+fR4xUiatne8uptXbE46rQZAWA MsLNNipPrZukOGSnsnp/W0qLyCJsVb0pOyfrCug0KGAOYJvSVOiAqOOKvURRiCHNe7Kx 7biw== X-Gm-Message-State: AAQBX9ehWHrlYOd5doKXfGvjG72LjvK80IF4U+17qG49wGre5oF8b1cR IYg9z5Turbx79YXUYhEhcVOQbf2Gt7Y= X-Received: by 2002:a05:6808:1692:b0:38c:7a70:2d10 with SMTP id bb18-20020a056808169200b0038c7a702d10mr3624681oib.10.1681742409312; Mon, 17 Apr 2023 07:40:09 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id v132-20020aca618a000000b0038de993f3a6sm1984163oib.53.2023.04.17.07.40.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Apr 2023 07:40:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Apr 2023 11:39:30 -0300 Message-Id: <20230417143930.1186-1-jamrial@gmail.com> X-Mailer: git-send-email 2.40.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avutil/frame: use bitfields for some boolean and enum fields 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 8ma2xdKOqx5n Should reduce the size of AVFrame in the next major bump without changing the API. Suggested-by: Anton Khirnov Signed-off-by: James Almer --- This supersedes "avutil/frame: add new interlaced and top_field_first flags" and "avutil/frame: add a keyframe flag to AVFrame". libavutil/frame.h | 56 +++++++++++++++++++++++++++++++++++++++++++++ libavutil/version.h | 1 + 2 files changed, 57 insertions(+) diff --git a/libavutil/frame.h b/libavutil/frame.h index f85d630c5c..c26067f383 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -416,6 +416,7 @@ typedef struct AVFrame { */ int format; +#if FF_API_BITFIELDS /** * 1 -> keyframe, 0-> not */ @@ -425,6 +426,57 @@ typedef struct AVFrame { * Picture type of the frame. */ enum AVPictureType pict_type; +#else + /** + * 1 -> keyframe, 0-> not + */ + unsigned int key_frame: 1; + + /** + * The content of the picture is interlaced. + */ + unsigned int interlaced_frame: 1; + + /** + * If the content is interlaced, is top field displayed first. + */ + unsigned int top_field_first: 1; + + /** + * Tell user application that palette has changed from previous frame. + */ + unsigned int palette_has_changed: 1; + + /** + * Reserved. Must not be touched. + */ + unsigned int reserved_bitfield: (sizeof(unsigned int) * 8) - 9; + + /** + * MPEG vs JPEG YUV range. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorRange color_range: 2; + + enum AVChromaLocation chroma_location: 3; + + /** + * Picture type of the frame. + */ + enum AVPictureType pict_type: 8; + + enum AVColorPrimaries color_primaries: 8; + + enum AVColorTransferCharacteristic color_trc: 8; + + /** + * YUV colorspace type. + * - encoding: Set by user + * - decoding: Set by libavcodec + */ + enum AVColorSpace colorspace: 8; +#endif /** * Sample aspect ratio for the video frame, 0/1 if unknown/unspecified. @@ -491,6 +543,7 @@ typedef struct AVFrame { */ int repeat_pict; +#if FF_API_BITFIELDS /** * The content of the picture is interlaced. */ @@ -505,6 +558,7 @@ typedef struct AVFrame { * Tell user application that palette has changed from previous frame. */ int palette_has_changed; +#endif #if FF_API_REORDERED_OPAQUE /** @@ -595,6 +649,7 @@ typedef struct AVFrame { */ int flags; +#if FF_API_BITFIELDS /** * MPEG vs JPEG YUV range. * - encoding: Set by user @@ -614,6 +669,7 @@ typedef struct AVFrame { enum AVColorSpace colorspace; enum AVChromaLocation chroma_location; +#endif /** * frame timestamp estimated using various heuristics, in stream time base diff --git a/libavutil/version.h b/libavutil/version.h index 40f92af055..23cad31b46 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -115,6 +115,7 @@ #define FF_API_FRAME_PICTURE_NUMBER (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_HDR_VIVID_THREE_SPLINE (LIBAVUTIL_VERSION_MAJOR < 59) #define FF_API_FRAME_PKT (LIBAVUTIL_VERSION_MAJOR < 59) +#define FF_API_BITFIELDS (LIBAVUTIL_VERSION_MAJOR < 59) /** * @}