From patchwork Mon Nov 13 01:53:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dai, Jianhui J" X-Patchwork-Id: 44646 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a5:b0:181:818d:5e7f with SMTP id q37csp1068145pzg; Sun, 12 Nov 2023 17:53:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IHmanU1VoNPyEpUlvfoixFHmhw9M8BLfd9vilGUn+1Mgjz/H0Y3Nm82mZDgFPcIBFLiHkEr X-Received: by 2002:a17:906:1315:b0:9e9:88ec:7a53 with SMTP id w21-20020a170906131500b009e988ec7a53mr767890ejb.16.1699840429174; Sun, 12 Nov 2023 17:53:49 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u11-20020a1709064acb00b009c7695740e5si2201106ejt.407.2023.11.12.17.53.48; Sun, 12 Nov 2023 17:53:49 -0800 (PST) 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=@intel.com header.s=Intel header.b=Z6WBI4jS; arc=fail (body hash mismatch); 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B859168CC95; Mon, 13 Nov 2023 03:53:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.120]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B906A68CC87 for ; Mon, 13 Nov 2023 03:53:43 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699840423; x=1731376423; h=from:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=i1zhobleETxwCHndBYJmSrzMycGGJm4FuRwV6kWRkhI=; b=Z6WBI4jS1yx23kHx3BhPByUgTqNIEYiPyKtKIYjz8d3VCJKdGC1nvu+8 DEpQRzYvybI+0CODf2zphIDLAX3OBor1H78IyzsFToaWhjbaLZaS5XABp w67kBSaz174T4L1eCgntLpH5PIPpx0k9FP/jDV/6xRCYDRPGfrIzKncYX Ie/ZSC2JYu1ir/lxTT2DNDBJOpe4zSKEy1DirD57EVdX6J3gUnDHSJAvF /nw+K9p/J/9eymk2Qxz5CjCvIhOIksJioCMsYOrfc+ykM+UOX4AkbZw10 lCoEeheepJFZ0CVoKw0HqI6M8MZW7b8R9xnCGjamqttAwDs/jDvNrkRLx g==; X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="389233965" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="389233965" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 Nov 2023 17:53:41 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10892"; a="793314153" X-IronPort-AV: E=Sophos;i="6.03,298,1694761200"; d="scan'208";a="793314153" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga008.jf.intel.com with ESMTP/TLS/AES256-GCM-SHA384; 12 Nov 2023 17:53:40 -0800 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34; Sun, 12 Nov 2023 17:53:39 -0800 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.34 via Frontend Transport; Sun, 12 Nov 2023 17:53:39 -0800 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (104.47.74.40) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.34; Sun, 12 Nov 2023 17:53:39 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mZyf3gHu5Bki2Cq6Bjm/yomDJWx6RHT9BVpAfQ3svQvNrijNb4rWZdWK2zEwaXdot2Zh4glgDE80aSZq3rsiNMHysgEIG3lc2s4mwyUeOCu/Ups1VGxvBKGgEtykzDrErBmwtVuIqu4zgU5EXGBfpN2bfcHza+pKYnpgkGQTzpebK4McOjc9p17AYwcT2dHrbTypvcq8NW1qScVz3UALZC3xioA+StLhrJbsd2ooycPZzlMt6Pr/+pOfxHqYUFzN52eidx5d1oB/8aDj2FA2Sa6lyRRSc7ffXWHWcZTX3XxlJjnrheLrucS2pK2cAz5l1vePbERbvQ3FHa2Rdh9Rug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MJWaUjz6grwGzZ1/Ixxpm9Gh/yXCBb6STeLjxa5esb4=; b=KMChmwEQVAtcPvlJqXHrLyjuFNSw0tZQEdAOlFBxFyvU8SNaLjXmGoI289dA8E2v7j5t05VCMMQIHQ2VUMZMKUFf7F43nO7RWsBZke1pqlT2mBa6ylqL7J5FdI+G1qSbGwvL92eQflHaBJuZXnJrxpNk5xGk9gOmwcXgM6mcTPk/TZWPAAoVzAsRVnn7o3HlgJJC/XFAT5nDpKuq0qf928zxDjiOPlnpB74I0sMplJieBESICeSAJWlHi2auDGRanj9Vc32eHi1AbqHd9F1CrIRSa5t808PBmDXWKKrJCuYHN/eTUYLQ1bXvMYGkY/eHt4XckptGZ7HanE6xZwpVgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none Received: from DM6PR11MB2681.namprd11.prod.outlook.com (2603:10b6:5:bd::33) by MW4PR11MB6982.namprd11.prod.outlook.com (2603:10b6:303:228::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6977.29; Mon, 13 Nov 2023 01:53:36 +0000 Received: from DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::554:31e:c67c:1747]) by DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::554:31e:c67c:1747%6]) with mapi id 15.20.6977.029; Mon, 13 Nov 2023 01:53:35 +0000 From: "Dai, Jianhui J" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH v6] avcodec/cbs_vp8: Add support for VP8 codec bitstream Thread-Index: AdmG0tDkR2acQa/GT0uMrzoXLuNwHw== Date: Mon, 13 Nov 2023 01:53:35 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-exchange-messagesentrepresentingtype: 1 x-ms-publictraffictype: Email x-ms-traffictypediagnostic: DM6PR11MB2681:EE_|MW4PR11MB6982:EE_ x-ms-office365-filtering-correlation-id: 331c62a8-b5b3-4369-13fa-08dbe3eb590d x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 4va3djcSY/QL6d6a4hXTy7y9vn5+kPBpdNQTAQzG++Je91TGdTfFO2ipyy6LrHuQEztaPtBbCxDmSBNDSoUbhq1t59I/4rxY5rPHS3NX0ETZEp6SDa+DNN9/qAP5SU2dmEzWlNoZp2HfD/3uVNhgWySEAJkNnSz9KYou1JifPtkM0ZG559d6RNXpEazx+Uky5ijJiYUU81aZ12Yms7Di8vOX3eINL3uNEcSr+STZ8G13Yb2vJhrRNreJ2c7K+d1OZeFk4MQ5mzv1oBljX1zdtjHT/EMiLHIxj33gEwcQpGL8ROeZQ2D0gNhyIlztGiC8VMSJN1OG9caYaK3LbBnVYFoQLy/JzxB8myswwQSToBCF5OsstYIsctG2bDjRgDC2CaFHePZ56edkyx7FHp8rEOSkFB1Hj5JF6FhPXuRLeVUl6tvrXDF3lLqZ/v5N4deSzaK++Mgwt9fZ7xFlc9xIO3KLc/axwtSHxNFoiyIEVrKGRXln/kpSbLNg6xuvPPJJ77FTvU5Bgbzwc07xuSc/vZLz1LDT1NG9AyzLY7IqQZw3fU07EA3KIwuFY4tJkZ2VJ4t7kciGM9ifuHmxj4CVzXyqiOa0JeiUTUmem+wz9ZXrSvuNwd/Z3HnOrKkZiSYwuivBWaL37f9ODv51akbh9w== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM6PR11MB2681.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366004)(396003)(136003)(346002)(39860400002)(376002)(230922051799003)(451199024)(186009)(64100799003)(1800799009)(66899024)(26005)(6506007)(7696005)(71200400001)(9686003)(83380400001)(5660300002)(8936002)(8676002)(52536014)(30864003)(2906002)(41300700001)(19627235002)(478600001)(316002)(122000001)(6916009)(64756008)(66446008)(66476007)(66556008)(76116006)(66946007)(82960400001)(33656002)(86362001)(38100700002)(38070700009)(55016003)(2004002)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: MPrwVw0dwGbUtd9Kf6tzhY/AqW62uDc2MyJQ4v+n+fq5thvXWu6BqtlXSRHRV83YyTi74tRBXk5I1BRtfCAV6pbhZ5oxnxoNbreXepkGU0UuYs0tXgWCsjWKrj1wnWfBLq3f7IyIOrSZJnfmv4ClicOEDrvxhp936YjA6XNT3SRz9xyVg0eJr9m1oe4K5e31dfQSNJ9+K+K5OPqIumZkf2RfWXSe17Y2Ec63D03AwnWEek0DwLnKNnDd/hwNK8ScvK90xLqYMZunZ4ak3u0AvxYtP5aux+46h3M6jXdLo+URIBDPdfpS/KMayfxW1ODfAjdeJxi2FeMeQwEtKtwRGibpKGUUYB4Qcmfb68PTCNbUWLT3grf7dPR8M5b+AnevyfwK/HPm2jb9WZNAt72Mj36erz2VHXV7U9EyS+Z0SNJd38VwqGCcAeysXfqAVu+H2U/CakhOm7Vfzhyb2Jqr5KCWRXsaYHsNKaHP1QV3I8tPn06hRItEGXvZDb7H8lXe0Kpw7LTYDiSvkMsP4xW4yTozPRiEB1sGJRYOdar+WL7GD9DNFJ7v0O8ZAyqQ+z8OnlfvouPT3Ryu5wK9tqxShjqPMvMCnqdlBQA/STvuhPWlDEyrRq4Q4DLSSCtKD0a6yKUBnE9QOhqQlNUW8UH20GVs/IkxdFP4Djyo255ABEhCrqhNkkfF5fg3EJHAmnUQ7nEmCoTdh4DO325idpVgNG5RAaQH3OZ0n+z0XW4qWIgsOsEHqiM4wg8mYPMOhPN2Rxb1D9y6UALXdpzv+Jw+p3+bOtuSpMB9KzfreRA9swOPluYfdjO48V1mwVda/PAL4n9S4JC1+1tBPQmsqu9jCeFe/46QBQYrluHPjfGhtylagnCuXuuv0Igv10Jj4xOMW2NKno7cHKDnzbx2Gt793u5ePXMLpexQfVfLA9BpGj3pLWbEtPAmHjLr/SbEGHX1mJ6fR7JzzucnIrN8//hf23Gl53VJscK1obEwcoo2Jv/IV6FqcJac+KvKgJvTb7jmh+krdogOEe83D10lnlLlYJLltufLAsThyGl2RzmBMd+5NrbUaXb7OU00g8n2qanyQaubruI2geN4s/700CVbrDHZg/UqF1UymGRAGI2TF8RZa8vBnbR44hJ2jeo6aEqnIIDh7NnuiYf+oJ5D7ljIm1hc3f7HAUiJR3FLPFdq8EQM7CdFzmojoDbhMZ+AVR3A72HcSVR+chc8P2VFjAcg/a1QPNYPmTdYLtCfFGbu5XPQTmbiL1rZ22PPPOwaxZ/qo405GWTZRL1sleDy3jGCoMbjSMKXlYBSuJ9duH/WPTT6vclB/1ek+1cIfKSEAWxvPEXLnfIjcJnSfYVtvzJWgdScNY9H7KtZeLJpBsAuP3slmNLySPMfx4/n6MSQPyGZxnQuPscmpmNxvYp0XiEvGS7NJE5TP74wyox96lm+Wtl+nnSCkcVcrJrVX7n935a/kp1GEesviHM4HmfJaC8q+C0n5fL2EfY62ILZ5iUBpyy8hfnsOqf3J1bcPeiUzacMyLZ+crWaDfwP21DHXpzDJJp6qegxUYjZIu1iye5x8R2yxEGp6hx6meC19FwSuP9I MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB2681.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 331c62a8-b5b3-4369-13fa-08dbe3eb590d X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Nov 2023 01:53:35.3327 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: NVLj4lvWmUltDMqhe27vt+Apyy5wllsEPPWCTqw9oj6zPriUr7IPRN0NIxZ8ydM7BuWweh+k/0ICSqnbrxOgwA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR11MB6982 X-OriginatorOrg: intel.com Subject: [FFmpeg-devel] [PATCH v6] avcodec/cbs_vp8: Add support for VP8 codec bitstream X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: OQONoOeib3p1 This commit adds support for VP8 bitstream read methods to the cbs codec. This enables the trace_headers bitstream filter to support VP8, in addition to AV1, H.264, H.265, and VP9. This can be useful for debugging VP8 stream issues. The CBS VP8 implements a simple VP8 boolean decoder using GetBitContext to read the bitstream. Only the read methods `read_unit` and `split_fragment` are implemented. The write methods `write_unit` and `assemble_fragment` return the error code AVERROR_PATCHWELCOME. This is because CBS VP8 write is unlikely to be used by any applications at the moment. The write methods can be added later if there is a real need for them. TESTS: ffmpeg -i fate-suite/vp8/frame_size_change.webm -vcodec copy -bsf:v trace_headers -f null - Signed-off-by: Jianhui Dai --- configure | 4 +- libavcodec/Makefile | 1 + libavcodec/cbs.c | 6 + libavcodec/cbs_internal.h | 1 + libavcodec/cbs_vp8.c | 380 +++++++++++++++++++++++++++ libavcodec/cbs_vp8.h | 133 ++++++++++ libavcodec/cbs_vp8_syntax_template.c | 248 +++++++++++++++++ 7 files changed, 772 insertions(+), 1 deletion(-) create mode 100644 libavcodec/cbs_vp8.c create mode 100644 libavcodec/cbs_vp8.h create mode 100644 libavcodec/cbs_vp8_syntax_template.c diff --git a/configure b/configure index 46d7a5cf0e..e7ccdc5e6a 100755 --- a/configure +++ b/configure @@ -2471,6 +2471,7 @@ CONFIG_EXTRA=" cbs_h266 cbs_jpeg cbs_mpeg2 + cbs_vp8 cbs_vp9 deflate_wrapper dirac_parse @@ -2756,6 +2757,7 @@ cbs_h265_select="cbs" cbs_h266_select="cbs" cbs_jpeg_select="cbs" cbs_mpeg2_select="cbs" +cbs_vp8_select="cbs" cbs_vp9_select="cbs" deflate_wrapper_deps="zlib" dirac_parse_select="golomb" @@ -3340,7 +3342,7 @@ h264_redundant_pps_bsf_select="cbs_h264" hevc_metadata_bsf_select="cbs_h265" mjpeg2jpeg_bsf_select="jpegtables" mpeg2_metadata_bsf_select="cbs_mpeg2" -trace_headers_bsf_select="cbs" +trace_headers_bsf_select="cbs cbs_vp8" vp9_metadata_bsf_select="cbs_vp9" vvc_metadata_bsf_select="cbs_h266" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 57d57f3ab5..a6dff5e61b 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -81,6 +81,7 @@ OBJS-$(CONFIG_CBS_H265) += cbs_h2645.o cbs_sei.o h2645_parse.o OBJS-$(CONFIG_CBS_H266) += cbs_h2645.o cbs_sei.o h2645_parse.o OBJS-$(CONFIG_CBS_JPEG) += cbs_jpeg.o OBJS-$(CONFIG_CBS_MPEG2) += cbs_mpeg2.o +OBJS-$(CONFIG_CBS_VP8) += cbs_vp8.o vp8data.o OBJS-$(CONFIG_CBS_VP9) += cbs_vp9.o OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o OBJS-$(CONFIG_DEFLATE_WRAPPER) += zlib_wrapper.o diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index cdd7adebeb..de7b1361aa 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -50,6 +50,9 @@ static const CodedBitstreamType *const cbs_type_table[] = { #if CONFIG_CBS_MPEG2 &ff_cbs_type_mpeg2, #endif +#if CONFIG_CBS_VP8 + &ff_cbs_type_vp8, +#endif #if CONFIG_CBS_VP9 &ff_cbs_type_vp9, #endif @@ -74,6 +77,9 @@ const enum AVCodecID ff_cbs_all_codec_ids[] = { #if CONFIG_CBS_MPEG2 AV_CODEC_ID_MPEG2VIDEO, #endif +#if CONFIG_CBS_VP8 + AV_CODEC_ID_VP8, +#endif #if CONFIG_CBS_VP9 AV_CODEC_ID_VP9, #endif diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index 07220f1f3e..d982262bd9 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -341,6 +341,7 @@ extern const CodedBitstreamType ff_cbs_type_h265; extern const CodedBitstreamType ff_cbs_type_h266; extern const CodedBitstreamType ff_cbs_type_jpeg; extern const CodedBitstreamType ff_cbs_type_mpeg2; +extern const CodedBitstreamType ff_cbs_type_vp8; extern const CodedBitstreamType ff_cbs_type_vp9; diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c new file mode 100644 index 0000000000..01d4b9cefe --- /dev/null +++ b/libavcodec/cbs_vp8.c @@ -0,0 +1,380 @@ +/* + * 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 "libavutil/avassert.h" + +#include "cbs.h" +#include "cbs_internal.h" +#include "cbs_vp8.h" + +#include + +#define DEFAULT_PROB 0x80 + +// The probability table is defined in 'vp8data.c'. +extern const uint8_t ff_vp8_token_update_probs[4][8][3][11]; + +// Implements VP8 boolean decoder using GetBitContext to read the bitstream. +typedef struct CBSVP8BoolDecoder { + GetBitContext *gbc; + + uint8_t value; + uint8_t range; + + uint8_t count; // Store the number of bits in the `value` buffer. + +} CBSVP8BoolDecoder; + +static int cbs_vp8_bool_decoder_init(CBSVP8BoolDecoder *decoder, GetBitContext *gbc) +{ + av_assert0(decoder); + av_assert0(gbc); + + decoder->gbc = gbc; + decoder->value = 0; + decoder->range = 255; + + decoder->count = 0; + + return 0; +} + +static bool cbs_vp8_bool_decoder_fill_value(CBSVP8BoolDecoder *decoder) +{ + int bits = 8 - decoder->count; + + av_assert0(decoder->count <= 8); + if (decoder->count == 8) { + return true; + } + + if (get_bits_left(decoder->gbc) >= bits) { + decoder->value |= get_bits(decoder->gbc, bits); + decoder->count += bits; + } + + return (decoder->count == 8); +} + +static int cbs_vp8_bool_decoder_read_bool(CBSVP8BoolDecoder *decoder, + const uint8_t prob, uint8_t *output) +{ + uint8_t split = 1 + (((decoder->range - 1) * prob) >> 8); + + if (!cbs_vp8_bool_decoder_fill_value(decoder)) { + return AVERROR_INVALIDDATA; + } + + av_assert0(decoder->count == 8); + if (decoder->value >= split) { + *output = 1; + decoder->range -= split; + decoder->value -= split; + } else { + *output = 0; + decoder->range = split; + } + + while (decoder->range < 128) { + decoder->value <<= 1; + decoder->range <<= 1; + --decoder->count; + } + + return 0; +} + +static int cbs_vp8_bool_decoder_read_literal(CBSVP8BoolDecoder *decoder, + const uint8_t prob, + uint32_t num_bits, + uint32_t *output) +{ + int ret = 0; + + av_assert0(num_bits <= 32); + + *output = 0; + for (; num_bits > 0; --num_bits) { + uint8_t bit_output = 0; + if ((ret = cbs_vp8_bool_decoder_read_bool(decoder, prob, + &bit_output)) != 0) { + return ret; + } + + *output = (*output << 1) | bit_output; + } + + return 0; +} + +static int cbs_vp8_bool_decoder_read_unsigned( + CodedBitstreamContext *ctx, CBSVP8BoolDecoder *bool_decoder, int width, + uint8_t prob, const char *name, const int *subscripts, uint32_t *write_to, + bool trace_enable) +{ + int ret = 0; + GetBitContext *gbc = bool_decoder->gbc; + uint32_t value; + + CBS_TRACE_READ_START(); + + av_assert0(width >= 0 && width <= 8); + + ret = cbs_vp8_bool_decoder_read_literal(bool_decoder, prob, width, &value); + if (ret != 0) { + return ret; + } + + if (trace_enable) { + CBS_TRACE_READ_END(); + } + + *write_to = value; + return 0; +} + +static int cbs_vp8_bool_decoder_read_signed( + CodedBitstreamContext *ctx, CBSVP8BoolDecoder *bool_decoder, int width, + uint8_t prob, const char *name, const int *subscripts, int32_t *write_to) +{ + int ret = 0; + GetBitContext *gbc = bool_decoder->gbc; + int32_t value; + uint8_t sign = 0; + + CBS_TRACE_READ_START(); + + av_assert0(width >= 0 && width <= 8); + + ret = cbs_vp8_bool_decoder_read_literal(bool_decoder, prob, width, &value); + if (ret != 0) { + return ret; + } + + ret = cbs_vp8_bool_decoder_read_bool(bool_decoder, prob, &sign); + if (ret != 0) { + return ret; + } + + if (sign) { + value = -value; + } + + CBS_TRACE_READ_END(); + + *write_to = value; + return 0; +} + +static int cbs_vp8_read_unsigned_le(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, const char *name, + const int *subscripts, uint32_t *write_to) +{ + int32_t value; + + CBS_TRACE_READ_START(); + + av_assert0(width > 0 && width <= 24); + + if (get_bits_left(gbc) < width) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid value: bitstream ended.\n"); + return AVERROR_INVALIDDATA; + } + + value = get_bits_le(gbc, width); + + CBS_TRACE_READ_END(); + + *write_to = value; + return 0; +} + +#define HEADER(name) \ + do { \ + ff_cbs_trace_header(ctx, name); \ + } while (0) + +#define CHECK(call) \ + do { \ + int err = (call); \ + if (err < 0) \ + return err; \ + } while (0) + +#define FUNC_NAME(rw, codec, name) cbs_##codec##_##rw##_##name +#define FUNC_VP8(rw, name) FUNC_NAME(rw, vp8, name) +#define FUNC(name) FUNC_VP8(READWRITE, name) + +#define SUBSCRIPTS(subs, ...) \ + (subs > 0 ? ((int[subs + 1]){subs, __VA_ARGS__}) : NULL) + +#define f(width, name) xf(width, name, 0) + +// bool [de|en]coder methods. +#define bc_f(width, name) bc_unsigned_subs(width, DEFAULT_PROB, true, name, 0) +#define bc_s(width, name) bc_signed_subs(width, DEFAULT_PROB, name, 0) +#define bc_fs(width, name, subs, ...) \ + bc_unsigned_subs(width, DEFAULT_PROB, true, name, subs, __VA_ARGS__) +#define bc_ss(width, name, subs, ...) \ + bc_signed_subs(width, DEFAULT_PROB, name, subs, __VA_ARGS__) + +// bool [de|en]coder methods for boolean value and disable tracing. +#define bc_b(name) bc_unsigned_subs(1, DEFAULT_PROB, false, name, 0) +#define bc_b_prob(prob, name) bc_unsigned_subs(1, prob, false, name, 0) + +#define READ +#define READWRITE read +#define RWContext GetBitContext +#define CBSVP8BoolCodingRW CBSVP8BoolDecoder + +#define xf(width, name, subs, ...) \ + do { \ + uint32_t value; \ + CHECK(cbs_vp8_read_unsigned_le(ctx, rw, width, #name, \ + SUBSCRIPTS(subs, __VA_ARGS__), &value)); \ + current->name = value; \ + } while (0) + +#define fixed(width, name, value) \ + do { \ + uint32_t fixed_value; \ + CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, 0, &fixed_value, \ + value, value)); \ + } while (0) + +#define bc_unsigned_subs(width, prob, enable_trace, name, subs, ...) \ + do { \ + uint32_t value; \ + CHECK(cbs_vp8_bool_decoder_read_unsigned( \ + ctx, bool_coding_rw, width, prob, #name, \ + SUBSCRIPTS(subs, __VA_ARGS__), &value, enable_trace)); \ + current->name = value; \ + } while (0) + +#define bc_signed_subs(width, prob, name, subs, ...) \ + do { \ + int32_t value; \ + CHECK(cbs_vp8_bool_decoder_read_signed( \ + ctx, bool_coding_rw, width, prob, #name, \ + SUBSCRIPTS(subs, __VA_ARGS__), &value)); \ + current->name = value; \ + } while (0) + +#include "cbs_vp8_syntax_template.c" + +static int cbs_vp8_split_fragment(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag, int header) +{ + int err; + + if (frag->data_size == 0) + return AVERROR_INVALIDDATA; + + err = ff_cbs_append_unit_data(frag, 0, frag->data, frag->data_size, + frag->data_ref); + if (err < 0) + return err; + + return 0; +} + +static int cbs_vp8_read_unit(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit) +{ + VP8RawFrame *frame; + GetBitContext gbc; + CBSVP8BoolDecoder bool_decoder; + int err, pos; + + err = ff_cbs_alloc_unit_content(ctx, unit); + if (err < 0) + return err; + frame = unit->content; + + // Create GetBitContext for uncompressed header. + err = init_get_bits8_le(&gbc, unit->data, 8 * unit->data_size); + if (err < 0) + return err; + + err = cbs_vp8_read_uncompressed_header(ctx, &gbc, frame); + if (err < 0) + return err; + + pos = get_bits_count(&gbc); + av_assert0(pos % 8 == 0); + + // Create boolean decoder for compressed header. + err = cbs_vp8_bool_decoder_init(&bool_decoder, &gbc); + if (err < 0) + return err; + + err = cbs_vp8_read_compressed_header(ctx, &bool_decoder, frame); + if (err < 0) + return err; + + pos = get_bits_count(&gbc); + pos /= 8; + av_assert0(pos <= unit->data_size); + + frame->data_ref = av_buffer_ref(unit->data_ref); + if (!frame->data_ref) + return AVERROR(ENOMEM); + + frame->data = unit->data + pos; + frame->data_size = unit->data_size - pos; + + return 0; +} + +static int cbs_vp8_write_unit(CodedBitstreamContext *ctx, + CodedBitstreamUnit *unit, PutBitContext *pbc) +{ + return AVERROR_PATCHWELCOME; +} + +static int cbs_vp8_assemble_fragment(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag) +{ + return AVERROR_PATCHWELCOME; +} + +static void cbs_vp8_flush(CodedBitstreamContext *ctx) +{ + // Do nothing. +} + +static const CodedBitstreamUnitTypeDescriptor cbs_vp8_unit_types[] = { + CBS_UNIT_TYPE_INTERNAL_REF(0, VP8RawFrame, data), + CBS_UNIT_TYPE_END_OF_LIST, +}; + +const CodedBitstreamType ff_cbs_type_vp8 = { + .codec_id = AV_CODEC_ID_VP8, + + .priv_data_size = 0, + + .unit_types = cbs_vp8_unit_types, + + .split_fragment = &cbs_vp8_split_fragment, + .read_unit = &cbs_vp8_read_unit, + .write_unit = &cbs_vp8_write_unit, + + .flush = &cbs_vp8_flush, + + .assemble_fragment = &cbs_vp8_assemble_fragment, +}; diff --git a/libavcodec/cbs_vp8.h b/libavcodec/cbs_vp8.h new file mode 100644 index 0000000000..9c09e21a1c --- /dev/null +++ b/libavcodec/cbs_vp8.h @@ -0,0 +1,133 @@ +/* + * 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 + */ + +#ifndef AVCODEC_CBS_VP8_H +#define AVCODEC_CBS_VP8_H + +#include +#include + +#include "cbs.h" + +enum { + VP8_START_CODE_0 = 0x9D, + VP8_START_CODE_1 = 0x01, + VP8_START_CODE_2 = 0x2A, +}; + +enum { + VP8_KEY_FRAME = 0, + VP8_NON_KEY_FRAME = 1, +}; + +typedef struct VP8RawFrameHeader { + // frame tag + uint8_t frame_type; + uint8_t profile; + uint8_t show_frame; + uint32_t first_partition_length_in_bytes; + + uint16_t width; + uint8_t horizontal_scale; + uint16_t height; + uint8_t vertical_scale; + + // frame header + uint8_t color_space; + uint8_t clamping_type; + + // segmentation + uint8_t segmentation_enable; + uint8_t update_segment_map; + uint8_t update_segment_feature_data; + uint8_t segment_feature_mode; + uint8_t segment_qp_update[4]; + int8_t segment_qp[4]; + uint8_t segment_loop_filter_level_update[4]; + int8_t segment_loop_filter_level[4]; + uint8_t segment_probs_update[3]; + uint8_t segment_probs[3]; + + // loop filter + uint8_t loop_filter_type; + uint8_t loop_filter_level; + uint8_t loop_filter_sharpness; + uint8_t mode_ref_lf_delta_enable; + uint8_t mode_ref_lf_delta_update; + uint8_t ref_lf_deltas_update[4]; + int8_t ref_lf_deltas[4]; + uint8_t mode_lf_deltas_update[4]; + int8_t mode_lf_deltas[4]; + + uint8_t log2_token_partitions; + + // qp + uint8_t base_qindex; + uint8_t y1dc_delta_q_present; + int8_t y1dc_delta_q; + uint8_t y2dc_delta_q_present; + int8_t y2dc_delta_q; + uint8_t y2ac_delta_q_present; + int8_t y2ac_delta_q; + uint8_t uvdc_delta_q_present; + int8_t uvdc_delta_q; + uint8_t uvac_delta_q_present; + int8_t uvac_delta_q; + + // ref + uint8_t refresh_golden_frame; + uint8_t refresh_alternate_frame; + uint8_t copy_buffer_to_golden; + uint8_t copy_buffer_to_alternate; + uint8_t ref_frame_sign_bias_golden; + uint8_t ref_frame_sign_bias_alternate; + uint8_t refresh_last_frame; + + uint8_t refresh_entropy_probs; + + // token probs + uint8_t coeff_prob_update[4][8][3][11]; + uint8_t coeff_prob[4][8][3][11]; + + uint8_t mb_no_skip_coeff; + uint8_t prob_skip_false; + + uint8_t prob_intra; + uint8_t prob_last; + uint8_t prob_golden; + + uint8_t intra_16x16_prob_update; + uint8_t intra_16x16_prob[4]; + + uint8_t intra_chrome_prob_update; + uint8_t intra_chrome_prob[3]; + + // mv probs + uint8_t mv_prob_update[2][19]; + uint8_t mv_prob[2][19]; +} VP8RawFrameHeader; + +typedef struct VP8RawFrame { + VP8RawFrameHeader header; + + uint8_t *data; + AVBufferRef *data_ref; + size_t data_size; +} VP8RawFrame; + +#endif /* AVCODEC_CBS_VP8_H */ diff --git a/libavcodec/cbs_vp8_syntax_template.c b/libavcodec/cbs_vp8_syntax_template.c new file mode 100644 index 0000000000..264aa2f758 --- /dev/null +++ b/libavcodec/cbs_vp8_syntax_template.c @@ -0,0 +1,248 @@ +/* + * 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 + */ + +static int FUNC(update_segmentation)(CodedBitstreamContext *ctx, + CBSVP8BoolCodingRW *bool_coding_rw, + VP8RawFrameHeader *current) +{ + bc_f(1, update_segment_map); + bc_f(1, update_segment_feature_data); + + if (current->update_segment_feature_data) { + bc_f(1, segment_feature_mode); + // quantizer + for (int i = 0; i < 4; i++) { + bc_b(segment_qp_update[i]); + if (current->segment_qp_update[i]) + bc_ss(7, segment_qp[i], 1, i); + } + // loop filter + for (int i = 0; i < 4; i++) { + bc_b(segment_loop_filter_level_update[i]); + if (current->segment_loop_filter_level_update[i]) + bc_ss(6, segment_loop_filter_level[i], 1, i); + } + } + + if (current->update_segment_map) { + for (int i = 0; i < 3; i++) { + bc_b(segment_probs_update[i]); + if (current->segment_probs_update[i]) + bc_fs(8, segment_probs[i], 1, i); + } + } + + return 0; +} + +static int FUNC(mode_ref_lf_deltas)(CodedBitstreamContext *ctx, + CBSVP8BoolCodingRW *bool_coding_rw, + VP8RawFrameHeader *current) +{ + bc_f(1, mode_ref_lf_delta_enable); + if (current->mode_ref_lf_delta_enable) { + bc_b(mode_ref_lf_delta_update); + if (current->mode_ref_lf_delta_update) { + // ref_lf_deltas + for (int i = 0; i < 4; i++) { + bc_b(ref_lf_deltas_update[i]); + if (current->ref_lf_deltas_update[i]) + bc_ss(6, ref_lf_deltas[i], 1, i); + } + // mode_lf_deltas + for (int i = 0; i < 4; i++) { + bc_b(mode_lf_deltas_update[i]); + if (current->mode_lf_deltas_update[i]) + bc_ss(6, mode_lf_deltas[i], 1, i); + } + } + } + + return 0; +} + +static int FUNC(quantization_params)(CodedBitstreamContext *ctx, + CBSVP8BoolCodingRW *bool_coding_rw, + VP8RawFrameHeader *current) +{ + bc_f(7, base_qindex); + + bc_b(y1dc_delta_q_present); + if (current->y1dc_delta_q_present) + bc_s(4, y1dc_delta_q); + + bc_b(y2dc_delta_q_present); + if (current->y2dc_delta_q_present) + bc_s(4, y2dc_delta_q); + + bc_b(y2ac_delta_q_present); + if (current->y2ac_delta_q_present) + bc_s(4, y2ac_delta_q); + + bc_b(uvdc_delta_q_present); + if (current->uvdc_delta_q_present) + bc_s(4, uvdc_delta_q); + + bc_b(uvac_delta_q_present); + if (current->uvac_delta_q_present) + bc_s(4, uvac_delta_q); + + return 0; +} + +static int FUNC(update_token_probs)(CodedBitstreamContext *ctx, + CBSVP8BoolCodingRW *bool_coding_rw, + VP8RawFrameHeader *current) +{ + for (int i = 0; i < 4; ++i) { + for (int j = 0; j < 8; ++j) { + for (int k = 0; k < 3; ++k) { + for (int l = 0; l < 11; ++l) { + bc_b_prob(ff_vp8_token_update_probs[i][j][k][l], + coeff_prob_update[i][j][k][l]); + if (current->coeff_prob_update[i][j][k][l]) + bc_fs(8, coeff_prob[i][j][k][l], 4, i, j, k, l); + } + } + } + } + + return 0; +} + +static int FUNC(update_mv_probs)(CodedBitstreamContext *ctx, + CBSVP8BoolCodingRW *bool_coding_rw, + VP8RawFrameHeader *current) +{ + for (int i = 0; i < 2; ++i) { + for (int j = 0; j < 19; ++j) { + bc_b(mv_prob_update[i][j]); + if (current->mv_prob_update[i][j]) + bc_fs(7, mv_prob[i][j], 2, i, j); + } + } + + return 0; +} + +static int FUNC(frame_tag)(CodedBitstreamContext *ctx, RWContext *rw, + VP8RawFrameHeader *current) +{ + f(1, frame_type); + f(3, profile); + f(1, show_frame); + f(19, first_partition_length_in_bytes); + + if (current->frame_type == VP8_KEY_FRAME) { + fixed(8, start_code_0, VP8_START_CODE_0); + fixed(8, start_code_1, VP8_START_CODE_1); + fixed(8, start_code_2, VP8_START_CODE_2); + + f(14, width); + f(2, horizontal_scale); + f(14, height); + f(2, vertical_scale); + } + + return 0; +} + +static int FUNC(frame_header)(CodedBitstreamContext *ctx, + CBSVP8BoolCodingRW *bool_coding_rw, + VP8RawFrameHeader *current) +{ + if (current->frame_type == VP8_KEY_FRAME) { + bc_f(1, color_space); + bc_f(1, clamping_type); + } + + bc_f(1, segmentation_enable); + if (current->segmentation_enable) + CHECK(FUNC(update_segmentation)(ctx, bool_coding_rw, current)); + + bc_f(1, loop_filter_type); + bc_f(6, loop_filter_level); + bc_f(3, loop_filter_sharpness); + + CHECK(FUNC(mode_ref_lf_deltas)(ctx, bool_coding_rw, current)); + + bc_f(2, log2_token_partitions); + + CHECK(FUNC(quantization_params)(ctx, bool_coding_rw, current)); + + if (current->frame_type != VP8_KEY_FRAME) { + bc_f(1, refresh_golden_frame); + bc_f(1, refresh_alternate_frame); + if (!current->refresh_golden_frame) + bc_f(2, copy_buffer_to_golden); + if (!current->refresh_alternate_frame) + bc_f(2, copy_buffer_to_alternate); + bc_f(1, ref_frame_sign_bias_golden); + bc_f(1, ref_frame_sign_bias_alternate); + } + bc_f(1, refresh_entropy_probs); + if (current->frame_type != VP8_KEY_FRAME) + bc_f(1, refresh_last_frame); + + CHECK(FUNC(update_token_probs)(ctx, bool_coding_rw, current)); + + bc_f(1, mb_no_skip_coeff); + if (current->mb_no_skip_coeff) + bc_f(8, prob_skip_false); + + if (current->frame_type != VP8_KEY_FRAME) { + bc_f(8, prob_intra); + bc_f(8, prob_last); + bc_f(8, prob_golden); + + // intra_16x16_prob + bc_b(intra_16x16_prob_update); + if (current->intra_16x16_prob_update) + for (int i = 0; i < 4; i++) + bc_fs(8, intra_16x16_prob[i], 1, i); + + // intra_chroma_prob + bc_b(intra_chrome_prob_update); + if (current->intra_chrome_prob_update) + for (int i = 0; i < 3; i++) + bc_fs(8, intra_chrome_prob[i], 1, i); + + CHECK(FUNC(update_mv_probs)(ctx, bool_coding_rw, current)); + } + + return 0; +} + +static int FUNC(uncompressed_header)(CodedBitstreamContext *ctx, RWContext *rw, + VP8RawFrame *current) +{ + HEADER("Frame"); + + CHECK(FUNC(frame_tag)(ctx, rw, ¤t->header)); + + return 0; +} + +static int FUNC(compressed_header)(CodedBitstreamContext *ctx, + CBSVP8BoolCodingRW *bool_coding_rw, + VP8RawFrame *current) +{ + CHECK(FUNC(frame_header)(ctx, bool_coding_rw, ¤t->header)); + + return 0; +}