From patchwork Mon Jan 11 16:33:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 24906 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 222EC44A990 for ; Mon, 11 Jan 2021 18:34:15 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DD4668ABEE; Mon, 11 Jan 2021 18:34:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC42F68ABEF for ; Mon, 11 Jan 2021 18:34:12 +0200 (EET) Received: by mail-pl1-f169.google.com with SMTP id y8so101380plp.8 for ; Mon, 11 Jan 2021 08:34:12 -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=5+ha6P9NBqPRZWcAsvZ4nXi0hv+nU6iKtqzdxMF54xI=; b=fH6GWEwxq2eq98Ssx4V3Fh3YcPn1CvMcqSeiPFF9u3lhtL9V/NEQSWSe+dHAfbgYJZ m0UteM8dIVUMGvyyLJuTj9lQDTZTZz+y3xzwjHkPjoT4l3EbIZKto6O4byh09YDSJOah Sz/21T2Rs3HvO8t11KawQx0E1zjZuP21A7oS87j7FlEFkpfKsLOeR+pN5DfL2pZgaRxJ Ly7h2/yBWjwY9I6MoPfxJo74O6G/xELdcwY6gwuaecR1MNY8gzPaEzXqlPkHb6SZ6Bv9 qRgythagIZUFYQkZeqPuQz7w6EYBrQAqnvkLK850z+jZKTaNU6rQSBQA1rZkACTQyBn0 hJ2g== 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=5+ha6P9NBqPRZWcAsvZ4nXi0hv+nU6iKtqzdxMF54xI=; b=chhhKNdOwJS+RaOWU3mkiG39f5E5lhLzRhinsFFbNcCP1gw8SR1Pjvja6YRp6Kslan XZw5ylbqFy1LS+MUIvZFcuyRRkQsYPoFfRMtUTOyO68SawO8Kiya/IFI9ke5v4LpQakJ ZH1hL1YS1yasr4E8bXeyHi3sf/3mwpTuwz8bjKgdGn/UK/eUdMeUyOkyfhhh0qMENbR8 ZD9kv16/lLqiI9DlpY8tLsfFA/OOreDqSC3MTG20maKWhFNPPaM3ZebilqftQkT7jMN5 Xk1JEKuZY2g5s1Q0SEy+noMavcbLe3I5k5yVLN+MOMAGty0IXxNLnMOXURqF8t1Igj+g p/jQ== X-Gm-Message-State: AOAM533bf0PlzwFS6tLVCZIJHLUSar4nA+GPh9XxC4XtX8hePw9EMGy/ WABpKRG20zOdkgkC4fnivrwzWlRRgzaL2w== X-Google-Smtp-Source: ABdhPJwbL+nmmy70rNLrdmhaPy6/rScNK3RJOg2Lesijt2lOVcyRrqFisl4MnHRXRLXyOnpZuKjDlA== X-Received: by 2002:a17:90a:73c5:: with SMTP id n5mr95176pjk.118.1610382850962; Mon, 11 Jan 2021 08:34:10 -0800 (PST) Received: from smith.tendawifi.com (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id x21sm203205pgi.75.2021.01.11.08.34.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 Jan 2021 08:34:10 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Jan 2021 00:33:18 +0800 Message-Id: <20210111163319.13387-11-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210111163319.13387-1-nuomi2021@gmail.com> References: <20210109073421.23721-1-nuomi2021@gmail.com> <20210111163319.13387-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 10/11] 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 fdbf424e31..ae9a98a18e 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",