From patchwork Thu Jun 15 06:23:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42091 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp551642pzb; Wed, 14 Jun 2023 23:24:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5vct7DsEt+phXNxKeRyGopJST7LE6QKBWT69LavTGZPUoWq+zHMmzj968hjGbI9+Yn2A5O X-Received: by 2002:a17:907:8690:b0:982:8bd5:4215 with SMTP id qa16-20020a170907869000b009828bd54215mr2085132ejc.33.1686810252030; Wed, 14 Jun 2023 23:24:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810252; cv=none; d=google.com; s=arc-20160816; b=ty2xw/Kzu1az1hF5vZ4V003T5yS4eD4mZge2Vh7zotpSk6k76FzErNsSRFC3EpO64a BnmFatu8riQCC+/85mW3QemzNEFAHkhV1I32gGBqxNoBfhk0P2n9kpQoDXez+G0fHx20 LLCBEEohXzTBLpLsd5XKMNuOvBPLfcRT/181ocbbk9MK07JpLTujXh0liXNi4c9udsHG LTJazba0vlaKXQ6er86Jb8OK04MsIKqwkfco4xQHoalxO0COU9Mes0Q0s61qC8D3qSeO Nm4/Jx/zHPIUxFGWTsB8hiqFrF9puHvCzHnQkkv4rJjw/8DtYinTei7GWxQf5+u/CDMj x2bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=uIC5vFdywZVuIOo/8a2rK2lfUiISz11G5iQZO34Ap+w=; b=FsE2zlDmB/jeKawAbOjA+L2RStMnkFqxIXFKMzCGY62nHt7HC6GXSDT/BFtgrD47IA XWw1EvyQk2zsiKC3WOgOxxkwGNPkMEVFVh8Qst6n2+c50IxWyCGJCGyxKHh+btClHlh/ SwnQ5eXqiE9BQd+4uxKYNFFSuXyQZ5t950w3rJu5bRF/z0mhalNYlEMp30EbbP6+hGs3 8s3nkSVpyyTwlCQD6mCQAQwqx1iidjD4jdWtNgzaTH9QgWG/oX7lH3fPNnO/nXkVsbco ScCAixh/NlIpkLuBsEBlACgSvEE9aca2VhxRGgqoOYi0/m27LkMEmuZm4xrhYxxs3LPf MFbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=aJOB2Mh8; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gh21-20020a170906e09500b0098283b0b3edsi1303824ejb.87.2023.06.14.23.24.11; Wed, 14 Jun 2023 23:24:12 -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=@samsung.com header.s=mail20170921 header.b=aJOB2Mh8; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C846768C31B; Thu, 15 Jun 2023 09:24:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8EA2068C31B for ; Thu, 15 Jun 2023 09:24:00 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062357euoutp025e5f33e19935d6a2f7651873994d6456~owPlDtidv2605426054euoutp02K for ; Thu, 15 Jun 2023 06:23:57 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230615062357euoutp025e5f33e19935d6a2f7651873994d6456~owPlDtidv2605426054euoutp02K DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810237; bh=8k28Xr2/9QCBPiMMCrQUIlDPd8vzpof1QfSCAuiQY7I=; h=From:To:Cc:Subject:Date:References:From; b=aJOB2Mh8DNF15BsOSKvwKLLH7DIUdf4fs85a9f0/1/tYeNBrFtbYOWtt6Ix9ERGdo EodjClPiZ0b/DiBK7gBMzZkklJ3Lag7cOeVc8hOViOk/w6jTBE7h/Y53MqWNmxbEWp 8dwrtDIa8Gn6oCBidx2W9mP7ZHTXWF8ZplWGrbVc= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230615062357eucas1p2a3253348d90dbe952a276d4bc5abd2f3~owPk56XYf2182421824eucas1p2t; Thu, 15 Jun 2023 06:23:57 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 3C.1E.37758.C7EAA846; Thu, 15 Jun 2023 07:23:56 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062356eucas1p12f7a05a6c27c51a2e59df9f7ef61a6f2~owPkaXxIm1057310573eucas1p1Y; Thu, 15 Jun 2023 06:23:56 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230615062356eusmtrp1c7464b25c35473c87738aad2098e8b9c~owPkZ4ZvW0390503905eusmtrp1b; Thu, 15 Jun 2023 06:23:56 +0000 (GMT) X-AuditID: cbfec7f5-7ffff7000002937e-da-648aae7c8dd3 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 54.A9.14344.C7EAA846; Thu, 15 Jun 2023 07:23:56 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230615062356eusmtip154482825f7ed908b07622b6b909bb3f4~owPj74OhR2844928449eusmtip1P; Thu, 15 Jun 2023 06:23:56 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:23:47 +0200 Message-Id: <20230615062347.1674-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7o167pSDGZ/s7L4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDION5xhLHj4gbliQnMvYwPj7IdM XYycHBICJhLHv01l72Lk4hASWMEosXT6BxYI5wujxIE1a6AynxklXjz+Adfy9PgaRojEckaJ R0t+QDmtTBKXV98Hq2IT0JV4+eERmC0iYCpxsnkvG4jNLKAtse7udzBbWCBSovHNTUYQm0VA VeLc/qssIDavgJXElVk7obZpSkzYMocJIi4ocXLmExaIOLfEulmXWCFmyks0b53NDBH/yS5x oaEWwnaRuN/QyA5hC0u8Or4FypaROD25B2gOB5BdLHGo3wHCrJE49CMdosJa4m3jcUaQMDPQ Bet36UNUOEpMbDSHMPkkbrwVhFjPJzFp23RmiDCvREebEISpItHXKQYxTkri6bI5UAd6SDw8 voB1AqPiLCQ/zULyxyyErQsYmVcxiqeWFuempxYb56WW6xUn5haX5qXrJefnbmIEJojT/45/ 3cG44tVHvUOMTByMhxglOJiVRHifarSnCPGmJFZWpRblxxeV5qQWH2KU5mBREufVtj2ZLCSQ nliSmp2aWpBaBJNl4uCUamCadvHMnQObyxf8S3zmX5V/p9h+hakL3wI2zhfqE05cO1GUoNR8 o59F+a6dlap378KINRoCq+fEPO2WjpJgVTc4ZBBy/dz6yM//hPbGGcddlrun4GK2XiWztnOp y4WLT31/Mu79ouVkoX9vxwSHDI0vftIxzkf4+l/ofJvzIGvKHueFgtzFe0t8Ei5GaRT/XrJq MmNizHTWaJNsnYm75u6sSdG8FbDI5bnjbN5F+7TruGYtigj5kvzBRSo/JGNPsMSc9JaOEy/n pa7X+B2onxP0trrLWGWbcWr0o7CVQT3Neod3NhRv399yub1F6ShLmuLz9vjtT5/febhHQPQo 7+kn8x6eKfuzd+eSA9wP+d8qsRRnJBpqMRcVJwIAkRhHcX8DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrMLMWRmVeSWpSXmKPExsVy+t/xu7o167pSDNauk7D4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DION5xhLHj4gbliQnMvYwPj7IdMXYycHBICJhJPj69hBLGFBJYy Skw4ngQRl5JYunQRI4QtLPHnWhdbFyMXUE0zk8St3TvAmtkEdCVefngEZosImEtcXHcLrIFZ QFti3d3vbCC2sEC4xLtfS8FqWARUJc7tv8oCYvMKWElcmbUT6ghNiQlb5jBBxAUlTs58wgIR 55ZYN+sSK8RMeYnmrbOZJzDyz0JSNgtJagEj0ypGkdTS4tz03GIjveLE3OLSvHS95PzcTYzA 0N127OeWHYwrX33UO8TIxMF4iFGCg1lJhPepRnuKEG9KYmVValF+fFFpTmrxIUZToFsnMkuJ JucDoyevJN7QzMDU0MTM0sDU0sxYSZzXs6AjUUggPbEkNTs1tSC1CKaPiYNTqoFpVpdN2MOZ sl0ZefwGL1d8WzMvLUfx7J/1TPNmFn1uv3HxqGJ5t1THYv5VKkbnL6w3+FdkWbrRsmQho9KF dyfeLal8UWifFSjMyR794kT//O4uW70j15z+nqwN217cHTSl+Nbljoq9zK0RX5WKItYzlJhb 8nCns295nC1+TGqW9mH3fHfFoJUvebsFAhqZ5q1tu3p5gahP2RztusYpF+IvH9WSl2iR28Wa vj+lW/TEcwPDPBWdo3I8b79F/uy/n/Jj+rVv8aud9+yYuVEtbXbnIyXHg6te/G2rU30UpO25 mrVK8+jjR6qtmU3Mh45//h/AJs/2ssVx108fSYeejYc+Xl+3hZVr2/mcdR/fcNgpsRRnJBpq MRcVJwIAS4SIGeYCAAA= X-CMS-MailID: 20230615062356eucas1p12f7a05a6c27c51a2e59df9f7ef61a6f2 X-Msg-Generator: CA X-RootMTR: 20230615062356eucas1p12f7a05a6c27c51a2e59df9f7ef61a6f2 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062356eucas1p12f7a05a6c27c51a2e59df9f7ef61a6f2 References: Subject: [FFmpeg-devel] [PATCH v25 1/9] avcodec/evc_parser: Added parser implementation for EVC format 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: +izplsv7vUnc - Added constants definitions for EVC parser - Provided NAL units parsing following ISO_IEC_23094-1 - EVC parser registration Signed-off-by: Dawid Kozinski --- configure | 2 + libavcodec/Makefile | 2 + libavcodec/evc.h | 155 ++++++++ libavcodec/evc_parse.c | 800 ++++++++++++++++++++++++++++++++++++++++ libavcodec/evc_parse.h | 328 ++++++++++++++++ libavcodec/evc_parser.c | 235 ++++++++++++ libavcodec/parsers.c | 1 + 7 files changed, 1523 insertions(+) create mode 100644 libavcodec/evc.h create mode 100644 libavcodec/evc_parse.c create mode 100644 libavcodec/evc_parse.h create mode 100644 libavcodec/evc_parser.c diff --git a/configure b/configure index 4ac7cc6c0b..c9a86e9f8e 100755 --- a/configure +++ b/configure @@ -2483,6 +2483,7 @@ CONFIG_EXTRA=" dnn dovi_rpu dvprofile + evcparse exif faandct faanidct @@ -3321,6 +3322,7 @@ av1_amf_encoder_deps="amf" # parsers aac_parser_select="adts_header mpeg4audio" av1_parser_select="cbs_av1" +evc_parser_select="golomb evcparse" h264_parser_select="golomb h264dsp h264parse h264_sei" hevc_parser_select="hevcparse hevc_sei" mpegaudio_parser_select="mpegaudioheader" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2efab60d7d..a28919992a 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -84,6 +84,7 @@ OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DEFLATE_WRAPPER) += zlib_wrapper.o OBJS-$(CONFIG_DOVI_RPU) += dovi_rpu.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o +OBJS-$(CONFIG_EVCPARSE) += evc_parse.o OBJS-$(CONFIG_EXIF) += exif.o tiff_common.o OBJS-$(CONFIG_FAANDCT) += faandct.o OBJS-$(CONFIG_FAANIDCT) += faanidct.o @@ -1168,6 +1169,7 @@ OBJS-$(CONFIG_DVAUDIO_PARSER) += dvaudio_parser.o OBJS-$(CONFIG_DVBSUB_PARSER) += dvbsub_parser.o OBJS-$(CONFIG_DVD_NAV_PARSER) += dvd_nav_parser.o OBJS-$(CONFIG_DVDSUB_PARSER) += dvdsub_parser.o +OBJS-$(CONFIG_EVC_PARSER) += evc_parser.o OBJS-$(CONFIG_FLAC_PARSER) += flac_parser.o flacdata.o flac.o OBJS-$(CONFIG_FTR_PARSER) += ftr_parser.o OBJS-$(CONFIG_G723_1_PARSER) += g723_1_parser.o diff --git a/libavcodec/evc.h b/libavcodec/evc.h new file mode 100644 index 0000000000..d1fdb4fac6 --- /dev/null +++ b/libavcodec/evc.h @@ -0,0 +1,155 @@ +/* + * EVC definitions and enums + * Copyright (c) 2022 Dawid Kozinski + * + * 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_EVC_H +#define AVCODEC_EVC_H + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +/** + * @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic + * Table 4 - NAL unit type codes and NAL unit type classes + */ +enum EVCNALUnitType { + EVC_NOIDR_NUT = 0, /* Coded slice of a non-IDR picture */ + EVC_IDR_NUT = 1, /* Coded slice of an IDR picture */ + EVC_RSV_VCL_NUT02 = 2, + EVC_RSV_VCL_NUT03 = 3, + EVC_RSV_VCL_NUT04 = 4, + EVC_RSV_VCL_NUT05 = 5, + EVC_RSV_VCL_NUT06 = 6, + EVC_RSV_VCL_NUT07 = 7, + EVC_RSV_VCL_NUT08 = 8, + EVC_RSV_VCL_NUT09 = 9, + EVC_RSV_VCL_NUT10 = 10, + EVC_RSV_VCL_NUT11 = 11, + EVC_RSV_VCL_NUT12 = 12, + EVC_RSV_VCL_NUT13 = 13, + EVC_RSV_VCL_NUT14 = 14, + EVC_RSV_VCL_NUT15 = 15, + EVC_RSV_VCL_NUT16 = 16, + EVC_RSV_VCL_NUT17 = 17, + EVC_RSV_VCL_NUT18 = 18, + EVC_RSV_VCL_NUT19 = 19, + EVC_RSV_VCL_NUT20 = 20, + EVC_RSV_VCL_NUT21 = 21, + EVC_RSV_VCL_NUT22 = 22, + EVC_RSV_VCL_NUT23 = 23, + EVC_SPS_NUT = 24, /* Sequence parameter set */ + EVC_PPS_NUT = 25, /* Picture paremeter set */ + EVC_APS_NUT = 26, /* Adaptation parameter set */ + EVC_FD_NUT = 27, /* Filler data */ + EVC_SEI_NUT = 28, /* Supplemental enhancement information */ + EVC_RSV_NONVCL29 = 29, + EVC_RSV_NONVCL30 = 30, + EVC_RSV_NONVCL31 = 31, + EVC_RSV_NONVCL32 = 32, + EVC_RSV_NONVCL33 = 33, + EVC_RSV_NONVCL34 = 34, + EVC_RSV_NONVCL35 = 35, + EVC_RSV_NONVCL36 = 36, + EVC_RSV_NONVCL37 = 37, + EVC_RSV_NONVCL38 = 38, + EVC_RSV_NONVCL39 = 39, + EVC_RSV_NONVCL40 = 40, + EVC_RSV_NONVCL41 = 41, + EVC_RSV_NONVCL42 = 42, + EVC_RSV_NONVCL43 = 43, + EVC_RSV_NONVCL44 = 44, + EVC_RSV_NONVCL45 = 45, + EVC_RSV_NONVCL46 = 46, + EVC_RSV_NONVCL47 = 47, + EVC_RSV_NONVCL48 = 48, + EVC_RSV_NONVCL49 = 49, + EVC_RSV_NONVCL50 = 50, + EVC_RSV_NONVCL51 = 51, + EVC_RSV_NONVCL52 = 52, + EVC_RSV_NONVCL53 = 53, + EVC_RSV_NONVCL54 = 54, + EVC_RSV_NONVCL55 = 55, + EVC_UNSPEC_NUT56 = 56, + EVC_UNSPEC_NUT57 = 57, + EVC_UNSPEC_NUT58 = 58, + EVC_UNSPEC_NUT59 = 59, + EVC_UNSPEC_NUT60 = 60, + EVC_UNSPEC_NUT61 = 61, + EVC_UNSPEC_NUT62 = 62 +}; + +// slice type +// @see ISO_IEC_23094-1_2020 7.4.5 Slice header semantics +// +enum EVCSliceType { + EVC_SLICE_TYPE_B = 0, + EVC_SLICE_TYPE_P = 1, + EVC_SLICE_TYPE_I = 2 +}; + +enum { + // 7.4.3.2: aps_video_parameter_set_id is u(4). + EVC_MAX_APS_COUNT = 32, + + // 7.4.3.1: sps_seq_parameter_set_id is in [0, 15]. + EVC_MAX_SPS_COUNT = 16, + + // 7.4.3.2: pps_pic_parameter_set_id is in [0, 63]. + EVC_MAX_PPS_COUNT = 64, + + // 7.4.5: slice header slice_pic_parameter_set_id in [0, 63] + EVC_MAX_SH_COUNT = 64, + + // E.3.2: cpb_cnt_minus1[i] is in [0, 31]. + EVC_MAX_CPB_CNT = 32, + + // A.4.1: in table A.1 the highest level allows a MaxLumaPs of 35 651 584. + EVC_MAX_LUMA_PS = 35651584, + + EVC_MAX_NUM_REF_PICS = 21, + + EVC_MAX_NUM_RPLS = 32, + + // A.4.1: pic_width_in_luma_samples and pic_height_in_luma_samples are + // constrained to be not greater than sqrt(MaxLumaPs * 8). Hence height/ + // width are bounded above by sqrt(8 * 35651584) = 16888.2 samples. + EVC_MAX_WIDTH = 16888, + EVC_MAX_HEIGHT = 16888, + + // A.4.1: table A.1 allows at most 22 tile rows for any level. + EVC_MAX_TILE_ROWS = 22, + // A.4.1: table A.1 allows at most 20 tile columns for any level. + EVC_MAX_TILE_COLUMNS = 20, + + // A.4.1: table A.1 allows at most 600 slice segments for any level. + EVC_MAX_SLICE_SEGMENTS = 600, + + // 7.4.7.1: in the worst case (tiles_enabled_flag and + // entropy_coding_sync_enabled_flag are both set), entry points can be + // placed at the beginning of every Ctb row in every tile, giving an + // upper bound of (num_tile_columns_minus1 + 1) * PicHeightInCtbsY - 1. + // Only a stream with very high resolution and perverse parameters could + // get near that, though, so set a lower limit here with the maximum + // possible value for 4K video (at most 135 16x16 Ctb rows). + HEVC_MAX_ENTRY_POINT_OFFSETS = EVC_MAX_TILE_COLUMNS * 135, +}; + +#endif // AVCODEC_EVC_H diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c new file mode 100644 index 0000000000..618c05e3c8 --- /dev/null +++ b/libavcodec/evc_parse.c @@ -0,0 +1,800 @@ +/* + * 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 "golomb.h" +#include "parser.h" +#include "evc.h" +#include "evc_parse.h" + +#define EXTENDED_SAR 255 + +#define NUM_CHROMA_FORMATS 4 // @see ISO_IEC_23094-1 section 6.2 table 2 + +static const enum AVPixelFormat pix_fmts_8bit[NUM_CHROMA_FORMATS] = { + AV_PIX_FMT_GRAY8, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P +}; + +static const enum AVPixelFormat pix_fmts_9bit[NUM_CHROMA_FORMATS] = { + AV_PIX_FMT_GRAY9, AV_PIX_FMT_YUV420P9, AV_PIX_FMT_YUV422P9, AV_PIX_FMT_YUV444P9 +}; + +static const enum AVPixelFormat pix_fmts_10bit[NUM_CHROMA_FORMATS] = { + AV_PIX_FMT_GRAY10, AV_PIX_FMT_YUV420P10, AV_PIX_FMT_YUV422P10, AV_PIX_FMT_YUV444P10 +}; + +static const enum AVPixelFormat pix_fmts_12bit[NUM_CHROMA_FORMATS] = { + AV_PIX_FMT_GRAY12, AV_PIX_FMT_YUV420P12, AV_PIX_FMT_YUV422P12, AV_PIX_FMT_YUV444P12 +}; + +static const enum AVPixelFormat pix_fmts_14bit[NUM_CHROMA_FORMATS] = { + AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUV420P14, AV_PIX_FMT_YUV422P14, AV_PIX_FMT_YUV444P14 +}; + +static const enum AVPixelFormat pix_fmts_16bit[NUM_CHROMA_FORMATS] = { + AV_PIX_FMT_GRAY16, AV_PIX_FMT_YUV420P16, AV_PIX_FMT_YUV422P16, AV_PIX_FMT_YUV444P16 +}; + +int ff_evc_get_nalu_type(const uint8_t *bits, int bits_size, void *logctx) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) { + av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit header\n"); + return -1; + } + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +uint32_t ff_evc_read_nal_unit_length(const uint8_t *bits, int bits_size, void *logctx) +{ + uint32_t nalu_len = 0; + + if (bits_size < EVC_NALU_LENGTH_PREFIX_SIZE) { + av_log(logctx, AV_LOG_ERROR, "Can't read NAL unit length\n"); + return 0; + } + + nalu_len = AV_RB32(bits); + + return nalu_len; +} + +// nuh_temporal_id specifies a temporal identifier for the NAL unit +int ff_evc_get_temporal_id(const uint8_t *bits, int bits_size, void *logctx) +{ + int temporal_id = 0; + uint16_t t = 0; + + if (bits_size < EVC_NALU_HEADER_SIZE) { + av_log(logctx, AV_LOG_ERROR, "Can't read NAL unit header\n"); + return 0; + } + + // forbidden_zero_bit + if ((bits[0] & 0x80) != 0) + return -1; + + t = AV_RB16(bits); + + temporal_id = (t >> 6) & 0x0007; + + return temporal_id; +} + +// @see ISO_IEC_23094-1 (7.3.7 Reference picture list structure syntax) +static int ref_pic_list_struct(GetBitContext *gb, RefPicListStruct *rpl) +{ + uint32_t delta_poc_st, strp_entry_sign_flag = 0; + rpl->ref_pic_num = get_ue_golomb(gb); + if (rpl->ref_pic_num > 0) { + delta_poc_st = get_ue_golomb(gb); + + rpl->ref_pics[0] = delta_poc_st; + if (rpl->ref_pics[0] != 0) { + strp_entry_sign_flag = get_bits(gb, 1); + + rpl->ref_pics[0] *= 1 - (strp_entry_sign_flag << 1); + } + } + + for (int i = 1; i < rpl->ref_pic_num; ++i) { + delta_poc_st = get_ue_golomb(gb); + if (delta_poc_st != 0) + strp_entry_sign_flag = get_bits(gb, 1); + rpl->ref_pics[i] = rpl->ref_pics[i - 1] + delta_poc_st * (1 - (strp_entry_sign_flag << 1)); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.2 HRD parameters syntax) +static int hrd_parameters(GetBitContext *gb, HRDParameters *hrd) +{ + hrd->cpb_cnt_minus1 = get_ue_golomb(gb); + hrd->bit_rate_scale = get_bits(gb, 4); + hrd->cpb_size_scale = get_bits(gb, 4); + for (int SchedSelIdx = 0; SchedSelIdx <= hrd->cpb_cnt_minus1; SchedSelIdx++) { + hrd->bit_rate_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cpb_size_value_minus1[SchedSelIdx] = get_ue_golomb(gb); + hrd->cbr_flag[SchedSelIdx] = get_bits(gb, 1); + } + hrd->initial_cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->cpb_removal_delay_length_minus1 = get_bits(gb, 5); + hrd->time_offset_length = get_bits(gb, 5); + + return 0; +} + +// @see ISO_IEC_23094-1 (E.2.1 VUI parameters syntax) +static int vui_parameters(GetBitContext *gb, VUIParameters *vui) +{ + vui->aspect_ratio_info_present_flag = get_bits(gb, 1); + if (vui->aspect_ratio_info_present_flag) { + vui->aspect_ratio_idc = get_bits(gb, 8); + if (vui->aspect_ratio_idc == EXTENDED_SAR) { + vui->sar_width = get_bits(gb, 16); + vui->sar_height = get_bits(gb, 16); + } + } + vui->overscan_info_present_flag = get_bits(gb, 1); + if (vui->overscan_info_present_flag) + vui->overscan_appropriate_flag = get_bits(gb, 1); + vui->video_signal_type_present_flag = get_bits(gb, 1); + if (vui->video_signal_type_present_flag) { + vui->video_format = get_bits(gb, 3); + vui->video_full_range_flag = get_bits(gb, 1); + vui->colour_description_present_flag = get_bits(gb, 1); + if (vui->colour_description_present_flag) { + vui->colour_primaries = get_bits(gb, 8); + vui->transfer_characteristics = get_bits(gb, 8); + vui->matrix_coefficients = get_bits(gb, 8); + } + } + vui->chroma_loc_info_present_flag = get_bits(gb, 1); + if (vui->chroma_loc_info_present_flag) { + vui->chroma_sample_loc_type_top_field = get_ue_golomb(gb); + vui->chroma_sample_loc_type_bottom_field = get_ue_golomb(gb); + } + vui->neutral_chroma_indication_flag = get_bits(gb, 1); + + vui->field_seq_flag = get_bits(gb, 1); + + vui->timing_info_present_flag = get_bits(gb, 1); + if (vui->timing_info_present_flag) { + vui->num_units_in_tick = get_bits(gb, 32); + vui->time_scale = get_bits(gb, 32); + vui->fixed_pic_rate_flag = get_bits(gb, 1); + } + vui->nal_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->nal_hrd_parameters_present_flag) + hrd_parameters(gb, &vui->hrd_parameters); + vui->vcl_hrd_parameters_present_flag = get_bits(gb, 1); + if (vui->vcl_hrd_parameters_present_flag) + hrd_parameters(gb, &vui->hrd_parameters); + if (vui->nal_hrd_parameters_present_flag || vui->vcl_hrd_parameters_present_flag) + vui->low_delay_hrd_flag = get_bits(gb, 1); + vui->pic_struct_present_flag = get_bits(gb, 1); + vui->bitstream_restriction_flag = get_bits(gb, 1); + if (vui->bitstream_restriction_flag) { + vui->motion_vectors_over_pic_boundaries_flag = get_bits(gb, 1); + vui->max_bytes_per_pic_denom = get_ue_golomb(gb); + vui->max_bits_per_mb_denom = get_ue_golomb(gb); + vui->log2_max_mv_length_horizontal = get_ue_golomb(gb); + vui->log2_max_mv_length_vertical = get_ue_golomb(gb); + vui->num_reorder_pics = get_ue_golomb(gb); + vui->max_dec_pic_buffering = get_ue_golomb(gb); + } + + return 0; +} + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +EVCParserSPS *ff_evc_parse_sps(EVCParserContext *ctx, const uint8_t *bs, int bs_size) +{ + GetBitContext gb; + EVCParserSPS *sps; + int sps_seq_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + if(!ctx->sps[sps_seq_parameter_set_id]) { + if((ctx->sps[sps_seq_parameter_set_id] = av_malloc(sizeof(EVCParserSPS))) == NULL) + return NULL; + } + + sps = ctx->sps[sps_seq_parameter_set_id]; + sps->sps_seq_parameter_set_id = sps_seq_parameter_set_id; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps->profile_idc = get_bits(&gb, 8); + + sps->level_idc = get_bits(&gb, 8); + + skip_bits_long(&gb, 32); /* skip toolset_idc_h */ + skip_bits_long(&gb, 32); /* skip toolset_idc_l */ + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps->chroma_format_idc = get_ue_golomb(&gb); + + sps->pic_width_in_luma_samples = get_ue_golomb(&gb); + sps->pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps->bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps->bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + sps->sps_btt_flag = get_bits(&gb, 1); + if (sps->sps_btt_flag) { + sps->log2_ctu_size_minus5 = get_ue_golomb(&gb); + sps->log2_min_cb_size_minus2 = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_14_cb_size = get_ue_golomb(&gb); + sps->log2_diff_ctu_max_tt_cb_size = get_ue_golomb(&gb); + sps->log2_diff_min_cb_min_tt_cb_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_suco_flag = get_bits(&gb, 1); + if (sps->sps_suco_flag) { + sps->log2_diff_ctu_size_max_suco_cb_size = get_ue_golomb(&gb); + sps->log2_diff_max_suco_min_suco_cb_size = get_ue_golomb(&gb); + } + + sps->sps_admvp_flag = get_bits(&gb, 1); + if (sps->sps_admvp_flag) { + sps->sps_affine_flag = get_bits(&gb, 1); + sps->sps_amvr_flag = get_bits(&gb, 1); + sps->sps_dmvr_flag = get_bits(&gb, 1); + sps->sps_mmvd_flag = get_bits(&gb, 1); + sps->sps_hmvp_flag = get_bits(&gb, 1); + } + + sps->sps_eipd_flag = get_bits(&gb, 1); + if (sps->sps_eipd_flag) { + sps->sps_ibc_flag = get_bits(&gb, 1); + if (sps->sps_ibc_flag) + sps->log2_max_ibc_cand_size_minus2 = get_ue_golomb(&gb); + } + + sps->sps_cm_init_flag = get_bits(&gb, 1); + if (sps->sps_cm_init_flag) + sps->sps_adcc_flag = get_bits(&gb, 1); + + sps->sps_iqt_flag = get_bits(&gb, 1); + if (sps->sps_iqt_flag) + sps->sps_ats_flag = get_bits(&gb, 1); + + sps->sps_addb_flag = get_bits(&gb, 1); + sps->sps_alf_flag = get_bits(&gb, 1); + sps->sps_htdf_flag = get_bits(&gb, 1); + sps->sps_rpl_flag = get_bits(&gb, 1); + sps->sps_pocs_flag = get_bits(&gb, 1); + sps->sps_dquant_flag = get_bits(&gb, 1); + sps->sps_dra_flag = get_bits(&gb, 1); + + if (sps->sps_pocs_flag) + sps->log2_max_pic_order_cnt_lsb_minus4 = get_ue_golomb(&gb); + + if (!sps->sps_pocs_flag || !sps->sps_rpl_flag) { + sps->log2_sub_gop_length = get_ue_golomb(&gb); + if (sps->log2_sub_gop_length == 0) + sps->log2_ref_pic_gap_length = get_ue_golomb(&gb); + } + + if (!sps->sps_rpl_flag) + sps->max_num_tid0_ref_pics = get_ue_golomb(&gb); + else { + sps->sps_max_dec_pic_buffering_minus1 = get_ue_golomb(&gb); + sps->long_term_ref_pic_flag = get_bits(&gb, 1); + sps->rpl1_same_as_rpl0_flag = get_bits(&gb, 1); + sps->num_ref_pic_list_in_sps[0] = get_ue_golomb(&gb); + + for (int i = 0; i < sps->num_ref_pic_list_in_sps[0]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[0][i]); + + if (!sps->rpl1_same_as_rpl0_flag) { + sps->num_ref_pic_list_in_sps[1] = get_ue_golomb(&gb); + for (int i = 0; i < sps->num_ref_pic_list_in_sps[1]; ++i) + ref_pic_list_struct(&gb, &sps->rpls[1][i]); + } + } + + sps->picture_cropping_flag = get_bits(&gb, 1); + + if (sps->picture_cropping_flag) { + sps->picture_crop_left_offset = get_ue_golomb(&gb); + sps->picture_crop_right_offset = get_ue_golomb(&gb); + sps->picture_crop_top_offset = get_ue_golomb(&gb); + sps->picture_crop_bottom_offset = get_ue_golomb(&gb); + } + + if (sps->chroma_format_idc != 0) { + sps->chroma_qp_table_struct.chroma_qp_table_present_flag = get_bits(&gb, 1); + + if (sps->chroma_qp_table_struct.chroma_qp_table_present_flag) { + sps->chroma_qp_table_struct.same_qp_table_for_chroma = get_bits(&gb, 1); + sps->chroma_qp_table_struct.global_offset_flag = get_bits(&gb, 1); + for (int i = 0; i < (sps->chroma_qp_table_struct.same_qp_table_for_chroma ? 1 : 2); i++) { + sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i] = get_ue_golomb(&gb);; + for (int j = 0; j <= sps->chroma_qp_table_struct.num_points_in_qp_table_minus1[i]; j++) { + sps->chroma_qp_table_struct.delta_qp_in_val_minus1[i][j] = get_bits(&gb, 6); + sps->chroma_qp_table_struct.delta_qp_out_val[i][j] = get_se_golomb(&gb); + } + } + } + } + + sps->vui_parameters_present_flag = get_bits(&gb, 1); + if (sps->vui_parameters_present_flag) + vui_parameters(&gb, &(sps->vui_parameters)); + + // @note + // If necessary, add the missing fields to the EVCParserSPS structure + // and then extend parser implementation + + return sps; +} + +// @see ISO_IEC_23094-1 (7.3.2.2 SPS RBSP syntax) +// +// @note +// The current implementation of parse_sps function doesn't handle VUI parameters parsing. +// If it will be needed, parse_sps function could be extended to handle VUI parameters parsing +// to initialize fields of the AVCodecContex i.e. color_primaries, color_trc,color_range +// +EVCParserPPS *ff_evc_parse_pps(EVCParserContext *ctx, const uint8_t *bs, int bs_size) +{ + GetBitContext gb; + EVCParserPPS *pps; + + int pps_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + pps_pic_parameter_set_id = get_ue_golomb(&gb); + if (pps_pic_parameter_set_id > EVC_MAX_PPS_COUNT) + return NULL; + + if(!ctx->pps[pps_pic_parameter_set_id]) { + if((ctx->pps[pps_pic_parameter_set_id] = av_malloc(sizeof(EVCParserSPS))) == NULL) + return NULL; + } + + pps = ctx->pps[pps_pic_parameter_set_id]; + + pps->pps_pic_parameter_set_id = pps_pic_parameter_set_id; + + pps->pps_seq_parameter_set_id = get_ue_golomb(&gb); + if (pps->pps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return NULL; + + pps->num_ref_idx_default_active_minus1[0] = get_ue_golomb(&gb); + pps->num_ref_idx_default_active_minus1[1] = get_ue_golomb(&gb); + pps->additional_lt_poc_lsb_len = get_ue_golomb(&gb); + pps->rpl1_idx_present_flag = get_bits(&gb, 1); + pps->single_tile_in_pic_flag = get_bits(&gb, 1); + + if (!pps->single_tile_in_pic_flag) { + pps->num_tile_columns_minus1 = get_ue_golomb(&gb); + pps->num_tile_rows_minus1 = get_ue_golomb(&gb); + pps->uniform_tile_spacing_flag = get_bits(&gb, 1); + + if (!pps->uniform_tile_spacing_flag) { + for (int i = 0; i < pps->num_tile_columns_minus1; i++) + pps->tile_column_width_minus1[i] = get_ue_golomb(&gb); + + for (int i = 0; i < pps->num_tile_rows_minus1; i++) + pps->tile_row_height_minus1[i] = get_ue_golomb(&gb); + } + pps->loop_filter_across_tiles_enabled_flag = get_bits(&gb, 1); + pps->tile_offset_len_minus1 = get_ue_golomb(&gb); + } + + pps->tile_id_len_minus1 = get_ue_golomb(&gb); + pps->explicit_tile_id_flag = get_bits(&gb, 1); + + if (pps->explicit_tile_id_flag) { + for (int i = 0; i <= pps->num_tile_rows_minus1; i++) { + for (int j = 0; j <= pps->num_tile_columns_minus1; j++) + pps->tile_id_val[i][j] = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } + } + + pps->pic_dra_enabled_flag = 0; + pps->pic_dra_enabled_flag = get_bits(&gb, 1); + + if (pps->pic_dra_enabled_flag) + pps->pic_dra_aps_id = get_bits(&gb, 5); + + pps->arbitrary_slice_present_flag = get_bits(&gb, 1); + pps->constrained_intra_pred_flag = get_bits(&gb, 1); + pps->cu_qp_delta_enabled_flag = get_bits(&gb, 1); + + if (pps->cu_qp_delta_enabled_flag) + pps->log2_cu_qp_delta_area_minus6 = get_ue_golomb(&gb); + + return pps; +} + +// @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) +EVCParserSliceHeader *ff_evc_parse_slice_header(EVCParserContext *ctx, const uint8_t *bs, int bs_size) +{ + GetBitContext gb; + EVCParserSliceHeader *sh; + EVCParserPPS *pps; + EVCParserSPS *sps; + + int num_tiles_in_slice = 0; + int slice_pic_parameter_set_id; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return NULL; + + slice_pic_parameter_set_id = get_ue_golomb(&gb); + + if (slice_pic_parameter_set_id < 0 || slice_pic_parameter_set_id >= EVC_MAX_PPS_COUNT) + return NULL; + + if(!ctx->slice_header[slice_pic_parameter_set_id]) { + if((ctx->slice_header[slice_pic_parameter_set_id] = av_malloc(sizeof(EVCParserSliceHeader))) == NULL) + return NULL; + } + + sh = ctx->slice_header[slice_pic_parameter_set_id]; + + pps = ctx->pps[slice_pic_parameter_set_id]; + if(!pps) + return NULL; + + sps = ctx->sps[slice_pic_parameter_set_id]; + if(!sps) + return NULL; + + sh->slice_pic_parameter_set_id = slice_pic_parameter_set_id; + + if (!pps->single_tile_in_pic_flag) { + sh->single_tile_in_slice_flag = get_bits(&gb, 1); + sh->first_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + } else + sh->single_tile_in_slice_flag = 1; + + if (!sh->single_tile_in_slice_flag) { + if (pps->arbitrary_slice_present_flag) + sh->arbitrary_slice_flag = get_bits(&gb, 1); + + if (!sh->arbitrary_slice_flag) + sh->last_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + else { + sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb(&gb); + num_tiles_in_slice = sh->num_remaining_tiles_in_slice_minus1 + 2; + for (int i = 0; i < num_tiles_in_slice - 1; ++i) + sh->delta_tile_id_minus1[i] = get_ue_golomb(&gb); + } + } + + sh->slice_type = get_ue_golomb(&gb); + + if (ctx->nalu_type == EVC_IDR_NUT) + sh->no_output_of_prior_pics_flag = get_bits(&gb, 1); + + if (sps->sps_mmvd_flag && ((sh->slice_type == EVC_SLICE_TYPE_B) || (sh->slice_type == EVC_SLICE_TYPE_P))) + sh->mmvd_group_enable_flag = get_bits(&gb, 1); + else + sh->mmvd_group_enable_flag = 0; + + if (sps->sps_alf_flag) { + int ChromaArrayType = sps->chroma_format_idc; + + sh->slice_alf_enabled_flag = get_bits(&gb, 1); + + if (sh->slice_alf_enabled_flag) { + sh->slice_alf_luma_aps_id = get_bits(&gb, 5); + sh->slice_alf_map_flag = get_bits(&gb, 1); + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if ((ChromaArrayType == 1 || ChromaArrayType == 2) && sh->slice_alf_chroma_idc > 0) + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + } + if (ChromaArrayType == 3) { + int sliceChromaAlfEnabledFlag = 0; + int sliceChroma2AlfEnabledFlag = 0; + + if (sh->slice_alf_chroma_idc == 1) { // @see ISO_IEC_23094-1 (7.4.5) + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 0; + } else if (sh->slice_alf_chroma_idc == 2) { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 1; + } else if (sh->slice_alf_chroma_idc == 3) { + sliceChromaAlfEnabledFlag = 1; + sliceChroma2AlfEnabledFlag = 1; + } else { + sliceChromaAlfEnabledFlag = 0; + sliceChroma2AlfEnabledFlag = 0; + } + + if (!sh->slice_alf_enabled_flag) + sh->slice_alf_chroma_idc = get_bits(&gb, 2); + + if (sliceChromaAlfEnabledFlag) { + sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma_map_flag = get_bits(&gb, 1); + } + + if (sliceChroma2AlfEnabledFlag) { + sh->slice_alf_chroma2_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma2_map_flag = get_bits(&gb, 1); + } + } + } + + if (ctx->nalu_type != EVC_IDR_NUT) { + if (sps->sps_pocs_flag) + sh->slice_pic_order_cnt_lsb = get_bits(&gb, sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + } + + // @note + // If necessary, add the missing fields to the EVCParserSliceHeader structure + // and then extend parser implementation + + return sh; +} + +int ff_evc_parse_nal_unit(EVCParserContext *ctx, const uint8_t *buf, int buf_size, void *logctx) +{ + int nalu_type, nalu_size; + int tid; + const uint8_t *data = buf; + int data_size = buf_size; + + // ctx->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + ctx->key_frame = -1; + + nalu_size = buf_size; + if (nalu_size <= 0) { + av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); + return AVERROR_INVALIDDATA; + } + + // @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic (Table 4 - NAL unit type codes and NAL unit type classes) + // @see enum EVCNALUnitType in evc.h + nalu_type = ff_evc_get_nalu_type(data, data_size, logctx); + if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { + av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); + return AVERROR_INVALIDDATA; + } + ctx->nalu_type = nalu_type; + + tid = ff_evc_get_temporal_id(data, data_size, logctx); + if (tid < 0) { + av_log(logctx, AV_LOG_ERROR, "Invalid temporial id: (%d)\n", tid); + return AVERROR_INVALIDDATA; + } + ctx->nuh_temporal_id = tid; + + data += EVC_NALU_HEADER_SIZE; + data_size -= EVC_NALU_HEADER_SIZE; + + switch(nalu_type) { + case EVC_SPS_NUT: { + EVCParserSPS *sps; + int SubGopLength; + int bit_depth; + + sps = ff_evc_parse_sps(ctx, data, nalu_size); + if (!sps) { + av_log(logctx, AV_LOG_ERROR, "SPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + + ctx->coded_width = sps->pic_width_in_luma_samples; + ctx->coded_height = sps->pic_height_in_luma_samples; + + if(sps->picture_cropping_flag) { + ctx->width = sps->pic_width_in_luma_samples - sps->picture_crop_left_offset - sps->picture_crop_right_offset; + ctx->height = sps->pic_height_in_luma_samples - sps->picture_crop_top_offset - sps->picture_crop_bottom_offset; + } else { + ctx->width = sps->pic_width_in_luma_samples; + ctx->height = sps->pic_height_in_luma_samples; + } + + SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + ctx->gop_size = SubGopLength; + + ctx->delay = (sps->sps_max_dec_pic_buffering_minus1) ? sps->sps_max_dec_pic_buffering_minus1 - 1 : SubGopLength + sps->max_num_tid0_ref_pics - 1; + + if (sps->profile_idc == 1) ctx->profile = FF_PROFILE_EVC_MAIN; + else ctx->profile = FF_PROFILE_EVC_BASELINE; + + if (sps->vui_parameters_present_flag) { + if (sps->vui_parameters.timing_info_present_flag) { + int64_t num = sps->vui_parameters.num_units_in_tick; + int64_t den = sps->vui_parameters.time_scale; + if (num != 0 && den != 0) + av_reduce(&ctx->framerate.den, &ctx->framerate.num, num, den, 1 << 30); + } + } + + bit_depth = sps->bit_depth_chroma_minus8 + 8; + ctx->format = AV_PIX_FMT_NONE; + + switch (bit_depth) { + case 8: + ctx->format = pix_fmts_8bit[sps->chroma_format_idc]; + break; + case 9: + ctx->format = pix_fmts_9bit[sps->chroma_format_idc]; + break; + case 10: + ctx->format = pix_fmts_10bit[sps->chroma_format_idc]; + break; + case 12: + ctx->format = pix_fmts_12bit[sps->chroma_format_idc]; + break; + case 14: + ctx->format = pix_fmts_14bit[sps->chroma_format_idc]; + break; + case 16: + ctx->format = pix_fmts_16bit[sps->chroma_format_idc]; + break; + } + av_assert0(ctx->format != AV_PIX_FMT_NONE); + + break; + } + case EVC_PPS_NUT: { + EVCParserPPS *pps; + + pps = ff_evc_parse_pps(ctx, data, nalu_size); + if (!pps) { + av_log(logctx, AV_LOG_ERROR, "PPS parsing error\n"); + return AVERROR_INVALIDDATA; + } + break; + } + case EVC_SEI_NUT: // Supplemental Enhancement Information + case EVC_APS_NUT: // Adaptation parameter set + case EVC_FD_NUT: // Filler data + break; + case EVC_IDR_NUT: // Coded slice of a IDR or non-IDR picture + case EVC_NOIDR_NUT: { + EVCParserSliceHeader *sh; + EVCParserSPS *sps; + int slice_pic_parameter_set_id; + + sh = ff_evc_parse_slice_header(ctx, data, nalu_size); + if (!sh) { + av_log(logctx, AV_LOG_ERROR, "Slice header parsing error\n"); + return AVERROR_INVALIDDATA; + } + + switch (sh->slice_type) { + case EVC_SLICE_TYPE_B: { + ctx->pict_type = AV_PICTURE_TYPE_B; + break; + } + case EVC_SLICE_TYPE_P: { + ctx->pict_type = AV_PICTURE_TYPE_P; + break; + } + case EVC_SLICE_TYPE_I: { + ctx->pict_type = AV_PICTURE_TYPE_I; + break; + } + default: { + ctx->pict_type = AV_PICTURE_TYPE_NONE; + } + } + + ctx->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + // POC (picture order count of the current picture) derivation + // @see ISO/IEC 23094-1:2020(E) 8.3.1 Decoding process for picture order count + slice_pic_parameter_set_id = sh->slice_pic_parameter_set_id; + sps = ctx->sps[slice_pic_parameter_set_id]; + + if (sps && sps->sps_pocs_flag) { + + int PicOrderCntMsb = 0; + ctx->poc.prevPicOrderCntVal = ctx->poc.PicOrderCntVal; + + if (nalu_type == EVC_IDR_NUT) + PicOrderCntMsb = 0; + else { + int MaxPicOrderCntLsb = 1 << (sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + + int prevPicOrderCntLsb = ctx->poc.PicOrderCntVal & (MaxPicOrderCntLsb - 1); + int prevPicOrderCntMsb = ctx->poc.PicOrderCntVal - prevPicOrderCntLsb; + + + if ((sh->slice_pic_order_cnt_lsb < prevPicOrderCntLsb) && + ((prevPicOrderCntLsb - sh->slice_pic_order_cnt_lsb) >= (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb + MaxPicOrderCntLsb; + + else if ((sh->slice_pic_order_cnt_lsb > prevPicOrderCntLsb) && + ((sh->slice_pic_order_cnt_lsb - prevPicOrderCntLsb) > (MaxPicOrderCntLsb / 2))) + + PicOrderCntMsb = prevPicOrderCntMsb - MaxPicOrderCntLsb; + + else + PicOrderCntMsb = prevPicOrderCntMsb; + } + ctx->poc.PicOrderCntVal = PicOrderCntMsb + sh->slice_pic_order_cnt_lsb; + + } else { + if (nalu_type == EVC_IDR_NUT) { + ctx->poc.PicOrderCntVal = 0; + ctx->poc.DocOffset = -1; + } else { + int SubGopLength = (int)pow(2.0, sps->log2_sub_gop_length); + if (tid == 0) { + ctx->poc.PicOrderCntVal = ctx->poc.prevPicOrderCntVal + SubGopLength; + ctx->poc.DocOffset = 0; + ctx->poc.prevPicOrderCntVal = ctx->poc.PicOrderCntVal; + } else { + int ExpectedTemporalId; + int PocOffset; + int prevDocOffset = ctx->poc.DocOffset; + + ctx->poc.DocOffset = (prevDocOffset + 1) % SubGopLength; + if (ctx->poc.DocOffset == 0) { + ctx->poc.prevPicOrderCntVal += SubGopLength; + ExpectedTemporalId = 0; + } else + ExpectedTemporalId = 1 + (int)log2(ctx->poc.DocOffset); + while (tid != ExpectedTemporalId) { + ctx->poc.DocOffset = (ctx->poc.DocOffset + 1) % SubGopLength; + if (ctx->poc.DocOffset == 0) + ExpectedTemporalId = 0; + else + ExpectedTemporalId = 1 + (int)log2(ctx->poc.DocOffset); + } + PocOffset = (int)(SubGopLength * ((2.0 * ctx->poc.DocOffset + 1) / (int)pow(2.0, tid) - 2)); + ctx->poc.PicOrderCntVal = ctx->poc.prevPicOrderCntVal + PocOffset; + } + } + } + + ctx->output_picture_number = ctx->poc.PicOrderCntVal; + ctx->key_frame = (nalu_type == EVC_IDR_NUT) ? 1 : 0; + + break; + } + } + + return 0; +} + diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h new file mode 100644 index 0000000000..671a2b8e93 --- /dev/null +++ b/libavcodec/evc_parse.h @@ -0,0 +1,328 @@ +/* + * 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 + */ + +/** + * @file + * EVC decoder/parser shared code + */ + +#ifndef AVCODEC_EVC_PARSE_H +#define AVCODEC_EVC_PARSE_H + +#define EVC_MAX_QP_TABLE_SIZE 58 +#define NUM_CPB 32 + +// rpl structure +typedef struct RefPicListStruct { + int poc; + int tid; + int ref_pic_num; + int ref_pic_active_num; + int ref_pics[EVC_MAX_NUM_REF_PICS]; + char pic_type; + +} RefPicListStruct; + +// chromaQP table structure to be signalled in SPS +typedef struct ChromaQpTable { + int chroma_qp_table_present_flag; // u(1) + int same_qp_table_for_chroma; // u(1) + int global_offset_flag; // u(1) + int num_points_in_qp_table_minus1[2]; // ue(v) + int delta_qp_in_val_minus1[2][EVC_MAX_QP_TABLE_SIZE]; // u(6) + int delta_qp_out_val[2][EVC_MAX_QP_TABLE_SIZE]; // se(v) +} ChromaQpTable; + +// Hypothetical Reference Decoder (HRD) parameters, part of VUI +typedef struct HRDParameters { + int cpb_cnt_minus1; // ue(v) + int bit_rate_scale; // u(4) + int cpb_size_scale; // u(4) + int bit_rate_value_minus1[NUM_CPB]; // ue(v) + int cpb_size_value_minus1[NUM_CPB]; // ue(v) + int cbr_flag[NUM_CPB]; // u(1) + int initial_cpb_removal_delay_length_minus1; // u(5) + int cpb_removal_delay_length_minus1; // u(5) + int dpb_output_delay_length_minus1; // u(5) + int time_offset_length; // u(5) +} HRDParameters; + +// video usability information (VUI) part of SPS +typedef struct VUIParameters { + int aspect_ratio_info_present_flag; // u(1) + int aspect_ratio_idc; // u(8) + int sar_width; // u(16) + int sar_height; // u(16) + int overscan_info_present_flag; // u(1) + int overscan_appropriate_flag; // u(1) + int video_signal_type_present_flag; // u(1) + int video_format; // u(3) + int video_full_range_flag; // u(1) + int colour_description_present_flag; // u(1) + int colour_primaries; // u(8) + int transfer_characteristics; // u(8) + int matrix_coefficients; // u(8) + int chroma_loc_info_present_flag; // u(1) + int chroma_sample_loc_type_top_field; // ue(v) + int chroma_sample_loc_type_bottom_field; // ue(v) + int neutral_chroma_indication_flag; // u(1) + int field_seq_flag; // u(1) + int timing_info_present_flag; // u(1) + int num_units_in_tick; // u(32) + int time_scale; // u(32) + int fixed_pic_rate_flag; // u(1) + int nal_hrd_parameters_present_flag; // u(1) + int vcl_hrd_parameters_present_flag; // u(1) + int low_delay_hrd_flag; // u(1) + int pic_struct_present_flag; // u(1) + int bitstream_restriction_flag; // u(1) + int motion_vectors_over_pic_boundaries_flag; // u(1) + int max_bytes_per_pic_denom; // ue(v) + int max_bits_per_mb_denom; // ue(v) + int log2_max_mv_length_horizontal; // ue(v) + int log2_max_mv_length_vertical; // ue(v) + int num_reorder_pics; // ue(v) + int max_dec_pic_buffering; // ue(v) + + HRDParameters hrd_parameters; +} VUIParameters; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCParserSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + int sps_btt_flag; // u(1) + int log2_ctu_size_minus5; // ue(v) + int log2_min_cb_size_minus2; // ue(v) + int log2_diff_ctu_max_14_cb_size; // ue(v) + int log2_diff_ctu_max_tt_cb_size; // ue(v) + int log2_diff_min_cb_min_tt_cb_size_minus2; // ue(v) + + int sps_suco_flag; // u(1) + int log2_diff_ctu_size_max_suco_cb_size; // ue(v) + int log2_diff_max_suco_min_suco_cb_size; // ue(v) + + int sps_admvp_flag; // u(1) + int sps_affine_flag; // u(1) + int sps_amvr_flag; // u(1) + int sps_dmvr_flag; // u(1) + int sps_mmvd_flag; // u(1) + int sps_hmvp_flag; // u(1) + + int sps_eipd_flag; // u(1) + int sps_ibc_flag; // u(1) + int log2_max_ibc_cand_size_minus2; // ue(v) + + int sps_cm_init_flag; // u(1) + int sps_adcc_flag; // u(1) + + int sps_iqt_flag; // u(1) + int sps_ats_flag; // u(1) + + int sps_addb_flag; // u(1) + int sps_alf_flag; // u(1) + int sps_htdf_flag; // u(1) + int sps_rpl_flag; // u(1) + int sps_pocs_flag; // u(1) + int sps_dquant_flag; // u(1) + int sps_dra_flag; // u(1) + + int log2_max_pic_order_cnt_lsb_minus4; // ue(v) + int log2_sub_gop_length; // ue(v) + int log2_ref_pic_gap_length; // ue(v) + + int max_num_tid0_ref_pics; // ue(v) + + int sps_max_dec_pic_buffering_minus1; // ue(v) + int long_term_ref_pic_flag; // u(1) + int rpl1_same_as_rpl0_flag; // u(1) + int num_ref_pic_list_in_sps[2]; // ue(v) + struct RefPicListStruct rpls[2][EVC_MAX_NUM_RPLS]; + + int picture_cropping_flag; // u(1) + int picture_crop_left_offset; // ue(v) + int picture_crop_right_offset; // ue(v) + int picture_crop_top_offset; // ue(v) + int picture_crop_bottom_offset; // ue(v) + + struct ChromaQpTable chroma_qp_table_struct; + + int vui_parameters_present_flag; // u(1) + + struct VUIParameters vui_parameters; + +} EVCParserSPS; + +typedef struct EVCParserPPS { + int pps_pic_parameter_set_id; // ue(v) + int pps_seq_parameter_set_id; // ue(v) + int num_ref_idx_default_active_minus1[2]; // ue(v) + int additional_lt_poc_lsb_len; // ue(v) + int rpl1_idx_present_flag; // u(1) + int single_tile_in_pic_flag; // u(1) + int num_tile_columns_minus1; // ue(v) + int num_tile_rows_minus1; // ue(v) + int uniform_tile_spacing_flag; // u(1) + int tile_column_width_minus1[EVC_MAX_TILE_ROWS]; // ue(v) + int tile_row_height_minus1[EVC_MAX_TILE_COLUMNS]; // ue(v) + int loop_filter_across_tiles_enabled_flag; // u(1) + int tile_offset_len_minus1; // ue(v) + int tile_id_len_minus1; // ue(v) + int explicit_tile_id_flag; // u(1) + int tile_id_val[EVC_MAX_TILE_ROWS][EVC_MAX_TILE_COLUMNS]; // u(v) + int pic_dra_enabled_flag; // u(1) + int pic_dra_aps_id; // u(5) + int arbitrary_slice_present_flag; // u(1) + int constrained_intra_pred_flag; // u(1) + int cu_qp_delta_enabled_flag; // u(1) + int log2_cu_qp_delta_area_minus6; // ue(v) + +} EVCParserPPS; + +// The sturcture reflects Slice Header RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.6 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +// u(n) - unsigned integer using n bits. +// When n is "v" in the syntax table, the number of bits varies in a manner dependent on the value of other syntax elements. +typedef struct EVCParserSliceHeader { + int slice_pic_parameter_set_id; // ue(v) + int single_tile_in_slice_flag; // u(1) + int first_tile_id; // u(v) + int arbitrary_slice_flag; // u(1) + int last_tile_id; // u(v) + int num_remaining_tiles_in_slice_minus1; // ue(v) + int delta_tile_id_minus1[EVC_MAX_TILE_ROWS * EVC_MAX_TILE_COLUMNS]; // ue(v) + + int slice_type; // ue(v) + int no_output_of_prior_pics_flag; // u(1) + int mmvd_group_enable_flag; // u(1) + int slice_alf_enabled_flag; // u(1) + + int slice_alf_luma_aps_id; // u(5) + int slice_alf_map_flag; // u(1) + int slice_alf_chroma_idc; // u(2) + int slice_alf_chroma_aps_id; // u(5) + int slice_alf_chroma_map_flag; // u(1) + int slice_alf_chroma2_aps_id; // u(5) + int slice_alf_chroma2_map_flag; // u(1) + int slice_pic_order_cnt_lsb; // u(v) + + // @note + // Currently the structure does not reflect the entire Slice Header RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of the AVCodecContext structure. + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCParserSliceHeader; + +// picture order count of the current picture +typedef struct EVCParserPoc { + int PicOrderCntVal; // current picture order count value + int prevPicOrderCntVal; // the picture order count of the previous Tid0 picture + int DocOffset; // the decoding order count of the previous picture +} EVCParserPoc; + +typedef struct EVCParserContext { + //ParseContext pc; + EVCParserSPS *sps[EVC_MAX_SPS_COUNT]; + EVCParserPPS *pps[EVC_MAX_PPS_COUNT]; + EVCParserSliceHeader *slice_header[EVC_MAX_PPS_COUNT]; + + EVCParserPoc poc; + + int nuh_temporal_id; // the value of TemporalId (shall be the same for all VCL NAL units of an Access Unit) + int nalu_type; // the current NALU type + + // Dimensions of the decoded video intended for presentation. + int width; + int height; + + // Dimensions of the coded video. + int coded_width; + int coded_height; + + // The format of the coded data, corresponds to enum AVPixelFormat + int format; + + // AV_PICTURE_TYPE_I, EVC_SLICE_TYPE_P, AV_PICTURE_TYPE_B + int pict_type; + + // Set by parser to 1 for key frames and 0 for non-key frames + int key_frame; + + // Picture number incremented in presentation or output order. + // This corresponds to EVCEVCParserPoc::PicOrderCntVal + int output_picture_number; + + // profile + // 0: FF_PROFILE_EVC_BASELINE + // 1: FF_PROFILE_EVC_MAIN + int profile; + + // Framerate value in the compressed bitstream + AVRational framerate; + + // Number of pictures in a group of pictures + int gop_size; + + // Number of frames the decoded output will be delayed relative to the encoded input + int delay; + + int parsed_extradata; + +} EVCParserContext; + +int ff_evc_get_nalu_type(const uint8_t *bits, int bits_size, void *logctx); + +uint32_t ff_evc_read_nal_unit_length(const uint8_t *bits, int bits_size, void *logctx); + +// nuh_temporal_id specifies a temporal identifier for the NAL unit +int ff_evc_get_temporal_id(const uint8_t *bits, int bits_size, void *logctx); + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +EVCParserSPS *ff_evc_parse_sps(EVCParserContext *ctx, const uint8_t *bs, int bs_size); + +// @see ISO_IEC_23094-1 (7.3.2.2 SPS RBSP syntax) +EVCParserPPS *ff_evc_parse_pps(EVCParserContext *ctx, const uint8_t *bs, int bs_size); + +// @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) +EVCParserSliceHeader *ff_evc_parse_slice_header(EVCParserContext *ctx, const uint8_t *bs, int bs_size); + +int ff_evc_parse_nal_unit(EVCParserContext *ctx, const uint8_t *buf, int buf_size, void *logctx); + +#endif /* AVCODEC_EVC_PARSE_H */ diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c new file mode 100644 index 0000000000..16309898eb --- /dev/null +++ b/libavcodec/evc_parser.c @@ -0,0 +1,235 @@ +/* + * EVC format parser + * + * Copyright (C) 2021 Dawid Kozinski + * + * 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 "parser.h" +#include "bytestream.h" +#include "evc.h" +#include "evc_parse.h" + +/** + * Parse NAL units of found picture and decode some basic information. + * + * @param s codec parser context + * @param avctx codec context + * @param buf buffer with field/frame data + * @param buf_size size of the buffer + */ +static int parse_nal_units(AVCodecParserContext *s, AVCodecContext *avctx, const uint8_t *buf, int buf_size) +{ + EVCParserContext *ctx = s->priv_data; + const uint8_t *data = buf; + int data_size = buf_size; + int bytes_read = 0; + int nalu_size = 0; + + while (data_size > 0) { + + // Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length) + if (data_size < EVC_NALU_LENGTH_PREFIX_SIZE) + return AVERROR_INVALIDDATA; + + nalu_size = ff_evc_read_nal_unit_length(data, data_size, avctx); + + bytes_read += EVC_NALU_LENGTH_PREFIX_SIZE; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + data_size -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if (data_size < nalu_size) + return AVERROR_INVALIDDATA; + + if (ff_evc_parse_nal_unit(ctx, data, nalu_size, avctx) != 0) { + av_log(avctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + + if(ctx->nalu_type == EVC_SPS_NUT) { + + s->coded_width = ctx->coded_width; + s->coded_height = ctx->coded_height; + s->width = ctx->width; + s->height = ctx->height; + + s->format = ctx->format; + + avctx->gop_size = ctx->gop_size; + avctx->delay = ctx->delay; + avctx->profile = ctx->profile; + + } else if(ctx->nalu_type == EVC_NOIDR_NUT || ctx->nalu_type == EVC_IDR_NUT) { + + s->pict_type = ctx->pict_type; + s->key_frame = ctx->key_frame; + s->output_picture_number = ctx->output_picture_number; + + } + + data += nalu_size; + data_size -= nalu_size; + } + return 0; +} + +// Decoding nal units from evcC (EVCDecoderConfigurationRecord) +// @see @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.2 +static int decode_extradata(EVCParserContext *ctx, const uint8_t *data, int size, void *logctx) +{ + int ret = 0; + GetByteContext gb; + + bytestream2_init(&gb, data, size); + + if (!data || size <= 0) + return -1; + + // extradata is encoded as evcC format. + if (data[0] == 1) { + int num_of_arrays; // indicates the number of arrays of NAL units of the indicated type(s) + + int nalu_length_field_size; // indicates the length in bytes of the NALUnitLenght field in EVC video stream sample in the stream + // The value of this field shall be one of 0, 1, or 3 corresponding to a length encoded with 1, 2, or 4 bytes, respectively. + + if (bytestream2_get_bytes_left(&gb) < 18) { + av_log(logctx, AV_LOG_ERROR, "evcC %d too short\n", size); + return AVERROR_INVALIDDATA; + } + + bytestream2_skip(&gb, 16); + + // @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 + // LengthSizeMinusOne plus 1 indicates the length in bytes of the NALUnitLength field in a EVC video stream sample in the stream to which this configuration record applies. For example, a size of one byte is indicated with a value of 0. + // The value of this field shall be one of 0, 1, or 3 corresponding to a length encoded with 1, 2, or 4 bytes, respectively. + nalu_length_field_size = (bytestream2_get_byte(&gb) & 3) + 1; + if( nalu_length_field_size != 1 && + nalu_length_field_size != 2 && + nalu_length_field_size != 4 ) { + av_log(logctx, AV_LOG_ERROR, "The length in bytes of the NALUnitLenght field in a EVC video stream has unsupported value of %d\n", nalu_length_field_size); + return AVERROR_INVALIDDATA; + } + + num_of_arrays = bytestream2_get_byte(&gb); + + /* Decode nal units from evcC. */ + for (int i = 0; i < num_of_arrays; i++) { + + // @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 + // NAL_unit_type indicates the type of the NAL units in the following array (which shall be all of that type); + // - it takes a value as defined in ISO/IEC 23094-1; + // - it is restricted to take one of the values indicating a SPS, PPS, APS, or SEI NAL unit. + int nal_unit_type = bytestream2_get_byte(&gb) & 0x3f; + int num_nalus = bytestream2_get_be16(&gb); + + for (int j = 0; j < num_nalus; j++) { + + int nal_unit_length = bytestream2_get_be16(&gb); + + if (bytestream2_get_bytes_left(&gb) < nal_unit_length) { + av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit size in extradata.\n"); + return AVERROR_INVALIDDATA; + } + + if( nal_unit_type == EVC_SPS_NUT || + nal_unit_type == EVC_PPS_NUT || + nal_unit_type == EVC_APS_NUT || + nal_unit_type == EVC_SEI_NUT ) { + if (ff_evc_parse_nal_unit(ctx, gb.buffer, nal_unit_length, logctx) != 0) { + av_log(logctx, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + return AVERROR_INVALIDDATA; + } + } + + bytestream2_skip(&gb, nal_unit_length); + } + } + } else + return -1; + + return ret; +} + +static int evc_parse(AVCodecParserContext *s, AVCodecContext *avctx, + const uint8_t **poutbuf, int *poutbuf_size, + const uint8_t *buf, int buf_size) +{ + int next; + int ret; + EVCParserContext *ctx = s->priv_data; + + if (avctx->extradata && !ctx->parsed_extradata) { + decode_extradata(ctx, avctx->extradata, avctx->extradata_size, avctx); + ctx->parsed_extradata = 1; + } + + next = buf_size; + + ret = parse_nal_units(s, avctx, buf, buf_size); + if(ret < 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return buf_size; + } + + s->picture_structure = AV_PICTURE_STRUCTURE_FRAME; + + // poutbuf contains just one Access Unit + *poutbuf = buf; + *poutbuf_size = buf_size; + + return next; +} + +static int evc_parser_init(AVCodecParserContext *s) +{ + EVCParserContext *ctx = s->priv_data; + + memset(ctx->sps, 0, sizeof(EVCParserSPS *)*EVC_MAX_SPS_COUNT); + memset(ctx->pps, 0, sizeof(EVCParserPPS *)*EVC_MAX_PPS_COUNT); + memset(ctx->slice_header, 0, sizeof(EVCParserSliceHeader *)*EVC_MAX_PPS_COUNT); + + return 0; +} + +static void evc_parser_close(AVCodecParserContext *s) +{ + EVCParserContext *ctx = s->priv_data; + + for(int i = 0; i < EVC_MAX_SPS_COUNT; i++) { + EVCParserSPS *sps = ctx->sps[i]; + av_freep(&sps); + } + + for(int i = 0; i < EVC_MAX_PPS_COUNT; i++) { + EVCParserPPS *pps = ctx->pps[i]; + EVCParserSliceHeader *sh = ctx->slice_header[i]; + + av_freep(&pps); + av_freep(&sh); + } +} + +const AVCodecParser ff_evc_parser = { + .codec_ids = { AV_CODEC_ID_EVC }, + .priv_data_size = sizeof(EVCParserContext), + .parser_init = evc_parser_init, + .parser_parse = evc_parse, + .parser_close = evc_parser_close, +}; diff --git a/libavcodec/parsers.c b/libavcodec/parsers.c index d355808018..2c077ec3ae 100644 --- a/libavcodec/parsers.c +++ b/libavcodec/parsers.c @@ -41,6 +41,7 @@ extern const AVCodecParser ff_dvaudio_parser; extern const AVCodecParser ff_dvbsub_parser; extern const AVCodecParser ff_dvdsub_parser; extern const AVCodecParser ff_dvd_nav_parser; +extern const AVCodecParser ff_evc_parser; extern const AVCodecParser ff_flac_parser; extern const AVCodecParser ff_ftr_parser; extern const AVCodecParser ff_g723_1_parser; From patchwork Thu Jun 15 06:24:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42092 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp551772pzb; Wed, 14 Jun 2023 23:24:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6wJpKJ/I8eQ8hPK0jY7noBJyWZaeoC140LX2KfhS27cnFSTiAUY5uEEV0bQ7fIeF/I+A+0 X-Received: by 2002:ac2:5307:0:b0:4ea:f632:4738 with SMTP id c7-20020ac25307000000b004eaf6324738mr9630395lfh.6.1686810267690; Wed, 14 Jun 2023 23:24:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810267; cv=none; d=google.com; s=arc-20160816; b=JHB7JWdtUNJ0O6wMKTNfmeXaBN5sQumtJ+vFVkSao1yUPrSMECAR/n1NjA1Jz656Bf AM8OoW5e/y/wTBYAIyt54aBreNKPPYij8QJ6Wh0YDlq0LPlK2BYH4mCvVqQCk0ilhknt W4FsQU11LVGOgL924aJKz06trY6CySz1HdevZioEZcnwwSyppUzmaSsLkYQPGXH1x3P3 ae6SefbrPyJqG+V2PX5L9hITmO0WIAuQHyXmyNUgc3mTZ0hu2Nhao9iAcv0SuZfrqPnx 3L4cC63VD3kW8iDBITo0smePbcyrCoW0431UuS4aaM5a7CGrnQLk5Ss9vXg3ZJzMCd9Y kJcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=ablA2WqDu7uEBIlsR80aGdcZWVRXjarMdboLLwEisMQ=; b=raZd/04BE7Q7Wj2bx7Aw4K3OpX9Yx0///1E7lqH2JMoM6l3GQBCL9ZH27qzJZWssGF J2zfraljrwvxmtsjneetG1kJdJok0J6HtQgTUQSZ0lqIz+7M53Os1xH2HwlD/5y3nysX wU15dhq2fG/eA+sQwZfVCqza8y7BQ9j4eKpY13u98wsyNaaTdy8cUHibZB1x9F9zZq1G RwZ+egjLJiqFPAQq9U/bRKtGV6qlMKqKkqO3Pr/M4mHKXU/x8QuwdcaE8YUCjyjkzpae sEfxaiFga83oso2eTwoaYasSuj2DH6H0v5FgnXBAwCmBgbkgjJGT91DOCEsIw6KnnuFg 09EA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=CR+P6H8c; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p8-20020a170906498800b00965a83df636si8755927eju.1024.2023.06.14.23.24.26; Wed, 14 Jun 2023 23:24:27 -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=@samsung.com header.s=mail20170921 header.b=CR+P6H8c; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D264D68C458; Thu, 15 Jun 2023 09:24:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B93B568C40E for ; Thu, 15 Jun 2023 09:24:16 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062415euoutp01a1fb804812c74e67f482a6ee654029ef~owP2GR42T3077230772euoutp011 for ; Thu, 15 Jun 2023 06:24:15 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230615062415euoutp01a1fb804812c74e67f482a6ee654029ef~owP2GR42T3077230772euoutp011 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810255; bh=equYKmWEz6bckUimLi08TMOdjCu/6Cmsoal+Yu6NNAA=; h=From:To:Cc:Subject:Date:References:From; b=CR+P6H8cmYrT56fblkZ2Xt18dILfyNoQVzjPr525jWea7YLw/3au0LCn7Ktb37MRI vtnSYsDpgku4BQpIaamdZbpzQ2AQvwO51IQVkadeK8Q1zXEj5h3NSx8LEafcYjg13p 92CUv2uZDLfVyzdVIiL+4VqoKfl8ENKlHO4fEaOI= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230615062415eucas1p21003e8a895fd35461f6ef6c5ac634657~owP1171VV2079320793eucas1p2L; Thu, 15 Jun 2023 06:24:15 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 7D.2E.37758.F8EAA846; Thu, 15 Jun 2023 07:24:15 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062414eucas1p1e1108ea87ec109eaae0a130f85bcaf6e~owP1jTxZ01414814148eucas1p1O; Thu, 15 Jun 2023 06:24:14 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230615062414eusmtrp146bf7b26f54d1f50b75c8f02882507e9~owP1i4jAA0476604766eusmtrp1N; Thu, 15 Jun 2023 06:24:14 +0000 (GMT) X-AuditID: cbfec7f5-7ffff7000002937e-12-648aae8fdbde Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 18.86.10549.E8EAA846; Thu, 15 Jun 2023 07:24:14 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230615062414eusmtip24f8792b58950dffcad9fe787eb2bd106~owP1Ogs5s3243632436eusmtip2x; Thu, 15 Jun 2023 06:24:14 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:24:06 +0200 Message-Id: <20230615062406.1488-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrNIsWRmVeSWpSXmKPExsWy7djP87r967pSDH4d57L4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDL2rnvGWPBBtKLtyWfGBsY2wS5G Tg4JAROJZTNmsHcxcnEICaxglPjx4jojhPOFUWL+/plQmc+MEvP+HGCCaVl5cDtUYjmjxOQ/ k1khnFYmid8Hd7OAVLEJ6Eq8/PAIrENEwFTiZPNeNhCbWUBbYt3d72C2sECNxPR385hBbBYB VYnO16/A6nkFrCSW3JjKCrFNU2LCljlQcUGJkzOfsEDEuSXWzbrECjFTXqJ562xmkCMkBL6y S2xd9AjqVBeJect3QdnCEq+Ob2GHsGUkTk/uARrEAWQXSxzqd4AwayQO/UiHqLCWeNt4nBEk zAx0wvpd+hAVjhJdT+QhTD6JG28FIfbzSUzaNp0ZIswr0dEmBGGqSPR1ikGMk5J4umwOM4Tt IXH69Ga2CYyKs5A8NQvJI7MQti5gZF7FKJ5aWpybnlpsnJdarlecmFtcmpeul5yfu4kRmB5O /zv+dQfjilcf9Q4xMnEwHmKU4GBWEuF9qtGeIsSbklhZlVqUH19UmpNafIhRmoNFSZxX2/Zk spBAemJJanZqakFqEUyWiYNTqoEp8PuNXJar0lYO0e+arNz/sZzzZy5MVPiw2fLs9f72G7cm znS9FaWyTaHT1i9f8mldbc09W/PNH0SX7fxudlnvZXfx7Su8U90OfHt3IEhy5tIjPC43fzNY Roc+VzxiuFR27e6p0RqR5gzyawQvvF7Nsdkw9RSr+J6FUXYcj6PPe7PdY7Za8unr8pMZ1S0n 54l9j5Hm0GG6pnTZ/YLxhPKZP7Xu+e15064Qcr3p8gldEeNFX7tYuv9GH+hxeN50afLbpApn 1YpMt/LlM9e++LFWP1TRMvuk4bKA16K7Ixfvcr70NnD5ntvRXfN3rudVdv4Y/O/OqsOXth+7 qqnT1fGnyc59dk2q6Mmc841FcRxeSizFGYmGWsxFxYkAo8yyI34DAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xe7p967pSDDb3mll8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehl71z1jLPggWtH25DNjA2ObYBcjJ4eEgInEyoPb2bsYuTiEBJYy SkyZd4kVIiElsXTpIkYIW1jiz7UuNhBbSKCZSeLfUgMQm01AV+Llh0dMILaIgLnExXW3wOqZ BbQl1t39DlYvLFAlcXLdbrA4i4CqROfrV2D1vAJWEktuTIXapSkxYcscqLigxMmZT1gg4twS 62ZB3MMsIC/RvHU28wRG/llIymYhSS1gZFrFKJJaWpybnltsqFecmFtcmpeul5yfu4kRGLbb jv3cvINx3quPeocYmTgYDzFKcDArifA+1WhPEeJNSaysSi3Kjy8qzUktPsRoCnTrRGYp0eR8 YOTklcQbmhmYGpqYWRqYWpoZK4nzehZ0JAoJpCeWpGanphakFsH0MXFwSjUwTc8Nqgu1eHck R3lj/VenSeV9dq6vL0adsSmxvrehKZCV+2vNxZWGf2+q+8u38FzZM1tEsq2a59iDw82PrX9W 8Doxnvhp9GrtjpM1/GZ1htVz36u3cjE+d9tqcK9NunyBZbm87Wqb+/3BMvd5BbQ/7LpttPj4 4bmq5jPvHZTu7TAp1NFVu1nG1HrtY/mZ/8pZLPcuOr0okvz7+UJrn0fumuMbpuoxxO3Yflxk O8/fabMvfMuv1lP9lf7MwlTa7hlvMF+/Jfu3TddkFqR/EkxjlHXSuPL3QdBrA0tON+veSWdP KstvPpzb3Vd3+VprnqjRP2uJW525kyJzmTZe/VMY78zN4cm5oO5Gl5509UMlluKMREMt5qLi RABrR83+5AIAAA== X-CMS-MailID: 20230615062414eucas1p1e1108ea87ec109eaae0a130f85bcaf6e X-Msg-Generator: CA X-RootMTR: 20230615062414eucas1p1e1108ea87ec109eaae0a130f85bcaf6e X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062414eucas1p1e1108ea87ec109eaae0a130f85bcaf6e References: Subject: [FFmpeg-devel] [PATCH v25 2/9] avformat/evc_muxer: Added muxer to handle writing EVC encoded data into file or output bytestream 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: A25854PDhoig - Provided AVOutputFormat structure describing EVC output format (ff_evc_muxer) - Added documentation for EVC muxer Signed-off-by: Dawid Kozinski --- doc/muxers.texi | 6 ++++++ libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 13 +++++++++++++ 4 files changed, 21 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 31fca17dd6..17ae33d15a 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2122,6 +2122,12 @@ DTS Coherent Acoustics (DCA) audio. Dolby Digital Plus, also known as Enhanced AC-3, audio. +@subsection evc + +MPEG-5 Essential Video Coding (EVC) / EVC / MPEG-5 Part 1 EVC video. + +Extensions: evc + @subsection g722 ITU-T G.722 audio. diff --git a/libavformat/Makefile b/libavformat/Makefile index 05434a0f82..f31135d806 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o +OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 96443a7272..d3871de268 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -154,6 +154,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const FFOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const FFOutputFormat ff_evc_muxer; extern const FFOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; extern const FFOutputFormat ff_ffmetadata_muxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 78fadda967..70d6322c53 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -401,6 +401,19 @@ const FFOutputFormat ff_hevc_muxer = { }; #endif +#if CONFIG_EVC_MUXER +const FFOutputFormat ff_evc_muxer = { + .p.name = "evc", + .p.long_name = NULL_IF_CONFIG_SMALL("raw EVC video"), + .p.extensions = "evc", + .p.audio_codec = AV_CODEC_ID_NONE, + .p.video_codec = AV_CODEC_ID_EVC, + .init = force_one_stream, + .write_packet = ff_raw_write_packet, + .p.flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_M4V_MUXER const FFOutputFormat ff_m4v_muxer = { .p.name = "m4v", From patchwork Thu Jun 15 06:24:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42093 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp551908pzb; Wed, 14 Jun 2023 23:24:45 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4Oezo0G31zM6o1rEzoo9WDo7KGUnwZAjLe4HJ2/LzOCiAS8q5TG3bnD9bHv2VBweaEPJDX X-Received: by 2002:a17:907:96ac:b0:97d:9b73:690b with SMTP id hd44-20020a17090796ac00b0097d9b73690bmr15994123ejc.59.1686810285691; Wed, 14 Jun 2023 23:24:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810285; cv=none; d=google.com; s=arc-20160816; b=b5DjPXu5rlVEkGoVrU2pDifXt+uYFfYMK1guvmRwzhQJiLo77/qJZ0LGSR2dX3whzt flhlEbdOZaE4KaLs9KvNrQQLTWylZNC3M17e4eVW/cMKCKNmmLL5LodeNbxl+2ZdLlOx 92GOIiMkoSEPK5JUd+H0pdeCG2W7yqrvLuayklKp1VIz7X/4D80uk9Tn+r4rBtAq9Hmv maYGfJIrdZfnYs/5303nRl/nZYiwXRYEga1HqaijNhzeJvbVKvh/o95/ayBj50CZJb0O 1XY2iP7GRwZPcJMzYGfbFcvO1CiQykaRBd9VAb+vaL1icN1ubT6vg0vy7J3eLb1hrFhL fc0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=rjD3+S4SezzZR/q7nEgfhsxCU0gCFv3gzKskB/7Wg0Q=; b=B1cbOQwvcyoYftsqkFzVzOksL0ygUiFH+D1bIevGuwcifLiltX36gyFYYid3UwkVKx MqgvbloPvx2Wv5Ma/kYCZ9vsEsSPSS9pwaGP3CWrS428uXuRjsFQ5Oo7TWHzig+rK9qn KMjfogE86AtuMhwRqXUCDJ00RYVTom4mYDwLe6WmTShv6UwjqTsvjrk6m/R+kUsQaaz/ 1knYjF8D19w5X6W0btp4k/FSVAdgJZQ7Ag86BDAcU0E6vN0jk+37lt4iVnlnGFGbrFYC tfhAPn5itt0JjkkerNvkc7a/XY+1AxX9lbNC15fhMxp6NLL5pXYU3vAM0DLUdKoCFDsy QKNw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=mUPGiZYl; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f19-20020a17090624d300b00977d57399e6si9355355ejb.938.2023.06.14.23.24.45; Wed, 14 Jun 2023 23:24:45 -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=@samsung.com header.s=mail20170921 header.b=mUPGiZYl; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C031568C48A; Thu, 15 Jun 2023 09:24:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3E84E68A037 for ; Thu, 15 Jun 2023 09:24:36 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062435euoutp02434711c5d8e9ba0f24424278292b6568~owQI5stfE2605426054euoutp02e for ; Thu, 15 Jun 2023 06:24:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230615062435euoutp02434711c5d8e9ba0f24424278292b6568~owQI5stfE2605426054euoutp02e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810275; bh=ph6RQSvhnJ2tsKuRWmX7qPJpxDTXhwvf/VwMzf/5DE0=; h=From:To:Cc:Subject:Date:References:From; b=mUPGiZYlpQbgzFG+3PWsnHJpOdj15KkwiHs2K9kiMhsJT1CvPORNkTkoP5EBv3Bry fbvLnPCGlHCUfhNLdidAgGMRhWtjC9UpprOHMIB5knU9+4CbrEkE6DepZYbRsh6XSD kRqjPwaVY98qZJ1WHwP+atEebl9Jr8Sl3v3ajRNc= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230615062435eucas1p18d50e2f184a28e09a769f60ba70a626d~owQIg_c_J1415814158eucas1p1o; Thu, 15 Jun 2023 06:24:35 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 9E.99.11320.3AEAA846; Thu, 15 Jun 2023 07:24:35 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062434eucas1p11a6aa4603b72ddfd19131bdcb1c46652~owQILA-zz0810708107eucas1p1z; Thu, 15 Jun 2023 06:24:34 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230615062434eusmtrp2f099b5ecaa991e7795e0c4f146e0fa29~owQIKhAJU1320713207eusmtrp2d; Thu, 15 Jun 2023 06:24:34 +0000 (GMT) X-AuditID: cbfec7f4-993ff70000022c38-fb-648aaea36d4e Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id AA.B9.14344.2AEAA846; Thu, 15 Jun 2023 07:24:34 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230615062434eusmtip2ca7cbe864ca98d47aaed207f543e37b2~owQHyQX4O3211032110eusmtip2T; Thu, 15 Jun 2023 06:24:34 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:24:26 +0200 Message-Id: <20230615062427.500-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7qL13WlGKzdzWPx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGVM//6NpWBbC2NFf98F5gbG18ld jJwcEgImEvO3TWDsYuTiEBJYwSix5+YZNgjnC6PEpeeroDKfGSW6Z+1mhGk58HQZO4gtJLCc UWL2kUCIolYmiYbNx5lAEmwCuhIvPzwCs0UETCVONu9lA7GZBbQl1t39DmYLCyRI7DzbwQxi swioSqzeuQZsKK+ApUT/92XMEMs0JSZsmcMEEReUODnzCQtEnFti3axLrBAz5SWat85mBjlC QuAnu8TcO7eYIIpcJDZu2c4OYQtLvDq+BcqWkfi/cz5QDQeQXSxxqN8BwqyROPQjHaLCWuJt 43FGkDAz0Anrd+lDhB0ljmxczghRzSdx460gxAF8EpO2TWeGCPNKdLQJQZgqEn2dYhCNUhJP l82BeslD4lrLQrYJjIqzkHw1C8knsxDWLmBkXsUonlpanJueWmyUl1quV5yYW1yal66XnJ+7 iRGYIE7/O/5lB+PyVx/1DjEycTAeYpTgYFYS4X2q0Z4ixJuSWFmVWpQfX1Sak1p8iFGag0VJ nFfb9mSykEB6YklqdmpqQWoRTJaJg1Oqgcnil9SWH8y+t95dNol/Fe54W+0ev885A0ae+y+5 Ly2Z+ILxd6oPI6+wfbexaalpklWaVs3d+YF/3u/+e8A+1Vbc33h9oKhD4zWPFoctdqfNZ/08 oHn6Kzefk/P8//VhqQWPvFZr+NlxswqVcz0PeyDveSTiToCwg8ySxNVSlf5MIvuSg1dPWnFv xauWV8clGx+eXdAfoD33/zV5a/Y9/3ZeqWEQsMgo2fQkaeISn04VtaZ//FenbD/dND/NbZK/ Xr8S392Ty3b8Dw2Sn+k4ZeqqGzcmyE9blRK36yc3X+BTx9n/vBcd/2u5Mi7XeMGRO7e5CmYe 6ZY0vFq/g3dyzbraQq7fJ1amiGtvXP/q1HYlluKMREMt5qLiRABVm95vfwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xe7qL1nWlGPQ1Gll8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRejZF+aUlqQoZ+cUltkrRhhZGeoaWFnpGJpZ6hsbmsVZG pkr6djYpqTmZZalF+nYJehnTv39jKdjWwljR33eBuYHxdXIXIyeHhICJxIGny9i7GLk4hASW Mko8ffiaCSIhJbF06SJGCFtY4s+1LjYQW0igmUni5EMLEJtNQFfi5YdHYPUiAuYSF9fdAqtn FtCWWHf3O1i9sECcxMP+m2A2i4CqxOqda9hBbF4BS4n+78uYIeZrSkzYMocJIi4ocXLmExaI OLfEulmXWCFmyks0b53NPIGRfxaSsllIUgsYmVYxiqSWFuem5xYb6RUn5haX5qXrJefnbmIE Bu62Yz+37GBc+eqj3iFGJg7GQ4wSHMxKIrxPNdpThHhTEiurUovy44tKc1KLDzGaAt06kVlK NDkfGDt5JfGGZgamhiZmlgamlmbGSuK8ngUdiUIC6YklqdmpqQWpRTB9TBycUg1M7N4s3LJK Mi2RR3ZvaTKfXBlXsmlj7/Ki3qDkwn0zr9pZXpZP/d7dfV46aMt5rcXhqkI8LxslRV6LMar0 hmvdZX0ZvUqb+6PC9Yw7dz3OZnY8/txsmlclyF74+qrU9UutLySvm8mfe7n8TUJ6yBOXJRGW y7YFlnU9NE0+dKmbecP7UsPbqne82H97HD1nnfGbh/tf0nNWLSenyz7pB32ZJLkeN9bfLJGu q7C56OHfkdN7u+3w+kBRkTkB85i0Hi082MT69OzxG4+vXm/+1NW76jznwduCnqUJKctj7P23 7Vxbu+WpUOHHLZuYqu9mbvq8Iq6wfG7r8Rvr1t2+yXgpo8su32XifN3P/TNZ9ISVWIozEg21 mIuKEwGDop1n5QIAAA== X-CMS-MailID: 20230615062434eucas1p11a6aa4603b72ddfd19131bdcb1c46652 X-Msg-Generator: CA X-RootMTR: 20230615062434eucas1p11a6aa4603b72ddfd19131bdcb1c46652 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062434eucas1p11a6aa4603b72ddfd19131bdcb1c46652 References: Subject: [FFmpeg-devel] [PATCH v25 3/9] avformat/evc_demuxer: Added demuxer to handle reading EVC video files 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M4r4364ea9JS - Provided AVInputFormat struct describing EVC input format (ff_evc_demuxer) Signed-off-by: Dawid Kozinski --- libavcodec/Makefile | 1 + libavcodec/bitstream_filters.c | 5 +- libavcodec/evc_frame_merge_bsf.c | 170 +++++++++++++++++++ libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/evcdec.c | 276 +++++++++++++++++++++++++++++++ 6 files changed, 452 insertions(+), 2 deletions(-) create mode 100644 libavcodec/evc_frame_merge_bsf.c create mode 100644 libavformat/evcdec.c diff --git a/libavcodec/Makefile b/libavcodec/Makefile index a28919992a..0ce8fe5b9c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1258,6 +1258,7 @@ OBJS-$(CONFIG_VP9_METADATA_BSF) += vp9_metadata_bsf.o OBJS-$(CONFIG_VP9_RAW_REORDER_BSF) += vp9_raw_reorder_bsf.o OBJS-$(CONFIG_VP9_SUPERFRAME_BSF) += vp9_superframe_bsf.o OBJS-$(CONFIG_VP9_SUPERFRAME_SPLIT_BSF) += vp9_superframe_split_bsf.o +OBJS-$(CONFIG_EVC_FRAME_MERGE_BSF) += evc_frame_merge_bsf.o # thread libraries OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o diff --git a/libavcodec/bitstream_filters.c b/libavcodec/bitstream_filters.c index e8216819ca..7512fccc78 100644 --- a/libavcodec/bitstream_filters.c +++ b/libavcodec/bitstream_filters.c @@ -65,16 +65,17 @@ extern const FFBitStreamFilter ff_vp9_metadata_bsf; extern const FFBitStreamFilter ff_vp9_raw_reorder_bsf; extern const FFBitStreamFilter ff_vp9_superframe_bsf; extern const FFBitStreamFilter ff_vp9_superframe_split_bsf; +extern const FFBitStreamFilter ff_evc_frame_merge_bsf; #include "libavcodec/bsf_list.c" const AVBitStreamFilter *av_bsf_iterate(void **opaque) { - uintptr_t i = (uintptr_t)*opaque; + uintptr_t i = (uintptr_t) * opaque; const FFBitStreamFilter *f = bitstream_filters[i]; if (f) { - *opaque = (void*)(i + 1); + *opaque = (void *)(i + 1); return &f->p; } return NULL; diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c new file mode 100644 index 0000000000..7f52c06292 --- /dev/null +++ b/libavcodec/evc_frame_merge_bsf.c @@ -0,0 +1,170 @@ +/* + * Copyright (c) 2019 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 "get_bits.h" +#include "golomb.h" +#include "bsf.h" +#include "bsf_internal.h" +#include "avcodec.h" + +#include "evc.h" +#include "evc_parse.h" + +#define INIT_AU_BUF_CAPACITY 1024 + +// Access unit data +typedef struct AccessUnitBuffer { + uint8_t *data; // the data buffer + size_t data_size; // size of data in bytes + size_t capacity; // buffer capacity +} AccessUnitBuffer; + +typedef struct EVCFMergeContext { + AVPacket *in; + EVCParserContext parser_ctx; + AccessUnitBuffer au_buffer; +} EVCFMergeContext; + +static int end_of_access_unit_found(EVCParserContext *parser_ctx) +{ + if (parser_ctx->profile == 0) { // BASELINE profile + if (parser_ctx->nalu_type == EVC_NOIDR_NUT || parser_ctx->nalu_type == EVC_IDR_NUT) + return 1; + } else { // MAIN profile + if (parser_ctx->nalu_type == EVC_NOIDR_NUT) { + if (parser_ctx->poc.PicOrderCntVal != parser_ctx->poc.prevPicOrderCntVal) + return 1; + } else if (parser_ctx->nalu_type == EVC_IDR_NUT) + return 1; + } + return 0; +} + +static void evc_frame_merge_flush(AVBSFContext *bsf) +{ + EVCFMergeContext *ctx = bsf->priv_data; + + av_packet_unref(ctx->in); +} + +static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) +{ + EVCFMergeContext *ctx = bsf->priv_data; + EVCParserContext *parser_ctx = &ctx->parser_ctx; + + AVPacket *in = ctx->in; + + int free_space = 0; + size_t nalu_size = 0; + uint8_t *nalu = NULL; + int au_end_found = 0; + int err; + + err = ff_bsf_get_packet_ref(bsf, in); + if (err < 0) + return err; + + nalu_size = ff_evc_read_nal_unit_length(in->data, EVC_NALU_LENGTH_PREFIX_SIZE, bsf); + if (nalu_size <= 0) { + av_packet_unref(in); + return AVERROR_INVALIDDATA; + } + + nalu = in->data + EVC_NALU_LENGTH_PREFIX_SIZE; + nalu_size = in->size - EVC_NALU_LENGTH_PREFIX_SIZE; + + // NAL unit parsing needed to determine if end of AU was found + err = ff_evc_parse_nal_unit(parser_ctx, nalu, nalu_size, bsf); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "NAL Unit parsing error\n"); + av_packet_unref(in); + + return err; + } + + au_end_found = end_of_access_unit_found(parser_ctx); + + free_space = ctx->au_buffer.capacity - ctx->au_buffer.data_size; + while (free_space < in->size) { + ctx->au_buffer.capacity *= 2; + free_space = ctx->au_buffer.capacity - ctx->au_buffer.data_size; + + if (free_space >= in->size) + ctx->au_buffer.data = av_realloc(ctx->au_buffer.data, ctx->au_buffer.capacity); + } + + memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, in->size); + + ctx->au_buffer.data_size += in->size; + + av_packet_unref(in); + + if (au_end_found) { + uint8_t *data = av_memdup(ctx->au_buffer.data, ctx->au_buffer.data_size); + err = av_packet_from_data(out, data, ctx->au_buffer.data_size); + + ctx->au_buffer.data_size = 0; + } else + err = AVERROR(EAGAIN); + + if (err < 0 && err != AVERROR(EAGAIN)) + evc_frame_merge_flush(bsf); + + return err; +} + +static int evc_frame_merge_init(AVBSFContext *bsf) +{ + EVCFMergeContext *ctx = bsf->priv_data; + + ctx->in = av_packet_alloc(); + if (!ctx->in) + return AVERROR(ENOMEM); + + ctx->au_buffer.capacity = INIT_AU_BUF_CAPACITY; + ctx->au_buffer.data = av_malloc(INIT_AU_BUF_CAPACITY); + ctx->au_buffer.data_size = 0; + + return 0; +} + +static void evc_frame_merge_close(AVBSFContext *bsf) +{ + EVCFMergeContext *ctx = bsf->priv_data; + + av_packet_free(&ctx->in); + + ctx->au_buffer.capacity = 0; + av_freep(&ctx->au_buffer.data); + ctx->au_buffer.data_size = 0; +} + +static const enum AVCodecID evc_frame_merge_codec_ids[] = { + AV_CODEC_ID_EVC, AV_CODEC_ID_NONE, +}; + +const FFBitStreamFilter ff_evc_frame_merge_bsf = { + .p.name = "evc_frame_merge", + .p.codec_ids = evc_frame_merge_codec_ids, + .priv_data_size = sizeof(EVCFMergeContext), + .init = evc_frame_merge_init, + .flush = evc_frame_merge_flush, + .close = evc_frame_merge_close, + .filter = evc_frame_merge_filter, +}; diff --git a/libavformat/Makefile b/libavformat/Makefile index f31135d806..6e4231fda2 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -251,6 +251,7 @@ OBJS-$(CONFIG_HCOM_DEMUXER) += hcom.o pcm.o OBJS-$(CONFIG_HDS_MUXER) += hdsenc.o OBJS-$(CONFIG_HEVC_DEMUXER) += hevcdec.o rawdec.o OBJS-$(CONFIG_HEVC_MUXER) += rawenc.o +OBJS-$(CONFIG_EVC_DEMUXER) += evcdec.o rawdec.o OBJS-$(CONFIG_EVC_MUXER) += rawenc.o OBJS-$(CONFIG_HLS_DEMUXER) += hls.o hls_sample_encryption.o OBJS-$(CONFIG_HLS_MUXER) += hlsenc.o hlsplaylist.o avc.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index d3871de268..ae604236ae 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -154,6 +154,7 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const FFOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVInputFormat ff_evc_demuxer; extern const FFOutputFormat ff_evc_muxer; extern const FFOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c new file mode 100644 index 0000000000..89eda0f53e --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,276 @@ +/* + * RAW EVC video demuxer + * + * Copyright (c) 2021 Dawid Kozinski + * + * 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 "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/internal.h" +#include "libavcodec/evc.h" +#include "libavcodec/bsf.h" + +#include "libavutil/opt.h" + +#include "rawdec.h" +#include "avformat.h" +#include "internal.h" + + +#define RAW_PACKET_SIZE 1024 + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; + +} EVCParserContext; + +typedef struct EVCDemuxContext { + const AVClass *class; + AVRational framerate; + + AVBSFContext *bsf; + +} EVCDemuxContext; + +#define DEC AV_OPT_FLAG_DECODING_PARAM +#define OFFSET(x) offsetof(EVCDemuxContext, x) +static const AVOption evc_options[] = { + { "framerate", "", OFFSET(framerate), AV_OPT_TYPE_VIDEO_RATE, {.str = "25"}, 0, INT_MAX, DEC}, + { NULL }, +}; +#undef OFFSET + +static const AVClass evc_demuxer_class = { + .class_name = "EVC Annex B demuxer", + .item_name = av_default_item_name, + .option = evc_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if (bits_size >= EVC_NALU_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) // Cannot get bitstream information. Malformed bitstream. + return -1; + + // nal_unit_type + unit_type_plus1 = (p[0] >> 1) & 0x3F; + } + + return unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bits, int bits_size) +{ + uint32_t nalu_len = 0; + + if (bits_size >= EVC_NALU_LENGTH_PREFIX_SIZE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for (int i = 0; i < EVC_NALU_LENGTH_PREFIX_SIZE; i++) + t = (t << 8) | p[i]; + + nalu_len = t; + if (nalu_len == 0) // Invalid bitstream size + return 0; + } + + return nalu_len; +} + +static int parse_nal_units(const AVProbeData *p, EVCParserContext *ev) +{ + int nalu_type; + size_t nalu_size; + unsigned char *bits = (unsigned char *)p->buf; + int bytes_to_read = p->buf_size; + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + + nalu_size = read_nal_unit_length(bits, EVC_NALU_LENGTH_PREFIX_SIZE); + if (nalu_size == 0) break; + + bits += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if(bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(bits, bytes_to_read); + + if (nalu_type == EVC_SPS_NUT) + ev->got_sps++; + else if (nalu_type == EVC_PPS_NUT) + ev->got_pps++; + else if (nalu_type == EVC_IDR_NUT ) + ev->got_idr++; + else if (nalu_type == EVC_NOIDR_NUT) + ev->got_nonidr++; + + bits += nalu_size; + bytes_to_read -= nalu_size; + } + + return 0; +} + +static int annexb_probe(const AVProbeData *p) +{ + EVCParserContext ev = {0}; + int ret = parse_nal_units(p, &ev); + + if (ret == 0 && ev.got_sps && ev.got_pps && (ev.got_idr || ev.got_nonidr > 3)) + return AVPROBE_SCORE_EXTENSION + 1; // 1 more than .mpg + + return 0; +} + +static int evc_read_header(AVFormatContext *s) +{ + AVStream *st; + FFStream *sti; + const AVBitStreamFilter *filter = av_bsf_get_by_name("evc_frame_merge"); + EVCDemuxContext *c = s->priv_data; + int ret = 0; + + st = avformat_new_stream(s, NULL); + if (!st) { + ret = AVERROR(ENOMEM); + goto fail; + } + sti = ffstream(st); + + st->codecpar->codec_type = AVMEDIA_TYPE_VIDEO; + st->codecpar->codec_id = AV_CODEC_ID_EVC; + + // This causes sending to the parser full frames, not chunks of data + // The flag PARSER_FLAG_COMPLETE_FRAMES will be set in demux.c (demux.c: 1316) + sti->need_parsing = AVSTREAM_PARSE_HEADERS; + + st->avg_frame_rate = c->framerate; + st->codecpar->framerate = c->framerate; + + // taken from rawvideo demuxers + avpriv_set_pts_info(st, 64, 1, 1200000); + + ret = av_bsf_alloc(filter, &c->bsf); + if (ret < 0) + return ret; + + ret = avcodec_parameters_copy(c->bsf->par_in, st->codecpar); + if (ret < 0) + return ret; + + ret = av_bsf_init(c->bsf); + if (ret < 0) + return ret; + +fail: + return ret; +} + +static int evc_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + int ret; + int32_t nalu_size; + int au_end_found; + + EVCDemuxContext *const c = s->priv_data; + + int eof = avio_feof (s->pb); + if(eof) { + av_packet_unref(pkt); + return AVERROR_EOF; + } + + au_end_found = 0; + + while(!au_end_found) { + + uint8_t buf[EVC_NALU_LENGTH_PREFIX_SIZE]; + ret = avio_read(s->pb, (unsigned char *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + if (ret < 0) { + av_packet_unref(pkt); + return ret; + } + + nalu_size = read_nal_unit_length((const uint8_t *)&buf, EVC_NALU_LENGTH_PREFIX_SIZE); + if(nalu_size <= 0) { + av_packet_unref(pkt); + return -1; + } + + avio_seek(s->pb, -EVC_NALU_LENGTH_PREFIX_SIZE, SEEK_CUR); + + ret = av_get_packet(s->pb, pkt, nalu_size + EVC_NALU_LENGTH_PREFIX_SIZE); + if (ret < 0) + return ret; + if (ret != (nalu_size + EVC_NALU_LENGTH_PREFIX_SIZE)) + return AVERROR(EIO); + + ret = av_bsf_send_packet(c->bsf, pkt); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Failed to send packet to " + "evc_frame_merge filter\n"); + return ret; + } + + ret = av_bsf_receive_packet(c->bsf, pkt); + if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) + av_log(s, AV_LOG_ERROR, "evc_frame_merge filter failed to " + "send output packet\n"); + + au_end_found = 1; + if (ret == AVERROR(EAGAIN)) + au_end_found = 0; + } + + return ret; +} + +static int evc_read_close(AVFormatContext *s) +{ + EVCDemuxContext *const c = s->priv_data; + + av_bsf_free(&c->bsf); + return 0; +} + +const AVInputFormat ff_evc_demuxer = { + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("EVC Annex B"), + .read_probe = annexb_probe, + .read_header = evc_read_header, // annexb_read_header + .read_packet = evc_read_packet, // annexb_read_packet + .read_close = evc_read_close, + .extensions = "evc", + .flags = AVFMT_GENERIC_INDEX, + .flags_internal = FF_FMT_INIT_CLEANUP, + .raw_codec_id = AV_CODEC_ID_EVC, + .priv_data_size = sizeof(EVCDemuxContext), + .priv_class = &evc_demuxer_class, +}; From patchwork Thu Jun 15 06:24:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42094 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp552015pzb; Wed, 14 Jun 2023 23:25:00 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7njZ2pqwbZu8hFZ0iTgTz+C4chIC5zr5P1IcGKHVyd9eUAPpeZ0dM35ulidmA4D/LNelrL X-Received: by 2002:a17:907:983:b0:974:6334:f6b2 with SMTP id bf3-20020a170907098300b009746334f6b2mr16088245ejc.22.1686810300252; Wed, 14 Jun 2023 23:25:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810300; cv=none; d=google.com; s=arc-20160816; b=gSqUI4idrvA5gUD3MxqxShAH6XjqO6owm12StL0HTEEwJFYz5DpmPaK1H/JCcFZa/v vO4pgDo6tL7vynY9n9HjlHThsLwQrzWRO2HtQyfTpoRAWZELC14nUfU4V+eNZ2qDZRj7 bjog04pRw6XHyU43EDXIfv/wob/5Gq6aXfY0uxBVJo4oxrKQ84bNLDxU/zbJGnz7CGDw TohM10c+UGDi3fuQm473qhUey71lXe0y844fM4KWOu9Y96wM1QSYXbjA0zqaRYDxx6TZ +QD4hAZBSxVbERWH9hBM9eCGeVbrjckAti1FrznDu7KNSmVVw/WlLLOWvj+Q7pbYBgNt 7YhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=BzNl0AWw29wQInbqmi27zZu7jQAbvqZ7PIH/OJk99Rw=; b=AFur3/J6ctWu/82AWlIRMxWdZXpcnQV5yZ/ZVlE94YX1damMo+3fAC9PSs1yHgqscD 106/OIcE9E7u0KET0fFM3q2ENzH7Qtkki6Jc+xFjnDUwgxB0tIplwiw9ZI5rBtLni5XO lcXMURSbaGIPb0SgZi8YK/a7YS20Wb+bvYmKAUNcxmAB1XmLXbsAkyl9zbu2iILElir9 is8TWfMUZCe385XfOAcdS6ZVObSQCezw29Wi7xZ+28rlQFonFFyz92Rmrx8Fka15ku8P STOoQScdKyz5D8b6WFG+P7Ep3Hvi3FGorgELdQ1Ctsz/TP/eJUDHOUgP04lUQZ2f3008 tIBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=tUN0xAe6; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v11-20020a170906338b00b009515dcbc00csi8329130eja.945.2023.06.14.23.24.59; Wed, 14 Jun 2023 23:25:00 -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=@samsung.com header.s=mail20170921 header.b=tUN0xAe6; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CE88C68C4AA; Thu, 15 Jun 2023 09:24:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D282068A037 for ; Thu, 15 Jun 2023 09:24:55 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062455euoutp020d57e12c2f2982d497790879101d7278~owQa3ovoS2844428444euoutp02s for ; Thu, 15 Jun 2023 06:24:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230615062455euoutp020d57e12c2f2982d497790879101d7278~owQa3ovoS2844428444euoutp02s DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810295; bh=gr41vdHb5q2DNyMJeK/DE4/A4iEGFu46qCyrYzo7Dq8=; h=From:To:Cc:Subject:Date:References:From; b=tUN0xAe6tZJYx/dEufkrMZfWIr5obFcfQ4+XsJTEQog1yOUuR7SwV8yGzmG8wU2oO 7F7SQI4DxYHoBJspCc05nC5pUM8OSZDC+VXpidL3FJT/Fn+GDCw6uK1WFOflmfESiw JJg2o5KDOU4ncsTyDMMZnb5HJs5dQRfWS/8LP9Bk= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230615062454eucas1p15a5a9958cba17860def3f46917496f0a~owQanAcO30810508105eucas1p12; Thu, 15 Jun 2023 06:24:54 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 9A.A9.11320.6BEAA846; Thu, 15 Jun 2023 07:24:54 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062454eucas1p1fedf76ef90c3a4ac98cdd19876e7434a~owQaK7kFk1411014110eucas1p1y; Thu, 15 Jun 2023 06:24:54 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230615062454eusmtrp2e2f5322fe0bcc9bb288ebc67b0a05337~owQaKa8aN1320713207eusmtrp2v; Thu, 15 Jun 2023 06:24:54 +0000 (GMT) X-AuditID: cbfec7f4-97dff70000022c38-2a-648aaeb61766 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 73.C9.14344.6BEAA846; Thu, 15 Jun 2023 07:24:54 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230615062453eusmtip145805383e58fea407842d5e0fc032156~owQZxMiU82844528445eusmtip1N; Thu, 15 Jun 2023 06:24:53 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:24:46 +0200 Message-Id: <20230615062446.1245-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRmVeSWpSXmKPExsWy7djP87rb1nWlGLzsU7f4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDI+zz/GXHD1N2PF7CWfmRoY3+5l 7GLk5JAQMJE4sfA1axcjF4eQwApGic+HZ7BBOF8YJdo+72OGcD4zSnyZcp4ZpqXxwSYmiMRy Ron9l/tZQBJCAq1MEt/uB4HYbAK6Ei8/PGICsUUETCVONu9lA7GZBbQl1t39DmYLCwRIbNz6 EayXRUBVYuLx/2A2r4CVxMv3/awQyzQlJmyZwwQRF5Q4OfMJC0ScW2LdrEusEDPlJZq3zga7 VELgL7vEjSsToC51kdi3thHKFpZ4dXwLO4QtI/F/53ygoRxAdrHEoX4HCLNG4tCPdIgKa4m3 jccZQcLMQCes36UPEXaU+HxzEStENZ/EjbeCEAfwSUzaNp0ZIswr0dEmBGGqSPR1ikE0Skk8 XTYH6hIPif0TehgnMCrOQvLVLCSfzEJYu4CReRWjeGppcW56arFRXmq5XnFibnFpXrpecn7u JkZgijj97/iXHYzLX33UO8TIxMF4iFGCg1lJhPepRnuKEG9KYmVValF+fFFpTmrxIUZpDhYl cV5t25PJQgLpiSWp2ampBalFMFkmDk6pBqb0HQKlCp/a5HjmVjk9awo4pqmW+1TgmlhAtqDi kqLLEe8Dd6/JOcESsys+d+eS3+cyhDulo/6d4luokXum7K4mY1HDMubOo8yLbqzTfpK3+aDT +q9ZCSJ+QUZ++d4a7Wv4+Pxjwm/Jr794SsxPxs7ofqVsgc7K2bNqvte9+Ot+5vFvprvx91P4 z5691G12+fnRs62qkkUNf9W6lLZJ1aW9UQvl3xhkkB+5bdOBKabvvZU8lpWd7oq9vvGmm04k a+Fe86+vrgS+/L/52YWJJeFnN/2P+aw7KSVRR/Ph25uxNyZWFlzc+I9/Yfyh5dtM7/7x2rJg 04GPv8rMknfbVX9LTpPk0cm/EBy+wFeklUGJpTgj0VCLuag4EQCz9gYigAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t/xu7rb1nWlGFw6wGnx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GV8nn+MueDqb8aK2Us+MzUwvt3L2MXIySEhYCLR+GATUxcjF4eQ wFJGiWWLt7BBJKQkli5dBFUkLPHnWhcbRFEzk0TvtcWsIAk2AV2Jlx8eMYHYIgLmEhfX3QJr YBbQllh39zvYIGEBP4lvs/6xgNgsAqoSE4//B7N5BawkXr7vZ4VYoCkxYcscJoi4oMTJmU9Y IOLcEutmXWKFmCkv0bx1NvMERv5ZSMpmIUktYGRaxSiSWlqcm55bbKRXnJhbXJqXrpecn7uJ ERi824793LKDceWrj3qHGJk4GA8xSnAwK4nwPtVoTxHiTUmsrEotyo8vKs1JLT7EaAp060Rm KdHkfGD85JXEG5oZmBqamFkamFqaGSuJ83oWdCQKCaQnlqRmp6YWpBbB9DFxcEo1MJXLBcTm cBbsMa4P1g88Z6DAV/y0WzPcNlckZCuD4XankI0yU5ydnypnRjjuvKXP+3D7v0gP+3M7RA8b degfcpu48fUaL49pm0saOo+9ZnnUYM7v9jnw2bPQlU9msZ39bf5gNZOz+dSmvwczOO6IOLQ7 H7wy3e5V45co2y2u6VuWvTb/pDa/eLqW1fZ9W+13eul1Lit3/Mf67syCxxdrlevnyyvaP32V fz4rat0svUkWEUfD5k3JNd/Ok7NNt9Xxvkb+2zUHYm2XJzhej1z5gu3klhQ1+4xf2ue6S6+t ZrAxnfnunO/eAMZPTwqYntdKrPOaffvYie8lLWyyfCdcKxlXn/34UlfkqsHeLw++zVRiKc5I NNRiLipOBABUCe7N5wIAAA== X-CMS-MailID: 20230615062454eucas1p1fedf76ef90c3a4ac98cdd19876e7434a X-Msg-Generator: CA X-RootMTR: 20230615062454eucas1p1fedf76ef90c3a4ac98cdd19876e7434a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062454eucas1p1fedf76ef90c3a4ac98cdd19876e7434a References: Subject: [FFmpeg-devel] [PATCH v25 4/9] avcodec/evc_encoder: Provided support for EVC encoder 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: g2MofNPQkB/0 - Added EVC encoder wrapper - Changes in project configuration file and libavcodec Makefile - Added documentation for xeve wrapper Signed-off-by: Dawid Kozinski --- configure | 4 + doc/encoders.texi | 69 +++++ doc/general_contents.texi | 11 + libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libxeve.c | 616 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 702 insertions(+) create mode 100644 libavcodec/libxeve.c diff --git a/configure b/configure index c9a86e9f8e..e2370a23bb 100755 --- a/configure +++ b/configure @@ -292,6 +292,7 @@ External library support: --enable-libwebp enable WebP encoding via libwebp [no] --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] + --enable-libxeve enable EVC encoding via libxeve [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1903,6 +1904,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxeve libxml2 libzimg libzmq @@ -3458,6 +3460,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" vapoursynth_demuxer_deps="vapoursynth" @@ -6832,6 +6835,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.3" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version enabled libzmq && require_pkg_config libzmq "libzmq >= 4.2.1" zmq.h zmq_ctx_new diff --git a/doc/encoders.texi b/doc/encoders.texi index 20cb8a1421..4b560dd918 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -2890,6 +2890,75 @@ ffmpeg -i input -c:v libxavs2 -xavs2-params RdoqLevel=0 output.avs2 @end example @end table +@section libxeve + +eXtra-fast Essential Video Encoder (XEVE) MPEG-5 EVC encoder wrapper. +The xeve-equivalent options or values are listed in parentheses for easy migration. + +This encoder requires the presence of the libxeve headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxeve}. + +@float NOTE +Many libxeve encoder options are mapped to FFmpeg global codec options, +while unique encoder options are provided through private options. +Additionally the xeve-params private options allows one to pass a list +of key=value tuples as accepted by the libxeve @code{parse_xeve_params} function. +@end float + +The xeve project website is at @url{https://github.com/mpeg5/xeve}. + +@subsection Options + +The following options are supported by the libxeve wrapper. +The xeve-equivalent options or values are listed in parentheses for easy migration. + +@float NOTE +To reduce the duplication of documentation, only the private options +and some others requiring special attention are documented here. For +the documentation of the undocumented generic options, see +@ref{codec-options,,the Codec Options chapter}. +@end float + +@float NOTE +To get a more accurate and extensive documentation of the libxeve options, +invoke the command @code{xeve_app --help} or consult the libxeve documentation. +@end float + +@table @option +@item b (@emph{bitrate}) +Set target video bitrate in bits/s. +Note that FFmpeg's b option is expressed in bits/s, while xeve's bitrate is in kilobits/s. + +@item bf (@emph{bframes}) +Set the maximum number of B frames (1,3,7,15). + +@item g (@emph{keyint}) +Set the GOP size (I-picture period). + +@item preset (@emph{preset}) +Set the xeve preset. +Set the encoder preset value to determine encoding speed [fast, medium, slow, placebo] + +@item tune (@emph{tune}) +Set the encoder tune parameter [psnr, zerolatency] + +@item profile (@emph{profile}) +Set the encoder profile [0: baselie; 1: main] + +@item crf (@emph{crf}) +Set the quality for constant quality mode. +Constant rate factor <10..49> [default: 32] + +@item qp (@emph{qp}) +Set constant quantization rate control method parameter. +Quantization parameter qp <0..51> [default: 32] + +@item threads (@emph{threads}) +Force to use a specific number of threads + +@end table + @section libxvid Xvid MPEG-4 Part 2 encoder wrapper. diff --git a/doc/general_contents.texi b/doc/general_contents.texi index 2eeebd847d..c6a997bfd6 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -343,6 +343,14 @@ libxavs2 is under the GNU Public License Version 2 or later details), you must upgrade FFmpeg's license to GPL in order to use it. @end float +@section eXtra-fast Essential Video Encoder (XEVE) + +FFmpeg can make use of the XEVE library for EVC video encoding. + +Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for +installing the XEVE library. Then pass @code{--enable-libxeve} to configure to +enable it. + @section ZVBI ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB @@ -598,6 +606,7 @@ library: @item raw DTS @tab X @tab X @item raw DTS-HD @tab @tab X @item raw E-AC-3 @tab X @tab X +@item raw EVC @tab X @tab X @item raw FLAC @tab X @tab X @item raw GSM @tab @tab X @item raw H.261 @tab X @tab X @@ -943,6 +952,8 @@ following image formats are supported: @item Electronic Arts TQI video @tab @tab X @item Escape 124 @tab @tab X @item Escape 130 @tab @tab X +@item EVC / MPEG-5 Part 1 @tab X @tab X + @tab encoding and decoding supported through external library libxeve @item FFmpeg video codec #1 @tab X @tab X @tab lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 0ce8fe5b9c..2223e9f46c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1142,6 +1142,7 @@ OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o +OBJS-$(CONFIG_LIBXEVE_ENCODER) += libxeve.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 11c136ef59..c317dd6da3 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -818,6 +818,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; #endif extern const FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; +extern const FFCodec ff_libxeve_encoder; extern const FFCodec ff_libxavs_encoder; extern const FFCodec ff_libxavs2_encoder; extern const FFCodec ff_libxvid_encoder; diff --git a/libavcodec/libxeve.c b/libavcodec/libxeve.c new file mode 100644 index 0000000000..c10b7de023 --- /dev/null +++ b/libavcodec/libxeve.c @@ -0,0 +1,616 @@ +/* + * libxeve encoder + * EVC (MPEG-5 Essential Video Coding) encoding using XEVE MPEG-5 EVC encoder library + * + * Copyright (C) 2021 Dawid Kozinski + * + * 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 +#include + +#include + +#include "libavutil/internal.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/time.h" +#include "libavutil/cpu.h" +#include "libavutil/avstring.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" +#include "codec_internal.h" +#include "profiles.h" +#include "encode.h" + +#define MAX_BS_BUF (16*1024*1024) + +/** + * Error codes + */ +#define XEVE_PARAM_BAD_NAME -100 +#define XEVE_PARAM_BAD_VALUE -200 + +/** + * Encoder states + * + * STATE_ENCODING - the encoder receives and processes input frames + * STATE_BUMPING - there are no more input frames, however the encoder still processes previously received data + */ +typedef enum State { + STATE_ENCODING, + STATE_BUMPING, +} State; + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + */ +typedef struct XeveContext { + const AVClass *class; + + XEVE id; // XEVE instance identifier + XEVE_CDSC cdsc; // coding parameters i.e profile, width & height of input frame, num of therads, frame rate ... + XEVE_BITB bitb; // bitstream buffer (output) + XEVE_STAT stat; // encoding status (output) + XEVE_IMGB imgb; // image buffer (input) + + State state; // encoder state (skipping, encoding, bumping) + + int profile_id; // encoder profile (main, baseline) + int preset_id; // preset of xeve ( fast, medium, slow, placebo) + int tune_id; // tune of xeve (psnr, zerolatency) + + // variables for rate control modes + int rc_mode; // Rate control mode [ 0(CQP) / 1(ABR) / 2(CRF) ] + int qp; // quantization parameter (QP) [0,51] + int crf; // constant rate factor (CRF) [10,49] + + int hash; // embed picture signature (HASH) for conformance checking in decoding + int sei_info; // embed Supplemental enhancement information while encoding + + int color_format; // input data color format: currently only XEVE_CF_YCBCR420 is supported + + AVDictionary *xeve_params; +} XeveContext; + +/** + * Convert FFmpeg pixel format (AVPixelFormat) to XEVE pre-defined color format + * + * @param[in] av_pix_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * @param[out] xeve_col_fmt XEVE pre-defined color format (@see xeve.h) + * + * @return 0 on success, negative value on failure + */ +static int libxeve_color_fmt(enum AVPixelFormat av_pix_fmt, int *xeve_col_fmt) +{ + switch (av_pix_fmt) { + case AV_PIX_FMT_YUV420P: + *xeve_col_fmt = XEVE_CF_YCBCR420; + break; + case AV_PIX_FMT_YUV420P10: + *xeve_col_fmt = XEVE_CF_YCBCR420; + break; + default: + *xeve_col_fmt = XEVE_CF_UNKNOWN; + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Convert FFmpeg pixel format (AVPixelFormat) into XEVE pre-defined color space + * + * @param[in] px_fmt pixel format (@see https://ffmpeg.org/doxygen/trunk/pixfmt_8h.html#a9a8e335cf3be472042bc9f0cf80cd4c5) + * + * @return XEVE pre-defined color space (@see xeve.h) on success, XEVE_CF_UNKNOWN on failure + */ +static int libxeve_color_space(enum AVPixelFormat av_pix_fmt) +{ + /* color space of input image */ + int cs = XEVE_CF_UNKNOWN; + + switch (av_pix_fmt) { + case AV_PIX_FMT_YUV420P: + cs = XEVE_CS_YCBCR420; + break; + case AV_PIX_FMT_YUV420P10: +#if AV_HAVE_BIGENDIAN + cs = XEVE_CS_SET(XEVE_CF_YCBCR420, 10, 1); +#else + cs = XEVE_CS_YCBCR420_10LE; +#endif + + break; + default: + cs = XEVE_CF_UNKNOWN; + break; + } + + return cs; +} + +/** + * The function returns a pointer to the object of the XEVE_CDSC type. + * XEVE_CDSC contains all encoder parameters that should be initialized before the encoder is used. + * + * The field values of the XEVE_CDSC structure are populated based on: + * - the corresponding field values of the AvCodecConetxt structure, + * - the xeve encoder specific option values, + * (the full list of options available for xeve encoder is displayed after executing the command ./ffmpeg --help encoder = libxeve) + * + * The order of processing input data and populating the XEVE_CDSC structure + * 1) first, the fields of the AVCodecContext structure corresponding to the provided input options are processed, + * (i.e -pix_fmt yuv420p -s:v 1920x1080 -r 30 -profile:v 0) + * 2) then xeve-specific options added as AVOption to the xeve AVCodec implementation + * (i.e -preset 0) + * + * Keep in mind that, there are options that can be set in different ways. + * In this case, please follow the above-mentioned order of processing. + * The most recent assignments overwrite the previous values. + * + * @param[in] avctx codec context (AVCodecContext) + * @param[out] cdsc contains all Xeve MPEG-5 EVC encoder encoder parameters that should be initialized before the encoder is use + * + * @return 0 on success, negative error code on failure + */ +static int get_conf(AVCodecContext *avctx, XEVE_CDSC *cdsc) +{ + XeveContext *xectx = NULL; + int ret; + + xectx = avctx->priv_data; + + /* initialize xeve_param struct with default values */ + ret = xeve_param_default(&cdsc->param); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set_default parameter\n"); + return AVERROR_EXTERNAL; + } + + /* read options from AVCodecContext */ + if (avctx->width > 0) + cdsc->param.w = avctx->width; + + if (avctx->height > 0) + cdsc->param.h = avctx->height; + + if (avctx->framerate.num > 0) { + // fps can be float number, but xeve API doesn't support it + cdsc->param.fps = lrintf(av_q2d(avctx->framerate)); + } + + // GOP size (key-frame interval, I-picture period) + cdsc->param.keyint = avctx->gop_size; // 0: only one I-frame at the first time; 1: every frame is coded in I-frame + + if (avctx->max_b_frames == 0 || avctx->max_b_frames == 1 || avctx->max_b_frames == 3 || + avctx->max_b_frames == 7 || avctx->max_b_frames == 15) // number of b-frames + cdsc->param.bframes = avctx->max_b_frames; + else { + av_log(avctx, AV_LOG_ERROR, "Incorrect value for maximum number of B frames: (%d) \n" + "Acceptable values for bf option (maximum number of B frames) are 0,1,3,7 or 15\n", avctx->max_b_frames); + return AVERROR_INVALIDDATA; + } + + cdsc->param.level_idc = avctx->level; + + if (avctx->rc_buffer_size) // VBV buf size + cdsc->param.vbv_bufsize = (int)(avctx->rc_buffer_size / 1000); + + cdsc->param.rc_type = xectx->rc_mode; + + if (xectx->rc_mode == XEVE_RC_CQP) + cdsc->param.qp = xectx->qp; + else if (xectx->rc_mode == XEVE_RC_ABR) { + if (avctx->bit_rate / 1000 > INT_MAX || avctx->rc_max_rate / 1000 > INT_MAX) { + av_log(avctx, AV_LOG_ERROR, "Not supported bitrate bit_rate and rc_max_rate > %d000\n", INT_MAX); + return AVERROR_INVALIDDATA; + } + cdsc->param.bitrate = (int)(avctx->bit_rate / 1000); + } else if (xectx->rc_mode == XEVE_RC_CRF) + cdsc->param.crf = xectx->crf; + else { + av_log(avctx, AV_LOG_ERROR, "Not supported rate control type: %d\n", xectx->rc_mode); + return AVERROR_INVALIDDATA; + } + + if (avctx->thread_count <= 0) { + int cpu_count = av_cpu_count(); + cdsc->param.threads = (cpu_count < XEVE_MAX_THREADS) ? cpu_count : XEVE_MAX_THREADS; + } else if (avctx->thread_count > XEVE_MAX_THREADS) + cdsc->param.threads = XEVE_MAX_THREADS; + else + cdsc->param.threads = avctx->thread_count; + + + libxeve_color_fmt(avctx->pix_fmt, &xectx->color_format); + + cdsc->param.cs = XEVE_CS_SET(xectx->color_format, cdsc->param.codec_bit_depth, AV_HAVE_BIGENDIAN); + + cdsc->max_bs_buf_size = MAX_BS_BUF; + + ret = xeve_param_ppt(&cdsc->param, xectx->profile_id, xectx->preset_id, xectx->tune_id); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot set profile(%d), preset(%d), tune(%d)\n", xectx->profile_id, xectx->preset_id, xectx->tune_id); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * Set XEVE_CFG_SET_USE_PIC_SIGNATURE for encoder + * + * @param[in] logger context + * @param[in] id XEVE encodec instance identifier + * @param[in] ctx the structure stores all the states associated with the instance of Xeve MPEG-5 EVC encoder + * + * @return 0 on success, negative error code on failure + */ +static int set_extra_config(AVCodecContext *avctx, XEVE id, XeveContext *ctx) +{ + int ret, size; + size = 4; + + // embed SEI messages identifying encoder parameters and command line arguments + // - 0: off\n" + // - 1: emit sei info" + // + // SEI - Supplemental enhancement information contains information + // that is not necessary to decode the samples of coded pictures from VCL NAL units. + // Some SEI message information is required to check bitstream conformance + // and for output timing decoder conformance. + // @see ISO_IEC_23094-1_2020 7.4.3.5 + // @see ISO_IEC_23094-1_2020 Annex D + ret = xeve_config(id, XEVE_CFG_SET_SEI_CMD, &ctx->sei_info, &size); // sei_cmd_info + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to set config for sei command info messages\n"); + return AVERROR_EXTERNAL; + } + + ret = xeve_config(id, XEVE_CFG_SET_USE_PIC_SIGNATURE, &ctx->hash, &size); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to set config for picture signature\n"); + return AVERROR_EXTERNAL; + } + + return 0; +} + +/** + * @brief Switch encoder to bumping mode + * + * @param id XEVE encodec instance identifier + * @return 0 on success, negative error code on failure + */ +static int setup_bumping(XEVE id) +{ + int val = 1; + int size = sizeof(int); + if (XEVE_FAILED(xeve_config(id, XEVE_CFG_SET_FORCE_OUT, (void *)(&val), &size))) + return AVERROR_EXTERNAL; + + return 0; +} + +/** + * @brief Initialize eXtra-fast Essential Video Encoder codec + * Create an encoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_init(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + unsigned char *bs_buf = NULL; + int i; + int shift_h = 0; + int shift_v = 0; + int width_chroma = 0; + int height_chroma = 0; + XEVE_IMGB *imgb = NULL; + int ret = 0; + + XEVE_CDSC *cdsc = &(xectx->cdsc); + + /* allocate bitstream buffer */ + bs_buf = av_malloc(MAX_BS_BUF); + if (bs_buf == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot allocate bitstream buffer\n"); + return AVERROR(ENOMEM); + } + xectx->bitb.addr = bs_buf; + xectx->bitb.bsize = MAX_BS_BUF; + + /* read configurations and set values for created descriptor (XEVE_CDSC) */ + if ((ret = get_conf(avctx, cdsc)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot get configuration\n"); + return AVERROR(EINVAL); + } + + if ((ret = xeve_param_check(&cdsc->param)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid configuration\n"); + return AVERROR(EINVAL); + } + + { + AVDictionaryEntry *en = NULL; + while (en = av_dict_get(xectx->xeve_params, "", en, AV_DICT_IGNORE_SUFFIX)) { + if ((ret = xeve_param_parse(&cdsc->param, en->key, en->value)) < 0) { + av_log(avctx, AV_LOG_WARNING, + "Error parsing option '%s = %s'.\n", + en->key, en->value); + } + } + } + + /* create encoder */ + xectx->id = xeve_create(cdsc, NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVE encoder\n"); + return AVERROR_EXTERNAL; + } + + if ((ret = set_extra_config(avctx, xectx->id, xectx)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set extra configuration\n"); + return AVERROR(EINVAL); + } + + if ((ret = av_pix_fmt_get_chroma_sub_sample(avctx->pix_fmt, &shift_h, &shift_v)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to get chroma shift\n"); + return AVERROR(EINVAL); + } + + // Chroma subsampling + // + // YUV format explanation + // shift_h == 1 && shift_v == 1 : YUV420 + // shift_h == 1 && shift_v == 0 : YUV422 + // shift_h == 0 && shift_v == 0 : YUV444 + // + width_chroma = AV_CEIL_RSHIFT(avctx->width, shift_h); + height_chroma = AV_CEIL_RSHIFT(avctx->height, shift_v); + + /* set default values for input image buffer */ + imgb = &xectx->imgb; + imgb->cs = libxeve_color_space(avctx->pix_fmt); + imgb->np = 3; /* only for yuv420p, yuv420ple */ + + for (i = 0; i < imgb->np; i++) + imgb->x[i] = imgb->y[i] = 0; + + imgb->w[0] = imgb->aw[0] = avctx->width; // width luma + imgb->w[1] = imgb->w[2] = imgb->aw[1] = imgb->aw[2] = width_chroma; + imgb->h[0] = imgb->ah[0] = avctx->height; // height luma + imgb->h[1] = imgb->h[2] = imgb->ah[1] = imgb->ah[2] = height_chroma; + + xectx->state = STATE_ENCODING; + + return 0; +} + +/** + * Encode raw data frame into EVC packet + * + * @param[in] avctx codec context + * @param[out] avpkt output AVPacket containing encoded data + * @param[in] frame AVFrame containing the raw data to be encoded + * @param[out] got_packet encoder sets to 0 or 1 to indicate that a + * non-empty packet was returned in pkt + * + * @return 0 on success, negative error code on failure + */ +static int libxeve_encode(AVCodecContext *avctx, AVPacket *avpkt, + const AVFrame *frame, int *got_packet) +{ + XeveContext *xectx = avctx->priv_data; + int ret = -1; + + // No more input frames are available but encoder still can have some data in its internal buffer to process + // and some frames to dump. + if (xectx->state == STATE_ENCODING && frame == NULL) { + if (setup_bumping(xectx->id) == 0) + xectx->state = STATE_BUMPING; // Entering bumping process + else { + av_log(avctx, AV_LOG_ERROR, "Failed to setup bumping\n"); + return 0; + } + } + + if (xectx->state == STATE_ENCODING) { + int i; + XEVE_IMGB *imgb = NULL; + + imgb = &xectx->imgb; + + for (i = 0; i < imgb->np; i++) { + imgb->a[i] = frame->data[i]; + imgb->s[i] = frame->linesize[i]; + } + + imgb->ts[XEVE_TS_PTS] = frame->pts; + + /* push image to encoder */ + ret = xeve_push(xectx->id, imgb); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_push() failed\n"); + return AVERROR_EXTERNAL; + } + } + if (xectx->state == STATE_ENCODING || xectx->state == STATE_BUMPING) { + /* encoding */ + ret = xeve_encode(xectx->id, &(xectx->bitb), &(xectx->stat)); + if (XEVE_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "xeve_encode() failed\n"); + return AVERROR_EXTERNAL; + } + + /* store bitstream */ + if (ret == XEVE_OK_OUT_NOT_AVAILABLE) { // Return OK but picture is not available yet + *got_packet = 0; + return 0; + } else if (ret == XEVE_OK) { + int av_pic_type; + + if (xectx->stat.write > 0) { + + ret = ff_get_encode_buffer(avctx, avpkt, xectx->stat.write, 0); + if (ret < 0) + return ret; + + memcpy(avpkt->data, xectx->bitb.addr, xectx->stat.write); + + avpkt->time_base.num = 1; + avpkt->time_base.den = xectx->cdsc.param.fps; + + avpkt->pts = xectx->bitb.ts[XEVE_TS_PTS]; + avpkt->dts = xectx->bitb.ts[XEVE_TS_DTS]; + + switch(xectx->stat.stype) { + case XEVE_ST_I: + av_pic_type = AV_PICTURE_TYPE_I; + avpkt->flags |= AV_PKT_FLAG_KEY; + break; + case XEVE_ST_P: + av_pic_type = AV_PICTURE_TYPE_P; + break; + case XEVE_ST_B: + av_pic_type = AV_PICTURE_TYPE_B; + break; + case XEVE_ST_UNKNOWN: + av_log(avctx, AV_LOG_ERROR, "Unknown slice type\n"); + return AVERROR_INVALIDDATA; + } + + ff_side_data_set_encoder_stats(avpkt, xectx->stat.qp * FF_QP2LAMBDA, NULL, 0, av_pic_type); + + *got_packet = 1; + } + } else if (ret == XEVE_OK_NO_MORE_FRM) { + // Return OK but no more frames + return 0; + } else { + av_log(avctx, AV_LOG_ERROR, "Invalid return value: %d\n", ret); + return AVERROR_EXTERNAL; + } + } else { + av_log(avctx, AV_LOG_ERROR, "Udefined encoder state\n"); + return AVERROR_INVALIDDATA; + } + + return 0; +} + +/** + * Destroy the encoder and release all the allocated resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxeve_close(AVCodecContext *avctx) +{ + XeveContext *xectx = avctx->priv_data; + + if (xectx->id) { + xeve_delete(xectx->id); + xectx->id = NULL; + } + + av_free(xectx->bitb.addr); /* release bitstream buffer */ + + return 0; +} + +#define OFFSET(x) offsetof(XeveContext, x) +#define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM + +static const enum AVPixelFormat supported_pixel_formats[] = { + AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV420P10, + AV_PIX_FMT_NONE +}; + +// Consider using following options (./ffmpeg --help encoder=libxeve) +// +static const AVOption libxeve_options[] = { + { "preset", "Encoding preset for setting encoding speed", OFFSET(preset_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PRESET_MEDIUM }, XEVE_PRESET_DEFAULT, XEVE_PRESET_PLACEBO, VE, "preset" }, + { "default", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_DEFAULT }, INT_MIN, INT_MAX, VE, "preset" }, + { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_FAST }, INT_MIN, INT_MAX, VE, "preset" }, + { "medium", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_MEDIUM }, INT_MIN, INT_MAX, VE, "preset" }, + { "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_SLOW }, INT_MIN, INT_MAX, VE, "preset" }, + { "placebo", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PRESET_PLACEBO }, INT_MIN, INT_MAX, VE, "preset" }, + { "tune", "Tuning parameter for special purpose operation", OFFSET(tune_id), AV_OPT_TYPE_INT, { .i64 = XEVE_TUNE_NONE }, XEVE_TUNE_NONE, XEVE_TUNE_PSNR, VE, "tune"}, + { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_NONE }, INT_MIN, INT_MAX, VE, "tune" }, + { "zerolatency", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_ZEROLATENCY }, INT_MIN, INT_MAX, VE, "tune" }, + { "psnr", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_TUNE_PSNR }, INT_MIN, INT_MAX, VE, "tune" }, + { "profile", "Encoding profile", OFFSET(profile_id), AV_OPT_TYPE_INT, { .i64 = XEVE_PROFILE_BASELINE }, XEVE_PROFILE_BASELINE, XEVE_PROFILE_MAIN, VE, "profile" }, + { "baseline", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_BASELINE }, INT_MIN, INT_MAX, VE, "profile" }, + { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_PROFILE_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, + { "rc_mode", "Rate control mode", OFFSET(rc_mode), AV_OPT_TYPE_INT, { .i64 = XEVE_RC_CQP }, XEVE_RC_CQP, XEVE_RC_CRF, VE, "rc_mode" }, + { "CQP", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CQP }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "ABR", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_ABR }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "CRF", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = XEVE_RC_CRF }, INT_MIN, INT_MAX, VE, "rc_mode" }, + { "qp", "Quantization parameter value for CQP rate control mode", OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 32 }, 0, 51, VE }, + { "crf", "Constant rate factor value for CRF rate control mode", OFFSET(crf), AV_OPT_TYPE_INT, { .i64 = 32 }, 10, 49, VE }, + { "hash", "Embed picture signature (HASH) for conformance checking in decoding", OFFSET(hash), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "sei_info", "Embed SEI messages identifying encoder parameters and command line arguments", OFFSET(sei_info), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, + { "xeve-params", "Override the xeve configuration using a :-separated list of key=value parameters", OFFSET(xeve_params), AV_OPT_TYPE_DICT, { 0 }, 0, 0, VE }, + { NULL } +}; + +static const AVClass libxeve_class = { + .class_name = "libxeve", + .item_name = av_default_item_name, + .option = libxeve_options, + .version = LIBAVUTIL_VERSION_INT, +}; + +/** + * libavcodec generic global options, which can be set on all the encoders and decoders + * @see https://www.ffmpeg.org/ffmpeg-codecs.html#Codec-Options + */ +static const FFCodecDefault libxeve_defaults[] = { + { "b", "0" }, // bitrate in terms of kilo-bits per second + { "g", "0" }, // gop_size (key-frame interval 0: only one I-frame at the first time; 1: every frame is coded in I-frame) + { "bf", "15"}, // maximum number of B frames (0: no B-frames, 1,3,7,15) + { "threads", "0"}, // number of threads to be used (0: automatically select the number of threads to set) + { NULL }, +}; + +const FFCodec ff_libxeve_encoder = { + .p.name = "libxeve", + .p.long_name = NULL_IF_CONFIG_SMALL("libxeve MPEG-5 EVC"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxeve_init, + FF_CODEC_ENCODE_CB(libxeve_encode), + .close = libxeve_close, + .priv_data_size = sizeof(XeveContext), + .p.priv_class = &libxeve_class, + .defaults = libxeve_defaults, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_DR1, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxeve", + .p.pix_fmts = supported_pixel_formats, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE, +}; From patchwork Thu Jun 15 06:25:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42095 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp552230pzb; Wed, 14 Jun 2023 23:25:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4q/9QKnibsN4NmTS9m4XzgLLmoqx3mCuNi6oEZeTIb9rozOFk+nWXyOPux0VOU4zY33VTb X-Received: by 2002:aa7:c513:0:b0:51a:2013:583 with SMTP id o19-20020aa7c513000000b0051a20130583mr1169204edq.13.1686810329931; Wed, 14 Jun 2023 23:25:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810329; cv=none; d=google.com; s=arc-20160816; b=QpSZnuZjmAtMA0FYHka1O8JA2rhll4gRGQW7KlZJBLF5kmbQfgyYoLZjYBa+ITtjvP 0tk5Q2pZmTVdJUtt3Zedkb7D01a/HxCsVMXNHtWLG+CfQcU1eJQxcvteSrotAWlUAxZ3 Pxr4Ole9c3pTzuDNp31yUJhXK0UpCSv/CaYnWebPz3XSO71o7lCtvCY0mq9F/xbzCogj ZXUB0q6i/X+fd1eFhiSk6lLU7ZvQFyca+c2FJbMKOv9QHPE5p+y641/uV9hOQBFg3KxM TMR94m3QCpKA5KyueddcqmP4eoWQTKmPxRKeBTJqLwK6hkCbgs/0stS7gDtKW981XnNo RjwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=Azq6pwvCaWUewN+ctdXSI7oy7Rwu1t4OVin2frYB1tk=; b=yQHaalQEyLJGZJPNvg6cQ1HFKanEpbPJigCuPmTRd6BVh3unGLsgBH+cWFYErrZEs4 iPg0DRrC5krx4eQ4jgSaSYBl49HWlfADMlzXkqubmRyO6wJNkzEGUcI3D0+akfyUSVjT /q58wstx9U4CgcdcP5stJ2ofFWNcm+a6kKRM6T48GuF8OZnPPzr0R5rDP6z895Xia+Sd 9j1bEGi3JnRfRUV9CSxQsMgZ3d2Vl/wZuGb0rCOBebas8nwHe5zJjJUSWMdPrFPYq0xX ME9rzUax3pP5M8wRKPpj5KD4nuaWarv/M3aMZifxZ2rzP4pSYoG1SMxzs372JwIGLPos dGKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=OaD9oC8T; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v17-20020aa7d651000000b00514a4bf2b90si10103267edr.322.2023.06.14.23.25.29; Wed, 14 Jun 2023 23:25:29 -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=@samsung.com header.s=mail20170921 header.b=OaD9oC8T; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF93668C48A; Thu, 15 Jun 2023 09:25:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 68FAC68C3CC for ; Thu, 15 Jun 2023 09:25:20 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062519euoutp02044524190259903113230625a7a40932~owQyF9odQ2604926049euoutp02e for ; Thu, 15 Jun 2023 06:25:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230615062519euoutp02044524190259903113230625a7a40932~owQyF9odQ2604926049euoutp02e DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810320; bh=F5AAx6/463qGh2mEfSfxBPtp+r3EKs4S7OeiTLky5Bw=; h=From:To:Cc:Subject:Date:References:From; b=OaD9oC8T7TenhG37M5mcmZljEJrDN/Yvka2H04NLKL3X07xsl/Ws5/DoQi5bdMKJK BOFU54axSp19aFR2U/ssGb9CWkqKi47l5f6BINoQCUscV11jEeBM+0dhVXlFrTIZd/ TvE2xHoYgmJ9qtSj3XP7s+8gDv0Z1O/Vbm8fdUbo= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230615062519eucas1p19b9b5b834810ff4edc55436b533f6b93~owQx9mxo81411014110eucas1p1A; Thu, 15 Jun 2023 06:25:19 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 3A.B9.11320.FCEAA846; Thu, 15 Jun 2023 07:25:19 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20230615062519eucas1p2bc9990a732a26592d637b31443bbccc1~owQxet0xE2086520865eucas1p2s; Thu, 15 Jun 2023 06:25:19 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230615062519eusmtrp22bf2f42f8c060ffbce805f84bfe258c4~owQxZvZ2N1320713207eusmtrp2H; Thu, 15 Jun 2023 06:25:19 +0000 (GMT) X-AuditID: cbfec7f4-97dff70000022c38-76-648aaecf8cbb Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 31.D9.14344.FCEAA846; Thu, 15 Jun 2023 07:25:19 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230615062518eusmtip1fb53ae94fa1cd6fe22c673b7026fa9e5~owQxFktm92965029650eusmtip1K; Thu, 15 Jun 2023 06:25:18 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:25:11 +0200 Message-Id: <20230615062511.1327-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDIsWRmVeSWpSXmKPExsWy7djPc7rn13WlGKw6qm3x5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGU8X3WXveDgGsaKpqWNzA2M62u6 GDk5JARMJBbdW8LSxcjFISSwglFi+o9D7BDOF0aJvXfOMkI4nxklDuzrZ4Jpab/8ixkisZxR 4vzlc6wgCSGBViaJlQ9DQGw2AV2Jlx8egTWICJhKnGzeywZiMwtoS6y7+x3MFhYIkFi9fwk7 iM0ioCpxcvNCZhCbV8BKoqFvEwvEMk2JCVvmMEHEBSVOznwCFeeWWDfrEivETHmJ5q2zwQ6S EPjLLjFt+md2iCIXiVWtM6AahCVeHd8CFZeR+L9zPtBQDiC7WOJQvwOEWSNx6Ec6RIW1xNvG 44wgYWagE9bv0ocIO0o0texigajmk7jxVhDiAD6JSdumM0OEeSU62oQgTBWJvk4xiEYpiafL 5jBD2B4S05/1MU9gVJyF5KtZSD6ZhbB2ASPzKkbx1NLi3PTUYqO81HK94sTc4tK8dL3k/NxN jMAEcfrf8S87GJe/+qh3iJGJg/EQowQHs5II71ON9hQh3pTEyqrUovz4otKc1OJDjNIcLEri vNq2J5OFBNITS1KzU1MLUotgskwcnFINTLmOM9Wkot/nPPSfUb37UOJp1+PsqvFXJMqP3E+e eutXRfUZ7Z1Pky4lTpeSLHh2OvR/5uwUo8OCvFz/dn4QypKc1XXzyTH9Yq7d3OFmwm9XXTHj XXOWl2/FonWBHUINyat73rGbbHvYYJom969i9+PHYlUxQpyBlZvEd1y1eXFZWvZrvavmw/Dg v2f3LJ11UFve6u76mrMSrCXGk7lLE28cZanR8PbauPuebaj83uqZE9bmv3ASX2N6Ljv6Qfpa G9+Xayvy9Q0Xh0y9vHGz4G6xlq2PxV6v4Do6MdJr05E7tWW/rkwrWrRFsrjs1qRaDu/Y5d/6 dn1XP+Zj1yVzc/7V1Szb3Up2xgkEPWa4claJpTgj0VCLuag4EQBsQHoUfwMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7rn13WlGDR94bT4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DKer7rLXnBwDWNF09JG5gbG9TVdjJwcEgImEu2XfzF3MXJxCAks ZZSYfvIEO0RCSmLp0kWMELawxJ9rXWwQRc1MEnPfnWAGSbAJ6Eq8/PCICcQWETCXuLjuFlgD s4C2xLq734EaODiEBfwkvv2wAwmzCKhKnNy8EKyVV8BKoqFvEwvEfE2JCVvmMEHEBSVOznwC FeeWWDfrEivESHmJ5q2zmScw8s9CUjYLSWoBI9MqRpHU0uLc9NxiI73ixNzi0rx0veT83E2M wMDdduznlh2MK1991DvEyMTBeIhRgoNZSYT3qUZ7ihBvSmJlVWpRfnxRaU5q8SFGU6BbJzJL iSbnA2MnryTe0MzA1NDEzNLA1NLMWEmc17OgI1FIID2xJDU7NbUgtQimj4mDU6qByauFn9/z y6tNFWZLtzKdnvGD7/yJtxcflfQqMv6z23wimLH2Vb7MO7Wv3lqz0voPuRks/7C0c86U6g2P PGx27wrJUZ5+w/bhv4PLg99ITJ/PzO8gNqnvxwP2rJVnOG//Nr6aOJmnXyRqx6ZLzv+LhPtv Srz5l80g3jhR4sLxPIWVO7cffHpJ2u7d+RdftkuvvLCJWboxLb9g0iOLT2ukvLOPXHJVK0y5 1hLEd1HA4Hjc3HslOXMtt2TPmPA759hhq+kfdb+zf2/+ckE8j8tT6GLrq2nNFg2nHG7NcuyR WSeczXd3y+XPv38zTvhy8feiqVMuclUJe/Af83+zpWZ7W6W3WkVkb07aP4Wa+OTrZ5WVWIoz Eg21mIuKEwEhmXtM5QIAAA== X-CMS-MailID: 20230615062519eucas1p2bc9990a732a26592d637b31443bbccc1 X-Msg-Generator: CA X-RootMTR: 20230615062519eucas1p2bc9990a732a26592d637b31443bbccc1 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062519eucas1p2bc9990a732a26592d637b31443bbccc1 References: Subject: [FFmpeg-devel] [PATCH v25 5/9] avcodec/evc_decoder: Provided support for EVC decoder 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: v0qGOB4yvATJ - Added EVC decoder wrapper - Changes in project configuration file and libavcodec Makefile - Added documentation for xevd wrapper Signed-off-by: Dawid Kozinski --- configure | 4 + doc/decoders.texi | 24 ++ doc/general_contents.texi | 10 +- libavcodec/Makefile | 1 + libavcodec/allcodecs.c | 1 + libavcodec/libxevd.c | 479 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 518 insertions(+), 1 deletion(-) create mode 100644 libavcodec/libxevd.c diff --git a/configure b/configure index e2370a23bb..cae3b666a5 100755 --- a/configure +++ b/configure @@ -293,6 +293,7 @@ External library support: --enable-libx264 enable H.264 encoding via x264 [no] --enable-libx265 enable HEVC encoding via x265 [no] --enable-libxeve enable EVC encoding via libxeve [no] + --enable-libxevd enable EVC decoding via libxevd [no] --enable-libxavs enable AVS encoding via xavs [no] --enable-libxavs2 enable AVS2 encoding via xavs2 [no] --enable-libxcb enable X11 grabbing using XCB [autodetect] @@ -1904,6 +1905,7 @@ EXTERNAL_LIBRARY_LIST=" libvorbis libvpx libwebp + libxevd libxeve libxml2 libzimg @@ -3460,6 +3462,7 @@ libx265_encoder_deps="libx265" libx265_encoder_select="atsc_a53" libxavs_encoder_deps="libxavs" libxavs2_encoder_deps="libxavs2" +libxevd_decoder_deps="libxevd" libxeve_encoder_deps="libxeve" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" @@ -6835,6 +6838,7 @@ enabled libx265 && require_pkg_config libx265 x265 x265.h x265_api_get require_cpp_condition libx265 x265.h "X265_BUILD >= 89" enabled libxavs && require libxavs "stdint.h xavs.h" xavs_encoder_encode "-lxavs $pthreads_extralibs $libm_extralibs" enabled libxavs2 && require_pkg_config libxavs2 "xavs2 >= 1.3.0" "stdint.h xavs2.h" xavs2_api_get +enabled libxevd && require_pkg_config libxevd "xevd >= 0.4.1" "xevd.h" xevd_decode enabled libxeve && require_pkg_config libxeve "xeve >= 0.4.3" "xeve.h" xeve_encode enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled libzimg && require_pkg_config libzimg "zimg >= 2.7.0" zimg.h zimg_get_api_version diff --git a/doc/decoders.texi b/doc/decoders.texi index 09b8314dd2..6311af229f 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -130,6 +130,30 @@ Set amount of frame threads to use during decoding. The default value is 0 (auto @end table +@section libxevd + +eXtra-fast Essential Video Decoder (XEVD) MPEG-5 EVC decoder wrapper. + +This decoder requires the presence of the libxevd headers and library +during configuration. You need to explicitly configure the build with +@option{--enable-libxevd}. + +The xevd project website is at @url{https://github.com/mpeg5/xevd}. + +@subsection Options + +The following options are supported by the libxevd wrapper. +The xevd-equivalent options or values are listed in parentheses for easy migration. + +To get a more accurate and extensive documentation of the libxevd options, +invoke the command @code{xevd_app --help} or consult the libxevd documentation. + +@table @option +@item threads (@emph{threads}) +Force to use a specific number of threads + +@end table + @section QSV Decoders The family of Intel QuickSync Video decoders (VC1, MPEG-2, H.264, HEVC, diff --git a/doc/general_contents.texi b/doc/general_contents.texi index c6a997bfd6..8e08f5ebc3 100644 --- a/doc/general_contents.texi +++ b/doc/general_contents.texi @@ -351,6 +351,14 @@ Go to @url{https://github.com/mpeg5/xeve} and follow the instructions for installing the XEVE library. Then pass @code{--enable-libxeve} to configure to enable it. +@section eXtra-fast Essential Video Decoder (XEVD) + +FFmpeg can make use of the XEVD library for EVC video decoding. + +Go to @url{https://github.com/mpeg5/xevd} and follow the instructions for +installing the XEVD library. Then pass @code{--enable-libxevd} to configure to +enable it. + @section ZVBI ZVBI is a VBI decoding library which can be used by FFmpeg to decode DVB @@ -953,7 +961,7 @@ following image formats are supported: @item Escape 124 @tab @tab X @item Escape 130 @tab @tab X @item EVC / MPEG-5 Part 1 @tab X @tab X - @tab encoding and decoding supported through external library libxeve + @tab encoding and decoding supported through external libraries libxeve and libxevd @item FFmpeg video codec #1 @tab X @tab X @tab lossless codec (fourcc: FFV1) @item Flash Screen Video v1 @tab X @tab X diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2223e9f46c..d0b8438717 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1142,6 +1142,7 @@ OBJS-$(CONFIG_LIBX264_ENCODER) += libx264.o OBJS-$(CONFIG_LIBX265_ENCODER) += libx265.o OBJS-$(CONFIG_LIBXAVS_ENCODER) += libxavs.o OBJS-$(CONFIG_LIBXAVS2_ENCODER) += libxavs2.o +OBJS-$(CONFIG_LIBXEVD_DECODER) += libxevd.o OBJS-$(CONFIG_LIBXEVE_ENCODER) += libxeve.o OBJS-$(CONFIG_LIBXVID_ENCODER) += libxvid.o OBJS-$(CONFIG_LIBZVBI_TELETEXT_DECODER) += libzvbi-teletextdec.o ass.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index c317dd6da3..eb0abbb1fd 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -819,6 +819,7 @@ extern LIBX264_CONST FFCodec ff_libx264_encoder; extern const FFCodec ff_libx264rgb_encoder; extern FFCodec ff_libx265_encoder; extern const FFCodec ff_libxeve_encoder; +extern const FFCodec ff_libxevd_decoder; extern const FFCodec ff_libxavs_encoder; extern const FFCodec ff_libxavs2_encoder; extern const FFCodec ff_libxvid_encoder; diff --git a/libavcodec/libxevd.c b/libavcodec/libxevd.c new file mode 100644 index 0000000000..7c4922d46e --- /dev/null +++ b/libavcodec/libxevd.c @@ -0,0 +1,479 @@ +/* + * libxevd decoder + * EVC (MPEG-5 Essential Video Coding) decoding using XEVD MPEG-5 EVC decoder library + * + * Copyright (C) 2021 Dawid Kozinski + * + * 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 +#include + +#include + +#include "libavutil/internal.h" +#include "libavutil/common.h" +#include "libavutil/opt.h" +#include "libavutil/pixdesc.h" +#include "libavutil/pixfmt.h" +#include "libavutil/imgutils.h" +#include "libavutil/cpu.h" + +#include "avcodec.h" +#include "internal.h" +#include "packet_internal.h" +#include "codec_internal.h" +#include "profiles.h" +#include "decode.h" + +#define XEVD_PARAM_BAD_NAME -1 +#define XEVD_PARAM_BAD_VALUE -2 + +#define EVC_NAL_HEADER_SIZE 2 /* byte */ + +/** + * The structure stores all the states associated with the instance of Xeve MPEG-5 EVC decoder + */ +typedef struct XevdContext { + const AVClass *class; + + XEVD id; // XEVD instance identifier @see xevd.h + XEVD_CDSC cdsc; // decoding parameters @see xevd.h + + // If end of stream occurs it is required "flushing" (aka draining) the codec, + // as the codec might buffer multiple frames or packets internally. + int draining_mode; // The flag is set if codec enters draining mode. + + AVPacket *pkt; +} XevdContext; + +/** + * The function populates the XEVD_CDSC structure. + * XEVD_CDSC contains all decoder parameters that should be initialized before its use. + * + * @param[in] avctx codec context + * @param[out] cdsc contains all decoder parameters that should be initialized before its use + * + */ +static void get_conf(AVCodecContext *avctx, XEVD_CDSC *cdsc) +{ + int cpu_count = av_cpu_count(); + + /* clear XEVS_CDSC structure */ + memset(cdsc, 0, sizeof(XEVD_CDSC)); + + /* init XEVD_CDSC */ + if (avctx->thread_count <= 0) + cdsc->threads = (cpu_count < XEVD_MAX_TASK_CNT) ? cpu_count : XEVD_MAX_TASK_CNT; + else if (avctx->thread_count > XEVD_MAX_TASK_CNT) + cdsc->threads = XEVD_MAX_TASK_CNT; + else + cdsc->threads = avctx->thread_count; +} + +/** + * Read NAL unit length + * @param bs input data (bitstream) + * @return the length of NAL unit on success, 0 value on failure + */ +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size, AVCodecContext *avctx) +{ + uint32_t len = 0; + XEVD_INFO info; + int ret; + + if (bs_size == XEVD_NAL_UNIT_LENGTH_BYTE) { + ret = xevd_info((void *)bs, XEVD_NAL_UNIT_LENGTH_BYTE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return 0; + } + len = info.nalu_len; + if (len == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream size! [%d]\n", bs_size); + return 0; + } + } + + return len; +} + +/** + * @param[in] xectx the structure that stores all the state associated with the instance of Xeve MPEG-5 EVC decoder + * @param[out] avctx codec context + * @return 0 on success, negative value on failure + */ +static int export_stream_params(const XevdContext *xectx, AVCodecContext *avctx) +{ + int ret; + int size; + int color_space; + + avctx->pix_fmt = AV_PIX_FMT_YUV420P10; + + size = 4; + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_WIDTH, &avctx->coded_width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_width\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_CODED_HEIGHT, &avctx->coded_height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get coded_height\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_WIDTH, &avctx->width, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get width\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_HEIGHT, &avctx->height, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get height\n"); + return AVERROR_EXTERNAL; + } + + ret = xevd_config(xectx->id, XEVD_CFG_GET_COLOR_SPACE, &color_space, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get color_space\n"); + return AVERROR_EXTERNAL; + } + switch(color_space) { + case XEVD_CS_YCBCR400_10LE: + avctx->pix_fmt = AV_PIX_FMT_GRAY10LE; + break; + case XEVD_CS_YCBCR420_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV420P10LE; + break; + case XEVD_CS_YCBCR422_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV422P10LE; + break; + case XEVD_CS_YCBCR444_10LE: + avctx->pix_fmt = AV_PIX_FMT_YUV444P10LE; + break; + default: + av_log(avctx, AV_LOG_ERROR, "Unknown color space\n"); + avctx->pix_fmt = AV_PIX_FMT_NONE; + return AVERROR_INVALIDDATA; + } + + // the function returns sps->num_reorder_pics + ret = xevd_config(xectx->id, XEVD_CFG_GET_MAX_CODING_DELAY, &avctx->max_b_frames, &size); + if (XEVD_FAILED(ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to get max_coding_delay\n"); + return AVERROR_EXTERNAL; + } + + avctx->has_b_frames = (avctx->max_b_frames) ? 1 : 0; + + return 0; +} + +/** + * @brief Copy image in imgb to frame. + * + * @param avctx codec context + * @param[in] imgb + * @param[out] frame + * @return 0 on success, negative value on failure + */ +static int libxevd_image_copy(struct AVCodecContext *avctx, XEVD_IMGB *imgb, struct AVFrame *frame) +{ + int ret; + if (imgb->cs != XEVD_CS_YCBCR420_10LE) { + av_log(avctx, AV_LOG_ERROR, "Not supported pixel format: %s\n", av_get_pix_fmt_name(avctx->pix_fmt)); + return AVERROR_INVALIDDATA; + } + + if (imgb->w[0] != avctx->width || imgb->h[0] != avctx->height) { // stream resolution changed + if (ff_set_dimensions(avctx, imgb->w[0], imgb->h[0]) < 0) { + av_log(avctx, AV_LOG_ERROR, "Cannot set new dimension\n"); + return AVERROR_INVALIDDATA; + } + } + + if (ret = ff_get_buffer(avctx, frame, 0) < 0) + return ret; + + av_image_copy(frame->data, frame->linesize, (const uint8_t **)imgb->a, + imgb->s, avctx->pix_fmt, + imgb->w[0], imgb->h[0]); + + return 0; +} + +/** + * Initialize decoder + * Create a decoder instance and allocate all the needed resources + * + * @param avctx codec context + * @return 0 on success, negative error code on failure + */ +static av_cold int libxevd_init(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + XEVD_CDSC *cdsc = &(xectx->cdsc); + + /* read configurations and set values for created descriptor (XEVD_CDSC) */ + get_conf(avctx, cdsc); + + /* create decoder */ + xectx->id = xevd_create(&(xectx->cdsc), NULL); + if (xectx->id == NULL) { + av_log(avctx, AV_LOG_ERROR, "Cannot create XEVD encoder\n"); + return AVERROR_EXTERNAL; + } + + xectx->draining_mode = 0; + xectx->pkt = av_packet_alloc(); + + return 0; +} + +/** + * Decode frame with decoupled packet/frame dataflow + * + * @param avctx codec context + * @param[out] frame decoded frame + * + * @return 0 on success, negative error code on failure + */ +static int libxevd_receive_frame(AVCodecContext *avctx, AVFrame *frame) +{ + XevdContext *xectx = avctx->priv_data; + AVPacket *pkt = xectx->pkt; + XEVD_IMGB *imgb = NULL; + + int xevd_ret = 0; + int ret = 0; + + if (!pkt) + return AVERROR(ENOMEM); + + // obtain input data + ret = ff_decode_get_packet(avctx, pkt); + if (ret < 0 && ret != AVERROR_EOF) { + av_packet_unref(pkt); + + return ret; + } else if(ret == AVERROR_EOF && xectx->draining_mode == 0) { // End of stream situations. Enter draining mode + + xectx->draining_mode = 1; + av_packet_unref(pkt); + + return 0; + } + + if (pkt->size > 0) { + int bs_read_pos = 0; + XEVD_STAT stat; + XEVD_BITB bitb; + int nalu_size; + + imgb = NULL; + + while(pkt->size > (bs_read_pos + XEVD_NAL_UNIT_LENGTH_BYTE)) { + memset(&stat, 0, sizeof(XEVD_STAT)); + + nalu_size = read_nal_unit_length(pkt->data + bs_read_pos, XEVD_NAL_UNIT_LENGTH_BYTE, avctx); + if (nalu_size == 0) { + av_log(avctx, AV_LOG_ERROR, "Invalid bitstream\n"); + av_packet_unref(pkt); + ret = AVERROR_INVALIDDATA; + + return ret; + } + bs_read_pos += XEVD_NAL_UNIT_LENGTH_BYTE; + + bitb.addr = pkt->data + bs_read_pos; + bitb.ssize = nalu_size; + + /* main decoding block */ + xevd_ret = xevd_decode(xectx->id, &bitb, &stat); + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to decode bitstream\n"); + av_packet_unref(pkt); + ret = AVERROR_EXTERNAL; + + return ret; + } + + bs_read_pos += nalu_size; + + if (stat.nalu_type == XEVD_NUT_SPS) { // EVC stream parameters changed + if ((ret = export_stream_params(xectx, avctx)) != 0) { + av_log(avctx, AV_LOG_ERROR, "Failed to export stream params\n"); + av_packet_unref(pkt); + + return ret; + } + } + if (stat.read != nalu_size) + av_log(avctx, AV_LOG_INFO, "Different reading of bitstream (in:%d, read:%d)\n,", nalu_size, stat.read); + if (stat.fnum >= 0) { + + xevd_ret = xevd_pull(xectx->id, &imgb); // The function returns a valid image only if the return code is XEVD_OK + + if (XEVD_FAILED(xevd_ret)) { + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d, frame#=%d)\n", xevd_ret, stat.fnum); + ret = AVERROR_EXTERNAL; + av_packet_unref(pkt); + + return ret; + } else if (xevd_ret == XEVD_OK_FRM_DELAYED) { + av_packet_unref(pkt); + + return AVERROR(EAGAIN); + } else { // XEVD_OK + if (!imgb) { + av_packet_unref(pkt); + + return AVERROR(EAGAIN); + } + + // got frame + ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + av_log(avctx, AV_LOG_ERROR, "Image copying error\n"); + + imgb->release(imgb); + imgb = NULL; + + av_packet_unref(pkt); + + return ret; + } + + // use ff_decode_frame_props() to fill frame properties + ret = ff_decode_frame_props(avctx, frame); + if (ret < 0) { + imgb->release(imgb); + imgb = NULL; + + av_packet_unref(pkt); + av_frame_unref(frame); + + return ret; + } + + frame->pkt_dts = pkt->dts; + + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + + av_packet_unref(pkt); + return 0; + } + } + } + } else { // decoder draining mode handling + + xevd_ret = xevd_pull(xectx->id, &imgb); + + if (xevd_ret == XEVD_ERR_UNEXPECTED) { // draining process completed + av_log(avctx, AV_LOG_DEBUG, "Draining process completed\n"); + av_packet_unref(pkt); + + return AVERROR_EOF; + } else if (XEVD_FAILED(xevd_ret)) { // handle all other errors + av_log(avctx, AV_LOG_ERROR, "Failed to pull the decoded image (xevd error code: %d)\n", xevd_ret); + av_packet_unref(pkt); + + return AVERROR_EXTERNAL; + } else { // XEVD_OK + if (!imgb) { + av_packet_unref(pkt); + + return AVERROR_EXTERNAL; + } + // got frame + ret = libxevd_image_copy(avctx, imgb, frame); + if(ret < 0) { + imgb->release(imgb); + imgb = NULL; + + av_packet_unref(pkt); + + return ret; + } + + frame->pkt_dts = pkt->dts; + + av_packet_unref(pkt); + + // xevd_pull uses pool of objects of type XEVD_IMGB. + // The pool size is equal MAX_PB_SIZE (26), so release object when it is no more needed + imgb->release(imgb); + imgb = NULL; + + return 0; + } + } + + return ret; +} + +/** + * Destroy decoder + * + * @param avctx codec context + * @return 0 on success + */ +static av_cold int libxevd_close(AVCodecContext *avctx) +{ + XevdContext *xectx = avctx->priv_data; + if (xectx->id) { + xevd_delete(xectx->id); + xectx->id = NULL; + } + + xectx->draining_mode = 0; + av_packet_free(&xectx->pkt); + + return 0; +} + +#define OFFSET(x) offsetof(XevdContext, x) +#define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM + +static const AVClass libxevd_class = { + .class_name = "libxevd", + .item_name = av_default_item_name, + .version = LIBAVUTIL_VERSION_INT, +}; + +const FFCodec ff_libxevd_decoder = { + .p.name = "evc", + .p.long_name = NULL_IF_CONFIG_SMALL("EVC / MPEG-5 Essential Video Coding (EVC)"), + .p.type = AVMEDIA_TYPE_VIDEO, + .p.id = AV_CODEC_ID_EVC, + .init = libxevd_init, + FF_CODEC_RECEIVE_FRAME_CB(libxevd_receive_frame), + .close = libxevd_close, + .priv_data_size = sizeof(XevdContext), + .p.priv_class = &libxevd_class, + .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS | AV_CODEC_CAP_AVOID_PROBING, + .p.profiles = NULL_IF_CONFIG_SMALL(ff_evc_profiles), + .p.wrapper_name = "libxevd", + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_NOT_INIT_THREADSAFE | FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_SETS_FRAME_PROPS +}; From patchwork Thu Jun 15 06:25:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42089 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp552399pzb; Wed, 14 Jun 2023 23:25:51 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4mug6iPzaVWIUP5lKaI8FhppbPDHViE+pZkytEcldN7Kct28c49f2D1YRzwMtC+4jonEWG X-Received: by 2002:a17:907:7da9:b0:973:946d:96ba with SMTP id oz41-20020a1709077da900b00973946d96bamr16465329ejc.69.1686810351572; Wed, 14 Jun 2023 23:25:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810351; cv=none; d=google.com; s=arc-20160816; b=l5jnlY1AnwNOlfB1xjzBsBU1hzTmtmNNI4o3QZ+L7EkZLtEcjG0hMdAcFuyGqINlfz 6NzX3YPMCky6E9H5h3tm6fND3kVkDr0bnpzbZY5GCoie+NVDAjDvKxxNL+78CI6sFbZa cGi439Bt33m+JJVipZ8BOMQVDcp1OUCmWPPNgmTkvYYOojlXSQ89x29w9DPeoerwp59V ibi7PQUuLHqmiaf9Bk6UJiPDd9/ziVt7N25uQJB9aHyExRx4sg+iiBLzrARw+QGM8LvO pAtxWPLZl+DDw6o2cxXXb5mLDvNXkYdo8e64YMRXSs+alN5lWBTicY5zdCNDJDQXoS0/ +sIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=l6eBQMOrFqTolQAm6f1u0UXOLOZUL8kp7SB7cFq5uTo=; b=n7v8Dnu5o6D+PUKRpEdSst/azpZN9Yk9zDhFslxcSIicwehsNTZ1ubtsN0HdRefS9E DPBTHRtsCaIXgf+8BbKl8KNgi/LGnzP22ax9FcgV4wXMkVhWQWUjxLapTOTftgn9poDl TCQZzPO3r9ySViVCRS9RB2X7nF3BcV7JgKjxayJJC/i61LI62w8fie4d/NFDJv+fpAB0 7ZVk/bIHiOy6Y+K4c5ebsgfGBCvXuo8rTB6JO0bojdftH6gJu659I2wlQORB5vhPWpU7 PgUn4h1KpQVTXhH4BODGBvItO5Xeen+AOzpvqrORFrttHzk3HlDLLBAvbZPFHJXg5zE0 VXVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=qsVGcARr; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id me23-20020a170906aed700b00977cde237absi8286723ejb.385.2023.06.14.23.25.51; Wed, 14 Jun 2023 23:25:51 -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=@samsung.com header.s=mail20170921 header.b=qsVGcARr; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DCF9B68C4AC; Thu, 15 Jun 2023 09:25:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout2.w1.samsung.com (mailout2.w1.samsung.com [210.118.77.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C207B68B59B for ; Thu, 15 Jun 2023 09:25:47 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062547euoutp02bdad1a739897a75597daa3e989d59b59~owRLh9p_j2604926049euoutp02h for ; Thu, 15 Jun 2023 06:25:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20230615062547euoutp02bdad1a739897a75597daa3e989d59b59~owRLh9p_j2604926049euoutp02h DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810347; bh=uMoTRvgG2kuvoRplD0UpZ9LqsJj8G2hegA5fdf2Mbd4=; h=From:To:Cc:Subject:Date:References:From; b=qsVGcARrSE2e/Rdqqr/55ex0BJOyj7T262aDscbAr02Cva0yV8iE4F7ZU5fvr7Jm9 /137Y9seSWnPLpsoBKXZ9EIW+3tH5706vp//VM1ZkcfL+gPdtBrdMzXOFi/11pWuZd GqzMpJd7AxK8SLpcPvmMMSZ51V4lIUbRWes2mOWA= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230615062547eucas1p1b85b9b148cdf0be9c46bbc8fdcaafc34~owRLY9oaP1416514165eucas1p1i; Thu, 15 Jun 2023 06:25:47 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 4D.6E.37758.AEEAA846; Thu, 15 Jun 2023 07:25:47 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062546eucas1p1d9c93dc2d76c526cc6b47a5b5abd38cc~owRK-yD161411014110eucas1p1Q; Thu, 15 Jun 2023 06:25:46 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230615062546eusmtrp1bbce2dec4a25e9cdf71e9d11f837a637~owRK-RYjG0494104941eusmtrp12; Thu, 15 Jun 2023 06:25:46 +0000 (GMT) X-AuditID: cbfec7f5-7ffff7000002937e-15-648aaeea8cd9 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id 7D.A6.10549.AEEAA846; Thu, 15 Jun 2023 07:25:46 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230615062546eusmtip108c2254cb93774b6546268ef4067be7b~owRKnLJXf2844928449eusmtip1v; Thu, 15 Jun 2023 06:25:46 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:25:38 +0200 Message-Id: <20230615062538.559-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrLIsWRmVeSWpSXmKPExsWy7djP87qv13WlGJy8zmTx5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBFcdmkpOZklqUW6dslcGVMOLGJsWDZDsaK3fd4GhhPtzF2 MXJySAiYSDyecwjI5uIQEljBKHF9VxMbhPOFUWLqgcfMEM5nRonldzazwrSc/bIZKrGcUeLs ykOsEE4rk8SuH5/ZQKrYBHQlXn54xARiiwiYSpxs3gsWZxbQllh39zuYLSwQK3Hi/Fp2EJtF QFXi491bYHFeAUuJV1+3sUBs05SYsGUOE0RcUOLkzCdQcW6JdbMusULMlJdo3job7CIJgY/s ElMO3YE61UXi5/sN7BC2sMSr41ugbBmJ05N7gAZxANnFEof6HSDMGolDP9IhKqwl3jYeZwQJ MwOdsH6XPkTYUWL7zXdMENV8EjfeCkIcwCcxadt0Zogwr0RHmxCEqSLR1ykG0Sgl8XTZHGYI 20Oia8N91gmMirOQfDULySezENYuYGRexSieWlqcm55abJyXWq5XnJhbXJqXrpecn7uJEZgi Tv87/nUH44pXH/UOMTJxMB5ilOBgVhLhfarRniLEm5JYWZValB9fVJqTWnyIUZqDRUmcV9v2 ZLKQQHpiSWp2ampBahFMlomDU6qByVyvKPLX1rNT8+xvP3l11U6HY+aTA80WW+OkTzdebtJM Wr1zQ/Ln2K6SD7pF1pM+MZ/IVvGWE/C9GzfHTrd6YUpX3Mncz9WheYWORz4tKVrMdLN1857T XzK+F1ef4ch1r38g9zpf5JWYx5QN94qeMZaEH2JKWpW/trv4z1sJi94DR6d7F9+re3b5TdnJ PW4ftz7aez8w8sfUhw+dH5o+mX+7dcHF5fIbhR90nfPfLbYiqdfqkmKGCtfuVd+yr0hkac67 Mf/2zFtni5KuTEm0j+B/o7NjWtvvaZJToqujCrYn37ghf8RS9t6f7tksmtwnW5KjFnkW6xZq nq2xCOH65+DAELrO8srHhY2Pbqs1JSmxFGckGmoxFxUnAgDHJ85tgAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xu7qv1nWlGHRsVbb4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DImnNjEWLBsB2PF7ns8DYyn2xi7GDk5JARMJM5+2cwMYgsJLGWU mLxEFCIuJbF06SKoGmGJP9e62CBqmpkkVnwKA7HZBHQlXn54xARiiwiYS1xcdwusnllAW2Ld 3e9g9cIC0RIdO+axgNgsAqoSH+/eAovzClhKvPq6jQVivqbEhC1zmCDighInZz6BinNLrJt1 iRViprxE89bZzBMY+WchKZuFJLWAkWkVo0hqaXFuem6xoV5xYm5xaV66XnJ+7iZGYNhuO/Zz 8w7Gea8+6h1iZOJgPMQowcGsJML7VKM9RYg3JbGyKrUoP76oNCe1+BCjKdCtE5mlRJPzgZGT VxJvaGZgamhiZmlgamlmrCTO61nQkSgkkJ5YkpqdmlqQWgTTx8TBKdXAlPt0lU2UFEtG1OLP C87LZ5cwJH1gLlnv5hG3K/CMViGfPRu/0Kze6rSdO79WrTTzKXrW8u3L7uCzwj4RWWxP+evW znog/Ld75h/D/jOVvtOFZ759L/lZaJ/S68lpvoVSosrnbr5rYPWesNHiVFp1utu5GVMCjjbf WfcsTnO/Cj/TjR9bJpaFv9c/u5wlPc7yQ6ZZjtGUk1mGq60DT3182/3RqNvLQXmNyPRtd3v3 ++iaiR98+Sr7XHMQD2PH5HusTz21CrNFd7/WFZikoOLE+mwpd/9Fxl/Blj1pX/+Ht94UElx3 pc7SZU6i57d3AV8YWw+mP49tV+MJDshvSHvlLtNh90Rsny9j1KXYN0+UWIozEg21mIuKEwE6 fiGx5AIAAA== X-CMS-MailID: 20230615062546eucas1p1d9c93dc2d76c526cc6b47a5b5abd38cc X-Msg-Generator: CA X-RootMTR: 20230615062546eucas1p1d9c93dc2d76c526cc6b47a5b5abd38cc X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062546eucas1p1d9c93dc2d76c526cc6b47a5b5abd38cc References: Subject: [FFmpeg-devel] [PATCH v25 6/9] avformat/mov_muxer: Extended MOV muxer to handle EVC video content 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lxrdej2kp9jF - Changes in mov_write_video_tag function to handle EVC elementary stream - Provided structure EVCDecoderConfigurationRecord that specifies the decoder configuration information for ISO/IEC 23094-1 video content Signed-off-by: Dawid Kozinski --- libavformat/Makefile | 2 +- libavformat/evc.c | 422 ++++++++++++++++++++++++++++++++++++++++ libavformat/evc.h | 44 +++++ libavformat/isom_tags.c | 2 + libavformat/movenc.c | 33 ++++ 5 files changed, 502 insertions(+), 1 deletion(-) create mode 100644 libavformat/evc.c create mode 100644 libavformat/evc.h diff --git a/libavformat/Makefile b/libavformat/Makefile index 6e4231fda2..d3503196e3 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -364,7 +364,7 @@ OBJS-$(CONFIG_MOV_DEMUXER) += mov.o mov_chan.o mov_esds.o \ OBJS-$(CONFIG_MOV_MUXER) += movenc.o av1.o avc.o hevc.o vpcc.o \ movenchint.o mov_chan.o rtp.o \ movenccenc.o movenc_ttml.o rawutils.o \ - dovi_isom.o + dovi_isom.o evc.o OBJS-$(CONFIG_MP2_MUXER) += rawenc.o OBJS-$(CONFIG_MP3_DEMUXER) += mp3dec.o replaygain.o OBJS-$(CONFIG_MP3_MUXER) += mp3enc.o rawenc.o id3v2enc.o diff --git a/libavformat/evc.c b/libavformat/evc.c new file mode 100644 index 0000000000..431cb107e3 --- /dev/null +++ b/libavformat/evc.c @@ -0,0 +1,422 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 Dawid Kozinski + * + * 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/intreadwrite.h" +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/evc.h" +#include "libavcodec/evc_parse.h" +#include "avformat.h" +#include "avio.h" +#include "evc.h" +#include "avio_internal.h" + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NALU_LENGTH_PREFIX_SIZE (4) /* byte */ +#define EVC_NALU_HEADER_SIZE (2) /* byte */ + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.1 +enum { + SPS_INDEX, + PPS_INDEX, + APS_INDEX, + SEI_INDEX, + NB_ARRAYS +}; + +// The sturcture reflects SPS RBSP(raw byte sequence payload) layout +// @see ISO_IEC_23094-1 section 7.3.2.1 +// +// The following descriptors specify the parsing process of each element +// u(n) - unsigned integer using n bits +// ue(v) - unsigned integer 0-th order Exp_Golomb-coded syntax element with the left bit first +typedef struct EVCSPS { + int sps_seq_parameter_set_id; // ue(v) + int profile_idc; // u(8) + int level_idc; // u(8) + int toolset_idc_h; // u(32) + int toolset_idc_l; // u(32) + int chroma_format_idc; // ue(v) + int pic_width_in_luma_samples; // ue(v) + int pic_height_in_luma_samples; // ue(v) + int bit_depth_luma_minus8; // ue(v) + int bit_depth_chroma_minus8; // ue(v) + + // @note + // Currently the structure does not reflect the entire SPS RBSP layout. + // It contains only the fields that are necessary to read from the NAL unit all the values + // necessary for the correct initialization of EVCDecoderConfigurationRecord + + // @note + // If necessary, add the missing fields to the structure to reflect + // the contents of the entire NAL unit of the SPS type + +} EVCSPS; + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +typedef struct EVCNALUnitArray { + uint8_t array_completeness; // when equal to 1 indicates that all NAL units of the given type are in the following array + uint8_t NAL_unit_type; // indicates the type of the NAL units in the following array + uint16_t numNalus; // indicates the number of NAL units of the indicated type + uint16_t *nalUnitLength; // indicates the length in bytes of the NAL unit + uint8_t **nalUnit; // contains an SPS, PPS, APS or a SEI NAL unit, as specified in ISO/IEC 23094-1 +} EVCNALUnitArray; + +/** + * @brief Specifies the decoder configuration information for ISO/IEC 23094-1 video content. + * @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.2 + * Carriage of network abstraction layer (NAL) unit structured video in the ISO base media file format + */ +typedef struct EVCDecoderConfigurationRecord { + uint8_t configurationVersion; // 8 bits + uint8_t profile_idc; // 8 bits + uint8_t level_idc; // 8 bits + uint32_t toolset_idc_h; // 32 bits + uint32_t toolset_idc_l; // 32 bits + uint8_t chroma_format_idc; // 2 bits + uint8_t bit_depth_luma_minus8; // 3 bits + uint8_t bit_depth_chroma_minus8; // 3 bits + uint16_t pic_width_in_luma_samples; // 16 bits + uint16_t pic_height_in_luma_samples; // 16 bits + uint8_t reserved; // 6 bits '000000'b + uint8_t lengthSizeMinusOne; // 2 bits + uint8_t num_of_arrays; // 8 bits + EVCNALUnitArray arrays[NB_ARRAYS]; +} EVCDecoderConfigurationRecord; + +typedef struct NALU { + int offset; + uint32_t size; +} NALU; + +typedef struct NALUList { + NALU *nalus; + unsigned nalus_array_size; + unsigned nb_nalus; ///< valid entries in nalus +} NALUList; + +// @see ISO_IEC_23094-1 (7.3.2.1 SPS RBSP syntax) +static int evcc_parse_sps(const uint8_t *bs, int bs_size, EVCDecoderConfigurationRecord *evcc) +{ + GetBitContext gb; + int sps_seq_parameter_set_id; + EVCSPS sps; + + if (init_get_bits8(&gb, bs, bs_size) < 0) + return 0; + + sps.sps_seq_parameter_set_id = get_ue_golomb(&gb); + + if (sps_seq_parameter_set_id >= EVC_MAX_SPS_COUNT) + return 0; + + // the Baseline profile is indicated by profile_idc eqal to 0 + // the Main profile is indicated by profile_idc eqal to 1 + sps.profile_idc = get_bits(&gb, 8); + + sps.level_idc = get_bits(&gb, 8); + + sps.toolset_idc_h = get_bits(&gb, 32); + sps.toolset_idc_l = get_bits(&gb, 32); + + // 0 - monochrome + // 1 - 4:2:0 + // 2 - 4:2:2 + // 3 - 4:4:4 + sps.chroma_format_idc = get_ue_golomb(&gb); + + sps.pic_width_in_luma_samples = get_ue_golomb(&gb); + sps.pic_height_in_luma_samples = get_ue_golomb(&gb); + + sps.bit_depth_luma_minus8 = get_ue_golomb(&gb); + sps.bit_depth_chroma_minus8 = get_ue_golomb(&gb); + + evcc->profile_idc = sps.profile_idc; + evcc->level_idc = sps.level_idc; + evcc->toolset_idc_h = sps.toolset_idc_h; + evcc->toolset_idc_l = sps.toolset_idc_l; + evcc->chroma_format_idc = sps.chroma_format_idc; + evcc->bit_depth_luma_minus8 = sps.bit_depth_luma_minus8; + evcc->bit_depth_chroma_minus8 = sps.bit_depth_chroma_minus8; + evcc->pic_width_in_luma_samples = sps.pic_width_in_luma_samples; + evcc->pic_height_in_luma_samples = sps.pic_height_in_luma_samples; + + return 0; +} + +// @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 +static int evcc_array_add_nal_unit(const uint8_t *nal_buf, uint32_t nal_size, + uint8_t nal_type, int ps_array_completeness, + EVCNALUnitArray *array) +{ + int ret; + uint16_t numNalus = array->numNalus; + + ret = av_reallocp_array(&array->nalUnit, numNalus + 1, sizeof(uint8_t *)); + if (ret < 0) + return ret; + + ret = av_reallocp_array(&array->nalUnitLength, numNalus + 1, sizeof(uint16_t)); + if (ret < 0) + return ret; + + array->nalUnit [numNalus] = (uint8_t *)nal_buf; + array->nalUnitLength[numNalus] = nal_size; + array->NAL_unit_type = nal_type; + array->numNalus++; + + /* + * When the sample entry name is 'evc1', the default and mandatory value of + * array_completeness is 1 for arrays of all types of parameter sets, and 0 + * for all other arrays. + */ + if (nal_type == EVC_SPS_NUT || nal_type == EVC_PPS_NUT || nal_type == EVC_APS_NUT) + array->array_completeness = ps_array_completeness; + + return 0; +} + +static void evcc_init(EVCDecoderConfigurationRecord *evcc) +{ + memset(evcc, 0, sizeof(EVCDecoderConfigurationRecord)); + evcc->configurationVersion = 1; + evcc->lengthSizeMinusOne = 3; // 4 bytes +} + +static void evcc_close(EVCDecoderConfigurationRecord *evcc) +{ + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + EVCNALUnitArray *const array = &evcc->arrays[i]; + array->numNalus = 0; + av_freep(&array->nalUnit); + av_freep(&array->nalUnitLength); + } +} + +static int evcc_write(AVIOContext *pb, EVCDecoderConfigurationRecord *evcc) +{ + uint16_t sps_count; + + av_log(NULL, AV_LOG_TRACE, "configurationVersion: %"PRIu8"\n", + evcc->configurationVersion); + av_log(NULL, AV_LOG_TRACE, "profile_idc: %"PRIu8"\n", + evcc->profile_idc); + av_log(NULL, AV_LOG_TRACE, "level_idc: %"PRIu8"\n", + evcc->level_idc); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_h: %"PRIu32"\n", + evcc->toolset_idc_h); + av_log(NULL, AV_LOG_TRACE, "toolset_idc_l: %"PRIu32"\n", + evcc->toolset_idc_l); + av_log(NULL, AV_LOG_TRACE, "chroma_format_idc: %"PRIu8"\n", + evcc->chroma_format_idc); + av_log(NULL, AV_LOG_TRACE, "bit_depth_luma_minus8: %"PRIu8"\n", + evcc->bit_depth_luma_minus8); + av_log(NULL, AV_LOG_TRACE, "bit_depth_chroma_minus8: %"PRIu8"\n", + evcc->bit_depth_chroma_minus8); + av_log(NULL, AV_LOG_TRACE, "pic_width_in_luma_samples: %"PRIu16"\n", + evcc->pic_width_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "pic_height_in_luma_samples: %"PRIu16"\n", + evcc->pic_height_in_luma_samples); + av_log(NULL, AV_LOG_TRACE, "lengthSizeMinusOne: %"PRIu8"\n", + evcc->lengthSizeMinusOne); + av_log(NULL, AV_LOG_TRACE, "num_of_arrays: %"PRIu8"\n", + evcc->num_of_arrays); + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if(array->numNalus == 0) + continue; + + av_log(NULL, AV_LOG_TRACE, "array_completeness[%"PRIu8"]: %"PRIu8"\n", + i, array->array_completeness); + av_log(NULL, AV_LOG_TRACE, "NAL_unit_type[%"PRIu8"]: %"PRIu8"\n", + i, array->NAL_unit_type); + av_log(NULL, AV_LOG_TRACE, "numNalus[%"PRIu8"]: %"PRIu16"\n", + i, array->numNalus); + for ( unsigned j = 0; j < array->numNalus; j++) + av_log(NULL, AV_LOG_TRACE, + "nalUnitLength[%"PRIu8"][%"PRIu16"]: %"PRIu16"\n", + i, j, array->nalUnitLength[j]); + } + + /* + * We need at least one SPS. + */ + sps_count = evcc->arrays[SPS_INDEX].numNalus; + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + if (!sps_count || sps_count > EVC_MAX_SPS_COUNT) + return AVERROR_INVALIDDATA; + + /* unsigned int(8) configurationVersion = 1; */ + avio_w8(pb, evcc->configurationVersion); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->profile_idc); + + /* unsigned int(8) profile_idc */ + avio_w8(pb, evcc->level_idc); + + /* unsigned int(32) toolset_idc_h */ + avio_wb32(pb, evcc->toolset_idc_h); + + /* unsigned int(32) toolset_idc_l */ + avio_wb32(pb, evcc->toolset_idc_l); + + /* + * unsigned int(2) chroma_format_idc; + * unsigned int(3) bit_depth_luma_minus8; + * unsigned int(3) bit_depth_chroma_minus8; + */ + avio_w8(pb, evcc->chroma_format_idc << 6 | + evcc->bit_depth_luma_minus8 << 3 | + evcc->bit_depth_chroma_minus8); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_width_in_luma_samples); + + /* unsigned int(16) pic_width_in_luma_samples; */ + avio_wb16(pb, evcc->pic_height_in_luma_samples); + + /* + * bit(6) reserved = '111111'b; + * unsigned int(2) chromaFormat; + */ + avio_w8(pb, evcc->lengthSizeMinusOne | 0xfc); + + /* unsigned int(8) numOfArrays; */ + avio_w8(pb, evcc->num_of_arrays); + + for (unsigned i = 0; i < FF_ARRAY_ELEMS(evcc->arrays); i++) { + const EVCNALUnitArray *const array = &evcc->arrays[i]; + + if (!array->numNalus) + continue; + + /* + * bit(1) array_completeness; + * unsigned int(1) reserved = 0; + * unsigned int(6) NAL_unit_type; + */ + avio_w8(pb, array->array_completeness << 7 | + array->NAL_unit_type & 0x3f); + + /* unsigned int(16) numNalus; */ + avio_wb16(pb, array->numNalus); + + for (unsigned j = 0; j < array->numNalus; j++) { + /* unsigned int(16) nalUnitLength; */ + avio_wb16(pb, array->nalUnitLength[j]); + + /* bit(8*nalUnitLength) nalUnit; */ + avio_write(pb, array->nalUnit[j], + array->nalUnitLength[j]); + } + } + + return 0; +} + +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness) +{ + EVCDecoderConfigurationRecord evcc; + int nalu_type; + size_t nalu_size; + int bytes_to_read = size; + unsigned array_index; + + int ret = 0; + + if (size < 8) { + /* We can't write a valid evcC from the provided data */ + return AVERROR_INVALIDDATA; + } else if (*data == 1) { + /* Data is already evcC-formatted */ + avio_write(pb, data, size); + return 0; + } + + evcc_init(&evcc); + + while (bytes_to_read > EVC_NALU_LENGTH_PREFIX_SIZE) { + nalu_size = ff_evc_read_nal_unit_length(data, EVC_NALU_LENGTH_PREFIX_SIZE, pb); + if (nalu_size == 0) break; + + data += EVC_NALU_LENGTH_PREFIX_SIZE; + bytes_to_read -= EVC_NALU_LENGTH_PREFIX_SIZE; + + if (bytes_to_read < nalu_size) break; + + nalu_type = ff_evc_get_nalu_type(data, bytes_to_read, pb); + + // @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 + // NAL_unit_type indicates the type of the NAL units in the following array (which shall be all of that type); + // - it takes a value as defined in ISO/IEC 23094-1; + // - it is restricted to take one of the values indicating a SPS, PPS, APS, or SEI NAL unit. + switch (nalu_type) { + case EVC_SPS_NUT: + array_index = SPS_INDEX; + break; + case EVC_PPS_NUT: + array_index = PPS_INDEX; + break; + case EVC_APS_NUT: + array_index = APS_INDEX; + break; + case EVC_SEI_NUT: + array_index = SEI_INDEX; + break; + default: + array_index = -1; + break; + } + + if( (array_index == SPS_INDEX) || + (array_index == PPS_INDEX) || + (array_index == APS_INDEX) || + (array_index == SEI_INDEX) ) { + + ret = evcc_array_add_nal_unit(data, nalu_size, nalu_type, ps_array_completeness, &(evcc.arrays[array_index])); + + if (ret < 0) + goto end; + if (evcc.arrays[array_index].numNalus == 1) + evcc.num_of_arrays++; + + if(nalu_type == EVC_SPS_NUT) { + ret = evcc_parse_sps(data, nalu_size, &evcc); + if (ret < 0) + goto end; + } + } + + data += nalu_size; + bytes_to_read -= nalu_size; + } + + ret = evcc_write(pb, &evcc); + +end: + evcc_close(&evcc); + return ret; +} diff --git a/libavformat/evc.h b/libavformat/evc.h new file mode 100644 index 0000000000..db56275fd8 --- /dev/null +++ b/libavformat/evc.h @@ -0,0 +1,44 @@ +/* + * EVC helper functions for muxers + * Copyright (c) 2022 Dawid Kozinski + * + * 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 AVFORMAT_EVC_H +#define AVFORMAT_EVC_H + +#include +#include "libavutil/rational.h" +#include "avio.h" + + + +/** + * Writes EVC sample metadata to the provided AVIOContext. + * + * @param pb pointer to the AVIOContext where the evc sample metadata shall be written + * @param buf input data buffer + * @param size size in bytes of the input data buffer + * @param ps_array_completeness @see ISO/IEC 14496-15:2021 Coding of audio-visual objects - Part 15: section 12.3.3.3 + * + * @return 0 in case of success, a negative error code in case of failure + */ +int ff_isom_write_evcc(AVIOContext *pb, const uint8_t *data, + int size, int ps_array_completeness); + +#endif // AVFORMAT_EVC_H diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 86c7272525..2a29823b2e 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -147,6 +147,8 @@ const AVCodecTag ff_codec_movvideo_tags[] = { { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', '1') }, /* AVC-based Dolby Vision derived from avc1 */ { AV_CODEC_ID_H264, MKTAG('d', 'v', 'a', 'v') }, /* AVC-based Dolby Vision derived from avc3 */ + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, /* EVC/MPEG-5 */ + { AV_CODEC_ID_VP8, MKTAG('v', 'p', '0', '8') }, /* VP8 */ { AV_CODEC_ID_VP9, MKTAG('v', 'p', '0', '9') }, /* VP9 */ { AV_CODEC_ID_AV1, MKTAG('a', 'v', '0', '1') }, /* AV1 */ diff --git a/libavformat/movenc.c b/libavformat/movenc.c index a9c8e104f0..f1cc80b1b3 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -35,6 +35,7 @@ #include "isom.h" #include "av1.h" #include "avc.h" +#include "evc.h" #include "libavcodec/ac3_parser_internal.h" #include "libavcodec/dnxhddata.h" #include "libavcodec/flac.h" @@ -1455,6 +1456,21 @@ static int mov_write_hvcc_tag(AVIOContext *pb, MOVTrack *track) return update_size(pb, pos); } +static int mov_write_evcc_tag(AVIOContext *pb, MOVTrack *track) +{ + int64_t pos = avio_tell(pb); + + avio_wb32(pb, 0); + ffio_wfourcc(pb, "evcC"); + + if (track->tag == MKTAG('e','v','c','1')) + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 1); + else + ff_isom_write_evcc(pb, track->vos_data, track->vos_len, 0); + + return update_size(pb, pos); +} + /* also used by all avid codecs (dv, imx, meridien) and their variants */ static int mov_write_avid_tag(AVIOContext *pb, MOVTrack *track) { @@ -1704,6 +1720,16 @@ static int mov_get_h264_codec_tag(AVFormatContext *s, MOVTrack *track) return tag; } +static int mov_get_evc_codec_tag(AVFormatContext *s, MOVTrack *track) +{ + int tag = track->par->codec_tag; + + if (!tag) + tag = MKTAG('e', 'v', 'c', '1'); + + return tag; +} + static const struct { enum AVPixelFormat pix_fmt; uint32_t tag; @@ -1785,6 +1811,8 @@ static unsigned int mov_get_codec_tag(AVFormatContext *s, MOVTrack *track) tag = mov_get_mpeg2_xdcam_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_H264) tag = mov_get_h264_codec_tag(s, track); + else if (track->par->codec_id == AV_CODEC_ID_EVC) + tag = mov_get_evc_codec_tag(s, track); else if (track->par->codec_id == AV_CODEC_ID_DNXHD) tag = mov_get_dnxhd_codec_tag(s, track); else if (track->par->codec_type == AVMEDIA_TYPE_VIDEO) { @@ -2352,6 +2380,9 @@ static int mov_write_video_tag(AVFormatContext *s, AVIOContext *pb, MOVMuxContex mov_write_avcc_tag(pb, track); if (track->mode == MODE_IPOD) mov_write_uuid_tag_ipod(pb); + } + else if (track->par->codec_id ==AV_CODEC_ID_EVC) { + mov_write_evcc_tag(pb, track); } else if (track->par->codec_id == AV_CODEC_ID_VP9) { mov_write_vpcc_tag(mov->fc, pb, track); } else if (track->par->codec_id == AV_CODEC_ID_AV1) { @@ -6126,6 +6157,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || par->codec_id == AV_CODEC_ID_VP9 || + par->codec_id == AV_CODEC_ID_EVC || par->codec_id == AV_CODEC_ID_TRUEHD) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { /* copy frame to create needed atoms */ @@ -7785,6 +7817,7 @@ static const AVCodecTag codec_mp4_tags[] = { { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '3') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, + { AV_CODEC_ID_EVC, MKTAG('e', 'v', 'c', '1') }, { AV_CODEC_ID_MPEG2VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', '4', 'v') }, { AV_CODEC_ID_MJPEG, MKTAG('m', 'p', '4', 'v') }, From patchwork Thu Jun 15 06:25:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42096 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp552610pzb; Wed, 14 Jun 2023 23:26:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7lVk6V26t1rE/4cp9qgNvqltX+x6Gpl3ecthJitbldsjwtf+J5QxgeA9eM15b5QCl6ukTX X-Received: by 2002:a05:6402:88e:b0:516:81d3:2627 with SMTP id e14-20020a056402088e00b0051681d32627mr12847383edy.0.1686810378578; Wed, 14 Jun 2023 23:26:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810378; cv=none; d=google.com; s=arc-20160816; b=hnaaQQDLQZVV1lWl+I2DxBVEOUkoYZC4Ja2y39EbkvMT5/vqZXNGl3V5Rn7X8gRI5s VGQPJPTwuedDStvBWnr0AAplfv1d8LaQMaBkydJ1EdSl+yrga76O51ck4DpeJ6hyxFY3 cI90uHXYNFhHsG93c4riWi0X17LBsIvKpX3cC1yXLbQRuCZCGmZAWZhbRSb7yTtiDZmX dfVRYHrak0YNDkF2ziQDcZdlluqqCuX8g+O2bL2+SO7VqN6CkPihySwi/lr63AeE9bGC 4zmj6uc9ctY9a5YLEnxiYwC+0kHoh9v/ycLMWR14n+RJVMIxia5CDH42KTa47sLPjpzB g3BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=cRZrdbSGqBFUO8R+EezIHSL/KAd3vmC9myTOBrGX3wc=; b=VRaR/KQpTOz4U0UyigCv/5H948DjlmdguKPJtKHrrU46wb1dp8WRSRtnZg2FcaX5+o ftlMr6jh0pzM7Q17U4romw2FHP04JsQCUxfLMk0PE8HMyZowCjzc9W/GUrkwngk2bYPb KuYyHXZ8YVZhoDSHYgDpb8a2JBMuKBH8RD+DSL5+Pvtplo3FrUt0fLrS4HMXGPFxCZqd kGitYD4KAOadJTilwFDY9OyHFS9tKVbn2O4vctGqoJsCh2of5kVKkkXn5cLsqNz8q0rH pA8egHZ1VccvnWgLTmww50K53SsgmgR3kydX21GYbiKKKfhR/PpySEZy4vX7M01rr6sH j0sQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=iW7W9vvA; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p20-20020a056402075400b005162bd9ec49si9685678edy.527.2023.06.14.23.26.18; Wed, 14 Jun 2023 23:26:18 -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=@samsung.com header.s=mail20170921 header.b=iW7W9vvA; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0130668C4CE; Thu, 15 Jun 2023 09:26:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 104FA68C3E7 for ; Thu, 15 Jun 2023 09:26:09 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062608euoutp01090a80a31dfc5b1b6f2721512ef07d4c~owRfWuBol0174101741euoutp01r for ; Thu, 15 Jun 2023 06:26:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230615062608euoutp01090a80a31dfc5b1b6f2721512ef07d4c~owRfWuBol0174101741euoutp01r DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810368; bh=KCqziG+PKI5eAz7i1qL0YO9ecrRYDppRKwc2etu0VfI=; h=From:To:Cc:Subject:Date:References:From; b=iW7W9vvA7RFx0qu1ha+waNnivgcP5efISSYP2h2BGVOY51zPa5x3LaBe8TfDNMLD+ 2/pxtrjCSENes+MMnGBXREZ0gMaHBpw0MYJyWwqfwrbFoq7jEEh3o+BzNRlnHTLD2T qwXdGgaBJ/XXW5u4PNlxhfd4a29r9kGjRheTMHp4= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20230615062608eucas1p153263b21e5fdf0d4af7b7b3de2c84ce7~owRfFeUZB0947509475eucas1p17; Thu, 15 Jun 2023 06:26:08 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id A5.7E.37758.00FAA846; Thu, 15 Jun 2023 07:26:08 +0100 (BST) Received: from eusmtrp2.samsung.com (unknown [182.198.249.139]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062608eucas1p1340c9e2af35377799cec5732eafb257d~owRe0xGFl1414114141eucas1p1h; Thu, 15 Jun 2023 06:26:08 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp2.samsung.com (KnoxPortal) with ESMTP id 20230615062608eusmtrp2512eaac70de17156e18984298bf4907d~owRe0J2Jl1343813438eusmtrp21; Thu, 15 Jun 2023 06:26:08 +0000 (GMT) X-AuditID: cbfec7f5-815ff7000002937e-48-648aaf0070ce Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 85.E9.14344.FFEAA846; Thu, 15 Jun 2023 07:26:07 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20230615062607eusmtip259e916fc9540a7d52cea134827ecb3a5~owReiYpaI2983529835eusmtip2N; Thu, 15 Jun 2023 06:26:07 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:25:59 +0200 Message-Id: <20230615062559.225-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87oM67tSDM484rP4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDKmrehnL7jIU3F44ifmBsZ7nF2M nBwSAiYSm9Y8Yexi5OIQEljBKHH42mxWCOcLo8Ta6XvZIZzPjBIfjz5l62LkAGuZcxAqvpxR Yt77ZiYIp5VJYtaUX8wgc9kEdCVefnjEBGKLCJhKnGzeywZiMwtoS6y7+x3MFhZIlPj7cwML yFAWAVWJz4drQExeAUuJ77/8Ia7TlJiwZQ7YFF4BQYmTM5+wQMS5JdbNusQKMVFeonnrbGaQ EyQE/rJLnPl0jhWiyEVi0eerbBC2sMSr41vYIWwZif875zNB/FIscajfAcKskTj0Ix2iwlri beNxRpAwM9AJ63fpQ4QdJVZtbGeGqOaTuPFWEOIAPolJ26ZDhXklOtqEIEwVib5OMYhGKYmn y+YwQ9geEv/fbWebwKg4C8lXs5B8Mgth7QJG5lWM4qmlxbnpqcXGeanlesWJucWleel6yfm5 mxiBqeH0v+NfdzCuePVR7xAjEwfjIUYJDmYlEd6nGu0pQrwpiZVVqUX58UWlOanFhxilOViU xHm1bU8mCwmkJ5akZqemFqQWwWSZODilGpj4j8nPzHJ6EyfYO/HU6k8Glbev2DspHNqyf81/ 8+8ujNxX29nfpfx3y1L4px9QHnv2z7uiGf999M2vRG6/GteRlJCwIi9M0Ldhir7yrA9/jOoa f8ulP9wxqTfsSouG6+EaOx+J/ZHOrwu2Xt66bQHL68W1qfr+WlyNn8M4975e+MvKa8fJuxFZ qyNmds77vkr+81JHgYru2ilBBWIvbDreXeNX+35ZNpXJefdS+VWKm7YtufegI9v+Sk6+nryj Q+e2vb9cbXfPCvJNfyskfFjKl0+s4xvLXZVPu/yeTy18W6zsKTon1LI3UCbt4uH7fivE2vb6 h9ya9EC30SX4lnPA3Cdd+3tvL/v13mvCxFglluKMREMt5qLiRAA0GeCifAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrPLMWRmVeSWpSXmKPExsVy+t/xe7r/13WlGOw6bG3x5doXZouV336z WHz7dIbZgdnjz6LNLB59W1YxBjBF6dkU5ZeWpCpk5BeX2CpFG1oY6RlaWugZmVjqGRqbx1oZ mSrp29mkpOZklqUW6dsl6GVMW9HPXnCRp+LwxE/MDYz3OLsYOTgkBEwk5hxk72Lk4hASWMoo sapjElsXIydQXEpi6dJFjBC2sMSfa11sEEXNTBKnVsxgB0mwCehKvPzwiAnEFhEwl7i47hZY A7OAtsS6u9/BBgkLxEvsvd/LArKMRUBV4vPhGhCTV8BS4vsvf4jxmhITtswBm8IrIChxcuYT Fog4t8S6WZdYISbKSzRvnc08gZF/FpKyWUhSCxiZVjGKpJYW56bnFhvpFSfmFpfmpesl5+du YgSG7LZjP7fsYFz56qPeIUYmDsZDjBIczEoivE812lOEeFMSK6tSi/Lji0pzUosPMZoCXTqR WUo0OR8YNXkl8YZmBqaGJmaWBqaWZsZK4ryeBR2JQgLpiSWp2ampBalFMH1MHJxSDUwt8Xsv mN76/vmtTtPVP9u7RTdP4D27WNXnZOW2DYkKIXZJ0++HKyrbv5m2/0ZWeFFc9PQXJfvEFKdJ sSXneC5LN0yuMJz+yMF/9nSbfx+k1x3m69+vwluvHLbn0+0D4UZeJsXrvhxMftOvJxAsF7Rx Z+WTSZskjq7SuP3szKPZDGLTpOb56y6WXHfBNmhulPi8rWLRSjN8+HbwGKxsNp25KkjW2zdi qfmeX/fiGlu/vbDM0Vt95E7PEe6eU/s1t8YvFCq16Fio9NE0M81r8Xu9czKi/O7JPMnSr/Y3 Nwr5swV/vP9kJheb80HP7lY1hx9XXxe8ZJ4QxJT/TvZ7fJLopSl78j3a/C5fz39jHqDEUpyR aKjFXFScCABYUXmz4gIAAA== X-CMS-MailID: 20230615062608eucas1p1340c9e2af35377799cec5732eafb257d X-Msg-Generator: CA X-RootMTR: 20230615062608eucas1p1340c9e2af35377799cec5732eafb257d X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062608eucas1p1340c9e2af35377799cec5732eafb257d References: Subject: [FFmpeg-devel] [PATCH v25 7/9] avformat/mov_demuxer: Extended MOV demuxer to handle EVC video content 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Uhrytt+l3RQ2 - Added evc extension to the list of extensions for ff_mov_demuxer Signed-off-by: Dawid Kozinski --- libavformat/demux.c | 1 + libavformat/mov.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/libavformat/demux.c b/libavformat/demux.c index b3f563ccc7..1b21b8440c 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -120,6 +120,7 @@ static int set_codec_from_probe_data(AVFormatContext *s, AVStream *st, { "mp3", AV_CODEC_ID_MP3, AVMEDIA_TYPE_AUDIO }, { "mpegvideo", AV_CODEC_ID_MPEG2VIDEO, AVMEDIA_TYPE_VIDEO }, { "truehd", AV_CODEC_ID_TRUEHD, AVMEDIA_TYPE_AUDIO }, + { "evc", AV_CODEC_ID_EVC, AVMEDIA_TYPE_VIDEO }, { 0 } }; int score; diff --git a/libavformat/mov.c b/libavformat/mov.c index a8d004e02b..278dec6765 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -2646,6 +2646,7 @@ static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb, case AV_CODEC_ID_VP9: sti->need_parsing = AVSTREAM_PARSE_FULL; break; + case AV_CODEC_ID_EVC: case AV_CODEC_ID_AV1: /* field_order detection of H264 requires parsing */ case AV_CODEC_ID_H264: @@ -7932,6 +7933,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = { { MKTAG('i','l','o','c'), mov_read_iloc }, { MKTAG('p','c','m','C'), mov_read_pcmc }, /* PCM configuration box */ { MKTAG('p','i','t','m'), mov_read_pitm }, +{ MKTAG('e','v','c','C'), mov_read_glbl }, { 0, NULL } }; From patchwork Thu Jun 15 06:26:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42090 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp552843pzb; Wed, 14 Jun 2023 23:26:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6+yvMOJL56DH1hgf6NZGorJhcH2JPBHLOlFerW/9bPu0zEVMCvVtsPUxGBPPXlVCcnkLR+ X-Received: by 2002:aa7:cfc4:0:b0:518:e1e7:3d51 with SMTP id r4-20020aa7cfc4000000b00518e1e73d51mr2527720edy.34.1686810403499; Wed, 14 Jun 2023 23:26:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810403; cv=none; d=google.com; s=arc-20160816; b=pWGjx5A7jxZKk3GKg1VJ/+JfV01sBIE3HZ9Ez/2g7EMV7M+XqD30Xz8jW9b3qWyLV+ EMTkW+k9PX3IS94/8jtIzR+yBdjI/fRPI98Kl0e0PdBs3a2qVMeJ33p+ijt3p6fiSkE+ xmt5I/72EVXXbRDLrEIqZ5JoqVgQ4AUig+UvioBiB9H3BE9dlPg9MkekdaREgCaQuTAD zhasPsRbtFw3YTIW2ow5j9B2b8W9Akh//dpaIkh0L0e1sasektYU9yVgpyhu6DGc+vqi 1neEknDwJt1viONjb6/epmTAQgIfz8fwAyusdiYs83oJdxXd8rpBIeopYEmFNqs4qsEA SI4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=9+5bk9CMCfLF2gqNLcTr9p+sEzFeK6Fj/YzgJBffICA=; b=M5e98nZc2ijAxKM6AIBKPsr25vadkgyI42VwMfkA0MrDFqc34lHCHrROZItSIB9C0x +SuYdF+7jdGgJi176QKaUChv0Swf2Tk0sc3juNpimcAmn2u+t4r7tS+cBNnH/ACvQY78 8DZFUTRZ1IGyEHJK9Lya3bWDK4UtuzY2LKWyb4X7ZYwZZcIYJ3ER39ftxggkG82kl+8C iMsI3Hv5bsGV72gxu7h18nNk1wDI4d1IXhMv4ixRvfPIZ6xT5A7jtlrjo5E9zZpXyW/J NH2jP/nzmeTAOcfqru/3dBMThL63GoszUvPeO9bJWcAviKPS0eLfZkR5y7CtvTSpvqaB Wo4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=JT4hN1K4; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i15-20020aa7c70f000000b005187bc4537fsi2271270edq.131.2023.06.14.23.26.43; Wed, 14 Jun 2023 23:26:43 -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=@samsung.com header.s=mail20170921 header.b=JT4hN1K4; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 03F1C68C4EE; Thu, 15 Jun 2023 09:26:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 13C9E68C430 for ; Thu, 15 Jun 2023 09:26:37 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062637euoutp0188d59979645a4392f7a30887458d6b11~owR54nbVj0174101741euoutp01_ for ; Thu, 15 Jun 2023 06:26:37 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230615062637euoutp0188d59979645a4392f7a30887458d6b11~owR54nbVj0174101741euoutp01_ DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810397; bh=Gsf6TedkgBFa066YWs0IXCzzFa4VOoaJ1AzM7OugNjY=; h=From:To:Cc:Subject:Date:References:From; b=JT4hN1K48vxE2L/xTCaqHoqF9xpcn/zYEOgFpOxkvN1+Q+58S6309sw+1RNumDOJC WVA3u5KcbciYEdH2DXBotheuv4yUfC1//o1h6knJlUD8PEMZ2B8pTploFqHuzGBNXh wnP5FnJRGW0S8FIvHczaLfUzX98iSD0DBUmeVbaI= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230615062636eucas1p2f3e689145155854559c8bd61d8f97cf1~owR5umaFS1943319433eucas1p2r; Thu, 15 Jun 2023 06:26:36 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id D8.FA.42423.C1FAA846; Thu, 15 Jun 2023 07:26:36 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062636eucas1p13493f6b468ac90173a8a99cdacbb4c0a~owR5ezTCL0945709457eucas1p1J; Thu, 15 Jun 2023 06:26:36 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230615062636eusmtrp1ee6b228c46e8d5c959f5d968f4f32c74~owR5d4y0v0572105721eusmtrp1g; Thu, 15 Jun 2023 06:26:36 +0000 (GMT) X-AuditID: cbfec7f2-a3bff7000002a5b7-fc-648aaf1c671f Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D8.C6.10549.C1FAA846; Thu, 15 Jun 2023 07:26:36 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230615062636eusmtip115f524fa1620ba18959410f697d83804~owR5LkoSA2795827958eusmtip1C; Thu, 15 Jun 2023 06:26:36 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:26:18 +0200 Message-Id: <20230615062618.1219-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBIsWRmVeSWpSXmKPExsWy7djPc7oy67tSDC78N7T4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5iiuGxSUnMyy1KL9O0SuDJW3fvFXHCKvWLRm9XsDYz/WbsY OTkkBEwkrj/azwxiCwmsYJT4uFYTwv7CKDHtqzGE/ZlRYvWvEJj6TZ8OA9VzAcWXM0rcfjWH HcJpZZLoPv+GDaSKTUBX4uWHR0wgtoiAqcTJ5r1gcWYBbYl1d7+D2cIC9hLfL0wB28wioCpx 6f5cMJtXwEri67wf7BDbNCUmbJnDBBEXlDg58wkLRJxbYt2sS6wQM+UlmrfOBrtIQuAnu0Tr 47+MXYwcQI6LRPvvCoh6YYlXx7dAzZSROD25hwWipFjiUL8DhFkjcehHOkSFtcTbxuNgQ5iB Lli/Sx8i7CjxvnsfG0Q1n8SNt4IQ+/kkJm2bzgwR5pXoaBOCMFUk+jrFIBqlJJ4um8MMYXtI 7Ol8yTaBUXEWkqdmIXlkFsLaBYzMqxjFU0uLc9NTiw3zUsv1ihNzi0vz0vWS83M3MQITw+l/ xz/tYJz76qPeIUYmDsZDjBIczEoivE812lOEeFMSK6tSi/Lji0pzUosPMUpzsCiJ82rbnkwW EkhPLEnNTk0tSC2CyTJxcEo1MHldn//FNM1NJ1mVu6jkEdOKkJACm+/BZVV+056pTl2h+yD8 hOsDnrVikQK2Sb/K8x/qql2REDE4ULU16+msNr1FF06u/r6J9ZnD1tXZgdEbPO0Mn/5Q3Zb3 2pVnm47k8+0si1dfXXbHMq6seKqcLYuAwHyP+aKfHyfocZa8O89/x3pD9YnQRX8iz3KX7ljw K1X43G7l8xPcjt0vf7DqXoWg1eW61F2cms/yN0lvKk2tTpk94crL9rSaxaJlhaVfNPez607t nSuv5NJ18+6T6qQfp811OpSWym7q3RpimvpbSZ7j7bKHqsH5OvPK5Hd7e2/ZtGuTicb1jNdM CeLKS+QO6ZYpHbMv3vqiltNysxJLcUaioRZzUXEiANRf7kh7AwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrELMWRmVeSWpSXmKPExsVy+t/xu7oy67tSDKZ/VrL4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DJW3fvFXHCKvWLRm9XsDYz/WbsYOTkkBEwkNn06zNzFyMUhJLCU UWJNcyc7REJKYunSRYwQtrDEn2tdbBBFzUwSXcv/soAk2AR0JV5+eMQEYosImEtcXHcLrIFZ QFti3d3vbCC2sIC9xPcLU5hBbBYBVYlL9+eC2bwCVhJf5/2AWqYpMWHLHCaIuKDEyZlPWCDi 3BLrZl1ihZgpL9G8dTbzBEb+WUjKZiFJLWBkWsUoklpanJueW2yoV5yYW1yal66XnJ+7iREY uNuO/dy8g3Heq496hxiZOBgPMUpwMCuJ8D7VaE8R4k1JrKxKLcqPLyrNSS0+xGgKdOtEZinR 5Hxg7OSVxBuaGZgamphZGphamhkrifN6FnQkCgmkJ5akZqemFqQWwfQxcXBKNTDxn1+jqHvG o/vA4bPObA4VUq65PwwKzhl/cpth0rRQ02dqTrERu5SJx4zd7BrvJh6b1vfwarb3h683pppc nPosXtHrPIdNpK2Mrtv2ZesX3Vlmbl/96MwK5divvzzfldk/15K6Z7y231x6TVuCR9b1eY93 vWi79nMTu8nsz97TvCVUHZpSFX+cPbVJfv/Dj8dmT2/tfD9pRuSiRz9ab9fcjHnR8Tz18iWG 28dzJjNFPvAS0D217KKxmH3QzwJT2zvsk3JELx6bm63dn6Ofc/TpLEu/MCXD74LTRPMY1t6T cDovsHPhnYOe0WEtC/3qr1dXCsw13plrEqjYfe2I/F3579NSGaI2vzNgjsrikLRSYinOSDTU Yi4qTgQAhSrh0OUCAAA= X-CMS-MailID: 20230615062636eucas1p13493f6b468ac90173a8a99cdacbb4c0a X-Msg-Generator: CA X-RootMTR: 20230615062636eucas1p13493f6b468ac90173a8a99cdacbb4c0a X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062636eucas1p13493f6b468ac90173a8a99cdacbb4c0a References: Subject: [FFmpeg-devel] [PATCH v25 8/9] avcodec/evc: Changes in Changelog file 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ToFHJMxZxexu - Changelog update Signed-off-by: Dawid Kozinski --- Changelog | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Changelog b/Changelog index cd872d9bf2..af7a6ba5bd 100644 --- a/Changelog +++ b/Changelog @@ -62,7 +62,8 @@ version 6.0: - filtergraph syntax in ffmpeg CLI now supports passing file contents as option values, by prefixing option name with '/' - hstack_qsv, vstack_qsv and xstack_qsv filters - +- eXtra-fast Essential Video Encoder (XEVE) +- eXtra-fast Essential Video Decoder (XEVD) version 5.1: - add ipfs/ipns gateway support @@ -90,7 +91,6 @@ version 5.1: - added chromakey_cuda filter - added bilateral_cuda filter - version 5.0: - ADPCM IMA Westwood encoder - Westwood AUD muxer @@ -136,7 +136,6 @@ version 5.0: - anlmf audio filter - IMF demuxer (experimental) - version 4.4: - AudioToolbox output device - MacCaption demuxer From patchwork Thu Jun 15 06:26:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dawid Kozinski/Multimedia \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 42097 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp553018pzb; Wed, 14 Jun 2023 23:27:06 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7/hBQM9esjtyMSMXwEnFOfUC5P/3Ml0h8yjvfmCxQi1e3MnziE2Z1lEpGea3y3yFJ/dYpW X-Received: by 2002:a17:907:9412:b0:973:d1ce:dbe8 with SMTP id dk18-20020a170907941200b00973d1cedbe8mr15859340ejc.46.1686810425781; Wed, 14 Jun 2023 23:27:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686810425; cv=none; d=google.com; s=arc-20160816; b=i0mv2439AtgNXHEMRzDwkPcIHFsyURQbyf4xVhb5EsxCy3bHcOnF1GwXccuqhRZnJy gtCzwqnzMTdIpRauyZCYl5maavtY8DDmMHCLwcHl26GpoJNFjAZU2ZAMlfiZUufEXiH1 HtqiN8BnpaxNIjTYwC7TD+7McqfcxDIDhStyvTs6l2srFZk4EDMMzBsqd5DwwgDvkKN7 Ly2BicdBbpodSCuaobdIcw80KTm/LIM1VcpGgd1n0OFOy41q/fFvowUEFlOYjVh2m1CL qytz66KwaKKAR79Pacy0xQ3OvwIJcl5+6F+K/LHeXkLGnPU62l36g/eVOcMO1mK25Zhh eK/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:cms-type:mime-version :message-id:date:to:from:dkim-signature:dkim-filter:delivered-to; bh=vQLXquoCJR2BihgqmBAmZVRu5/Ztj3tWp2Oiw9BZPy4=; b=qgELKu9J79othJ5IYH0eZsTzdhlxGSz37xRJMufF8d/c6G2PNMaRJV7Nu7pj8pMaz+ 6+GJEjFMuMKiwOwdSGbb7/pJoW4q8pX5v/zcgRKjL/KlFMRrQTg6PGIKFT0NA3RrK6iw dAO7RknJSwpdu2I67I6yBPPhm/M6n6xApiAv0IpRCu8y3GcptASNnhyMrU76o6EHb/ix JMxZYgjEGMZTM8kaIS1AFl1S+TPY6pJxZlzRqisRlqM3+S/IKkUA8RbPYrPijja1rs66 raEqirMckaBCk54X/2Yl0wZv35T9kzswGjaXfDpCY+g8wX9wQ0UE/dvSuew1ri8/XIt1 CBpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ONQ8Y7t4; 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=NONE dis=NONE) header.from=samsung.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j21-20020a170906279500b00982b2965801si94609ejc.749.2023.06.14.23.27.05; Wed, 14 Jun 2023 23:27:05 -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=@samsung.com header.s=mail20170921 header.b=ONQ8Y7t4; 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=NONE dis=NONE) header.from=samsung.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E77168C4F3; Thu, 15 Jun 2023 09:27:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mailout1.w1.samsung.com (mailout1.w1.samsung.com [210.118.77.11]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E399E68C48A for ; Thu, 15 Jun 2023 09:26:56 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20230615062656euoutp0151a64c387cacd206de4c3e6eff704303~owSL_k04s0174401744euoutp01z for ; Thu, 15 Jun 2023 06:26:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20230615062656euoutp0151a64c387cacd206de4c3e6eff704303~owSL_k04s0174401744euoutp01z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1686810416; bh=eojHFpbefn8B7vhiIQztdG97SqkoAlQmSpTi3QOQJ5A=; h=From:To:Cc:Subject:Date:References:From; b=ONQ8Y7t4pzMwc3y/UYpz3vzrdKQrSEahrCgKK9GSSrElvvrHgfFwtCdrfbcddPa8c E5lPm7+DGYQVjVHpv4Lw6GCOjVVhsZnjNo8Vc51EIbQ0xCO0b1MVC6wvNYRJ0OMEru VEYpJEJ9IGNXDpoVuFo8xp8bbeoHG/XdStWq3KAw= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20230615062656eucas1p216989aa040629170f9e4b3aa7092c037~owSLidUGg2674726747eucas1p2e; Thu, 15 Jun 2023 06:26:56 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 3F.0A.11320.F2FAA846; Thu, 15 Jun 2023 07:26:55 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20230615062655eucas1p1834acd2dc2596911f76ed4d02bcfa506~owSLMUZuz0967509675eucas1p1a; Thu, 15 Jun 2023 06:26:55 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20230615062655eusmtrp1b3424610c75ab27081ba1377e2fed12f~owSLL5lSb0572105721eusmtrp1w; Thu, 15 Jun 2023 06:26:55 +0000 (GMT) X-AuditID: cbfec7f4-97dff70000022c38-8c-648aaf2f7e7c Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id F0.D6.10549.F2FAA846; Thu, 15 Jun 2023 07:26:55 +0100 (BST) Received: from AMDN5164.EU.corp.samsungelectronics.net (unknown [106.120.40.55]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20230615062655eusmtip1a7478f13e4c5f197fd636de851513d04~owSK6vNN52902129021eusmtip1y; Thu, 15 Jun 2023 06:26:55 +0000 (GMT) From: Dawid Kozinski To: d.frankiewic@samsung.com, ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 08:26:47 +0200 Message-Id: <20230615062647.470-1-d.kozinski@samsung.com> X-Mailer: git-send-email 2.37.3.windows.1 MIME-Version: 1.0 X-Unsent: 1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsWy7djP87r667tSDJrfm1l8ufaF2WLlt98s Ft8+nWF2YPb4s2gzi0ffllWMAUxRXDYpqTmZZalF+nYJXBlfX+xiKjjNWfHn5yPWBsa/LF2M nBwSAiYSfa8mgdlCAisYJZrOZ3QxcgHZXxglpn9+xwrhfGaU2L56CjtMx8bn99ggEssZJaY9 /c0I4bQySbyad5ENpIpNQFfi5YdHTCC2iICpxMnmvWBxZgFtiXV3v4PZwgKOEu8uPAVq5uBg EVCVmPLOGyTMK2ApsXpzK9QyTYkJW+YwQcQFJU7OfAJ1NrfEulmXWCFGyks0b53NDBH/yS7x fIUlhO0i8edqL9QcYYlXx7dA2TISpyf3sICslRAoljjU7wBh1kgc+pEOUWEt8bbxONhhzEAX rN+lDxF2lJjz5CU7RDWfxI23ghD7+SQmbZvODBHmlehoE4IwVST6OsUgGqUkni6bA3Whh8TH 02tYJzAqzkLy1Cwkj8xCWLuAkXkVo3hqaXFuemqxUV5quV5xYm5xaV66XnJ+7iZGYGo4/e/4 lx2My1991DvEyMTBeIhRgoNZSYT3qUZ7ihBvSmJlVWpRfnxRaU5q8SFGaQ4WJXFebduTyUIC 6YklqdmpqQWpRTBZJg5OqQamgtmyySl+1y7N23ttnl3u89PXS+dv2mjvJ/HxlWOjxvSUede9 LWUz1utbz5H39r29yHPHo4B1t6uXpbeqdC+ZnKNlnc9b4GXsZyT7iM+zwHrZz+4zYU+2zjt/ 9tRHr6+3vmU85o1ccC6t6ef+13sshN1M9K+5BH2d+1HH9GrqxT9sx+NObarPDPMXF/2bemfP 4e+77HM+PlmrEvfOMb+2jmmz9YFXKT0aYq8Pz4yPmW7O1yHYt3oNb/pGycNOWvNrpLaZLxD9 YXivpeW1i+HR59XFiy5LmAfM6/uRVB9isl3O/HSF1MKPvzYlNu8uWLXdP0eVcdGfxc2tf4WX e5a5GwUqu1zhued2OXxK9ooHSizFGYmGWsxFxYkAEaHhwXwDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrALMWRmVeSWpSXmKPExsVy+t/xu7r667tSDKasVrX4cu0Ls8XKb79Z LL59OsPswOzxZ9FmFo++LasYA5ii9GyK8ktLUhUy8otLbJWiDS2M9AwtLfSMTCz1DI3NY62M TJX07WxSUnMyy1KL9O0S9DK+vtjFVHCas+LPz0esDYx/WboYOTkkBEwkNj6/x9bFyMUhJLCU UeLbttusEAkpiaVLFzFC2MISf651sYHYQgLNTBJH3iiC2GwCuhIvPzxiArFFBMwlLq67BVbP LKAtse7ud7B6YQFHiXcXngLFOThYBFQlprzzBgnzClhKrN7cyg4xXlNiwpY5TBBxQYmTM59A 3cYtsW7WJVaIkfISzVtnM09g5J+FpGwWktQCRqZVjCKppcW56bnFhnrFibnFpXnpesn5uZsY gUG77djPzTsY5736qHeIkYmD8RCjBAezkgjvU432FCHelMTKqtSi/Pii0pzU4kOMpkCnTmSW Ek3OB8ZNXkm8oZmBqaGJmaWBqaWZsZI4r2dBR6KQQHpiSWp2ampBahFMHxMHp1QD0051Lw/J R3GBKU02/OIiHSIMInq5EzdOYsrQvd3alH+He/JTGaVdooZTImu2zIvj/+Rcahq9e4nSm6C9 3A2zjKprmTdsWj+xf8U5o8yuQ62lHP/8/Jwllq5WndXNe0dqV5jzNMnm5wzHA6NPRU559OEm 46Klifx2S/canJv/9O1yB0mxiH29GlFPn9vPmMd/K7Dp8uy9IqYe0m+OrLP6kn9v/qp7zTxB Blrdk88tVtvSdTS8fvOSj+xu9gGJJ1TZH+ziNjo4ee2sBYGmE5KO18X0Jv9csSm7tv9Ca7j6 3oLXjhsvv7zzROfCt47lkqxzFnGyfXecLDD3VNv+SZESb09tMNOsKlDklKpZGXJRS4mlOCPR UIu5qDgRAC+YRfLjAgAA X-CMS-MailID: 20230615062655eucas1p1834acd2dc2596911f76ed4d02bcfa506 X-Msg-Generator: CA X-RootMTR: 20230615062655eucas1p1834acd2dc2596911f76ed4d02bcfa506 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20230615062655eucas1p1834acd2dc2596911f76ed4d02bcfa506 References: Subject: [FFmpeg-devel] [PATCH v25 9/9] avcodec/evc: Changes in MAINTAINERS file 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 Cc: Dawid Kozinski Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eLz4mxQ6oeQE - MAINTAINERS update Signed-off-by: Dawid Kozinski --- MAINTAINERS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 07852486e4..a595800af7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -198,6 +198,8 @@ Codecs: libvpx* James Zern libxavs.c Stefan Gehrer libxavs2.c Huiwen Ren + libxevd.c Samsung (Dawid Kozinski) + libxeve.c Samsung (Dawid Kozinski) libzvbi-teletextdec.c Marton Balint lzo.h, lzo.c Reimar Doeffinger mdec.c Michael Niedermayer @@ -417,6 +419,7 @@ Muxers/Demuxers: dv.c Roman Shaposhnik electronicarts.c Peter Ross epafdec.c Paul B Mahol + evc* Samsung (Dawid Kozinski) ffm* Baptiste Coudurier flic.c Mike Melanson flvdec.c Michael Niedermayer