From patchwork Mon Mar 8 14:05:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 26267 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 8FC5D44A8C0 for ; Mon, 8 Mar 2021 16:55:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7057F68804D; Mon, 8 Mar 2021 16:55:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f171.google.com (mail-vk1-f171.google.com [209.85.221.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 32B2168804D for ; Mon, 8 Mar 2021 16:55:09 +0200 (EET) Received: by mail-vk1-f171.google.com with SMTP id m25so2197713vkk.6 for ; Mon, 08 Mar 2021 06:55:09 -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=gQpw9lDJ1zwmulWBG9d2Cm1m//UlzgN9ZKprEFRdrm8=; b=pSfkwzyt8shSc86AQk1wC3ULOdCJ8WAK+HTlNP+QO05+vOMCPkXwF+2Kmmjj4hwANd yxCJutwFzdaW4a5n5quPYXIFkLMFKdW4240/AmBZtVRHWEB9h1P1U8mnqkEmRWCeSS/V WmAa+VXiBzy6S01z5MHoyprTRD/qFrtYp13qD4dEqXaBYRk4xOYHYZPL8aGXzKK/bHRI m6rYdk5BoPQuvQivrrV/Q+jenQ2ZfRjzbC91NXKxiqmlaklt9AYxZ8ZDIwhbu4q3VZrN eLTX7RsY/xths/S5u8SuJJcZwBSqUiRRd+RJFkMYV/uk8ao0917FFRUE72Vh8xu9UZzD Y9eQ== 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=gQpw9lDJ1zwmulWBG9d2Cm1m//UlzgN9ZKprEFRdrm8=; b=XLa66oaK7djbXe3ktp6ERO6BvpMLJMNBJpmx7NcEZ/s3PS7j8zbQQ/lXGjr05/JfhQ QK432Ay7pgKKPA9g5B4d4i/Zkj+wLpFQFUxcy89fWzNsO0uEFfRwVea5GNxT3IxA1BwR vXPCI5OuJoIT0ylts6kYRjdToxqNs5xwx0SO99cMYyEuluq2Go6OwOmkNvphqiyMMtoF mIhTKhiWhIF3ilv/aHr7vrX990J08uUgAiTV7hTzAeVMKezaNUrv14/63oEHlfsbyzHy Djj6qUoT/vcPBlCZz7TbcujUZlcWK2avJ5BmRrE+o30vh3SFYZT/vJm6+SemJpO+req+ 82zQ== X-Gm-Message-State: AOAM533C1Y+z7krGkNnc1Lao1py+WzmVnCw5lv37dYOS0ZcUIGKhB2fe vOTzZlePlL0QB2rKjdLzf7BziIDFUUw= X-Google-Smtp-Source: ABdhPJzXRHED3pf17ZgNy6fATamKP+JmuyZb/OzrBImulD59zrqTkBOYRsvGRibDsCIMTx33uqBpTg== X-Received: by 2002:a17:902:9a0c:b029:e5:fedb:92c6 with SMTP id v12-20020a1709029a0cb02900e5fedb92c6mr13166123plp.59.1615212401925; Mon, 08 Mar 2021 06:06:41 -0800 (PST) Received: from smith.tendawifi.com (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id y20sm10427392pfo.210.2021.03.08.06.06.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 06:06:41 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Mar 2021 22:05:51 +0800 Message-Id: <20210308140553.4054-8-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308140553.4054-1-nuomi2021@gmail.com> References: <20210217015146.19724-1-nuomi2021@gmail.com> <20210308140553.4054-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 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 af6428541d..d5aa0cc843 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -568,6 +568,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 1543d0d7ca..00b7c60dad 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -467,6 +467,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",