From patchwork Mon Nov 5 00:10:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10921 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 6247744C5DE for ; Mon, 5 Nov 2018 02:16:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D221D68A725; Mon, 5 Nov 2018 02:16:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE13768A725 for ; Mon, 5 Nov 2018 02:16:19 +0200 (EET) Received: by mail-wr1-f50.google.com with SMTP id j17-v6so2423765wrq.11 for ; Sun, 04 Nov 2018 16:16:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=jkBAcZqJRUAdlMgdBA5AT0Py3vv3A2XOEGPP1gFPkBs=; b=xFz7PZuQY1aDCtRYO1tdnx+usngN2qgvxQl3+LdeLsrtNgzgwic79JnpLrKV8cp1VU tAXIshb3nb0bpAm5YWEjvGpNfQYftSFPjutYQuvSqr+6yaceXBgPEpnK68KQqRoOzuhQ ipyhukM65tsNyQ36Dp95J94bpLXQ0XoFeYwayY7yeuHMDa0k9EadsFptecV7/4csR2PD lSf62rQI2dNgcwmAQ0TOyMjmVleJJlaYJQyFgHagaU7LSMvc4u8ZWvnUcQoYLdeirCsF 4qdDIjXhkrNgjLa1qWobbcVllIW7W7kN/riNqvp1YhwhWBbj9Lr1yXeKaxyiewWB8taz gMUA== 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=jkBAcZqJRUAdlMgdBA5AT0Py3vv3A2XOEGPP1gFPkBs=; b=SowOtuKOTFAbxkhR6FHDjv65XgEmv017UVBgwwYRGpG0hUGEdUzVkkZYkWrGXZfEOP xsWDMvIZHT+URv/bjEHHUczDqnBGh/MPqm55Ap2g09YTII8m9btg9VrVUSzlSPJeAumy vQPScGhP7HQQx5MKEubMVhpHwaJVGdi67SKtAyJQWRnHAQXUL8pGR3/7R99ATSUdar5P 9+BNdmUQUbomaosgmRNaqpf/7n+RU5DsaKljHk2Ajxj0l42uldcbbbwkYs80L7Ahb8kZ S+kbbOFUZhZFibWS2flHgYku6bHABeErMJfywRBH0+D+nxKIqk+LLu6RlpjbvDgteg6v os+g== X-Gm-Message-State: AGRZ1gLlsjI2xZ7z1/2nj7uRxHwNOss1+2acUBFHzuhOGClgO3FJFxl7 1peQON+1XsHGyYBIB1+aaqRteMNhLBk= X-Google-Smtp-Source: AJdET5fWZHE8kDZ+3Ih8gmtHEabGjirgdVLaBhNh43yNhXb2ikl3ovRAgGmu1ks6DQZP73eFEHGlIQ== X-Received: by 2002:a5d:6389:: with SMTP id p9-v6mr17090725wru.215.1541376651240; Sun, 04 Nov 2018 16:10:51 -0800 (PST) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id z3-v6sm2342428wma.6.2018.11.04.16.10.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Nov 2018 16:10:50 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Nov 2018 00:10:44 +0000 Message-Id: <20181105001045.24545-2-sw@jkqxz.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181105001045.24545-1-sw@jkqxz.net> References: <20181105001045.24545-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] cbs_av1: Support redundant frame headers 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" --- Includes support for using them when the normal frame header as been lost (try "-bsf:v filter_units=remove_types=3"). libavcodec/cbs_av1.c | 8 +++- libavcodec/cbs_av1.h | 2 + libavcodec/cbs_av1_syntax_template.c | 64 +++++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 8 deletions(-) diff --git a/libavcodec/cbs_av1.c b/libavcodec/cbs_av1.c index 1c49d90f51..b61b757f41 100644 --- a/libavcodec/cbs_av1.c +++ b/libavcodec/cbs_av1.c @@ -996,7 +996,9 @@ static int cbs_av1_read_unit(CodedBitstreamContext *ctx, case AV1_OBU_REDUNDANT_FRAME_HEADER: { err = cbs_av1_read_frame_header_obu(ctx, &gbc, - &obu->obu.frame_header); + &obu->obu.frame_header, + obu->header.obu_type == + AV1_OBU_REDUNDANT_FRAME_HEADER); if (err < 0) return err; } @@ -1124,7 +1126,9 @@ static int cbs_av1_write_obu(CodedBitstreamContext *ctx, case AV1_OBU_REDUNDANT_FRAME_HEADER: { err = cbs_av1_write_frame_header_obu(ctx, pbc, - &obu->obu.frame_header); + &obu->obu.frame_header, + obu->header.obu_type == + AV1_OBU_REDUNDANT_FRAME_HEADER); if (err < 0) return err; } diff --git a/libavcodec/cbs_av1.h b/libavcodec/cbs_av1.h index b66a09c389..af9e88df71 100644 --- a/libavcodec/cbs_av1.h +++ b/libavcodec/cbs_av1.h @@ -400,6 +400,8 @@ typedef struct CodedBitstreamAV1Context { AVBufferRef *sequence_header_ref; int seen_frame_header; + uint8_t *frame_header; + size_t frame_header_size; int temporal_id; int spatial_id; diff --git a/libavcodec/cbs_av1_syntax_template.c b/libavcodec/cbs_av1_syntax_template.c index e146bbf8bb..5649af841a 100644 --- a/libavcodec/cbs_av1_syntax_template.c +++ b/libavcodec/cbs_av1_syntax_template.c @@ -1463,24 +1463,76 @@ static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, } static int FUNC(frame_header_obu)(CodedBitstreamContext *ctx, RWContext *rw, - AV1RawFrameHeader *current) + AV1RawFrameHeader *current, int redundant) { CodedBitstreamAV1Context *priv = ctx->priv_data; - int err; - - HEADER("Frame Header"); + int start_pos, fh_bits, fh_bytes, err; + const uint8_t *fh_start; if (priv->seen_frame_header) { - // Nothing to do. + if (!redundant) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid repeated " + "frame header OBU.\n"); + return AVERROR_INVALIDDATA; + } else { + GetBitContext fh; + size_t k; + int b; + + HEADER("Redundant Frame Header"); + + init_get_bits(&fh, priv->frame_header, + priv->frame_header_size); + for (k = 0; k < priv->frame_header_size; k++) { + b = get_bits1(&fh); + xf(1, frame_header_copy[k], b, b, b, 1, k); + } + } } else { + if (redundant) + HEADER("Redundant Frame Header (used as Frame Header)"); + else + HEADER("Frame Header"); + priv->seen_frame_header = 1; +#ifdef READ + start_pos = get_bits_count(rw); +#else + start_pos = put_bits_count(rw); +#endif + CHECK(FUNC(uncompressed_header)(ctx, rw, current)); if (current->show_existing_frame) { priv->seen_frame_header = 0; } else { priv->seen_frame_header = 1; + + av_freep(&priv->frame_header); + +#ifdef READ + fh_bits = get_bits_count(rw) - start_pos; + fh_start = rw->buffer + start_pos / 8; +#else + // Need to flush the bitwriter so that we can copy its output, + // but use a copy so we don't affect the caller's structure. + { + PutBitContext tmp = *rw; + flush_put_bits(&tmp); + } + + fh_bits = put_bits_count(rw) - start_pos; + fh_start = rw->buf + start_pos / 8; +#endif + fh_bytes = (fh_bits + 7) / 8; + + priv->frame_header_size = fh_bits; + priv->frame_header = + av_mallocz(fh_bytes + AV_INPUT_BUFFER_PADDING_SIZE); + if (!priv->frame_header) + return AVERROR(ENOMEM); + memcpy(priv->frame_header, fh_start, fh_bytes); } } @@ -1528,7 +1580,7 @@ static int FUNC(frame_obu)(CodedBitstreamContext *ctx, RWContext *rw, { int err; - CHECK(FUNC(frame_header_obu)(ctx, rw, ¤t->header)); + CHECK(FUNC(frame_header_obu)(ctx, rw, ¤t->header, 0)); CHECK(FUNC(byte_alignment)(ctx, rw));