* [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR
@ 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-15 17:59 ` [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR Tristan Matthews
0 siblings, 2 replies; 9+ messages in thread
From: Tristan Matthews @ 2022-08-31 18:32 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Tristan Matthews
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
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* [FFmpeg-devel] [PATCH 1/1] fate/opus: add silk LBRR test (refs #9890)
2022-08-31 18:32 [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR Tristan Matthews
@ 2022-09-08 19:57 ` Tristan Matthews
2022-09-08 20:01 ` Tristan Matthews
2022-09-15 17:59 ` [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR Tristan Matthews
1 sibling, 1 reply; 9+ messages in thread
From: Tristan Matthews @ 2022-09-08 19:57 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Tristan Matthews
This adds a fate test for a sample with LBRR packets.
It requires that these files be uploaded:
https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.mka
https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.dec
---
tests/fate/opus.mak | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
index 573044ed15..7d359f414a 100644
--- a/tests/fate/opus.mak
+++ b/tests/fate/opus.mak
@@ -4,7 +4,7 @@
OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts
OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06)
-OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04)
+OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) silk-lbrr
OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 10 12)
define FATE_OPUS_TEST
@@ -33,6 +33,7 @@ fate-opus-testvector09: CMP_TARGET = 0
fate-opus-testvector10: CMP_TARGET = 38
fate-opus-testvector11: CMP_TARGET = 0
fate-opus-testvector12: CMP_TARGET = 160
+fate-opus-silk-lbrr: CMP_TARGET = 0
fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440
fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0
--
2.34.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/1] fate/opus: add silk LBRR test (refs #9890)
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
0 siblings, 1 reply; 9+ messages in thread
From: Tristan Matthews @ 2022-09-08 20:01 UTC (permalink / raw)
To: ffmpeg-devel
On Thu, Sep 8, 2022 at 3:58 PM Tristan Matthews <tmatth@videolan.org> wrote:
> This adds a fate test for a sample with LBRR packets.
>
> It requires that these files be uploaded:
> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.mka
> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.dec
>
> ---
> tests/fate/opus.mak | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
> index 573044ed15..7d359f414a 100644
> --- a/tests/fate/opus.mak
> +++ b/tests/fate/opus.mak
> @@ -4,7 +4,7 @@
>
> OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts
> OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06)
> -OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04)
> +OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) silk-lbrr
> OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 10 12)
>
> define FATE_OPUS_TEST
> @@ -33,6 +33,7 @@ fate-opus-testvector09: CMP_TARGET = 0
> fate-opus-testvector10: CMP_TARGET = 38
> fate-opus-testvector11: CMP_TARGET = 0
> fate-opus-testvector12: CMP_TARGET = 160
> +fate-opus-silk-lbrr: CMP_TARGET = 0
> fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440
> fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0
>
> --
> 2.34.1
>
Sorry this was supposed to be in response to
http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/300758.html (as it
depends on it) but I screwed up the git-send-email.
Best,
-t
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/1] fate/opus: add silk LBRR test (refs #9890)
2022-09-08 20:01 ` Tristan Matthews
@ 2022-09-23 12:15 ` Andreas Rheinhardt
2022-09-23 19:04 ` Tristan Matthews
0 siblings, 1 reply; 9+ messages in thread
From: Andreas Rheinhardt @ 2022-09-23 12:15 UTC (permalink / raw)
To: ffmpeg-devel
Tristan Matthews:
> On Thu, Sep 8, 2022 at 3:58 PM Tristan Matthews <tmatth@videolan.org> wrote:
>
>> This adds a fate test for a sample with LBRR packets.
>>
>> It requires that these files be uploaded:
>> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.mka
>> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.dec
>>
>> ---
>> tests/fate/opus.mak | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
>> index 573044ed15..7d359f414a 100644
>> --- a/tests/fate/opus.mak
>> +++ b/tests/fate/opus.mak
>> @@ -4,7 +4,7 @@
>>
>> OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts
>> OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06)
>> -OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04)
>> +OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) silk-lbrr
>> OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 10 12)
>>
>> define FATE_OPUS_TEST
>> @@ -33,6 +33,7 @@ fate-opus-testvector09: CMP_TARGET = 0
>> fate-opus-testvector10: CMP_TARGET = 38
>> fate-opus-testvector11: CMP_TARGET = 0
>> fate-opus-testvector12: CMP_TARGET = 160
>> +fate-opus-silk-lbrr: CMP_TARGET = 0
>> fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440
>> fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0
>>
>> --
>> 2.34.1
>>
>
>
> Sorry this was supposed to be in response to
> http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/300758.html (as it
> depends on it) but I screwed up the git-send-email.
>
Does this sample have to be so long?
- Andreas
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/1] fate/opus: add silk LBRR test (refs #9890)
2022-09-23 12:15 ` Andreas Rheinhardt
@ 2022-09-23 19:04 ` Tristan Matthews
2022-09-30 13:53 ` Tristan Matthews
0 siblings, 1 reply; 9+ messages in thread
From: Tristan Matthews @ 2022-09-23 19:04 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Fri, Sep 23, 2022 at 8:15 AM Andreas Rheinhardt
<andreas.rheinhardt@outlook.com> wrote:
>
> Tristan Matthews:
> > On Thu, Sep 8, 2022 at 3:58 PM Tristan Matthews <tmatth@videolan.org> wrote:
> >
> >> This adds a fate test for a sample with LBRR packets.
> >>
> >> It requires that these files be uploaded:
> >> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.mka
> >> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.dec
> >>
> >> ---
> >> tests/fate/opus.mak | 3 ++-
> >> 1 file changed, 2 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
> >> index 573044ed15..7d359f414a 100644
> >> --- a/tests/fate/opus.mak
> >> +++ b/tests/fate/opus.mak
> >> @@ -4,7 +4,7 @@
> >>
> >> OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts
> >> OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06)
> >> -OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04)
> >> +OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) silk-lbrr
> >> OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 10 12)
> >>
> >> define FATE_OPUS_TEST
> >> @@ -33,6 +33,7 @@ fate-opus-testvector09: CMP_TARGET = 0
> >> fate-opus-testvector10: CMP_TARGET = 38
> >> fate-opus-testvector11: CMP_TARGET = 0
> >> fate-opus-testvector12: CMP_TARGET = 160
> >> +fate-opus-silk-lbrr: CMP_TARGET = 0
> >> fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440
> >> fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0
> >>
> >> --
> >> 2.34.1
> >>
> >
> >
> > Sorry this was supposed to be in response to
> > http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/300758.html (as it
> > depends on it) but I screwed up the git-send-email.
> >
>
> Does this sample have to be so long?
I've shortened it from 4 seconds to 1 second (which is still long
enough to hear the bug when using an older build).
Note that most of the opus test vectors are on the order of 25 seconds.
Best,
Tristan
>
> - Andreas
> _______________________________________________
> 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".
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/1] fate/opus: add silk LBRR test (refs #9890)
2022-09-23 19:04 ` Tristan Matthews
@ 2022-09-30 13:53 ` Tristan Matthews
2022-10-04 9:05 ` Anton Khirnov
0 siblings, 1 reply; 9+ messages in thread
From: Tristan Matthews @ 2022-09-30 13:53 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Fri, Sep 23, 2022 at 3:04 PM Tristan Matthews <tmatth@videolan.org> wrote:
>
> On Fri, Sep 23, 2022 at 8:15 AM Andreas Rheinhardt
> <andreas.rheinhardt@outlook.com> wrote:
> >
> > Tristan Matthews:
> > > On Thu, Sep 8, 2022 at 3:58 PM Tristan Matthews <tmatth@videolan.org> wrote:
> > >
> > >> This adds a fate test for a sample with LBRR packets.
> > >>
> > >> It requires that these files be uploaded:
> > >> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.mka
> > >> https://people.videolan.org/~tmatth/9890-fate/silk-lbrr.dec
> > >>
> > >> ---
> > >> tests/fate/opus.mak | 3 ++-
> > >> 1 file changed, 2 insertions(+), 1 deletion(-)
> > >>
> > >> diff --git a/tests/fate/opus.mak b/tests/fate/opus.mak
> > >> index 573044ed15..7d359f414a 100644
> > >> --- a/tests/fate/opus.mak
> > >> +++ b/tests/fate/opus.mak
> > >> @@ -4,7 +4,7 @@
> > >>
> > >> OPUS_CELT_SAMPLES = $(addprefix testvector, 01 11) tron.6ch.tinypkts
> > >> OPUS_HYBRID_SAMPLES = $(addprefix testvector, 05 06)
> > >> -OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04)
> > >> +OPUS_SILK_SAMPLES = $(addprefix testvector, 02 03 04) silk-lbrr
> > >> OPUS_OTHER_SAMPLES = $(addprefix testvector, 07 08 09 10 12)
> > >>
> > >> define FATE_OPUS_TEST
> > >> @@ -33,6 +33,7 @@ fate-opus-testvector09: CMP_TARGET = 0
> > >> fate-opus-testvector10: CMP_TARGET = 38
> > >> fate-opus-testvector11: CMP_TARGET = 0
> > >> fate-opus-testvector12: CMP_TARGET = 160
> > >> +fate-opus-silk-lbrr: CMP_TARGET = 0
> > >> fate-opus-tron.6ch.tinypkts: CMP_SHIFT = 1440
> > >> fate-opus-tron.6ch.tinypkts: CMP_TARGET = 0
> > >>
> > >> --
> > >> 2.34.1
> > >>
> > >
> > >
> > > Sorry this was supposed to be in response to
> > > http://ffmpeg.org/pipermail/ffmpeg-devel/2022-August/300758.html (as it
> > > depends on it) but I screwed up the git-send-email.
> > >
> >
> > Does this sample have to be so long?
>
> I've shortened it from 4 seconds to 1 second (which is still long
> enough to hear the bug when using an older build).
> Note that most of the opus test vectors are on the order of 25 seconds.
These shorter samples have been updated by James Almer, so this patch
is good to go
Best,
-t
>
> Best,
> Tristan
>
> >
> > - Andreas
> > _______________________________________________
> > 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".
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR
2022-08-31 18:32 [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR Tristan Matthews
2022-09-08 19:57 ` [FFmpeg-devel] [PATCH 1/1] fate/opus: add silk LBRR test (refs #9890) Tristan Matthews
@ 2022-09-15 17:59 ` Tristan Matthews
2022-09-23 11:43 ` Tristan Matthews
1 sibling, 1 reply; 9+ messages in thread
From: Tristan Matthews @ 2022-09-15 17:59 UTC (permalink / raw)
To: ffmpeg-devel
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".
^ permalink raw reply [flat|nested] 9+ messages in thread* [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR
2022-09-15 17:59 ` [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR Tristan Matthews
@ 2022-09-23 11:43 ` Tristan Matthews
0 siblings, 0 replies; 9+ messages in thread
From: Tristan Matthews @ 2022-09-23 11:43 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Tristan Matthews
Fix suggested by Mark Harris. Fixes ticket #9890
Simplified after feedback from Anton Khirnov.
---
libavcodec/opus_silk.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavcodec/opus_silk.c b/libavcodec/opus_silk.c
index 8523b55ada..f9d67f4fb3 100644
--- a/libavcodec/opus_silk.c
+++ b/libavcodec/opus_silk.c
@@ -833,6 +833,8 @@ int ff_silk_decode_superframe(SilkContext *s, OpusRangeCoder *rc,
int active1 = (j == 0 && !(redundancy[1] & (1 << i))) ? 0 : 1;
silk_decode_frame(s, rc, i, j, coded_channels, 1, active1, 1);
}
+
+ s->midonly = 0;
}
for (i = 0; i < nb_frames; i++) {
--
2.34.1
_______________________________________________
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".
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-10-04 9:06 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-31 18:32 [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR 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 ` [FFmpeg-devel] [PATCH 1/1] opus_silk: reset midonly flag after skipping LBRR Tristan Matthews
2022-09-23 11:43 ` Tristan Matthews
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