shithub: opus

Download patch

ref: b76888dc866868c073e5f94a63ccb80912a5be41
parent: 9134e96cb24fa3a4c5249e3940a163d889fe692d
author: Jean-Marc Valin <[email protected]>
date: Tue Jan 7 16:00:18 EST 2014 

Preventing unnecessary stack use when using a large decode buffer

This was causing pseudostack builds to fail because opus_demo uses a 2-second
buffer.


--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -722,6 +722,7 @@
 {
    VARDECL(opus_int16, out);
    int ret, i;
+   int nb_samples;
    ALLOC_STACK;
 
    if(frame_size<=0)
@@ -729,6 +730,14 @@
       RESTORE_STACK;
       return OPUS_BAD_ARG;
    }
+   if (data != NULL && len > 0)
+   {
+      nb_samples = opus_decoder_get_nb_samples(st, data, len);
+      if (nb_samples>0)
+         frame_size = IMIN(frame_size, nb_samples);
+      else
+         return OPUS_INVALID_PACKET;
+   }
    ALLOC(out, frame_size*st->channels, opus_int16);
 
    ret = opus_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 0);
@@ -749,6 +758,7 @@
 {
    VARDECL(float, out);
    int ret, i;
+   int nb_samples;
    ALLOC_STACK;
 
    if(frame_size<=0)
@@ -757,6 +767,14 @@
       return OPUS_BAD_ARG;
    }
 
+   if (data != NULL && len > 0)
+   {
+      nb_samples = opus_decoder_get_nb_samples(st, data, len);
+      if (nb_samples>0)
+         frame_size = IMIN(frame_size, nb_samples);
+      else
+         return OPUS_INVALID_PACKET;
+   }
    ALLOC(out, frame_size*st->channels, float);
 
    ret = opus_decode_native(st, data, len, out, frame_size, decode_fec, 0, NULL, 1);