From: Tristan Matthews <tmatth@videolan.org>
To: ffmpeg-devel@ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR
Date: Thu, 15 Sep 2022 13:59:43 -0400
Message-ID: <CAN8HRD=JmCH-uyJMyP_9z0t9TvfYdxf1c52z2Nr8R73=QWhk=w@mail.gmail.com> (raw)
In-Reply-To: <20220831183207.2703227-1-tmatth@videolan.org>
On Wed, Aug 31, 2022 at 2:32 PM Tristan Matthews <tmatth@videolan.org> wrote:
>
> Fix suggested by Mark Harris. Fixes ticket #9890
> ---
> libavcodec/opus_silk.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c
> index 8523b55ada..0b4438388e 100644
> --- a/libavcodec/opus_silk.c
> +++ b/libavcodec/opus_silk.c
> @@ -828,11 +828,16 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc,
>
> /* decode the LBRR frames */
> for (i = 0; i < nb_frames; i++) {
> + int skipped = 0;
> for (j = 0; j < coded_channels; j++)
> if (redundancy[j] & (1 << i)) {
> int active1 = (j == 0 && !(redundancy[1] & (1 << i))) ? 0 : 1;
> silk_decode_frame(s, rc, i, j, coded_channels, 1, active1, 1);
> + skipped = 1;
> }
> + /* reset midonly if needed */
> + if (skipped)
> + s->midonly = 0;
> }
>
> for (i = 0; i < nb_frames; i++) {
> --
> 2.34.1
>
Ping
_______________________________________________
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".
next prev parent reply other threads:[~2022-09-15 18:00 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-31 18:32 Tristan Matthews
2022-09-08 19:57 ` [FFmpeg-devel] [PATCH 1/1] fate/opus: add silk LBRR test (refs #9890) Tristan Matthews
2022-09-08 20:01 ` Tristan Matthews
2022-09-23 12:15 ` Andreas Rheinhardt
2022-09-23 19:04 ` Tristan Matthews
2022-09-30 13:53 ` Tristan Matthews
2022-10-04 9:05 ` Anton Khirnov
2022-09-15 17:59 ` Tristan Matthews [this message]
2022-09-23 11:43 ` [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR Tristan Matthews
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAN8HRD=JmCH-uyJMyP_9z0t9TvfYdxf1c52z2Nr8R73=QWhk=w@mail.gmail.com' \
--to=tmatth@videolan.org \
--cc=ffmpeg-devel@ffmpeg.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git