From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id E2F304055D for ; Mon, 28 Mar 2022 01:09:16 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E98C368B296; Mon, 28 Mar 2022 04:09:12 +0300 (EEST) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BFEDB68B279 for ; Mon, 28 Mar 2022 04:09:05 +0300 (EEST) Received: by mail-ot1-f54.google.com with SMTP id y3-20020a056830070300b005cd9c4d03feso9739256ots.3 for ; Sun, 27 Mar 2022 18:09:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7m2+zB0mTEDaXXT7yrZPz0F1e/pnSusECJoEVgUhq/U=; b=BSHYXVfNPJ1koaSarPawWFsejMa/3dEoxQNeM/6dThN9gGACE5N0IJRIqpxGIbj1UL lLOw8xfBmUSRvq7XLpr0SxRQ+2IHfKNbDXErvbgSzUPpwq4KBX90wwmUKLTmhzsAkaB4 cpq4pu8aRj6GsJCWpw+Z/hj6l0vQGsyxvDk+IWR8TrxkW/x0tHBr7txdnVetFd0sad+Q +kWkCeLaYJu82x5ODPxG/D64G0l5OTNm97OuKYycLRlZcVGo5FI4e9X+cSOC4KlYjjf4 q85ZKLWHg3p+mLlDdGW3NTIX6za0SEkwqCB7naD3ONHy6womQCYPChIIo6OKHiwdzCYD Meaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=7m2+zB0mTEDaXXT7yrZPz0F1e/pnSusECJoEVgUhq/U=; b=nXmkkKYqPMRErIihRL5ERN2fC/euJwcZELljGVWZ4Ri9yUNUDJm9bV6cubtK39QPFe fLRBnVZ0OSDU3QklKG9Igh+G5Wv/nns9qp9FMtV3KzZ9tNsJ4l6SIFml2rcpXyOsf15T fwDaQ8aN5rQ9umhMaU3AXJvyZlUL42A5zkZdwOd2wb7C+CePwo5QQwnqgj4TvwSg5P3v IyN5iANYS/xHNcr8dapdqsFqNB1Ok98raMFophyNCi7OArazWZeWc1ULkYw/1Ip6lf0b 2ZtmOKVNaPdFifGfneBen7ZmTqoXH2d1GmqntISehFSy6meJB3uiNCCzZ1SXG5xYTBSy ucVA== X-Gm-Message-State: AOAM5331/hgZyUyUvzrH1SnNQri+G+DOwJ9uXXHIUk652+3+35Oj0qvH BgcLdwmvDRUiiB10B+C1I3NcpeL4UpnpLg== X-Google-Smtp-Source: ABdhPJznxrvxIJUEs86a3T5xS8lEJgsKppYdsZJO1aOPFExFORSJhq5d5ID8Fu0OynUmNSn6rWz4cA== X-Received: by 2002:a05:6830:16c3:b0:5b2:3700:654a with SMTP id l3-20020a05683016c300b005b23700654amr9198720otr.353.1648429743881; Sun, 27 Mar 2022 18:09:03 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id bc36-20020a05682016a400b003240a532a1csm6136054oob.29.2022.03.27.18.09.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Mar 2022 18:09:03 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 27 Mar 2022 22:08:50 -0300 Message-Id: <20220328010851.1193-1-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/cbs_av1: rename the private frame_header fields to frame_header_data 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: It doesn't contain the decomposed struct, but the raw bitstream. This is in preparation for the following patch. Signed-off-by: James Almer --- libavcodec/cbs_av1.c | 6 +++--- libavcodec/cbs_av1.h | 6 +++--- libavcodec/cbs_av1_syntax_template.c | 28 ++++++++++++++-------------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 1229480567..ecd775ea2a 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -1249,9 +1249,9 @@ static void cbs_av1_flush(CodedBitstreamContext *ctx) { CodedBitstreamAV1Context *priv = ctx->priv_data; - av_buffer_unref(&priv->frame_header_ref); + av_buffer_unref(&priv->frame_header_data_ref); priv->sequence_header = NULL; - priv->frame_header = NULL; + priv->frame_header_data = NULL; memset(priv->ref, 0, sizeof(priv->ref)); priv->operating_point_idc = 0; @@ -1264,7 +1264,7 @@ static void cbs_av1_close(CodedBitstreamContext *ctx) CodedBitstreamAV1Context *priv = ctx->priv_data; av_buffer_unref(&priv->sequence_header_ref); - av_buffer_unref(&priv->frame_header_ref); + av_buffer_unref(&priv->frame_header_data_ref); } static void cbs_av1_free_metadata(void *unit, uint8_t *content) diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 1fc80dcfa0..d4776b7a30 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -431,9 +431,9 @@ typedef struct CodedBitstreamAV1Context { AVBufferRef *sequence_header_ref; int seen_frame_header; - AVBufferRef *frame_header_ref; - uint8_t *frame_header; - size_t frame_header_size; + AVBufferRef *frame_header_data_ref; + uint8_t *frame_header_data; + size_t frame_header_data_size; int temporal_id; int spatial_id; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index d98d3d42de..bd50cfbe38 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1698,12 +1698,12 @@ static int FUNC(frame_header_obu)(CodedBitstreamContext *ctx, RWContext *rw, HEADER("Redundant Frame Header"); - av_assert0(priv->frame_header_ref && priv->frame_header); + av_assert0(priv->frame_header_data_ref && priv->frame_header_data); - init_get_bits(&fh, priv->frame_header, - priv->frame_header_size); - for (i = 0; i < priv->frame_header_size; i += 8) { - b = FFMIN(priv->frame_header_size - i, 8); + init_get_bits(&fh, priv->frame_header_data, + priv->frame_header_data_size); + for (i = 0; i < priv->frame_header_data_size; i += 8) { + b = FFMIN(priv->frame_header_data_size - i, 8); val = get_bits(&fh, b); xf(b, frame_header_copy[i], val, val, val, 1, i / 8); @@ -1730,7 +1730,7 @@ static int FUNC(frame_header_obu)(CodedBitstreamContext *ctx, RWContext *rw, } else { priv->seen_frame_header = 1; - av_buffer_unref(&priv->frame_header_ref); + av_buffer_unref(&priv->frame_header_data_ref); #ifdef READ fh_bits = get_bits_count(rw) - start_pos; @@ -1748,20 +1748,20 @@ static int FUNC(frame_header_obu)(CodedBitstreamContext *ctx, RWContext *rw, #endif fh_bytes = (fh_bits + 7) / 8; - priv->frame_header_size = fh_bits; + priv->frame_header_data_size = fh_bits; if (rw_buffer_ref) { - priv->frame_header_ref = av_buffer_ref(rw_buffer_ref); - if (!priv->frame_header_ref) + priv->frame_header_data_ref = av_buffer_ref(rw_buffer_ref); + if (!priv->frame_header_data_ref) return AVERROR(ENOMEM); - priv->frame_header = fh_start; + priv->frame_header_data = fh_start; } else { - priv->frame_header_ref = + priv->frame_header_data_ref = av_buffer_alloc(fh_bytes + AV_INPUT_BUFFER_PADDING_SIZE); - if (!priv->frame_header_ref) + if (!priv->frame_header_data_ref) return AVERROR(ENOMEM); - priv->frame_header = priv->frame_header_ref->data; - memcpy(priv->frame_header, fh_start, fh_bytes); + priv->frame_header_data = priv->frame_header_data_ref->data; + memcpy(priv->frame_header_data, fh_start, fh_bytes); } } } -- 2.35.1 _______________________________________________ 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".