From patchwork Sat Apr 13 19:25:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 12726 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 D8887447BA7 for ; Sat, 13 Apr 2019 22:26:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C531D68AA39; Sat, 13 Apr 2019 22:26:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 60C0B68A9AB for ; Sat, 13 Apr 2019 22:26:19 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id w30so15007459qta.8 for ; Sat, 13 Apr 2019 12:26:19 -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=QJNi1ovo1pvyZnLy2Du2atWF6sDXy5OEbbMwqRv9kBE=; b=FY1/nMz8URjpUVKWRcQsP25/S9RvT1paCC82fxFMtP56uCCfuyQiIPl1uKK5kRepeJ RnT8dkMbPqjT2p0uOjst9i8oG3NOK1PW1TsFlyLz9gqV2+a63y1rcLAe+ivC4uYHnxHd ZCbEVWcDVehHxfvzb061pRdjEzTzbsYk+Hd6DqhOUs4trrHFeakXBYIEFd9Px8zQ6Hiq INvkOuZ0gccuy35mhzAilrRQtMoveZH89AOuyqaiPAszlScPt0Epnl1HzuFIhtmrwbia j8bNeNbHtBj4NWE7QPh4eG4CGlU1y9UYivq6333kzOtUNnYtSEPhgEQvFKvsh5u/1nHH avmA== 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=QJNi1ovo1pvyZnLy2Du2atWF6sDXy5OEbbMwqRv9kBE=; b=qQOt1E2FRgsnTPIzktBpSixp9E/4BeAV1ao+8fML+SCNIBB2ISrZs/e0rraA43Ikox yFsAPZZIVhNwr2Cv3avOh/xHV/bpiyWwb2PKvTdWGzpGzPQhextlSOACuN0boR42Jsj8 qGFS7Vq1UkwyF3ckpgBcF4AU5F2ZcbkSLvuvQjBKkunMwcTINQ+J+OvRcZqMflfKjn02 cfAV0BVIyQr4EITW+CZVHEQUcnv7A6kocAfzJrZDu4apxjW/psyUNNRpNXAHscIZcS6p 3VCgB6I+T+PrZwrodoaPnBdOGStg5NzcqdbuHtAfiF0wcGZw/aS842evBi3k5B6J4ceH VenA== X-Gm-Message-State: APjAAAXvlPnoeE7X3T2z2Z0Ka5YE4wZFLIe2sJM0fkph+T0nKS2v7fze Fg08R9cmyg7z6mB20QKASaa0Es8BLos= X-Google-Smtp-Source: APXvYqyRDG3uAIuIZNxW0ttwqDdE5HpPqWkv8QhOe9hauYenh0LWUa868eNpAdxV7YE6+VTQ9oL3FA== X-Received: by 2002:a0c:d28c:: with SMTP id q12mr54228466qvh.88.1555183578018; Sat, 13 Apr 2019 12:26:18 -0700 (PDT) Received: from localhost.localdomain ([181.23.87.223]) by smtp.gmail.com with ESMTPSA id y18sm30215897qty.78.2019.04.13.12.26.16 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 13 Apr 2019 12:26:17 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2019 16:25:41 -0300 Message-Id: <20190413192541.9060-1-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 2/2 v2] 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 | 24 ++++++++++++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 0c03ca28af..c175038f0d 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -868,6 +868,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) { @@ -894,6 +899,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); @@ -1068,6 +1076,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); } @@ -1193,6 +1207,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 56009145e8..675bfe5bb4 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1755,3 +1755,27 @@ 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. + current->payload_size = cbs_av1_get_payload_bytes_left(rw); + + 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; +}