From patchwork Wed Apr 20 12:32: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: 35362 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp846669pzh; Wed, 20 Apr 2022 05:32:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxDsHR+/OwJdSwaubLUaCYNtX0IeLRKmTeWTcXjERA/RrfQHUD6jO4F3e9oZopME0D1G1pZ X-Received: by 2002:a50:ef03:0:b0:41d:7084:13e8 with SMTP id m3-20020a50ef03000000b0041d708413e8mr23048169eds.54.1650457967504; Wed, 20 Apr 2022 05:32:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650457967; cv=none; d=google.com; s=arc-20160816; b=NvNDQpxhv8ySJoNqxjAXpR5R4avILaebo1ig+YdF5i7sqW8FFLOAW/9qDo3+vkQNRz qsZwog8Sfm7Spu336LfCJYQSrnHs4R+qPYF0RUT0VlpaFvifejOb+vApnbje9wscO2qz CyKvEj6Rd5g2Q80CqQeYGK6HPiaIHAx9vf6q0/hSM838t5uX6XcCksuVZLLZW6Op1ulf /XxVCq39+bIxUIyomcE8glM2UnyNCJAfM7lZQTSR6m0mrwbmJBjTPyWVV/IbsnhNmXmv gVDxuZGfRNOsasQQEhAZO9YQerNe6Noq/pk1kuIiSJl2VLnMFjVqwJhbIPRDd9I62gGR ibfg== 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=poDKZm2SywpBvc7bcrNETGZvspJdPILEMh576NLgPNM=; b=t71bo4RpFF3GIpLE/jBGE4PuLkcVuHSz6FzmqYcnOjauJxFzCevrIT+1LswNAZ2hlU 6TrDhmYlk3KIjvoANCk2QmqGyCxwLSKzimuSWf5Hu9VYu+v86VHpd15ZG4rwr/+kwTPx Y3oXC8rneuMNHp0e0sHfW6vMxBi6VW54ydrQNOJYVWV6mYHn/42UVOW1uEAnVghACjky zSCS6f6eyNsVBd7zCMAdRkRRfDlv3dFd32mPa0rlQOae+USBwPWRv7Dow2B92SI+i8p6 jNeVqbyzQqhrxAYYIpJBv3/jo8xWi88fXomDRnyZ2JQs42vPXAWGRSQt3WqpVDNktDT4 8tyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@samsung.com header.s=mail20170921 header.b=ZdpAjk+n; 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 ew23-20020a170907951700b006df892af0besi1517876ejc.940.2022.04.20.05.32.47; Wed, 20 Apr 2022 05:32:47 -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=ZdpAjk+n; 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 C4F7668B3CF; Wed, 20 Apr 2022 15:32:19 +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 879E368B38A for ; Wed, 20 Apr 2022 15:32:12 +0300 (EEST) Received: from eucas1p2.samsung.com (unknown [182.198.249.207]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20220420123212euoutp016e674f9df59e47abae503660eda225c8~nmr6m0Rxs1204512045euoutp01S for ; Wed, 20 Apr 2022 12:32:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20220420123212euoutp016e674f9df59e47abae503660eda225c8~nmr6m0Rxs1204512045euoutp01S DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1650457932; bh=3YL0tuNS8WwpS5vdJRTB0v16GoqyD0YTRlriW4norKc=; h=From:To:Subject:Date:References:From; b=ZdpAjk+nkEEDEXrOd33CbkylrGuZvueDoryIEBIUtFneNS4IV7ojD4yh64xT0cQIn pDIaeAnla8Ai2v4zZJADf9U1wLthvM7ck+avovcTBV1rnj9oC6HQjnDWoHpY+xVVYI bMJbY0lHAvtr/dKsxJ6JdNrYKlwqSI05tVle1SqA= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20220420123211eucas1p17aa6a71251304f13072b4d85b9a22850~nmr6U2xzi0887108871eucas1p1K for ; Wed, 20 Apr 2022 12:32:11 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 85.35.10009.B4DFF526; Wed, 20 Apr 2022 13:32:11 +0100 (BST) Received: from eusmtrp1.samsung.com (unknown [182.198.249.138]) by eucas1p1.samsung.com (KnoxPortal) with ESMTPA id 20220420123211eucas1p17b2a496278927bf1f15fc3046d30dc83~nmr545yIS0887108871eucas1p1J for ; Wed, 20 Apr 2022 12:32:11 +0000 (GMT) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eusmtrp1.samsung.com (KnoxPortal) with ESMTP id 20220420123211eusmtrp1e4a290c0c2b75910e5f591c9c8e0c421~nmr54WnUQ0757307573eusmtrp1G for ; Wed, 20 Apr 2022 12:32:11 +0000 (GMT) X-AuditID: cbfec7f2-e7fff70000002719-10-625ffd4b190f Received: from eusmtip2.samsung.com ( [203.254.199.222]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id E0.69.09522.B4DFF526; Wed, 20 Apr 2022 13:32:11 +0100 (BST) Received: from AMDN3260 (unknown [106.210.132.171]) by eusmtip2.samsung.com (KnoxPortal) with ESMTPA id 20220420123211eusmtip22a225a13ecce6a7efa6e85ff9152e585~nmr5pfSMg1851318513eusmtip2Z for ; Wed, 20 Apr 2022 12:32:11 +0000 (GMT) From: "Dawid Kozinski" To: Date: Wed, 20 Apr 2022 14:32:10 +0200 Message-ID: <005601d854b2$a84314b0$f8c93e10$@samsung.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AdhUsd64ROjTeGIQTDC50fZLbvXhbw== Content-Language: pl X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrOIsWRmVeSWpSXmKPExsWy7djPc7ref+OTDA79Ubf49ukMswOjx59F m1kCGKO4bFJSczLLUov07RK4Mu7N2cdS8CSqYuu/PqYGxn8uXYycHBICJhK9e9vYuhi5OIQE VjBKTOycwwqSEBKYxCTxcFkmRGIik8SNPbeBqjjAOn7PlYSIL2eUuPp2CxNEQxuTxLyfNSA2 m4C+xMxFn9hAbBEBWYnV/6aA9QoLhEps2sYPEmYRUJXY9nc3C4jNK2ApsWb5IWYIW1Di5Mwn YHFmASOJJavnM0HY8hLb385hhjhaQeLn02WsEOP1JFo/7GOHqBGRuPGohRHkNgmBn+wSH5ra WCEaXCRO7Z7DDmELS7w6vgXKlpE4PbmHBeKvYolD/Q4QZo3EoR/pEBXWEm8bjzNC2I4SM7o3 MkKU8EnceCsIsZVPYtK26cwQYV6JjjYhCFNFoq9TDKJRSuLpMpjbPSSOH25lm8CoOAvJu7OQ vDsLybuzkLy1gJFlFaN4amlxbnpqsWFearlecWJucWleul5yfu4mRmBaOP3v+KcdjHNffdQ7 xMjEwXiIUYKDWUmEN3RmfJIQb0piZVVqUX58UWlOavEhRmkOFiVx3uTMDYlCAumJJanZqakF qUUwWSYOTqkGJtfoKyxKTDd+VCuzpdmm9T5IeNKUH33viMhng6CT1y2uTLSqL9acXe3NfSrs c3FA3/0VwR8SuBy+p15+49Raf+ZB49sb0RNLBHZGiDCckVHMaU+ZU1UctF6t3+T02h/Tby90 blGSdfjum8gSYaO5/4no3X1KS9P1jn3+8b/W6CSn0c9bwXNaluXZrVaO/ce4R9mKVTFku2VL 37Tcn34v5K8c+uWWt4Ztz/qAdduSZvr9i+Y6OnflhVzZqh8p1xbduG8QYO6q1cIkEKvgrVvQ n3Et3+/u7Es5PFtW61buVhE44mNoxm0YXWbJEv5xyTphR8efWgemB5U7/bqhdM/S/tey830x +3elsieXim9UYinOSDTUYi4qTgQAIZcz7HoDAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrGLMWRmVeSWpSXmKPExsVy+t/xe7ref+OTDK4+4bP49ukMswOjx59F m1kCGKP0bIryS0tSFTLyi0tslaINLYz0DC0t9IxMLPUMjc1jrYxMlfTtbFJSczLLUov07RL0 Mu7N2cdS8CSqYuu/PqYGxn8uXYwcHBICJhK/50p2MXJxCAksZZQ4sb+HtYuREyguJbF06SJG CFtY4s+1LjaIohYmiZX7zzCDJNgE9CVmLvrEBmKLCMhKrP43BcwWFgiWeLVtHwuIzSKgKrHt 724wm1fAUmLN8kPMELagxMmZT8DizEBHNB7uhrLlJba/ncMMsVhB4ufTZawQ8/UkWj/sY4eo EZG48aiFcQKjwCwko2YhGTULyahZSFoWMLKsYhRJLS3OTc8tNtQrTswtLs1L10vOz93ECAzw bcd+bt7BOO/VR71DjEwcjIcYJTiYlUR4Q2fGJwnxpiRWVqUW5ccXleakFh9iNAX6bSKzlGhy PjDG8kriDc0MTA1NzCwNTC3NjJXEeT0LOhKFBNITS1KzU1MLUotg+pg4OKUamCKvGWzNvhPI /CX94IEHVyvivzWfSd+9YPPPCIEugYbNLl+qme5LzTITiJo95diEUO302uLNe++pn1rTfrH+ rvf+zXX9JxgmcL5t3/fiqpcez9ttU9ZvtzmvnHXg94vW36Xqa7/qruCoK2dyt5sR2WZ3LueM naPX1vWWP048CmZhSmdcceP0Dae+gIT2wyxaGyQC5qx7Pkf/UezVnt8e2q/fOqokPL9TYbL9 UtQc7YbjBpVKHMFbrx2QPFLvNP8b819nnq3n+Vd69m387Ly6umhv9PdbOW8Ma+5oLLj+UNLZ /uXmxbkqV1rEVHvmHXC8J5fEfDdx+ySpJeGbEoL/9ikmpJYn1u3aw+/iHnpaeI0SS3FGoqEW c1FxIgCzaT/r+QIAAA== X-CMS-MailID: 20220420123211eucas1p17b2a496278927bf1f15fc3046d30dc83 X-Msg-Generator: CA X-RootMTR: 20220420123211eucas1p17b2a496278927bf1f15fc3046d30dc83 X-EPHeader: CA CMS-TYPE: 201P X-CMS-RootMailID: 20220420123211eucas1p17b2a496278927bf1f15fc3046d30dc83 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: ZAj0OLQgMOaB - 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 | 127 +++++++++++++++++++++++++++++++++++++++ libavformat/isom_tags.c | 2 + libavformat/mov.c | 2 +- libavformat/movenc.c | 28 +++++++++ libavformat/rawenc.c | 13 ++++ 8 files changed, 181 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 e3233fd7ac..dae53d8b08 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -245,6 +245,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 7c1d0ac38f..90e45572d2 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..21f3f0f0e4 --- /dev/null +++ b/libavformat/evcdec.c @@ -0,0 +1,127 @@ +/* + * 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 + +#include "libavcodec/get_bits.h" +#include "libavcodec/golomb.h" +#include "libavcodec/internal.h" + +#include "rawdec.h" +#include "avformat.h" + +#define EVC_NAL_HEADER_SIZE 2 /* byte */ + +typedef struct EVCParserContext { + int got_sps; + int got_pps; + int got_idr; + int got_nonidr; +} EVCParserContext; + +static int get_nalu_type(const uint8_t *bs, int bs_size) +{ + int nal_unit_type_plus1 = 0; + XEVD_INFO info; + int ret; + + if(bs_size >= EVC_NAL_HEADER_SIZE) { + ret = xevd_info((void*)bs, EVC_NAL_HEADER_SIZE, 1, &info); + if (XEVD_FAILED(ret)) { + av_log(NULL, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return -1; + } + nal_unit_type_plus1 = info.nalu_type; + } + + return nal_unit_type_plus1 - 1; +} + +static uint32_t read_nal_unit_length(const uint8_t *bs, int bs_size) +{ + 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(NULL, AV_LOG_ERROR, "Cannot get bitstream information\n"); + return 0; + } + len = info.nalu_len; + if(len == 0) { + av_log(NULL, AV_LOG_ERROR, "Invalid bitstream size! [%d]\n", bs_size); + return 0; + } + } + + return 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 > XEVD_NAL_UNIT_LENGTH_BYTE) { + + nalu_size = read_nal_unit_length(bits, XEVD_NAL_UNIT_LENGTH_BYTE); + if(nalu_size == 0) break; + + bits += XEVD_NAL_UNIT_LENGTH_BYTE; + bytes_to_read -= XEVD_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 == XEVD_NUT_SPS) + ev->got_sps++; + else if (nalu_type == XEVD_NUT_PPS) + ev->got_pps++; + else if (nalu_type == XEVD_NUT_IDR ) + ev->got_idr++; + else if (nalu_type == XEVD_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 6c847de164..0719f27ce8 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -8882,7 +8882,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", + .extensions = "mov,mp4,m4a,3gp,3g2,mj2,psp,m4b,ism,ismv,isma,f4v,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 b9956e699c..9116baf01b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1373,6 +1373,17 @@ 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"); + ff_isom_write_avcc(pb, track->vos_data, track->vos_len); + + 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) { @@ -1622,6 +1633,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; @@ -1703,6 +1724,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) { @@ -2239,6 +2262,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) { @@ -5767,6 +5793,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)) { @@ -7332,6 +7359,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 efdfd0b0aa..bd2b4c6400 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",