From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 4883540F9A for ; Mon, 14 Mar 2022 12:30:02 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3F70B68B0B4; Mon, 14 Mar 2022 14:30:00 +0200 (EET) Received: from mail-yw1-f181.google.com (mail-yw1-f181.google.com [209.85.128.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2B866881C8 for ; Mon, 14 Mar 2022 14:29:53 +0200 (EET) Received: by mail-yw1-f181.google.com with SMTP id 00721157ae682-2d07ae0b1c0so161058107b3.2 for ; Mon, 14 Mar 2022 05:29:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=cz+6AwF6RzS8vQEwNprrbVkCz56hmgfo0nyBQyAp0lE=; b=gmLEwT6d9+g50TXZHn7XlTwHfka5tzKGxWb4tY0Kk0SgukyH/fMUJ5l6cZ5zshccTB esZ0fpJCauKWMT6Uw9JV0faN9U+KBsxMKCyMCo/SVt4Nq7drmes2A9zPLM+HppM3yDl+ VxGs80eTixFIFerLaJVbU98KM15x69spGPcJKn1ejknipPCO9yqF6vrKEREdme5+IOkg 1V9KMOjWt7oYT9y2JfqsGlZS4Nm8YyR254C11enb2c6D3FMPMFQ/rLDo5UhumZhWTH4T crD1940P1U53JTPbCQlu0pxteTTeTIhlHio4xMPAlztAX+pt8f1LsYHmVwRrFWy3alc1 FX4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=cz+6AwF6RzS8vQEwNprrbVkCz56hmgfo0nyBQyAp0lE=; b=dvoq//TqwcJ/zf5tluEfFZX4dHAHNnayK9+UzPAC+9+qrF7XmJZAueDjMQw1ZaVxq2 p7KI5RVOr8CCOlvMIGTuwvggH65rxEvMbyZxF5hRMLnqH+dOUCkrKQeSWD2jDCwhH2oQ u6qk4eZLKMBPArXFkaKSvfxX9aTEgclDtUIfAtq9rksVnyu3u9P2WOdME/WPN1TE8Ohk sKGlEJmNo3orfys+cDEOE5goi7xkSFy0fwSMDz7Q7NqZD42/MDBSXvod7FHoD8E5ZCxR RTQdu1Km/Sq9hMMtEFZxVK0yciZ7lCLFHXnjHPDKLEpY4oK6dOPtYtGgMOo9TRF+ETQ9 WkpQ== X-Gm-Message-State: AOAM533AWm+1bUvuq39aK8nk4AKr11G48boSLqwpElSiWVSRjyCgpjHv VDP7TJVHsm7rqVDclEnvSjxLwByvdlZmg+ICCH2DpUUx X-Google-Smtp-Source: ABdhPJwivMMavNA+QP6u9Jz2/8x5clUJw4MeZQ32Oal9KQgU5Di5USMKUbP54e3zbfbLwyFT3mU4Qeu+Sy8tJxd1jKA= X-Received: by 2002:a81:5c03:0:b0:2dc:e44:41ca with SMTP id q3-20020a815c03000000b002dc0e4441camr18612323ywb.302.1647260992244; Mon, 14 Mar 2022 05:29:52 -0700 (PDT) MIME-Version: 1.0 References: <20220314115602.263642-1-onemda@gmail.com> <4932f52a-3df7-525f-22cc-a5ccfa34f6e4@gmail.com> In-Reply-To: From: Paul B Mahol Date: Mon, 14 Mar 2022 13:31:42 +0100 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH 1/2] avcodec: add null encoders 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On Mon, Mar 14, 2022 at 1:17 PM James Almer wrote: > > > On 3/14/2022 9:17 AM, Paul B Mahol wrote: > > On Mon, Mar 14, 2022 at 1:12 PM James Almer wrote: > > > >> > >> > >> On 3/14/2022 8:56 AM, Paul B Mahol wrote: > >>> Signed-off-by: Paul B Mahol > >>> --- > >>> libavcodec/Makefile | 2 ++ > >>> libavcodec/allcodecs.c | 2 ++ > >>> libavcodec/codec_desc.c | 14 ++++++++++ > >>> libavcodec/codec_id.h | 2 ++ > >>> libavcodec/nullenc.c | 61 > +++++++++++++++++++++++++++++++++++++++++ > >>> 5 files changed, 81 insertions(+) > >>> create mode 100644 libavcodec/nullenc.c > >>> > >>> diff --git a/libavcodec/Makefile b/libavcodec/Makefile > >>> index cd929da8e6..8554b5ee7d 100644 > >>> --- a/libavcodec/Makefile > >>> +++ b/libavcodec/Makefile > >>> @@ -542,6 +542,8 @@ OBJS-$(CONFIG_MXPEG_DECODER) += > mxpegdec.o > >>> OBJS-$(CONFIG_NELLYMOSER_DECODER) += nellymoserdec.o > nellymoser.o > >>> OBJS-$(CONFIG_NELLYMOSER_ENCODER) += nellymoserenc.o > nellymoser.o > >>> OBJS-$(CONFIG_NOTCHLC_DECODER) += notchlc.o > >>> +OBJS-$(CONFIG_NULL_AUDIO_ENCODER) += nullenc.o > >>> +OBJS-$(CONFIG_NULL_VIDEO_ENCODER) += nullenc.o > >>> OBJS-$(CONFIG_NUV_DECODER) += nuv.o rtjpeg.o > >>> OBJS-$(CONFIG_ON2AVC_DECODER) += on2avc.o on2avcdata.o > >>> OBJS-$(CONFIG_OPUS_DECODER) += opusdec.o opus.o > opus_celt.o > >> opus_rc.o \ > >>> diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > >>> index 628d27fd75..a30920bfe2 100644 > >>> --- a/libavcodec/allcodecs.c > >>> +++ b/libavcodec/allcodecs.c > >>> @@ -487,6 +487,8 @@ extern const AVCodec ff_mpc8_decoder; > >>> extern const AVCodec ff_msnsiren_decoder; > >>> extern const AVCodec ff_nellymoser_encoder; > >>> extern const AVCodec ff_nellymoser_decoder; > >>> +extern const AVCodec ff_null_audio_encoder; > >>> +extern const AVCodec ff_null_video_encoder; > >>> extern const AVCodec ff_on2avc_decoder; > >>> extern const AVCodec ff_opus_encoder; > >>> extern const AVCodec ff_opus_decoder; > >>> diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c > >>> index 81f3b3c640..7d6bfd352c 100644 > >>> --- a/libavcodec/codec_desc.c > >>> +++ b/libavcodec/codec_desc.c > >>> @@ -3516,6 +3516,20 @@ static const AVCodecDescriptor > >> codec_descriptors[] = { > >>> .long_name = NULL_IF_CONFIG_SMALL("AVFrame to AVPacket > >> passthrough"), > >>> .props = AV_CODEC_PROP_LOSSLESS, > >>> }, > >>> + { > >>> + .id = AV_CODEC_ID_AUDIO_NULL, > >>> + .type = AVMEDIA_TYPE_AUDIO, > >>> + .name = "null_audio", > >>> + .long_name = NULL_IF_CONFIG_SMALL("Audio NULL"), > >>> + .props = AV_CODEC_PROP_LOSSY, > >>> + }, > >>> + { > >>> + .id = AV_CODEC_ID_VIDEO_NULL, > >>> + .type = AVMEDIA_TYPE_VIDEO, > >>> + .name = "null_video", > >>> + .long_name = NULL_IF_CONFIG_SMALL("Video NULL"), > >>> + .props = AV_CODEC_PROP_LOSSY, > >> > >> Also AV_CODEC_PROP_INTRA_ONLY on both. > >> > >>> + }, > >>> }; > >>> > >>> static int descriptor_compare(const void *key, const void *member) > >>> diff --git a/libavcodec/codec_id.h b/libavcodec/codec_id.h > >>> index 3ffb9bd22e..4822dc7685 100644 > >>> --- a/libavcodec/codec_id.h > >>> +++ b/libavcodec/codec_id.h > >>> @@ -571,6 +571,8 @@ enum AVCodecID { > >>> * stream (only used by libavformat) > */ > >>> AV_CODEC_ID_FFMETADATA = 0x21000, ///< Dummy codec for streams > >> containing only metadata information. > >>> AV_CODEC_ID_WRAPPED_AVFRAME = 0x21001, ///< Passthrough codec, > >> AVFrames wrapped in AVPacket > >>> + AV_CODEC_ID_AUDIO_NULL = 0x21002, ///< Null audio codec > >>> + AV_CODEC_ID_VIDEO_NULL = 0x21003, ///< Null video codec > >>> }; > >>> > >>> /** > >>> diff --git a/libavcodec/nullenc.c b/libavcodec/nullenc.c > >>> new file mode 100644 > >>> index 0000000000..8d3553ed33 > >>> --- /dev/null > >>> +++ b/libavcodec/nullenc.c > >>> @@ -0,0 +1,61 @@ > >>> +/* > >>> + * Copyright (c) 2022 The FFmpeg Project > >>> + * > >>> + * 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 "libavutil/internal.h" > >>> +#include "libavutil/frame.h" > >>> +#include "libavutil/buffer.h" > >>> + > >>> +#include "avcodec.h" > >>> +#include "internal.h" > >>> +#include "encode.h" > >>> + > >>> +static int null_encoder(AVCodecContext *avctx, AVPacket *pkt, > >>> + const AVFrame *frame, int *got_packet) > >>> +{ > >>> + int ret; > >>> + > >>> + pkt->pts = frame->pts; > >>> + if (avctx->codec_type == AVMEDIA_TYPE_AUDIO) > >>> + pkt->duration = ff_samples_to_time_base(avctx, > >> frame->nb_samples); > >>> + pkt->flags |= AV_PKT_FLAG_KEY; > >>> + if ((ret = ff_alloc_packet(avctx, pkt, 1)) < 0) > >> > >> To avoid bogus statistics, could you instead allocate a blank packet of > >> size av_samples_get_buffer_size()? > >> Also, use ff_get_encode_buffer() and set the DR1 codec cap. > >> > >>> + return ret; > >>> + *got_packet = 1; > >>> + return 0; > >>> +} > >>> + > >>> +const AVCodec ff_null_video_encoder = { > >>> + .name = "null_video", > >>> + .long_name = NULL_IF_CONFIG_SMALL("Video NULL encoder"), > >>> + .type = AVMEDIA_TYPE_VIDEO, > >>> + .id = AV_CODEC_ID_VIDEO_NULL, > >>> + .encode2 = null_encoder, > >>> + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > >>> +}; > >>> + > >>> +const AVCodec ff_null_audio_encoder = { > >>> + .name = "null_audio", > >>> + .long_name = NULL_IF_CONFIG_SMALL("Audio NULL encoder"), > >>> + .type = AVMEDIA_TYPE_AUDIO, > >>> + .id = AV_CODEC_ID_AUDIO_NULL, > >>> + .encode2 = null_encoder, > >>> + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, > >>> + .capabilities = AV_CODEC_CAP_VARIABLE_FRAME_SIZE, > >> > >> What's the benefit from this? If the idea is to get rid of > >> wrappedavframe, then you also need to fix vapoursync, decklink, kmsgrab, > >> opengl, xv, and yuv4mpeg. > >> > >> I'd rather not add more fake codec ids for this purpose unless it's a > >> thorough solution. > >> > > > > See null muxer patch. null muxer does not need pcm codecs or wrapped > video > > codec. > > I saw it, hence my comment above. wrappedavframe is still used by > several components, so this is adding two new pseudo codec ids but not > resolving the problem wrappedavframes represents. > Not interested in fixing wrapped mess. I added encoder for null muxer. So that audio decoding/filtering can be benchmarked properly. _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".