From patchwork Wed Oct 3 01:44:30 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10547 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp3609693uaq; Tue, 2 Oct 2018 18:45:24 -0700 (PDT) X-Google-Smtp-Source: ACcGV63Q1gaF/sGsfpDHx5JxmHoY8xHaIajoJTF/+KYk5GDMiPutfzITm5ZYbMDEIKt+O6brkVDU X-Received: by 2002:adf:c88b:: with SMTP id k11-v6mr12430557wrh.6.1538531124673; Tue, 02 Oct 2018 18:45:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538531124; cv=none; d=google.com; s=arc-20160816; b=WldIWoo3TH86l03ZqSqXRIdI0UvHhx6/scaQG17MJ5GFR4msPajQ1+KEj29VN6/3DO EzKCTzWCmgUXoFfql7q9zXyFn1iI+vNqctLosLr++6dVYLwmNaSr2Fkc1xFdU/JFmu6u y70YGG83NKyxLI0M9upXGuOjaR6jlnX3IxC1uzv9Vowp9SWIv+0tA48qh+hLvaRXSWiP zlxVAM8mDLzxhJtIOlxHb71U4gDTxI9pfUGFy/IUnCShIoh0SYWWFtszrm4tp3kM4dQe m5+XKw98WiaKO1bATPGLt0qKwNq6fiOGOCMvQT6hKCJBT+R/18N39tUNsXA/EZ8xjo7D F0mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=vpcpK2ukXCDEB/jZsXj8DN56yvQSpjX8xb1iYbSljrA=; b=GFWAlo94GweGogfqKHKV6AL8+a7O3zjaLXeMmGirqbOLvr2wjgilpi/taXjib7T0J3 1XXzQmxBZQ+dbH5Ay05FOTX1lMOc98A8etLBUrY0Fqu8jV4JOSz77OL0R+5K5EjSrHT2 pB8eZvo+pBVMfh6fAMK3+u4TH3aRcTbCSXCMUHCL5ed6/drPyVXI7DDteAP1CSOCJJUu N9QZvTn2JynwWtfkmLXBmE7GmRgfQ4UCY8Qfxt4fbAe9s/Yt9TZ/w6aZJ4qWkPblUJBm Y4qrB2LyTGQH1eAJD9xmTf7x461RUZFJaDeIvmQ72ei6fluJqNWpuvK8vRXbOeufVRX4 Q0EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hgqMqchs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f17-v6si9611156wrj.166.2018.10.02.18.45.23; Tue, 02 Oct 2018 18:45:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=hgqMqchs; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8E8F689EA1; Wed, 3 Oct 2018 04:45:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3248B6800D9 for ; Wed, 3 Oct 2018 04:44:55 +0300 (EEST) Received: by mail-qk1-f194.google.com with SMTP id q5-v6so2493324qki.6 for ; Tue, 02 Oct 2018 18:45:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=qL/Gq3qOT8fym5HkmSXk8e4dl77te+2ql6l+jD601Dg=; b=hgqMqchsfLmXtEIV3ad+w+CfacT2qqXABdc2S08TApLHBhiQzZL89DmIC6KRQW3R6i HPBDwsfTsi4I/AaODtldXNHlNfWyX3DRK09YSzteRWVU42NtqEDsYzEvyYIL7K1rU+nq y7rb5FtCL1nQjBPPsY4tC+0t68vApsxfrE4E35Hgd2PDXFdr9ZUy3rme3DtuA316F7aq KptCdcXbxT9LCInZQkrEGPB2rhSQ33Pd2T9tEiYzGcGpB56FPYNPM1QnCr8nWtnSA0aC Vi53wfWE8docWivFPJJZb04gYCDiPVKw7ycpXLZA/5YnDEquzyDULz8IIT/ffzLXkmm0 EiYQ== 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:mime-version :content-transfer-encoding; bh=qL/Gq3qOT8fym5HkmSXk8e4dl77te+2ql6l+jD601Dg=; b=hOBYXgXIT/7vx4PArCcR06YQKFS04LHqO7f4mGhIQH5vX7ubcLMw4i4kezO4Yw495r OhJGYA6EBBF09uQz7qG2RltEoxza7rYhvmJ1BtVl8BNe6uVMpSWzMUaiioWzO2srr31R J0AnT2h1thx/QJTn1uNH1Em3jfqaJwadZn0gqSO4QF0KAvDxZ/rYMJuxE85fdxo7f12s P+7UA2JXvj1VwoMEuCiQgEbUBKDob/0GSTyobH3N5UpHGQhzcUqAroo2p1m1zgBitBy+ GjImNNEzfhjqEdZ2KEYCobDVGUpAXgVcfvUeu3zLOEkCnSDRhA70Czf4X2CMhMoVtKxv UxDQ== X-Gm-Message-State: ABuFfoj7lUIClraUZPE6Q9I1iEGaNp83rNT0VWMm4erDAfbZWQhleYq0 qexkXx1u45p2I2mWfBCrfts3983J X-Received: by 2002:a37:674c:: with SMTP id b73-v6mr14347672qkc.183.1538531113144; Tue, 02 Oct 2018 18:45:13 -0700 (PDT) Received: from localhost.localdomain ([179.38.230.94]) by smtp.gmail.com with ESMTPSA id o185-v6sm8142815qke.34.2018.10.02.18.45.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Oct 2018 18:45:12 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Oct 2018 22:44:30 -0300 Message-Id: <20181003014430.7164-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec: add an AV1 parser 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" Simple parser to set keyframes, frame type, structure, width, height, and pixel format, plus stream profile and level. Signed-off-by: James Almer --- Missing Changelog entry and version bump still. configure | 1 + libavcodec/Makefile | 1 + libavcodec/av1_parser.c | 226 ++++++++++++++++++++++++++++++++++++++++ libavcodec/parsers.c | 1 + 4 files changed, 229 insertions(+) create mode 100644 libavcodec/av1_parser.c diff --git a/configure b/configure index 8168ca4369..ea0182d0aa 100755 --- a/configure +++ b/configure @@ -3020,6 +3020,7 @@ wmv3_crystalhd_decoder_select="crystalhd" # parsers aac_parser_select="adts_header" +av1_parser_select="cbs_av1" h264_parser_select="golomb h264dsp h264parse" hevc_parser_select="hevcparse" mpegaudio_parser_select="mpegaudioheader" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index b2c6995f9a..dc28892e64 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1006,6 +1006,7 @@ OBJS-$(CONFIG_AAC_PARSER) += aac_parser.o aac_ac3_parser.o \ mpeg4audio.o OBJS-$(CONFIG_AC3_PARSER) += ac3tab.o aac_ac3_parser.o OBJS-$(CONFIG_ADX_PARSER) += adx_parser.o adx.o +OBJS-$(CONFIG_AV1_PARSER) += av1_parser.o OBJS-$(CONFIG_AVS2_PARSER) += avs2_parser.o OBJS-$(CONFIG_BMP_PARSER) += bmp_parser.o OBJS-$(CONFIG_CAVSVIDEO_PARSER) += cavs_parser.o diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c new file mode 100644 index 0000000000..0dee3e9d2e --- /dev/null +++ b/libavcodec/av1_parser.c @@ -0,0 +1,226 @@ +/* + * AV1 parser + * + * Copyright (C) 2018 James Almer + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "av1_parse.h" +#include "cbs.h" +#include "cbs_av1.h" +#include "parser.h" + +typedef struct AV1ParseContext { + CodedBitstreamContext *cbc; + CodedBitstreamFragment temporal_unit; + int parsed_extradata; +} AV1ParseContext; + +static const enum AVPixelFormat pix_fmts_8bit[2][2] = { + { AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, + { AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P }, +}; +static const enum AVPixelFormat pix_fmts_10bit[2][2] = { + { AV_PIX_FMT_YUV444P10, AV_PIX_FMT_NONE }, + { AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV420P10 }, +}; +static const enum AVPixelFormat pix_fmts_12bit[2][2] = { + { AV_PIX_FMT_YUV444P12, AV_PIX_FMT_NONE }, + { AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV420P12 }, +}; + +static int av1_parser_parse(AVCodecParserContext *ctx, + AVCodecContext *avctx, + const uint8_t **out_data, int *out_size, + const uint8_t *data, int size) +{ + AV1ParseContext *s = ctx->priv_data; + CodedBitstreamFragment *td = &s->temporal_unit; + CodedBitstreamAV1Context *av1 = s->cbc->priv_data; + int ret; + + *out_data = data; + *out_size = size; + + ctx->key_frame = -1; + ctx->pict_type = AV_PICTURE_TYPE_NONE; + ctx->picture_structure = AV_PICTURE_STRUCTURE_UNKNOWN; + + s->cbc->log_ctx = avctx; + + if (avctx->extradata_size && !s->parsed_extradata) { + s->parsed_extradata = 1; + + ret = ff_cbs_read(s->cbc, td, avctx->extradata, avctx->extradata_size); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to parse extradata.\n"); + return size; + } + + ff_cbs_fragment_uninit(s->cbc, td); + } + + ret = ff_cbs_read(s->cbc, td, data, size); + if (ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to parse temporal unit.\n"); + return size; + } + + if (!av1->sequence_header) { + av_log(avctx, AV_LOG_ERROR, "No sequence header available\n"); + goto end; + } + + for (int i = 0; i < td->nb_units; i++) { + CodedBitstreamUnit *unit = &td->units[i]; + AV1RawOBU *obu = unit->content; + AV1RawSequenceHeader *seq = av1->sequence_header; + AV1RawColorConfig *color = &seq->color_config; + AV1RawFrameHeader *frame; + int frame_type; + + if (unit->type == AV1_OBU_FRAME) + frame = &obu->obu.frame.header; + else if (unit->type == AV1_OBU_FRAME_HEADER) + frame = &obu->obu.frame_header; + else + continue; + + if (frame->show_existing_frame) { + AV1ReferenceFrameState *ref = &av1->ref[frame->frame_to_show_map_idx]; + + if (!ref->valid) { + av_log(avctx, AV_LOG_ERROR, "Invalid reference frame\n"); + goto end; + } + + ctx->width = ref->frame_width; + ctx->height = ref->frame_height; + frame_type = ref->frame_type; + + ctx->key_frame = 0; + } else if (!frame->show_frame) { + continue; + } else { + ctx->width = av1->frame_width; + ctx->height = av1->frame_height; + frame_type = frame->frame_type; + + ctx->key_frame = frame_type == AV1_FRAME_KEY; + } + + avctx->profile = seq->seq_profile; + avctx->level = seq->seq_level_idx[0]; + + switch (frame_type) { + case AV1_FRAME_KEY: + case AV1_FRAME_INTRA_ONLY: + ctx->pict_type = AV_PICTURE_TYPE_I; + break; + case AV1_FRAME_INTER: + ctx->pict_type = AV_PICTURE_TYPE_P; + break; + case AV1_FRAME_SWITCH: + ctx->pict_type = AV_PICTURE_TYPE_SP; + break; + } + ctx->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + + switch (av1->bit_depth) { + case 8: + ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY8 + : pix_fmts_8bit [color->subsampling_x][color->subsampling_y]; + break; + case 10: + ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY10 + : pix_fmts_10bit[color->subsampling_x][color->subsampling_y]; + break; + case 12: + ctx->format = color->mono_chrome ? AV_PIX_FMT_GRAY12 + : pix_fmts_12bit[color->subsampling_x][color->subsampling_y]; + break; + } + av_assert2(ctx->format != AV_PIX_FMT_NONE); + } + +end: + ff_cbs_fragment_uninit(s->cbc, td); + + return size; +} + +static const CodedBitstreamUnitType decompose_unit_types[] = { + AV1_OBU_TEMPORAL_DELIMITER, + AV1_OBU_SEQUENCE_HEADER, + AV1_OBU_FRAME_HEADER, + AV1_OBU_TILE_GROUP, + AV1_OBU_FRAME, +}; + +static av_cold int av1_parser_init(AVCodecParserContext *ctx) +{ + AV1ParseContext *s = ctx->priv_data; + int ret; + + ret = ff_cbs_init(&s->cbc, AV_CODEC_ID_AV1, NULL); + if (ret < 0) + return ret; + + s->cbc->decompose_unit_types = (CodedBitstreamUnitType *)decompose_unit_types; + s->cbc->nb_decompose_unit_types = FF_ARRAY_ELEMS(decompose_unit_types); + + return 0; +} + +static void av1_parser_close(AVCodecParserContext *ctx) +{ + AV1ParseContext *s = ctx->priv_data; + + ff_cbs_close(&s->cbc); +} + +static int av1_parser_split(AVCodecContext *avctx, + const uint8_t *buf, int buf_size) +{ + AV1OBU obu; + const uint8_t *ptr = buf, *end = buf + buf_size; + + while (ptr < end) { + int len = ff_av1_extract_obu(&obu, ptr, buf_size, avctx); + if (len < 0) + break; + + if (obu.type == AV1_OBU_FRAME_HEADER || + obu.type == AV1_OBU_FRAME) { + return ptr - buf; + } + ptr += len; + buf_size -= len; + } + + return 0; +} + +AVCodecParser ff_av1_parser = { + .codec_ids = { AV_CODEC_ID_AV1 }, + .priv_data_size = sizeof(AV1ParseContext), + .parser_init = av1_parser_init, + .parser_close = av1_parser_close, + .parser_parse = av1_parser_parse, + .split = av1_parser_split, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index cb86cceecc..f01cad4c84 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -26,6 +26,7 @@ extern AVCodecParser ff_aac_parser; extern AVCodecParser ff_aac_latm_parser; extern AVCodecParser ff_ac3_parser; extern AVCodecParser ff_adx_parser; +extern AVCodecParser ff_av1_parser; extern AVCodecParser ff_avs2_parser; extern AVCodecParser ff_bmp_parser; extern AVCodecParser ff_cavsvideo_parser;