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 B8AD444330 for ; Tue, 6 Sep 2022 08:00:53 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D9F168BA8F; Tue, 6 Sep 2022 11:00:50 +0300 (EEST) Received: from mail-yw1-f180.google.com (mail-yw1-f180.google.com [209.85.128.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6E9A868BA86 for ; Tue, 6 Sep 2022 11:00:44 +0300 (EEST) Received: by mail-yw1-f180.google.com with SMTP id 00721157ae682-3378303138bso88244467b3.9 for ; Tue, 06 Sep 2022 01:00:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date; bh=D51Mfw4p3hWa6+mq8FHaxC61ibiv6HVM0utyhMTkmzg=; b=mpedYCz2TkcKIHAH/4YWppEXgwTgGDyJnHJepz6npwWayOxjmsxwK+GncnxufN/Nvy v1clT+UUbSYOgvNvUqUlaC5p2j3lCo4klv57XGV9QrIc9C03Mmm3+UuFgLtUVMqjcMOG pkrHb5IUYvwn/J4yIk3m82KtWofBK6KiFdq8ZT3MUoEFBbfcowJBnRPvDpzOk8qknJxT XLYk7KWyn9kV0liyedKDuYOU6xZBtf5kCspA3cLHqapw1BrineVPSpkxiaKD9Ar0YtAE cWDTXZp5JRVKJFhBYp3q6mxjpyY/7ddUfKg+YUdxs0Hfbg7LXRQGxyT4lcgOaqXQLOXi Q4DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date; bh=D51Mfw4p3hWa6+mq8FHaxC61ibiv6HVM0utyhMTkmzg=; b=jhc8xOJd5aH/08079r3l7cbP0498kpz1AqWJmt5yVUKwZuDTSIB02Hjfm54tjpbGi5 ypG1lJKRv1twhUKHGWdTt29L+cIZCn/4RxvP3jaFgzpTTIFXWhV5Ehzd70Jd36lMrTr9 0F8OlmAWjWjl3vQ5vG669bGozj/0n0Of8SHTJz2U2+94nADI4Ke5Zlp/K6nZyjnLrUpJ YwMSjnW2TtImnzg63GO1ojwBu+/UUcKRVlDSMhe+yPum6S6erdBGHSbneCaEEXPGj9pq mMz9em/277G3MOzyk3zrrjccNR/XRWhkLaIx4XGluHDpphFpccMXkgMXs/T0vqvYFp/G gjoA== X-Gm-Message-State: ACgBeo0c15svmQquflYXWlPOpZ8xgz34d3K13DfElm5JbyHyCYmK8g25 CVQ9NTpG25xmie8GpTwHD0W0tYu/6blE3XfEQL/usHap X-Google-Smtp-Source: AA6agR5gcTLQbh3H/AcINiNzEcvJvIONKttK7Zrxa2umzQNG8wexdmsytT6dUF/dcd6uy8vcISbRP5xMQzsreJW8VUc= X-Received: by 2002:a0d:ee04:0:b0:345:2079:6d39 with SMTP id x4-20020a0dee04000000b0034520796d39mr8479876ywe.516.1662451242589; Tue, 06 Sep 2022 01:00:42 -0700 (PDT) MIME-Version: 1.0 References: <166245104712.3205.17673747682508396684@lain.khirnov.net> In-Reply-To: <166245104712.3205.17673747682508396684@lain.khirnov.net> From: Paul B Mahol Date: Tue, 6 Sep 2022 10:03:51 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: Re: [FFmpeg-devel] [PATCH] speexdec fix 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 Tue, Sep 6, 2022 at 9:57 AM Anton Khirnov wrote: > Quoting Paul B Mahol (2022-09-03 18:24:51) > > Patch attached. > > > > From 6a90e5d582ba2fc3a08fb08fb1b5f3f38d315b3f Mon Sep 17 00:00:00 2001 > > From: Paul B Mahol > > Date: Sat, 3 Sep 2022 18:17:23 +0200 > > Subject: [PATCH] avcodec/speexdec: improve support for speex in non-ogg > > > > Signed-off-by: Paul B Mahol > > --- > > libavcodec/speexdec.c | 16 +++++++++++----- > > 1 file changed, 11 insertions(+), 5 deletions(-) > > > > diff --git a/libavcodec/speexdec.c b/libavcodec/speexdec.c > > index 83981fc454..9793d939fc 100644 > > --- a/libavcodec/speexdec.c > > +++ b/libavcodec/speexdec.c > > @@ -1462,7 +1462,7 @@ static av_cold int > speex_decode_init(AVCodecContext *avctx) > > default: s->mode = 2; > > } > > > > - s->frames_per_packet = 1; > > + s->frames_per_packet = 64; > > s->frame_size = NB_FRAME_SIZE << s->mode; > > } > > > > @@ -1537,6 +1537,7 @@ static int speex_decode_frame(AVCodecContext > *avctx, AVFrame *frame, > > int *got_frame_ptr, AVPacket *avpkt) > > { > > SpeexContext *s = avctx->priv_data; > > + int frames_per_packet = s->frames_per_packet; > > const float scale = 1.f / 32768.f; > > int buf_size = avpkt->size; > > float *dst; > > @@ -1547,26 +1548,31 @@ static int speex_decode_frame(AVCodecContext > *avctx, AVFrame *frame, > > if ((ret = init_get_bits8(&s->gb, avpkt->data, buf_size)) < 0) > > return ret; > > > > - frame->nb_samples = FFALIGN(s->frame_size * s->frames_per_packet, > 4); > > + frame->nb_samples = FFALIGN(s->frame_size * frames_per_packet, 4); > > if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) > > return ret; > > > > dst = (float *)frame->extended_data[0]; > > - for (int i = 0; i < s->frames_per_packet; i++) { > > + for (int i = 0; i < frames_per_packet; i++) { > > ret = speex_modes[s->mode].decode(avctx, &s->st[s->mode], > &s->gb, dst + i * s->frame_size); > > if (ret < 0) > > return ret; > > if (avctx->ch_layout.nb_channels == 2) > > speex_decode_stereo(dst + i * s->frame_size, s->frame_size, > &s->stereo); > > + if (get_bits_left(&s->gb) < 5 || > > + show_bits(&s->gb, 5) == 15) { > > + frames_per_packet = i + 1; > > + break; > > + } > > } > > > > dst = (float *)frame->extended_data[0]; > > s->fdsp->vector_fmul_scalar(dst, dst, scale, frame->nb_samples * > frame->ch_layout.nb_channels); > > - frame->nb_samples = s->frame_size * s->frames_per_packet; > > + frame->nb_samples = s->frame_size * frames_per_packet; > > > > *got_frame_ptr = 1; > > > > - return buf_size; > > + return (get_bits_count(&s->gb) + 7) >> 3; > > Doesn't this need AV_CODEC_CAP_SUBFRAMES? > Dunno, documentation is not clear on this. > > Also, a test would be nice. > ENOTIME > > -- > Anton Khirnov > _______________________________________________ > 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".