From patchwork Sat Apr 13 19:21:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12727 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id C184F448700 for ; Sat, 13 Apr 2019 22:28:10 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A960468AB40; Sat, 13 Apr 2019 22:28:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E81768AAF5 for ; Sat, 13 Apr 2019 22:28:04 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id w5so14973407qtb.11 for ; Sat, 13 Apr 2019 12:28:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lR1/ie2JXv6xiBtqZ72ny0DLq5fFSayvlOPOcmYgP7w=; b=AkDtNEJmR2T60YNLbuBJbbls/3j7pjOxLMCpgwPg8OnLAMIgwr3/Y46NSx+WxIXWYA 1jfeM8o6p9y3PKFiTQkWFaMjhe+nKeLTGvRdRg4g5DbANCDtmWczUxqu1BiPaElR/dYp ce9HHgHrdn8Y/ZynTNy4eEDMnxPO5iQMJ4bGz1ZCLMlGL5zFXMRP4JxNy9xeC975Ptcn X3fjLI/ATmFHn1xc2CjrnHeb3nWhdd1/+QkefZKurzz594yTdYr0GvXLxdWVXtL/YQJU /DG1X3JsJ8CqNRUtv06saCjLNfU8Bnu9+Sp4vyrMjVjX9RtQ9DyUCgbVol+1yoEBUbg/ jKkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lR1/ie2JXv6xiBtqZ72ny0DLq5fFSayvlOPOcmYgP7w=; b=Nkam/s3qiALotdCPH5hrazbPqxrzD0x2rYAPyjXxi7E9uw3V1cq4izNWRZepW70/Yc qDYrRe3zAwup9Yy55wMxWFK73m9um+lyPlqY5W7iHAOCgRX409mX3z2JpIMWaV6xD6XJ IhZbXFLc/TT6bDJyBcyxYi1X5GxMmla+3PH8b4S6Jn/Q4ZdIixhn6mgaAEX+vKZZsbjy /6VkDB2SpdclNJ3BM0aN7QXt1leRArn/5Tm5I7Dyvqy4GGxhbbBEzGghf7V0h/N85bUC 1R0GG+74cKH23WgWteIAET1xXNMtrEYnTirztZa/Ul+m0K21qVkXixnA9V78l/JtPWWM cEHQ== X-Gm-Message-State: APjAAAWbHW/EOisfB3T+Fpq1gGLlP9IFyVGGAD3qSHjYC9h1JbReXRY0 8w21sDLuduZr1NxclV0LuJYxfLNhR/s= X-Google-Smtp-Source: APXvYqwaNUV9ExUU4KaJcZfM0DsgE8DlBBJFR8PkPpg1PNdcfCt/SOo2fGj+eEuBpUsFcujgvFkLGA== X-Received: by 2002:a0c:bec4:: with SMTP id f4mr53068527qvj.17.1555183342529; Sat, 13 Apr 2019 12:22:22 -0700 (PDT) Received: from localhost.localdomain ([181.23.87.223]) by smtp.gmail.com with ESMTPSA id 194sm19889191qkd.72.2019.04.13.12.22.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 12:22:22 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2019 16:21:43 -0300 Message-Id: <20190413192143.4008-2-jamrial@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190413192143.4008-1-jamrial@gmail.com> References: <20190413192143.4008-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/cbs_av1: add support for Padding OBUs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Based on itut_t35 Matadata OBU parsing code. Signed-off-by: James Almer --- libavcodec/cbs_av1.c | 20 +++++++++++++++++ libavcodec/cbs_av1.h | 7 ++++++ libavcodec/cbs_av1_syntax_template.c | 32 ++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 02f168b58d..22330eabf3 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -857,6 +857,11 @@ static void cbs_av1_free_tile_data(AV1RawTileData *td) av_buffer_unref(&td->data_ref); } +static void cbs_av1_free_padding(AV1RawPadding *pd) +{ + av_buffer_unref(&pd->payload_ref); +} + static void cbs_av1_free_metadata(AV1RawMetadata *md) { switch (md->metadata_type) { @@ -883,6 +888,9 @@ static void cbs_av1_free_obu(void *unit, uint8_t *content) case AV1_OBU_METADATA: cbs_av1_free_metadata(&obu->obu.metadata); break; + case AV1_OBU_PADDING: + cbs_av1_free_padding(&obu->obu.padding); + break; } av_freep(&obu); @@ -1057,6 +1065,12 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, } break; case AV1_OBU_PADDING: + { + err = cbs_av1_read_padding(ctx, &gbc, &obu->obu.padding); + if (err < 0) + return err; + } + break; default: return AVERROR(ENOSYS); } @@ -1182,6 +1196,12 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, } break; case AV1_OBU_PADDING: + { + err = cbs_av1_write_padding(ctx, pbc, &obu->obu.padding); + if (err < 0) + return err; + } + break; default: return AVERROR(ENOSYS); } diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index 71ceff9427..e799964b72 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -364,6 +364,12 @@ typedef struct AV1RawMetadata { } metadata; } AV1RawMetadata; +typedef struct AV1RawPadding { + uint8_t *payload; + size_t payload_size; + AVBufferRef *payload_ref; +} AV1RawPadding; + typedef struct AV1RawOBU { AV1RawOBUHeader header; @@ -377,6 +383,7 @@ typedef struct AV1RawOBU { AV1RawTileGroup tile_group; AV1RawTileList tile_list; AV1RawMetadata metadata; + AV1RawPadding padding; } obu; } AV1RawOBU; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index 76eb90b279..a6cafdd99f 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1763,3 +1763,35 @@ static int FUNC(metadata_obu)(CodedBitstreamContext *ctx, RWContext *rw, return 0; } + +static int FUNC(padding)(CodedBitstreamContext *ctx, RWContext *rw, + AV1RawPadding *current) +{ + int i, err; + + HEADER("Padding"); + +#ifdef READ + // The payload runs up to the start of the trailing bits, but there might + // be arbitrarily many trailing zeroes so we need to read through twice. + { + GetBitContext tmp = *rw; + current->payload_size = 0; + for (i = 0; get_bits_left(rw) >= 8; i++) { + if (get_bits(rw, 8)) + current->payload_size = i; + } + *rw = tmp; + + current->payload_ref = av_buffer_alloc(current->payload_size); + if (!current->payload_ref) + return AVERROR(ENOMEM); + current->payload = current->payload_ref->data; + } +#endif + + for (i = 0; i < current->payload_size; i++) + xf(8, obu_padding_byte[i], current->payload[i], 0x00, 0xff, 1, i); + + return 0; +}