From patchwork Wed Feb 17 01:51:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25679 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 BCE9A44B4E2 for ; Wed, 17 Feb 2021 04:15:10 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9CC4E68A0AE; Wed, 17 Feb 2021 04:15:10 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBACF6899A9 for ; Wed, 17 Feb 2021 04:15:04 +0200 (EET) Received: by mail-pf1-f182.google.com with SMTP id w18so7436091pfu.9 for ; Tue, 16 Feb 2021 18:15:04 -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=r1+Py0ui1hCPIdieWIp2FvmaMS2AQPMFis3OvftIM1U=; b=UNx40YREbCPtqd+nIGgpzv6dxlTrVrcbwvwJyYcrGoLiHex5i4kg/rDnXKwqPUpQvY 5Xt37mw5F4mmfBWHQge+6fSN5Tv5MfChfMiDg7ScEeUQv66iQ0ZQOTF6hgOAG9BCR8xp eMoM/lNnQpGk1UwV7Bbgfb9wN2sa+RhmBDZ4MXlkFNLwqQZwnFR9tOckQa0CcZsdWSbq 6XwN2XX8+8x06/5MkdNSANUwZg+ixFzWKOUzxeTQ45hvvBIVbbCEKrZzrNA2tkXj2yx/ mPOaX00PpsNXMoWLwt7Ja6PYjaJCGgmr1bdyY5KQHm8RQwQuKCBYYGfYjgG6VbSB+A/r 4v0A== 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=r1+Py0ui1hCPIdieWIp2FvmaMS2AQPMFis3OvftIM1U=; b=pvcYlcsOYN/a4zWmIw5HJvN5rINxnbCTC8CcFvcuwemYQu4pLnBxJ3cRH47g5l5hWl 150T0M9Wpp5drMIIV28AcdHb61zgGtUjj9hLYrUxviwk3qWgDK7Xupx+BTy80ToTu4+1 dlYxImsQ6EktS9G8uDo6apEoas3psSJrQeX9Col2KC8ZpFVlLTLqPkUGnup1Qw4nAR2n 6BD3Y1kcpgBMG2Aw8B9yW+ZMb9d84HSmjg0N+eCMb0SM8ZMtnGldxM6Rrk9rNAetmnlJ PBGv1SXZhXHl40INNov63LrN71VbmGcUzl5agrCX35uoelNCEZJHGEf70QB+DFIB4a5p N/tw== X-Gm-Message-State: AOAM532rp6TDQYZDxGR4ZDFb9mSsYiaryewFwGPDjd0FSWxfE4nnhIjO 52/AIeZ/Srz3eYSV3yEeHnShnABcGIA= X-Google-Smtp-Source: ABdhPJyBlV2g4r1ddq/9gxHe6clvbVp0JayQom8WSfgq1Qpx34I+jMgaNKoaGHIr72eHJtp+PoqiNQ== X-Received: by 2002:a62:dd89:0:b029:1de:5c28:771c with SMTP id w131-20020a62dd890000b02901de5c28771cmr21772776pff.50.1613526768525; Tue, 16 Feb 2021 17:52:48 -0800 (PST) Received: from Nuomi.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id n15sm361125pgl.31.2021.02.16.17.52.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 17:52:48 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 09:51:44 +0800 Message-Id: <20210217015146.19724-8-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217015146.19724-1-nuomi2021@gmail.com> References: <20210211143611.5663-1-nuomi2021@gmail.com> <20210217015146.19724-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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 2b9d0eee7f..d3a755a47a 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -565,6 +565,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 fb06723fb9..481541bf8c 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -464,6 +464,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..b4e24c3e26 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 = "vvc,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",