From patchwork Thu May 12 06:05:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dawid Kozinski X-Patchwork-Id: 35740 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp297323pzb; Wed, 11 May 2022 23:06:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7NQlt8xS3uYUpIIV4cF8qf307oC0BozZbOysfh+sggYEJ5WxiZvICElyvC+nI7GargRdP X-Received: by 2002:a17:907:60d6:b0:6fa:95d3:d4e5 with SMTP id hv22-20020a17090760d600b006fa95d3d4e5mr13597572ejc.357.1652335568756; Wed, 11 May 2022 23:06:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652335568; cv=none; d=google.com; s=arc-20160816; b=KbPwYlhCvvDwcaHcIjr2n2OtCxEQEEg3VLVQbl/UYvDWBELFpQbYrHkbCYQLnzQAbO KG/C4PyEHTeUuwMBMJiFmxQCiO7zq5rgp5te9Hz/84x3u0rw+exPKCVpr3S3Dy2mWZSC K4yOyuPUYKWP9xlekvqORh9Q8SFRFaLMxpmjUB916/wV11ZRx1AxaVb4n8OyrKs9WO26 RhroDExa5ZzvQLMgs6iNTJbXupMXS10h3vBokdI2QeD37N2spGl+GZ+SI2fvynvOk88O TXYqXFntFcgIo/W8Hi2Do9HGH2cxFcZ1B3z7z5hPBWJMXEv1z51BoNmVK4yiwQWMx6gB +pmw== 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:thread-index :content-language:mime-version:message-id:date:to:from :dkim-signature:dkim-filter:delivered-to; bh=0icGt2V1RiVFechpbNFK+FTbInyuUhGIHWiaActhFek=; b=kU0qEI8xp87wigjsvbDqN41klfzJfcVC8j4JlxoBdzDRsYmmfdBMOKergitnGrTezO GxUUvMfFQkeHc4x3J7SD1CbsE4YFeF4/keLEm8EqvQvXwNl3ffOWiAFPbsqESzUb7Z1m wS+LHaV///PlTKJdNSIUwkdAbgfyDnwOEkQmxPd049yr9GszK8Bh9ys3LuXlLg1F5lEn Imsaf1+3XlWYO9Hfn7cRTfbicBaWbMSColDNkVzTJFhDl1Y5EDBHLyoO9hrRZf5FEnEc USB6RpxtqtQc/3xHFF3DYJS/ESKR99hqbkw/EJ00bcZqBwSPVNSpnaAplYVKOVPh0yXq CQiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=fh+B7FVB; 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 qa38-20020a17090786a600b006e8424d10f3si5100872ejc.169.2022.05.11.23.06.08; Wed, 11 May 2022 23:06:08 -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=fh+B7FVB; 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 CB94668B46E; Thu, 12 May 2022 09:05:47 +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 D63D468B45D for ; Thu, 12 May 2022 09:05:41 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout2.w1.samsung.com (KnoxPortal) with ESMTP id 20220512060541euoutp02ac270b715adc7f7a7dedca5351547b43~uRmuf66w30958109581euoutp02k for ; Thu, 12 May 2022 06:05:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.w1.samsung.com 20220512060541euoutp02ac270b715adc7f7a7dedca5351547b43~uRmuf66w30958109581euoutp02k DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1652335541; bh=F/q0HxaCmHyeITvrBsnVXJiVPkt3jOelQQQkDdWLQV8=; h=From:To:Subject:Date:References:From; b=fh+B7FVBI/Zb56YOdalOBFt9MUqY9J3ulIQSZAy9DVXIBEgJOK18QrFcvw7CUIYAa 0aweU2SXTEiF0WIB21lDO1FSDuu37SQUkDxvU0ZsK9Cr98Egu2NVJW7TQNybC6BGPB 4UDE/1UKtmLfuN/Ifu+cEFteRsVPO7/A1OgjjedU= Received: from eusmges2new.samsung.com (unknown [203.254.199.244]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20220512060541eucas1p26b7df4dcc9c48e198a51d3ca117c6914~uRmuXO9cB0242102421eucas1p2p for ; Thu, 12 May 2022 06:05:41 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges2new.samsung.com (EUCPMTA) with SMTP id 5A.B5.09887.5B3AC726; Thu, 12 May 2022 07:05:41 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p2.samsung.com (KnoxPortal) with ESMTPA id 20220512060540eucas1p2d1d882eab8eb0e14d154a890a5dde735~uRmt8a20L0302903029eucas1p23 for ; Thu, 12 May 2022 06:05:40 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220512060540eusmtrp1565eb8198a554b74538c72c1c98c7339~uRmt71K6U1696616966eusmtrp1N for ; Thu, 12 May 2022 06:05:40 +0000 (GMT) X-AuditID: cbfec7f4-471ff7000000269f-84-627ca3b5ee90 Received: from eusmtip1.samsung.com ( [203.254.199.221]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 95.EF.09404.4B3AC726; Thu, 12 May 2022 07:05:40 +0100 (BST) Received: from AMDN3260 (unknown [106.210.132.171]) by eusmtip1.samsung.com (KnoxPortal) with ESMTPA id 20220512060540eusmtip17e6c60ab7a878e8be3addda2cb606cdc~uRmttcBoq3138931389eusmtip1E for ; Thu, 12 May 2022 06:05:40 +0000 (GMT) From: "Dawid Kozinski" To: Date: Thu, 12 May 2022 08:05:40 +0200 Message-ID: <020801d865c6$4eb2a490$ec17edb0$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Content-Language: pl Thread-Index: AdhlxNUPugc6w64QQciDbV4NGj12kw== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJIsWRmVeSWpSXmKPExsWy7djPc7pbF9ckGXxbwGnx7dMZZgdGjz+L NrMEMEZx2aSk5mSWpRbp2yVwZUyf94C94GtCxcUrz5gaGG96dDFycEgImEh8viDbxcjFISSw glHi2v5mJghnEpPE8c0rGSGciUwSD/Z9Z+5i5ATraFuwih0isZxR4uy0a1BOG5PEvab5TCBV bAL6EjMXfWIDsUUEZCVW/5vCBrJPWCBUYtM2fpAwi4CqxO+LM8HKeQUsJb6ePANlC0qcnPmE BcRmFjCSWLIaYiSzgLzE9rdzoI5QkPj5dBkrRFxE4sajFkaIVXoSe079BbtHQuAju8SZl1/Y IRpcJN4v+cIIYQtLvDq+BSouI3F6cg8LJCyKJQ71O0CYNRKHfqRDVFhLvG08DtXpKNHYNgeq mk/ixltBiAv4JCZtm84MEeaV6GgTgjBVJPo6xSAapSSeLoO53UNi/9FGtgmMirOQvDsLybuz kLw7C8mLCxhZVjGKp5YW56anFhvlpZbrFSfmFpfmpesl5+duYgSmhtP/jn/Zwbj81Ue9Q4xM HIyHGCU4mJVEeGuaa5KEeFMSK6tSi/Lji0pzUosPMUpzsCiJ8yZnbkgUEkhPLEnNTk0tSC2C yTJxcEo1MMk4ms475pOwL9N443k7Pt0CbUUtjt69K9NELbuW9nAYGeXXGzP5fH884bHEpplC Ly46XT411crz0NWkJv6Yk5+XxN9cV9ijf/h4pG99xLwo1YVTdburPrwTrVi1K3SGvWley485 568kpG2dsXW97rSH9nnyqX/LBJpjYp43ajbtmlemuJXpmn7KjwYthiy9F6tX9neHFF8zeR/2 1uHp/bvzvuR8DjGY+dbUVn3XIlPG1dvna7/1qV2+Q3CTxKyd6tGmf46LL680/lPn3Dj72/xV d75fq+dvv+GzZP1DT2bfJwammVmvpG9dfZC4Pe7bjoORRR5Blduvz1r79czqI0//iE3wDzM6 HcaiFHPfabsSS3FGoqEWc1FxIgBCq8FRfAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOLMWRmVeSWpSXmKPExsVy+t/xu7pbFtckGTyZrWnx7dMZZgdGjz+L NrMEMEbp2RTll5akKmTkF5fYKkUbWhjpGVpa6BmZWOoZGpvHWhmZKunb2aSk5mSWpRbp2yXo ZUyf94C94GtCxcUrz5gaGG96dDFyckgImEi0LVjF3sXIxSEksJRR4sXX/YwQCSmJpUsXQdnC En+udbFBFLUwSXQt72MBSbAJ6EvMXPSJDcQWEZCVWP1vCpgtLBAs8WrbPrAaFgFVid8XZzKB 2LwClhJfT56BsgUlTs58AlbDDHRF4+FuKFteYvvbOcwQixUkfj5dxgoRF5G48aiFEWKXnsSe U3/ZJzAKzEIyahaSUbOQjJqFpH0BI8sqRpHU0uLc9NxiI73ixNzi0rx0veT83E2MwBDfduzn lh2MK1991DvEyMTBeIhRgoNZSYS3prkmSYg3JbGyKrUoP76oNCe1+BCjKdBvE5mlRJPzgVGW VxJvaGZgamhiZmlgamlmrCTO61nQkSgkkJ5YkpqdmlqQWgTTx8TBKdXA5Kyz4d7hKn7GmMTP rAw5jif3RlzPSZfasbtW72iT6qN8hyuqRy7tsZ3uN/U8/721WkeMJzCfn3D52SR1i/gZO/U+ Hn0Xe0Oa4f7OZ84/q/LZj3jnBwuER20JXszgcyvlwtTjTNf3PdAJX/rWTZblqO3FPq/XJqVZ SkdMlyxYrbI8LONxLZOB44FajTtz/J+48WmdOjyRdUb8c62OQ60t8xpTRBzWrwjIOvIgZm3q FxHhH9zRJ9yfeMtyaqy4tOjc/vuBpt8iBMMVlM9/qJWZ5ne7c23Q/7rn0zTfecoJuK34oeXt 9Nao3uQmj0ZER6D9pys//65vmnqVWzXW2TYl1+L1ddXdaWVPQ2Krs8+YKbEUZyQaajEXFScC AHcWMlv6AgAA X-CMS-MailID: 20220512060540eucas1p2d1d882eab8eb0e14d154a890a5dde735 X-Msg-Generator: CA X-RootMTR: 20220512060540eucas1p2d1d882eab8eb0e14d154a890a5dde735 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220512060540eucas1p2d1d882eab8eb0e14d154a890a5dde735 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: qCxDuPg1Pt4a - 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 1af603b7f6..585279c0a4 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -2114,6 +2114,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 3b9995a9d3..74ca22657f 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 63876c468f..94e6167728 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -147,6 +147,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..d441c9e6eb --- /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 = {}; + 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 d7be593a86..07f8a62453 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -9037,7 +9037,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 c720fd742d..baf5068393 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1376,6 +1376,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) { @@ -1625,6 +1635,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; @@ -1706,6 +1726,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) { @@ -2243,6 +2265,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) { @@ -5775,6 +5800,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)) { @@ -7344,6 +7370,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",