From patchwork Mon Apr 1 23:39:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 12555 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 54CE3447332 for ; Tue, 2 Apr 2019 02:39:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4439468ABC7; Tue, 2 Apr 2019 02:39:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E4F4A68AB21 for ; Tue, 2 Apr 2019 02:39:47 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id a184so1204626wma.2 for ; Mon, 01 Apr 2019 16:39:47 -0700 (PDT) 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=I2v/oMM4bZuc9GGlXkCtEIDHvdUNhnGNNOYjhRn0vzI=; b=P+Hy/xvvctQa0jURMwdBysBCpikPN3wwMomBzpx6UtFgxLa83rlKHaEUEW7IXYQx01 QZAusphw5O+5zOpSCGhTW0ljHwByjLEvnYtkp/hBWZ4JveBNRrQexGXn+RyyHK+KUavG GyBAOvLo0SU7UFfwXYannNBLiExZrpIVEYuF8buFeIC9ilbwj/xzYtArUuZ4QJ/gbi6L b5m1u8Mthj1pLxOl4BSUqCmUrfUw0oQLX18LLy5E35G8MLHfu6y/y8rzohg0w09LcD/K lHisWRHGJAuGAWg5100gatUcz0RLw2Ksls5KIrz9Xtxm+hMm9naW1JTHHZ6hEsbcIzd7 alaQ== 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=I2v/oMM4bZuc9GGlXkCtEIDHvdUNhnGNNOYjhRn0vzI=; b=AbTU/IwWuJF9ewofcK9Z5tD/KSB9AjoVizIXrARPw88J3iylCKvpxuiGQCEOHYVvqA jLVZLaxC9EcYmRKG42051CnyQ3IYQ/qkWaFtHMdaNm8oFNde+P6XSiIa9n+N1LcuigqJ 47jo39xlOmpO2cNqxR/H4//NUO+kwtJxXtwkG/Hssq/JacN052ukD5dNKb5yE4y3LPlT kbp+ZoC/fOgz+1ZYLkfg8IZR2z/b5B/32m7BHWpWWefUsD8NBQarifMj2xeKoOK0QURr Q1yyXLWrDHy35xUjJcOx0LnI07ri39FTHDAYGr7G0rSaoLPGRUi/7DbTYWRRepA3GPmb P6Kw== X-Gm-Message-State: APjAAAUw1ODznUo/FCBu3uYjokRyrwVt5TQzEiP0/MFC00LOvbHksk0n HpssPZzmAvKCZZLz1KOW/bANu9PPTIc= X-Google-Smtp-Source: APXvYqzujXaCj4tCqR5vXks40iT8E13ZjlQrZzLSAXUTw9HEIPtV78cJcZkTwlpoMcxxHJRGeIAvQA== X-Received: by 2002:a7b:c00b:: with SMTP id c11mr1284830wmb.23.1554161987111; Mon, 01 Apr 2019 16:39:47 -0700 (PDT) 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 r30sm27943044wrr.46.2019.04.01.16.39.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 16:39:46 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Apr 2019 00:39:33 +0100 Message-Id: <20190401233940.5941-2-sw@jkqxz.net> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190401233940.5941-1-sw@jkqxz.net> References: <20190401233940.5941-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/9] cbs_vp9: Implement parser entrypoint 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" --- libavcodec/cbs_vp9.c | 90 +++++++++++++++++++++++++++++++++++--------- 1 file changed, 73 insertions(+), 17 deletions(-) diff --git a/libavcodec/cbs_vp9.c b/libavcodec/cbs_vp9.c index 0b5f137ed8..6ea4681d68 100644 --- a/libavcodec/cbs_vp9.c +++ b/libavcodec/cbs_vp9.c @@ -409,15 +409,23 @@ static int cbs_vp9_write_le(CodedBitstreamContext *ctx, PutBitContext *pbc, #undef byte_alignment -static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx, - CodedBitstreamFragment *frag, - int header) +typedef int (*cbs_vp9_split_frame_callback)(CodedBitstreamContext *ctx, + void *priv, + const uint8_t *data, + size_t data_size); + +static int cbs_vp9_split_frames(CodedBitstreamContext *ctx, + void *priv, cbs_vp9_split_frame_callback cb, + const uint8_t *data, size_t data_size) { uint8_t superframe_header; int err; + if (data_size == 0) + return 0; + // Last byte in the packet. - superframe_header = frag->data[frag->data_size - 1]; + superframe_header = data[data_size - 1]; if ((superframe_header & 0xe0) == 0xc0) { VP9RawSuperframeIndex sfi; @@ -427,8 +435,14 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx, index_size = 2 + (((superframe_header & 0x18) >> 3) + 1) * ((superframe_header & 0x07) + 1); + if (index_size > data_size) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "Superframe index (%" + SIZE_SPECIFIER" bytes) is larger than whole frame (%" + SIZE_SPECIFIER" bytes).\n", index_size, data_size); + return AVERROR_INVALIDDATA; + } - err = init_get_bits(&gbc, frag->data + frag->data_size - index_size, + err = init_get_bits(&gbc, data + data_size - index_size, 8 * index_size); if (err < 0) return err; @@ -439,34 +453,27 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx, pos = 0; for (i = 0; i <= sfi.frames_in_superframe_minus_1; i++) { - if (pos + sfi.frame_sizes[i] + index_size > frag->data_size) { + if (pos + sfi.frame_sizes[i] + index_size > data_size) { av_log(ctx->log_ctx, AV_LOG_ERROR, "Frame %d too large " "in superframe: %"PRIu32" bytes.\n", i, sfi.frame_sizes[i]); return AVERROR_INVALIDDATA; } - err = ff_cbs_insert_unit_data(ctx, frag, -1, 0, - frag->data + pos, - sfi.frame_sizes[i], - frag->data_ref); + err = cb(ctx, priv, data + pos, sfi.frame_sizes[i]); if (err < 0) return err; pos += sfi.frame_sizes[i]; } - if (pos + index_size != frag->data_size) { + if (pos + index_size != data_size) { av_log(ctx->log_ctx, AV_LOG_WARNING, "Extra padding at " "end of superframe: %"SIZE_SPECIFIER" bytes.\n", - frag->data_size - (pos + index_size)); + data_size - (pos + index_size)); } - return 0; - } else { - err = ff_cbs_insert_unit_data(ctx, frag, -1, 0, - frag->data, frag->data_size, - frag->data_ref); + err = cb(ctx, priv, data, data_size); if (err < 0) return err; } @@ -474,6 +481,23 @@ static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx, return 0; } +static int cbs_vp9_insert_unit(CodedBitstreamContext *ctx, void *priv, + const uint8_t *data, size_t data_size) +{ + CodedBitstreamFragment *frag = priv; + return ff_cbs_insert_unit_data(ctx, frag, -1, 0, + (uint8_t*)data, data_size, + frag->data_ref); +} + +static int cbs_vp9_split_fragment(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag, + int header) +{ + return cbs_vp9_split_frames(ctx, frag, &cbs_vp9_insert_unit, + frag->data, frag->data_size); +} + static void cbs_vp9_free_frame(void *unit, uint8_t *content) { VP9RawFrame *frame = (VP9RawFrame*)content; @@ -678,6 +702,36 @@ static void cbs_vp9_close(CodedBitstreamContext *ctx) av_freep(&priv->write_buffer); } +static int cbs_vp9_parse_frame(CodedBitstreamContext *ctx, void *priv, + const uint8_t *data, size_t data_size) +{ + VP9RawFrameHeader *frame = priv; + GetBitContext gbc; + int err; + + err = init_get_bits(&gbc, data, 8 * data_size); + if (err < 0) + return err; + + memset(frame, 0, sizeof(*frame)); + return cbs_vp9_read_uncompressed_header(ctx, &gbc, frame); +} + +static int cbs_vp9_parse_headers(CodedBitstreamContext *ctx, void *header, + const uint8_t *data, size_t size) +{ + VP9RawFrameHeader frame; + int err; + + err = cbs_vp9_split_frames(ctx, &frame, &cbs_vp9_parse_frame, data, size); + if (err < 0) + return err; + + if (header) + memcpy(header, &frame, sizeof(frame)); + return 0; +} + const CodedBitstreamType ff_cbs_type_vp9 = { .codec_id = AV_CODEC_ID_VP9, @@ -689,4 +743,6 @@ const CodedBitstreamType ff_cbs_type_vp9 = { .assemble_fragment = &cbs_vp9_assemble_fragment, .close = &cbs_vp9_close, + + .parse_headers = &cbs_vp9_parse_headers, };