From patchwork Wed Jun 22 06:49:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 36379 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp2657150pzb; Tue, 21 Jun 2022 23:49:35 -0700 (PDT) X-Google-Smtp-Source: AGRyM1uGxakMQjtdsxQgjUYckjqZ8PnUdXi3IJSyc4Ja4NY2ul7oonsPE+wNCWTVp1M8rUISmCGn X-Received: by 2002:a05:6402:3305:b0:435:8b1a:8fa1 with SMTP id e5-20020a056402330500b004358b1a8fa1mr2364248eda.32.1655880575297; Tue, 21 Jun 2022 23:49:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655880575; cv=none; d=google.com; s=arc-20160816; b=PpiI0flMh3XuJIFK6iI6iteFaUEFFMrRViXSka8j8PvsfDoXao/oppKruYlXwJ/BSw UD0Jk/eWiGiPjoP8ujWvBE78CZZRCaRfXikcxZsckISi/i5imyWAdO15tMm9AY+AQlE2 0zeYoxi4pF5sJKhoCpeH2klHWWycA7NmR0/K6bMcsokgToOHciCoE88a9uWliDWYeQo9 ztyctOtUwqqsxNcCB9A6JSzxefyEFYbANRnuAMoDhWaf02OUcUPrQCiKY95Qoz0mcPDB 7g+pjdlz/jvbarAk+OqwDG2YqPcGyeQ9dsVjVGli78b92P9+oKtm6asJRzFOuv3Bzl6w cfRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:references:cms-type:content-language :thread-index:mime-version:message-id:date:to:from:dkim-signature :dkim-filter:delivered-to; bh=qY85KYxj8V4PNqXfOLRXLGskAb1izyUCrpNpyqRhXfU=; b=YtvP8HtdpzYBxF/gC0inBRvznStWwClAoklVQoeVAia1V0tZ6DKL+SEawCHP62Y8HF UohJe/Wk6anUAlB956+Z1JTMrToh+np8B9Q3+cQCNj+h1jLfz/+XX/aV8i0gzY9XHc7o NAoI8xVmjhNF+MYi8JHxO1Cmj58+uWK3mALSHAwdSuwTwfdnb/sPBMMRj6VEeK12Xy2Z KZ1k+V9M+qcuWxBdJT5U4UfPFgEDqoG4BlEFvc2qqo1XYXyeGL649+XFNc/+blj0+Itq eYFFVZIuskXh5fuCDpR80/UuurveF/O1Th6jCxm5Dl/O2GssbuhBiCYOgKkRsqYk+gdm fuuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=F3FUv37g; 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 he37-20020a1709073da500b00722f1da9fc7si1292355ejc.793.2022.06.21.23.49.34; Tue, 21 Jun 2022 23:49:35 -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=F3FUv37g; 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 A014F68B6DD; Wed, 22 Jun 2022 09:49:17 +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 33B6668B0CD for ; Wed, 22 Jun 2022 09:49:11 +0300 (EEST) Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220622064910euoutp02813cf5b6e566a83762849516c49a1dfd~63pZyBbow0574005740euoutp02f for ; Wed, 22 Jun 2022 06:49:10 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220622064910euoutp02813cf5b6e566a83762849516c49a1dfd~63pZyBbow0574005740euoutp02f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1655880550; bh=lpwUe3N/g0dU8um47P/e3RRTJiIASkT5uctXn7HLqWs=; h=From:To:Subject:Date:References:From; b=F3FUv37gUsIJxumZyFLAGlqtO6hs72x0wIdoJKFyaoexo+V1uPdUFJEKkLZAQiyrX 4ItaHbnkVN6V5oQSVdz4iKFdN1JaJBH7o8Y8ihTVxoLUltPSayxnJ6ggYCIgFdGmAG 8G7CEsnsjqBiyJvK/GJkYvokOYHOallMyGfGuSfQ= Received: from eusmges3new.samsung.com (unknown [203.254.199.245]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20220622064910eucas1p180968f55f2b529e24e063dd3f4ccefe4~63pZqQLjF2947829478eucas1p15 for ; Wed, 22 Jun 2022 06:49:10 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges3new.samsung.com (EUCPMTA) with SMTP id 90.9B.09580.66BB2B26; Wed, 22 Jun 2022 07:49:10 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20220622064910eucas1p278476f244706d9b333bcead6670bb8c5~63pZYtMbz1235512355eucas1p2L for ; Wed, 22 Jun 2022 06:49:10 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220622064910eusmtrp132ef205e2ff3cfbe64c2361877e6c0c3~63pZXeplm1415214152eusmtrp1g for ; Wed, 22 Jun 2022 06:49:10 +0000 (GMT) X-AuditID: cbfec7f5-9c3ff7000000256c-e1-62b2bb66646b Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 68.B0.09038.66BB2B26; Wed, 22 Jun 2022 07:49:10 +0100 (BST) Received: from AMDN3260 (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220622064910eusmtip18c6e2881df142a8a54fe2594ee8a52ab~63pZJyhIK3188631886eusmtip1h for ; Wed, 22 Jun 2022 06:49:10 +0000 (GMT) From: "Dawid Kozinski" To: Date: Wed, 22 Jun 2022 08:49:10 +0200 Message-ID: <00bc01d88604$2d411220$87c33660$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdiGAoLNArKk2Rz2S6qr43qqJUiknw== Content-Language: pl X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOIsWRmVeSWpSXmKPExsWy7djP87ppuzclGbTuVrD49ukMswOjx59F m1kCGKO4bFJSczLLUov07RK4Ml4eX8la8C2hounOWtYGxlseXYwcHBICJhK77yp1MXJxCAms YJToWvGSEcKZxCQxteMnK4QzkUni/eTXzF2MnGAdn868Y4dILGeU+LnuKztIQkigjUni/9k8 EJtNQF9i5qJPbCC2iICsxOp/U9hA1gkLhEps2sYPEmYRUJW4vns6K0iYV8BSou0QH0iYV0BQ 4uTMJywgNrOAkcSS1fOZIGx5ie1v50CdoCDx8+kyVojpehIH18xng6gRkbjxqAXsAQmBn+wS M348Z4VocJHYf/IHlC0s8er4FnYIW0bi9OQeFkhIFEsc6neAMGskDv1Ih6iwlnjbeJwRwnaU eHp0FyNECZ/EjbeCEFv5JCZtm84MEeaV6GgTgjBVJPo6xSAapSSeLoO53UNi8p+17BMYFWch eXcWkndnIXl3FpK3FjCyrGIUTy0tzk1PLTbOSy3XK07MLS7NS9dLzs/dxAhMC6f/Hf+6g3HF q496hxiZOBgPMUpwMCuJ8Npwb0gS4k1JrKxKLcqPLyrNSS0+xCjNwaIkzpucuSFRSCA9sSQ1 OzW1ILUIJsvEwSnVwDQpZbkYz5x9zhvW83dezQpy3++UvEzze5y0rIPhv02Zyy2O3u5q6Tx4 7fha3Ytr7oW+XdTW8617wbLPdxucjqqUqWTen/l8EzfDHMbiorUVs/KyNy4J+MD5261q2rW1 Ebdad+zadPqmk9KpqX4xmzX375vxoHsR1wr5+x8/7Hwz1cFg0SQZlWyF/Z8WvXi2hM3z07Hb XGXdr88lLDDxezDPbH2Pm6y1Hc+M/wsPBVeJL8irrrm/elee10KBgq7dSmuXFit0a+f3W8xb yt40o3Br0c+AmFhn+cd1ZsuUQv7zrlyUySoU+SvV5RbLzM8PZkQ3pbSr58s9PeAvUMK283VX 3etkhrxC1aiHC5by5N1RYinOSDTUYi4qTgQAsDCs03oDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsVy+t/xu7ppuzclGSxbJGDx7dMZZgdGjz+L NrMEMEbp2RTll5akKmTkF5fYKkUbWhjpGVpa6BmZWOoZGpvHWhmZKunb2aSk5mSWpRbp2yXo Zbw8vpK14FtCRdOdtawNjLc8uhg5OSQETCQ+nXnH3sXIxSEksJRR4mTja0aIhJTE0qWLoGxh iT/XutggilqYJLpPr2ADSbAJ6EvMXPQJzBYRkJVY/W8KmC0sECzxats+FhCbRUBV4vru6axd jBwcvAKWEm2H+EDCvAKCEidnPgErYQY6ovFwN5QtL7H97RxmiL0KEj+fLmOFGK8ncXDNfDaI GhGJG49aGCcwCsxCMmoWklGzkIyahaRlASPLKkaR1NLi3PTcYiO94sTc4tK8dL3k/NxNjMAA 33bs55YdjCtffdQ7xMjEwXiIUYKDWUmE14Z7Q5IQb0piZVVqUX58UWlOavEhRlOg1yYyS4km 5wNjLK8k3tDMwNTQxMzSwNTSzFhJnNezoCNRSCA9sSQ1OzW1ILUIpo+Jg1OqgUk7T1eqRvug SqdO7mT2Cxe9Puy9MTmsbu+zKS8Ebv8/5teqnl/iceO7b1hcY53Qs+kXSuuFrt+Xbp2Yxd9b cWjOIe5vuxc/Ot952FokUODsnS22+0Qrk+Vv3l5p5S7M7dK+Y02a/xZB78//OF2f9LfWe9oe s9TWnvzR+aFdhLr46iudjTE98+tYrr39ZRRU73BpQ29wkZhTolHNzQsKGkV9UZfXljJ/Fjcz jP+0ZbXY24sxMTr/Jm5+a3FLWWjyu2sXhJz+x0+0XpDhfat4ZwLzPa2Pv/+dZJU5vuDO+6rm kpMHPUzUDZ8tZ1+k5Jm1bmX4tyymr7qrjr3huC3xm/3u1DvBN8KrcmoOObguXaLEUpyRaKjF XFScCAA9Sp3L+QIAAA== X-CMS-MailID: 20220622064910eucas1p278476f244706d9b333bcead6670bb8c5 X-Msg-Generator: CA X-RootMTR: 20220622064910eucas1p278476f244706d9b333bcead6670bb8c5 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220622064910eucas1p278476f244706d9b333bcead6670bb8c5 References: Subject: [FFmpeg-devel] [PATCH 3/3] Provided support for MPEG-5 EVC (Essential Video Coding) codec X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: j0Aj4OPXE59o - Added muxer for EVC format (MP4, raw) - Added demuxer for EVC format (MP4) - Added evc extension to the list of extensions for ff_mov_demuxer Signed-off-by: Dawid Kozinski --- doc/muxers.texi | 6 ++ libavformat/Makefile | 2 + libavformat/allformats.c | 2 + libavformat/evcdec.c | 142 +++++++++++++++++++++++++++++++++++++++ libavformat/isom_tags.c | 2 + libavformat/mov.c | 2 +- libavformat/movenc.c | 27 ++++++++ libavformat/rawenc.c | 13 ++++ 8 files changed, 195 insertions(+), 1 deletion(-) create mode 100644 libavformat/evcdec.c diff --git a/doc/muxers.texi b/doc/muxers.texi index b6cafaa5fd..1fc1c0de3e 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 1416bf31bd..39b23b754f 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -249,6 +249,8 @@ 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 OBJS-$(CONFIG_HNM_DEMUXER) += hnm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 8b84b52c64..2c64009291 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -148,6 +148,8 @@ extern const AVInputFormat ff_ea_cdata_demuxer; extern const AVInputFormat ff_eac3_demuxer; extern const AVOutputFormat ff_eac3_muxer; extern const AVInputFormat ff_epaf_demuxer; +extern const AVInputFormat ff_evc_demuxer; +extern const AVOutputFormat ff_evc_muxer; extern const AVOutputFormat ff_f4v_muxer; extern const AVInputFormat ff_ffmetadata_demuxer; extern const AVOutputFormat ff_ffmetadata_muxer; diff --git a/libavformat/evcdec.c b/libavformat/evcdec.c new file mode 100644 index 0000000000..58dc671d24 --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,142 @@ +/* + * 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 "rawdec.h" +#include "avformat.h" + +// The length field that indicates the length in bytes of the following NAL unit is configured to be of 4 bytes +#define EVC_NAL_UNIT_LENGTH_BYTE (4) /* byte */ + +#define EVC_NAL_HEADER_SIZE (2) /* byte */ +#define MAX_SPS_CNT (16) /* defined value in EVC standard */ + +// NALU types +// @see ISO_IEC_23094-1_2020 7.4.2.2 NAL unit header semantics +// +#define EVC_NUT_NONIDR (0) /* Coded slice of a non-IDR picture */ +#define EVC_NUT_IDR (1) /* Coded slice of an IDR picture */ +#define EVC_NUT_SPS (24) /* Sequence parameter set */ +#define EVC_NUT_PPS (25) /* Picture paremeter set */ +#define EVC_NUT_APS (26) /* Adaptation parameter set */ +#define EVC_NUT_FD (27) /* Filler data */ +#define EVC_NUT_SEI (28) /* Supplemental enhancement information */ + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bits, int bits_size) +{ + int unit_type_plus1 = 0; + + if(bits_size >= EVC_NAL_HEADER_SIZE) { + unsigned char *p = (unsigned char *)bits; + // forbidden_zero_bit + if ((p[0] & 0x80) != 0) { + av_log(NULL, AV_LOG_ERROR, "Cannot get bitstream information. Malformed bitstream.\n"); + 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_NAL_UNIT_LENGTH_BYTE) { + + int t = 0; + unsigned char *p = (unsigned char *)bits; + + for(int i=0; ibuf; + int bytes_to_read = p->buf_size; + + while(bytes_to_read > EVC_NAL_UNIT_LENGTH_BYTE) { + + nalu_size = read_nal_unit_length(bits, EVC_NAL_UNIT_LENGTH_BYTE); + if(nalu_size == 0) break; + + bits += EVC_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= EVC_NAL_UNIT_LENGTH_BYTE; + + if(bytes_to_read < nalu_size) break; + + nalu_type = get_nalu_type(bits, bytes_to_read); + + bits += nalu_size; + bytes_to_read -= nalu_size; + + if (nalu_type == EVC_NUT_SPS) + ev->got_sps++; + else if (nalu_type == EVC_NUT_PPS) + ev->got_pps++; + else if (nalu_type == EVC_NUT_IDR ) + ev->got_idr++; + else if (nalu_type == EVC_NUT_NONIDR) + ev->got_nonidr++; + } + + return 0; +} + +static int evc_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; +} + +FF_DEF_RAWVIDEO_DEMUXER(evc, "raw EVC video", evc_probe, "evc", AV_CODEC_ID_EVC) diff --git a/libavformat/isom_tags.c b/libavformat/isom_tags.c index 62e60470a8..0245cfb999 100644 --- a/libavformat/isom_tags.c +++ b/libavformat/isom_tags.c @@ -145,6 +145,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/mov.c b/libavformat/mov.c index 3ec0ea2361..6b2c03e44c 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -9038,7 +9038,7 @@ const AVInputFormat ff_mov_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("QuickTime / MOV"), .priv_class = &mov_class, .priv_data_size = sizeof(MOVContext), - .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif", + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,avif,evc", .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = mov_probe, .read_header = mov_read_header, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index b7b2f46a17..347ea72897 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1377,6 +1377,16 @@ 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"); + + 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) { @@ -1626,6 +1636,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', 'i'); + + return tag; +} + static const struct { enum AVPixelFormat pix_fmt; uint32_t tag; @@ -1707,6 +1727,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) { @@ -2264,6 +2286,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) { @@ -5968,6 +5993,7 @@ int ff_mov_write_packet(AVFormatContext *s, AVPacket *pkt) if ((par->codec_id == AV_CODEC_ID_DNXHD || par->codec_id == AV_CODEC_ID_H264 || par->codec_id == AV_CODEC_ID_HEVC || + par->codec_id == AV_CODEC_ID_EVC || par->codec_id == AV_CODEC_ID_TRUEHD || par->codec_id == AV_CODEC_ID_AC3) && !trk->vos_len && !TAG_IS_AVCI(trk->tag)) { @@ -7604,6 +7630,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') }, diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 26099cb1c1..48dedfa375 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -401,6 +401,19 @@ const AVOutputFormat ff_hevc_muxer = { }; #endif +#if CONFIG_EVC_MUXER +AVOutputFormat ff_evc_muxer = { + .name = "evc", + .long_name = NULL_IF_CONFIG_SMALL("raw EVC video"), + .extensions = "evc", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_EVC, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_M4V_MUXER const AVOutputFormat ff_m4v_muxer = { .name = "m4v",