From patchwork Mon Jan 25 14:15:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25165 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 52A6544BD19 for ; Mon, 25 Jan 2021 16:17:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0753068A0EF; Mon, 25 Jan 2021 16:17:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8000C68A148 for ; Mon, 25 Jan 2021 16:17:21 +0200 (EET) Received: by mail-pg1-f170.google.com with SMTP id 30so8975024pgr.6 for ; Mon, 25 Jan 2021 06:17:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FKwnBRt4idhVfjPo/J2SKiOG1wkb7c5/2cpFIkyriCQ=; b=AMg7/DHH+P6O9053cEGfo9XJzUNfi2UIK8NODr28gymJ15KrAZVC/xjbKGI9i6ETmS RQR9YIMDrySTf9uLF8mJFuJchCMn9NGnJqkiAFgqgfSJwXJEVvxoPOJiWvZsfclZR216 am6dEQVE3qGNP9mDRmBUAYIGVB4iCT86MIIdwG2rqxTmwCXfc416WtTjdhcXiPpUfiby MrnzySRGbz4QZE4QI4TJtwBpsEZcv0GaCyZ52eVX76ocRje1cLNubMt5yiGfwf04pOLL RamJMqbFo4wrxx+3zqVbpzpxx7HkG3EV288L/jph3uqbrpmwFWmQKne/fCDWnI8TWQ/r l/Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FKwnBRt4idhVfjPo/J2SKiOG1wkb7c5/2cpFIkyriCQ=; b=Fr0d4UZFYQ+0rFVNBc7BO76KTr3/QWW408yBgfagKK2Tixlu7d1cD0FwSsR94YAgfD 5bBqoOzW+31cyBUhcpbUeGbcVrqxse32pOoopqr4ra6idOWNdG7EhUpCz6JA1QoEkt3v 0rQFVm5iP5a/lifpXWJ8Y2z2f6BDaIU47Y1CweKVx4N1ULN+eSmNGWpRBxZ27G3bfp3Z 3RiG7/xjFKvGBeJgz6VE6+2ksA7doj2pC7QTsUJ3XQREyHZ+3gIgJC3ftv7Y6DU7kLl9 t9E3KK1eb86X2E06pNRUfbKK/kpCY16Qc3PuiWjNZwuLxpG7jXitp2udaHanQn1J1blH HMfQ== X-Gm-Message-State: AOAM530OhhqsWzk6SSHlTALosR6g96wBsV2cWMErZ8STUMJzbcJ/xo+b o37mun4ClL9AWtYA5sAQfb5QoPGxIN8= X-Google-Smtp-Source: ABdhPJxWj2rRXutr4ZYF2Msi9jqx5TshPpTfqeQgiXGYWlcOQ0X1TeRNXPH+pJQ9FPPmANkj6PxA4A== X-Received: by 2002:aa7:9f91:0:b029:1b9:8f9b:b1af with SMTP id z17-20020aa79f910000b02901b98f9bb1afmr606630pfr.3.1611584239529; Mon, 25 Jan 2021 06:17:19 -0800 (PST) Received: from smith.tendawifi.com (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id z6sm5523328pfr.133.2021.01.25.06.17.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 06:17:19 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jan 2021 22:15:05 +0800 Message-Id: <20210125141507.11012-8-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210125141507.11012-1-nuomi2021@gmail.com> References: <20210111152357.3965-1-nuomi2021@gmail.com> <20210125141507.11012-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 7/9] avformat: add h266/vvc muxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavformat/Makefile | 1 + libavformat/allformats.c | 1 + libavformat/rawenc.c | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+) diff --git a/libavformat/Makefile b/libavformat/Makefile index 4a5406da38..0253aa7d5a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -564,6 +564,7 @@ OBJS-$(CONFIG_VPK_DEMUXER) += vpk.o OBJS-$(CONFIG_VPLAYER_DEMUXER) += vplayerdec.o subtitles.o OBJS-$(CONFIG_VQF_DEMUXER) += vqf.o OBJS-$(CONFIG_VVC_DEMUXER) += vvcdec.o rawdec.o +OBJS-$(CONFIG_VVC_MUXER) += rawenc.o OBJS-$(CONFIG_W64_DEMUXER) += wavdec.o w64.o pcm.o OBJS-$(CONFIG_W64_MUXER) += wavenc.o w64.o OBJS-$(CONFIG_WAV_DEMUXER) += wavdec.o pcm.o diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a2182e0603..2ec3eeda7b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -463,6 +463,7 @@ extern AVInputFormat ff_vpk_demuxer; extern AVInputFormat ff_vplayer_demuxer; extern AVInputFormat ff_vqf_demuxer; extern AVInputFormat ff_vvc_demuxer; +extern AVOutputFormat ff_vvc_muxer; extern AVInputFormat ff_w64_demuxer; extern AVOutputFormat ff_w64_muxer; extern AVInputFormat ff_wav_demuxer; diff --git a/libavformat/rawenc.c b/libavformat/rawenc.c index 32704f9bfd..5eb95f069c 100644 --- a/libavformat/rawenc.c +++ b/libavformat/rawenc.c @@ -372,6 +372,31 @@ AVOutputFormat ff_hevc_muxer = { }; #endif +#if CONFIG_VVC_MUXER +static int vvc_check_bitstream(struct AVFormatContext *s, const AVPacket *pkt) +{ + if (pkt->size >= 5 && AV_RB32(pkt->data) != 0x0000001 && + AV_RB24(pkt->data) != 0x000001) { + //TODO: fixed this after vvc codec defined in http://mp4ra.org/#/codecs + av_log(s, AV_LOG_ERROR, "vvc: mp4 to annexb is not supported\n"); + return AVERROR_PATCHWELCOME; + } + return 1; +} + +AVOutputFormat ff_vvc_muxer = { + .name = "vvc", + .long_name = NULL_IF_CONFIG_SMALL("raw VVC video"), + .extensions = "hevc,h266,266", + .audio_codec = AV_CODEC_ID_NONE, + .video_codec = AV_CODEC_ID_VVC, + .write_header = force_one_stream, + .write_packet = ff_raw_write_packet, + .check_bitstream = vvc_check_bitstream, + .flags = AVFMT_NOTIMESTAMPS, +}; +#endif + #if CONFIG_M4V_MUXER AVOutputFormat ff_m4v_muxer = { .name = "m4v",