From patchwork Mon May 15 05:56:22 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: 41611 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1365150pzb; Sun, 14 May 2023 22:56:42 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7MBRhlo1OZgKqYqxh0h9Mnyt8Yi7804U2jdB/85fsA9ltEHJUl6tSUgPe7a881rDCuj90j X-Received: by 2002:aa7:d0d3:0:b0:50b:c94c:a48 with SMTP id u19-20020aa7d0d3000000b0050bc94c0a48mr23760809edo.30.1684130201815; Sun, 14 May 2023 22:56:41 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d6-20020a50fb06000000b0050bc3a3be78si9710372edq.140.2023.05.14.22.56.41; Sun, 14 May 2023 22:56:41 -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=@intel.com header.s=Intel header.b=ZU6l4El+; 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 D0F0468BF92; Mon, 15 May 2023 08:56:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6D2AF68B71D for ; Mon, 15 May 2023 08:56:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1684130194; x=1715666194; h=from:to:subject:date:message-id: content-transfer-encoding:mime-version; bh=Qkv4rMpKDm91dT/WaiLttIgzqxVqteqG6UcPvah8b18=; b=ZU6l4El+BQCyybfLEsdbf8F95CImF4Yad1m+p92tEpXeg2Bln1afzUm2 sw2bY+sCRX2u1sQrRV3eZQxZ7hKCeHq5Ej7oZEx9BmESR3TephsN/XG0x eeqTk5t6trAyafWr87CiK1aB2CqbA46Udpgkg99EJs/gPfucJZeSOLOXE APmsNiZJrsOBwtD1ib8sOpd7el1Bnzulki0d1SULq/19GghVllEwXE42j W+v/Za/p9vgJXWxbV08nBBPadJLl/dDudF8fTcsUsUoYD0pHBkGZf5SdZ JNzezdxu5EljndUNpSjh92mThaY2D6ZDIRJzEY6dggtxN52kPKn/wROzG Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10710"; a="379275597" X-IronPort-AV: E=Sophos;i="5.99,275,1677571200"; d="scan'208";a="379275597" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 May 2023 22:56:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10710"; a="825042642" X-IronPort-AV: E=Sophos;i="5.99,275,1677571200"; d="scan'208";a="825042642" Received: from orsmsx601.amr.corp.intel.com ([10.22.229.14]) by orsmga004.jf.intel.com with ESMTP; 14 May 2023 22:56:26 -0700 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) 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.23; Sun, 14 May 2023 22:56:26 -0700 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Sun, 14 May 2023 22:56:25 -0700 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) by orsmsx603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23 via Frontend Transport; Sun, 14 May 2023 22:56:25 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.106) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.23; Sun, 14 May 2023 22:56:25 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gDU3XWlYrddIkjnMi8eEzqbkOpcO2c8jKfdDq++RyRiaSNkLvYY5CYLPk+eZNk49jRkoMQBB3oIUuTm/VSW1TCm0hvh9B3S/O9ru+324Ab66InlVnAw4Mg4Qu4P0023B/DzUiQGrg5IGJP0B27RVcqLGrN5iq9YW4uiEe/lftQUO5WWDJscPzcjdULUgQTz9HzJ5Jo41WS22JrX/yoHd5+DLGbd6lxs1+ffgWvTTGntBdWqJE2e1MwETwG/d7FuSZUOOIu4gNuUwcFd1NrUlDKgNvNSuN2ZccSEagwzRj/mwjIS8el+8Z+qYzqbug42tps1MXjC1LLyDV8QRi8qVkw== 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=ySbiaKR+C6YmKWCmGDAumF0VT0Xv+8Ixu8gIB9C8CAQ=; b=e739ZMiZE80u+7o3Nl+f+G82O/qFjfSfvMH5642LYDYKVwgGu/KKvC3CiLPb/MXi+0GvWtgtEg/9PMp7PfeCFhrx1GGLp811/T25gT0u178oHrJ6kQ6i6EPxR6mHGCs1NaHH2oLINhZYPSSO0ywHQWIa/AFXAYmupquwGim8PzkSrIhO/bMwKYTRinnqZa7LjwytKcdnU8uIlinrq1r8jIRq4Ir7XzJYWZGo3s1b9AkdztOcEGfL+VbJKzXJomJ+a/joTIPHe9ouH6ZH25VfU7vKDJqHcdVpqgQQm8IJz9H28WXFFCeOo8M9m7I5RkVPR7KMVbd0XOsL+kK9m34a7g== 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 MN6PR11MB8244.namprd11.prod.outlook.com (2603:10b6:208:470::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.24; Mon, 15 May 2023 05:56:23 +0000 Received: from DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::c994:98fe:fd3a:ffcb]) by DM6PR11MB2681.namprd11.prod.outlook.com ([fe80::c994:98fe:fd3a:ffcb%4]) with mapi id 15.20.6387.030; Mon, 15 May 2023 05:56:23 +0000 From: "Dai, Jianhui J" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH V1] avcodec/cbs_vp8: Add support for VP8 codec bitstream READ methods Thread-Index: AdmG0tDkkKnQPJM6TRS9lBYKUl3QKg== Date: Mon, 15 May 2023 05:56:22 +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_|MN6PR11MB8244:EE_ x-ms-office365-filtering-correlation-id: 3928f138-3ae2-48e6-f207-08db55091ca3 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: iHED5yIEp5btXuAG5CQt8lsWqqSYxTy0B+ay7k+6QAw+LGP6sEjkLoZXEaDnmnokc8CrZ4hk2p/Y0ZmB5rqWO++iZq2CBlZPQAD90DWjgkPCYrI6QKkAC3MyODN74UHcMxjvzm101uw+JI2HztdA6xrbKpzSSfXeg9fwnpCDsXYAOouo2sAbBlZ8SkvdonJqCyACjf1NeXM21WwblfuhCY1+2vGRoeZaEoktB1KhE2qGg9GBZo0eExCImyiAD3qAa08fCVFe4XR00pEaFzIdqjXzmBiEcdca6zQiUMrSgI2dnsLWdTNBROIECgt9XM+xIR/3q0UyS67aJ5/HWasQhHNXFLvR0aFI6vr3O8aIPujSjaAwO5D3IbSLpXytYaqrQee/aHhSVj3iPff/4kNhg/aH1gznfDnFPvcUoBEbWMI/4Aj7o03PQ6lxJYBGPr+e/my1U6apoTYQYAyB1q7dar/mpRxkmx/TUoxfeunLu00Wm+Sy3NhZ9VQk9l01o87m1Ln/h8wApyZKMy8LHR18fQsA1ECd2lVd5rYwwKHfXKLr8yAX1Z1yQQQJDh5mnUOQ+sJAqIKz37W5IRIBrmElh2oBo5zlLYxDWCaAWKW8bINfS0QxPnABBisv4rroqEQ6ht1cG1QvGmeSMIVnxATICw== 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:(13230028)(39860400002)(376002)(366004)(346002)(136003)(396003)(451199021)(66556008)(66946007)(64756008)(66476007)(478600001)(66446008)(6916009)(186003)(76116006)(316002)(71200400001)(30864003)(41300700001)(19627235002)(8936002)(8676002)(5660300002)(6506007)(26005)(9686003)(2906002)(7696005)(83380400001)(66899021)(55016003)(122000001)(38100700002)(82960400001)(38070700005)(33656002)(52536014)(86362001)(2004002)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: 4XP9wMgjzmDdFB+CBOo+HP2oPhBRzcuZCdXO2ZVvs68uc4Uc3C8ofBuI2BT9nQp8Axl4jeKXnCBQHkA7SvsgBjSJRK7LaP5G8cmqhQEF+WZpDX5YLeJRUJMRKxgS9foe02l6d0Hg3ThAaGjlgTWtCQcem/RwedwA5ikve1LDJ9WOEOmmiTXL3XT2Jg/jTSReEzKg7mGVPWJakZnLFBp+mHs2VohiZAplsM83PQeyzdgXwiIXtrTWZIy1hZP5JAbabj574y9xw/o6bBWMWNFcPckFM9l3m9w9o+3meitqAgW21wMYlHmPfLMyd3OpDU6dw73PPOiMpPjd1aUQtkOSYbms+HEN+UuyzuHAGFJuchTlysj3rbo78e2Utg5cda3s/cDLb2WINOsL0b33w/Q+V2s4J/lFhMWsmIBlE7gvr6mXUFYlp/1bEjvKPVaqjN81aA7d/sPrLsldsosvbpgozwI0fApYRGXEOpoe/BWWUj2xBEHe25P9tuaPgB2bn5jInGIBYMdrWimBNANYxECTYdAG5qfYpkWq3n6Heb2aA7geZATljPwJMl9RTgjlqlHSKhIcDQN5pd38qaMVqoKR9nOTQYzRjd/6aDPXHFxGvwPnWLgMEIhlMCmHupe/8Hw/WBrV0ZzWjx4HPpQ1zEkuIqysw0NVDNEyaOPrqAm9oBc7DCcXdRopfz/OlQUlPa5+gmfXalUCdisLUlulPfIPaTWS4V+bX96LTx1GR2ePM+yKibdzjVwhxaj+KsZLksUWfCMVP4rCm38oGFZX4uvKk3aa3mnlMS+GaeUNua4TAS7sxBrP3e6VxWO0phIfi7MQIFcVvw+1JvlQdIR0O9zxS4G6jt622qXc/Ykug3jXlxbRuIAnywD+w6h8m1BgH07m++qNM4X8udo4rSUOrP2HwfxbsAK6+C5YWDnYQmsPxwYyS32fKT9+ttmXgcjXPjKb1DlvsNMLtMiP9qaNZJLsMa97k7LD5t+VR192O65tTUJAlXVYPbUfwsD1mJNJztQMY4forGKNlWd94v2U3Q4r1XUbsYG+Z4uZV5e0onkFH/suAzw2ZKd2iKLJSVwA9cO4e2icRiXpf73QFBKtEotC97p6aJzew12x2F49ZVZceEiE0fFTOwkOmg6sCZ3BPOCa37W63y2WCTRCXP2jtu1F1PsDG4n96rWJ2LfKXsM/IXqZS3QpPsRWSEAC3IGvTtIbFFEnmpAR+kwXtcPG8eaHu8p6tPGqjOy2gxTxb245KrG9gFr4bHESheStbpd0qVu92S2nbVq+jDiy7mjOdUBk7E4xErDJq42YxBZ8uYlun2ni+PCaPMIZZd7vRjikXEgbF/psMXDT9j2ESMXYWeylNsKIr7tpJiuoaGHuSgcS5wBChZmL+zHltCsW220dXl9M6fjL2zKhnQRxaxjK1cxEwvRavmdkyRk2nGWLaE3TremWwBiflTHxtvbvA7jFux1Y0jlVHew14FayRmuzDXJcDVskKYIPV7sun/O0c3v4d9JAn75YpmSU5Pi4EWEkdLm3/WE3jahKKHDW9aJdX9Jerq+iZe9ZCS+aPoNUy0AzWvtJF1OxG+5RmJncOWux4c/9 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: 3928f138-3ae2-48e6-f207-08db55091ca3 X-MS-Exchange-CrossTenant-originalarrivaltime: 15 May 2023 05:56:22.6534 (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: Iq8xkHjE3+OKKXEhJUesnUVGnHL21DmrtyKvo02ciXr7fYBF9Rw8fiZvr9DMH+5m2PWhkkHswA63h/IH/LQicw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR11MB8244 X-OriginatorOrg: intel.com Subject: [FFmpeg-devel] [PATCH V1] avcodec/cbs_vp8: Add support for VP8 codec bitstream READ methods 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: s1hyCnLPGRHr This commit adds VP8 into cbs supported codec list, and enables the `trace_headers` bitstream filters to support VP8, besides existing AV1, H.264, H.265 and VP9. It can be useful to debug VP8 stream issues. Only the READ methods `read_unit` and `split_fragment` are implemented, the WRITE methods `write_unit` and `assemble_fragment` return `AVERROR_PATCHWELCOME` error code. It is because the CBS VP8 WRITE is unlikely used by any applications at the moment. The WRITE methods can be added later if there are real requirments. 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 | 259 +++++++++++++++++++++++ libavcodec/cbs_vp8.h | 116 +++++++++++ libavcodec/cbs_vp8_syntax_template.c | 294 +++++++++++++++++++++++++++ 7 files changed, 680 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 bb7be67676..6ba7759e34 100755 --- a/configure +++ b/configure @@ -2433,6 +2433,7 @@ CONFIG_EXTRA=" cbs_jpeg cbs_mpeg2 cbs_vp9 + cbs_vp8 deflate_wrapper dirac_parse dnn @@ -2714,6 +2715,7 @@ cbs_h265_select="cbs" cbs_jpeg_select="cbs" cbs_mpeg2_select="cbs" cbs_vp9_select="cbs" +cbs_vp8_select="cbs" dct_select="rdft" deflate_wrapper_deps="zlib" dirac_parse_select="golomb" @@ -3284,7 +3286,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" # external libraries diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 3cf4444b7e..a4e5d7d7a5 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -79,6 +79,7 @@ OBJS-$(CONFIG_CBS_H265) += 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_VP9) += cbs_vp9.o +OBJS-$(CONFIG_CBS_VP8) += cbs_vp8.o vpx_rac.o OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DEFLATE_WRAPPER) += zlib_wrapper.o diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 504197e06d..f4ff05181f 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -49,6 +49,9 @@ static const CodedBitstreamType *const cbs_type_table[] = { #if CONFIG_CBS_VP9 &ff_cbs_type_vp9, #endif +#if CONFIG_CBS_VP8 + &ff_cbs_type_vp8, +#endif }; const enum AVCodecID ff_cbs_all_codec_ids[] = { @@ -69,6 +72,9 @@ const enum AVCodecID ff_cbs_all_codec_ids[] = { #endif #if CONFIG_CBS_VP9 AV_CODEC_ID_VP9, +#endif +#if CONFIG_CBS_VP8 + AV_CODEC_ID_VP8, #endif AV_CODEC_ID_NONE }; diff --git a/libavcodec/cbs_internal.h b/libavcodec/cbs_internal.h index e585c77934..9ea6393a9f 100644 --- a/libavcodec/cbs_internal.h +++ b/libavcodec/cbs_internal.h @@ -248,6 +248,7 @@ extern const CodedBitstreamType ff_cbs_type_h265; extern const CodedBitstreamType ff_cbs_type_jpeg; extern const CodedBitstreamType ff_cbs_type_mpeg2; extern const CodedBitstreamType ff_cbs_type_vp9; +extern const CodedBitstreamType ff_cbs_type_vp8; #endif /* AVCODEC_CBS_INTERNAL_H */ diff --git a/libavcodec/cbs_vp8.c b/libavcodec/cbs_vp8.c new file mode 100644 index 0000000000..ee5c5cbceb --- /dev/null +++ b/libavcodec/cbs_vp8.c @@ -0,0 +1,259 @@ +/* + * 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 "vp8data.h" + +static av_unused int cbs_vp8_trace_syntax_element(CodedBitstreamContext *ctx, + int pos, const char *name, + const int *subscripts, + int32_t value, int width) +{ + if (ctx->trace_enable) { + char bits[33] = "-"; + + av_assert0(width >= 0 && width <= 24); + if (width > 0) { + int i; + for (i = 0; i < width; i++) + bits[i] = value >> (width - i - 1) & 1 ? '1' : '0'; + bits[i] = 0; + } + + ff_cbs_trace_syntax_element(ctx, pos, name, subscripts, bits, value); + } + + return 0; +} + +static int cbs_vp8_read(CodedBitstreamContext *ctx, GetBitContext *gbc, + int width, int32_t *write_to) +{ + uint32_t value; + + av_assert0(width > 0 && width <= 24); + + if (get_bits_left(gbc) < width + 1) { + av_log(ctx->log_ctx, AV_LOG_ERROR, "Invalid value: bitstream ended.\n"); + return AVERROR_INVALIDDATA; + } + + value = get_bits_le(gbc, width); + *write_to = value; + return 0; +} + +static av_unused int cbs_vp8_rac_get(VPXRangeCoder *c, int bits) +{ + int value = 0; + + while (bits--) + value = (value << 1) | vpx_rac_get_prob(c, 128); + + return value; +} + +static int cbs_vp8_rac_get_bits_count(GetBitContext *gbc, VPXRangeCoder *c) +{ + int bits_count = (c->buffer - gbc->buffer) * 8; + bits_count += c->bits; + return bits_count; +} + +#define HEADER(name) \ + do { \ + ff_cbs_trace_header(ctx, name); \ + } while (0) + +#define CHECK(call) \ + do { \ + 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 vp8_f(width, name) vp8_xf(width, name, current->name) + +#define vp8_rac_unsigned(width, name) \ + do { \ + uint32_t value; \ + int pos = cbs_vp8_rac_get_bits_count(rw, c); \ + value = cbs_vp8_rac_get(c, width); \ + cbs_vp8_trace_syntax_element(ctx, pos, #name, 0, value, 0); \ + current->name = value; \ + } while (0) + +#define vp8_rac_unsigned_subs(width, name, subs, ...) \ + do { \ + uint32_t value; \ + int pos = cbs_vp8_rac_get_bits_count(rw, c); \ + value = cbs_vp8_rac_get(c, width); \ + cbs_vp8_trace_syntax_element(ctx, pos, #name, \ + SUBSCRIPTS(subs, __VA_ARGS__), value, 0); \ + current->name = value; \ + } while (0) + +#define vp8_rac_signed(width, name) \ + do { \ + uint32_t value; \ + int pos = cbs_vp8_rac_get_bits_count(rw, c); \ + value = cbs_vp8_rac_get(c, width); \ + if (cbs_vp8_rac_get(c, 1)) \ + value = -value; \ + cbs_vp8_trace_syntax_element(ctx, pos, #name, 0, value, 0); \ + current->name = value; \ + } while (0) + +#define vp8_rac_signed_subs(width, name, subs, ...) \ + do { \ + uint32_t value; \ + int pos = cbs_vp8_rac_get_bits_count(rw, c); \ + value = cbs_vp8_rac_get(c, width); \ + if (cbs_vp8_rac_get(c, 1)) \ + value = -value; \ + cbs_vp8_trace_syntax_element(ctx, pos, #name, \ + SUBSCRIPTS(subs, __VA_ARGS__), value, 0); \ + current->name = value; \ + } while (0) + +#define READ +#define READWRITE read +#define RWContext GetBitContext + +#define vp8_xf(width, name, var) \ + do { \ + uint32_t value; \ + int pos = get_bits_count(rw); \ + CHECK(cbs_vp8_read(ctx, rw, width, &value)); \ + var = value; \ + cbs_vp8_trace_syntax_element(ctx, pos, #name, 0, value, width); \ + } while (0) + +#define fixed(width, name, value) \ + do { \ + av_unused uint32_t fixed_value; \ + CHECK(ff_cbs_read_unsigned(ctx, rw, width, #name, 0, &fixed_value, \ + value, value)); \ + } while (0) + +#define byte_alignment(rw) (get_bits_count(rw) % 8) + +#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; + int err, pos; + + err = init_get_bits(&gbc, unit->data, 8 * unit->data_size); + if (err < 0) + return err; + + err = ff_cbs_alloc_unit_content(ctx, unit); + if (err < 0) + return err; + frame = unit->content; + + err = cbs_vp8_read_frame(ctx, &gbc, frame); + if (err < 0) + return err; + + pos = get_bits_count(&gbc); + av_assert0(pos % 8 == 0); + pos /= 8; + av_assert0(pos <= unit->data_size); + + if (pos == unit->data_size) + return AVERROR_INVALIDDATA; + + 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) +{ + return; +} + +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 = sizeof(CodedBitstreamVP8Context), + + .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..176d95853b --- /dev/null +++ b/libavcodec/cbs_vp8.h @@ -0,0 +1,116 @@ +/* + * 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" +#include "vpx_rac.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; + + uint32_t start_code_0; + uint32_t start_code_1; + uint32_t start_code_2; + + uint16_t width; + uint16_t horizontal_scale; + uint16_t height; + uint16_t vertical_scale; + + // frame header + uint8_t color_space; + uint8_t clamping_type; + + // segmentation + uint8_t segmentation_enabled; + uint8_t update_segment_map; + uint8_t update_segment_feature_data; + uint8_t segment_feature_mode; + int8_t segment_update_qp[4]; + int8_t segment_update_loop_filter_level[4]; + uint8_t segment_update_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_enabled; + int8_t ref_lf_deltas[4]; + int8_t mode_lf_deltas[4]; + + uint8_t log2_token_partitions; + + // qp + uint8_t base_qindex; + int8_t y1dc_delta_q; + int8_t y2dc_delta_q; + int8_t y2ac_delta_q; + int8_t uvdc_delta_q; + int8_t uvac_delta_q; + + // ref + uint8_t refresh_golden_frame; + uint8_t refresh_alternate_frame; + uint8_t ref_frame_sign_bias_golden; + uint8_t ref_frame_sign_bias_alternate; + uint8_t refresh_last_frame; + + // token probs + uint8_t refresh_entropy_probs; + + uint8_t mb_no_skip_coeff; + uint8_t prob_skip_false; + + uint8_t prob_intra; + uint8_t prob_last; + uint8_t prob_golden; +} VP8RawFrameHeader; + +typedef struct VP8RawFrame { + VP8RawFrameHeader header; + + uint8_t *data; + AVBufferRef *data_ref; + size_t data_size; +} VP8RawFrame; + +typedef struct CodedBitstreamVP8Context { + VPXRangeCoder c; +} CodedBitstreamVP8Context; + +#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..24f4075dab --- /dev/null +++ b/libavcodec/cbs_vp8_syntax_template.c @@ -0,0 +1,294 @@ +/* + * 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, RWContext *rw, + VPXRangeCoder *c, + VP8RawFrameHeader *current) +{ +#ifdef READ + int i; + + vp8_rac_unsigned(1, update_segment_map); + vp8_rac_unsigned(1, update_segment_feature_data); + + if (current->update_segment_feature_data) { + vp8_rac_unsigned(1, segment_feature_mode); + // quantizer + for (i = 0; i < 4; i++) + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed_subs(7, segment_update_qp[i], 1, i); + // loop filter + for (i = 0; i < 4; i++) { + if (cbs_vp8_rac_get(c, 1)) { + vp8_rac_signed_subs(6, segment_update_loop_filter_level[i], 1, + i); + } + } + } + + if (current->update_segment_map) { + for (i = 0; i < 3; i++) + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_unsigned_subs(8, segment_update_probs[i], 1, i); + } + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(mode_ref_lf_deltas)(CodedBitstreamContext *ctx, + RWContext *rw, VPXRangeCoder *c, + VP8RawFrameHeader *current) +{ +#ifdef READ + vp8_rac_unsigned(1, mode_ref_lf_delta_enabled); + if (current->mode_ref_lf_delta_enabled) { + if (cbs_vp8_rac_get(c, 1)) { + int i; + // ref_lf_deltas + for (i = 0; i < 4; i++) + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed_subs(6, ref_lf_deltas[i], 1, i); + // mode_lf_deltas + for (i = 0; i < 4; i++) + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed_subs(6, mode_lf_deltas[i], 1, i); + } + } + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(quantization_params)(CodedBitstreamContext *ctx, RWContext *rw, + VPXRangeCoder *c, VP8RawFrameHeader *current) +{ +#ifdef READ + vp8_rac_unsigned(7, base_qindex); + + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed(4, y1dc_delta_q); + + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed(4, y2dc_delta_q); + + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed(4, y2ac_delta_q); + + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed(4, uvdc_delta_q); + + if (cbs_vp8_rac_get(c, 1)) + vp8_rac_signed(4, uvac_delta_q); + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(update_token_probs)(CodedBitstreamContext *ctx, RWContext *rw, + VPXRangeCoder *c, + VP8RawFrameHeader *current) +{ +#ifdef READ + int i, j, k, l; + + for (i = 0; i < 4; ++i) { + for (j = 0; j < 8; ++j) { + for (k = 0; k < 3; ++k) { + for (l = 0; l < 11; ++l) + if (vpx_rac_get_prob_branchy( + c, vp8_token_update_probs[i][j][k][l])) + cbs_vp8_rac_get(c, 8); + } + } + } + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(update_mv_probs)(CodedBitstreamContext *ctx, RWContext *rw, + VPXRangeCoder *c, VP8RawFrameHeader *current) +{ +#ifdef READ + int i, j; + + for (i = 0; i < 2; ++i) { + for (j = 0; j < 19; ++j) + if (cbs_vp8_rac_get(c, 1)) + cbs_vp8_rac_get(c, 7); + } + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(frame_tag)(CodedBitstreamContext *ctx, RWContext *rw, + VP8RawFrameHeader *current) +{ +#ifdef READ + int err; + + vp8_f(1, frame_type); + vp8_f(3, profile); + vp8_f(1, show_frame); + vp8_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); + + vp8_f(14, width); + vp8_f(2, horizontal_scale); + vp8_f(14, height); + vp8_f(2, vertical_scale); + } + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(frame_header)(CodedBitstreamContext *ctx, RWContext *rw, + VP8RawFrameHeader *current) +{ +#ifdef READ + CodedBitstreamVP8Context *vp8 = ctx->priv_data; + VPXRangeCoder *c = &vp8->c; + int header_size; + int pos; + int err; + + pos = get_bits_count(rw); + av_assert0(pos % 8 == 0); + pos /= 8; + + header_size = current->first_partition_length_in_bytes; + + err = ff_vpx_init_range_decoder(c, rw->buffer + pos, header_size); + if (err < 0) + return err; + + if (current->frame_type == VP8_KEY_FRAME) { + vp8_rac_unsigned(1, color_space); + vp8_rac_unsigned(1, clamping_type); + } + + vp8_rac_unsigned(1, segmentation_enabled); + if (current->segmentation_enabled) + CHECK(FUNC(update_segmentation)(ctx, rw, c, current)); + + vp8_rac_unsigned(1, loop_filter_type); + vp8_rac_unsigned(6, loop_filter_level); + vp8_rac_unsigned(3, loop_filter_sharpness); + + CHECK(FUNC(mode_ref_lf_deltas)(ctx, rw, c, current)); + + vp8_rac_unsigned(2, log2_token_partitions); + + CHECK(FUNC(quantization_params)(ctx, rw, c, current)); + + if (current->frame_type != VP8_KEY_FRAME) { + vp8_rac_unsigned(1, refresh_golden_frame); + vp8_rac_unsigned(1, refresh_alternate_frame); + if (!current->refresh_golden_frame) + cbs_vp8_rac_get(c, 2); + if (!current->refresh_alternate_frame) + cbs_vp8_rac_get(c, 2); + vp8_rac_unsigned(1, ref_frame_sign_bias_golden); + vp8_rac_unsigned(1, ref_frame_sign_bias_alternate); + } + vp8_rac_unsigned(1, refresh_entropy_probs); + if (current->frame_type != VP8_KEY_FRAME) + vp8_rac_unsigned(1, refresh_last_frame); + + CHECK(FUNC(update_token_probs)(ctx, rw, c, current)); + + vp8_rac_unsigned(1, mb_no_skip_coeff); + if (current->mb_no_skip_coeff) + vp8_rac_unsigned(8, prob_skip_false); + + if (current->frame_type != VP8_KEY_FRAME) { + int i; + + vp8_rac_unsigned(8, prob_intra); + vp8_rac_unsigned(8, prob_last); + vp8_rac_unsigned(8, prob_golden); + + // intra_16x16_prob + if (cbs_vp8_rac_get(c, 1)) + for (i = 0; i < 4; i++) + cbs_vp8_rac_get(c, 8); + + // intra_chroma_prob + if (cbs_vp8_rac_get(c, 1)) + for (i = 0; i < 4; i++) + cbs_vp8_rac_get(c, 8); + + CHECK(FUNC(update_mv_probs)(ctx, rw, c, current)); + } + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(trailing_bits)(CodedBitstreamContext *ctx, RWContext *rw) +{ +#ifdef READ + int err; + + while (byte_alignment(rw) != 0) + fixed(1, zero_bit, 0); + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +} + +static int FUNC(frame)(CodedBitstreamContext *ctx, RWContext *rw, + VP8RawFrame *current) +{ +#ifdef READ + int err; + + HEADER("Frame"); + + CHECK(FUNC(frame_tag)(ctx, rw, ¤t->header)); + CHECK(FUNC(frame_header)(ctx, rw, ¤t->header)); + CHECK(FUNC(trailing_bits)(ctx, rw)); + + return 0; +#else + return AVERROR_PATCHWELCOME; +#endif +}