From patchwork Thu Dec 28 18:45:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Tomas_H=C3=A4rdin?= X-Patchwork-Id: 45373 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6623:b0:194:e134:edd4 with SMTP id n35csp4355187pzh; Thu, 28 Dec 2023 10:45:18 -0800 (PST) X-Google-Smtp-Source: AGHT+IEnBvIkMU+D7KUXawbUHeKTI0I6e0Pl5RRjvFK3zFP6jitl7lYaCwieIerMkP70bHOdbMmZ X-Received: by 2002:a17:906:105c:b0:a23:54a3:696e with SMTP id j28-20020a170906105c00b00a2354a3696emr4824283ejj.13.1703789117739; Thu, 28 Dec 2023 10:45:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703789117; cv=none; d=google.com; s=arc-20160816; b=HLotGPqS39P1hGQeHjxPFtmJ4Q2TmZMVwqoEYLoBAckYDA6g3sd1ceRbFsWjNpS9ES Sa+lgmN/dPl+8pDJcZHLw10UKOYwL/zNfle5885pdAbcHIhTRzY+ohZwTOhfinZfrB0f 9NSBTYs1KSTPpdR7cDIC1R6UepUHNX2r+du/m/zWf4CKPG6pepVQ6hDxZXXqGdjnRjf9 IydZLQt9+E3JygYS3JnSlkthPR/z+iUSEni7XJW3OOQX9GPau+u3/Rs184Fti30lRWwV zlqPbohjTSA2MJ3Vj9Zuq8QFQ7uK+lpokprMHQxV7CwCwuSYR0Bv0aaCAtX2ydcYPW7D KMSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:user-agent:references:in-reply-to:date:to:from :message-id:delivered-to; bh=R2YICTGGDjgjlSdE5XELtklbPZTtjIIO626PlMySwqk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=0ylGE5oWXwcFX6N3jKtB288OcAXjcdLSYbQxU9w4KdqJr46JOTB14V52leaMxLD5Ef Zj0qCm7vn+QGRkuZE526IP3Duaw/vC6pB+jQZaidskPpgrzninJApiVaKrsllm8nZZB3 QAREtKbBSUVBgCih3uTj/HyAIswXzuEU8CFG68qKITJ4HRsOEXhjWnHMkenX0p+Gr5HJ zGhtfsb2fKGaChCio/A3DUJtHSMfz2sK34P5vhkt7UXAs2O0/5QGDioLSGFauiBhYqLM GD74Bq992MjngAJE8qqta7p4ysgFeuGCuVA/zDvFvyczpyMfQCU3Hctth758AcbZD/Mf tTkg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y26-20020a170906471a00b00a26ef8a537fsi3536470ejq.927.2023.12.28.10.45.17; Thu, 28 Dec 2023 10:45:17 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1090168CCBF; Thu, 28 Dec 2023 20:45:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from glom.nmugroup.com (glom.nmugroup.com [193.183.80.6]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 578FD68C14E for ; Thu, 28 Dec 2023 20:45:08 +0200 (EET) Received: from localhost (localhost [127.0.0.1]) by glom.nmugroup.com (Postfix) with ESMTP id EFE9454252BF for ; Thu, 28 Dec 2023 19:45:07 +0100 (CET) Received: from debian.lan (unknown [IPv6:2a00:66c0:a::72c]) (Authenticated sender: git01) by glom.nmugroup.com (Postfix) with ESMTPSA id AF9CF54252BB for ; Thu, 28 Dec 2023 19:45:07 +0100 (CET) Message-ID: <2598dd89da395130bfd2b63460dceffc723bc4fc.camel@haerdin.se> From: Tomas =?iso-8859-1?q?H=E4rdin?= To: FFmpeg development discussions and patches Date: Thu, 28 Dec 2023 19:45:05 +0100 In-Reply-To: References: User-Agent: Evolution 3.46.4-2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] lavf/codec2: Silence warnings when either muxer/demuxer is disabled 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: sF/oMkml4ADj From 6fd458b7b9867a92a0876ddd3455ac37b160f08a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= Date: Wed, 27 Dec 2023 22:52:25 +0100 Subject: [PATCH 5/6] lavf/codec2: Silence warnings when either muxer/demuxer is disabled --- libavformat/codec2.c | 76 +++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 33 deletions(-) diff --git a/libavformat/codec2.c b/libavformat/codec2.c index b0c76714bc..0cba9bbd6c 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -49,6 +49,7 @@ typedef struct { int frames_per_packet; } Codec2Context; +#if CONFIG_CODEC2_DEMUXER static int check_version(uint8_t major, uint8_t minor) { //no .c2 files prior to 0.8 or later than 1.X if (major == MIN_MAJOR_VERSION && minor < MIN_MINOR_VERSION) @@ -69,7 +70,9 @@ static int codec2_probe(const AVProbeData *p) //32 bits of identification -> low score return AVPROBE_SCORE_EXTENSION + 1; } +#endif +#if CONFIG_CODEC2_DEMUXER || CONFIG_CODEC2RAW_DEMUXER //Mimics codec2_samples_per_frame() static int codec2_mode_frame_size(AVFormatContext *s, int mode) { @@ -161,6 +164,41 @@ static int codec2_read_header_common(AVFormatContext *s, AVStream *st, int heade return 0; } +static int codec2_read_packet(AVFormatContext *s, AVPacket *pkt) +{ + Codec2Context *c2 = s->priv_data; + AVStream *st = s->streams[0]; + int ret, size, n, block_align, frame_size; + + block_align = st->codecpar->block_align; + frame_size = st->codecpar->frame_size; + + if (block_align <= 0 || frame_size <= 0 || c2->frames_per_packet <= 0) { + return AVERROR(EINVAL); + } + + //try to read desired number of frames, compute n from to actual number of bytes read + size = c2->frames_per_packet * block_align; + ret = av_get_packet(s->pb, pkt, size); + if (ret < 0) { + return ret; + } + + //only set duration - compute_pkt_fields() and ff_pcm_read_seek() takes care of everything else + //tested by spamming the seek functionality in ffplay + n = ret / block_align; + pkt->duration = n * frame_size; + + //un-mark packet as corrupt if size is a multiple of block_align + //this can happen when frames_per_packet > 1 + if (ret % block_align == 0) + pkt->flags &= ~AV_PKT_FLAG_CORRUPT; + + return ret; +} +#endif + +#if CONFIG_CODEC2_DEMUXER static int codec2_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL); @@ -197,40 +235,9 @@ static int codec2_read_header(AVFormatContext *s) return codec2_read_header_common(s, st, CODEC2_EXTRADATA_SIZE); } +#endif -static int codec2_read_packet(AVFormatContext *s, AVPacket *pkt) -{ - Codec2Context *c2 = s->priv_data; - AVStream *st = s->streams[0]; - int ret, size, n, block_align, frame_size; - - block_align = st->codecpar->block_align; - frame_size = st->codecpar->frame_size; - - if (block_align <= 0 || frame_size <= 0 || c2->frames_per_packet <= 0) { - return AVERROR(EINVAL); - } - - //try to read desired number of frames, compute n from to actual number of bytes read - size = c2->frames_per_packet * block_align; - ret = av_get_packet(s->pb, pkt, size); - if (ret < 0) { - return ret; - } - - //only set duration - compute_pkt_fields() and ff_pcm_read_seek() takes care of everything else - //tested by spamming the seek functionality in ffplay - n = ret / block_align; - pkt->duration = n * frame_size; - - //un-mark packet as corrupt if size is a multiple of block_align - //this can happen when frames_per_packet > 1 - if (ret % block_align == 0) - pkt->flags &= ~AV_PKT_FLAG_CORRUPT; - - return ret; -} - +#if CONFIG_CODEC2_MUXER static int codec2_write_header(AVFormatContext *s) { AVStream *st; @@ -253,7 +260,9 @@ static int codec2_write_header(AVFormatContext *s) return 0; } +#endif +#if CONFIG_CODEC2RAW_DEMUXER static int codec2raw_read_header(AVFormatContext *s) { Codec2Context *c2 = s->priv_data; @@ -280,6 +289,7 @@ static int codec2raw_read_header(AVFormatContext *s) return codec2_read_header_common(s, st, 0); } +#endif //transcoding report2074.c2 to wav went from 7.391s to 5.322s with -frames_per_packet 1000 compared to default, same sha1sum #define FRAMES_PER_PACKET \ -- 2.39.2