prepare for OPUS hybrid mode

Author: schreibfaul1

src/opus_decoder/celt.h

@@ -277,6 +277,8 @@ inline int32_t PSHR(int32_t a, uint32_t shift){return (a + ((int32_t)1 << (shift
 #define ADD32(a,b) ((int32_t)(a)+(int32_t)(b))
 /** Subtract two 32-bit values */
 #define SUB32(a,b) ((int32_t)(a)-(int32_t)(b))
+/** Arithmetic shift-right of a 32-bit value */
+#define SHR32(a,shift) ((a) >> (shift))
 
 /** Add two 32-bit values, ignore any overflows */
 #define ADD32_ovflw(a,b) ((int32_t)((uint32_t)(a)+(uint32_t)(b)))
@@ -334,6 +336,7 @@ int32_t celt_rcp(int32_t x);
 #define MAX_PSEUDO 40
 #define LOG_MAX_PSEUDO 6
 #define ALLOC_NONE 1
+#define Q15ONE 32767
 
 /* Prototypes and inlines*/
 
@@ -501,6 +504,23 @@ inline int32_t pulses2bits(int32_t band, int32_t LM, int32_t pulses){
    return pulses == 0 ? 0 : cache[pulses]+1;
 }
 
+inline void smooth_fade(const int16_t *in1, const int16_t *in2,
+      int16_t *out, int overlap, int channels,
+      const int16_t *window, int32_t Fs)
+{
+   int i, c;
+   int inc = 48000/Fs;
+   for (c=0;c<channels;c++)
+   {
+      for (i=0;i<overlap;i++)
+      {
+         int16_t w = MULT16_16_Q15(window[i*inc], window[i*inc]);
+         out[i*channels+c] = SHR32(MAC16_16(MULT16_16(w,in2[i*channels+c]),
+                                   Q15ONE-w, in1[i*channels+c]), 15);
+      }
+   }
+}
+
 void     comb_filter_const(int32_t *y, int32_t *x, int32_t T, int32_t N, int16_t g10, int16_t g11, int16_t g12);
 void     comb_filter(int32_t *y, int32_t *x, int32_t T0, int32_t T1, int32_t N, int16_t g0, int16_t g1, int32_t tapset0,
                      int32_t tapset1);

src/opus_decoder/opus_decoder.cpp

@@ -371,6 +371,7 @@ int32_t opus_decode_frame(uint8_t *inbuf, int16_t *outbuf, int32_t packetLen, ui
         log_w("Hybrid mode not yet supported");
         return samplesPerFrame;
         int decodedSamples = 0;
+         int start_band = 0;
         int32_t silk_frame_size;
         int F2_5, F5, F10, F20;
         F20 = packetLen / 50;
@@ -397,8 +398,9 @@ int32_t opus_decode_frame(uint8_t *inbuf, int16_t *outbuf, int32_t packetLen, ui
                 default: break;
             }
         }
-        celt_decoder_ctl(CELT_SET_START_BAND_REQUEST, s_endband);
-        celt_decoder_ctl(CELT_SET_END_BAND_REQUEST, s_endband);
+        start_band = 17;
+        celt_decoder_ctl(CELT_SET_START_BAND_REQUEST, start_band);
+    //    celt_decoder_ctl(CELT_SET_END_BAND_REQUEST, s_endband);
         ret = celt_decode_with_ec((int16_t*)outbuf, samplesPerFrame);
     }
     return ret;

src/opus_decoder/opus_decoder.h

@@ -38,13 +38,13 @@ bool             OPUSDecoder_AllocateBuffers();
 void             OPUSDecoder_FreeBuffers();
 void             OPUSDecoder_ClearBuffers();
 void             OPUSsetDefaults();
-int32_t          OPUSDecode(uint8_t* inbuf, int32_t* bytesLeft, short* outbuf);
+int32_t          OPUSDecode(uint8_t* inbuf, int32_t* bytesLeft, int16_t* outbuf);
 int32_t          opusDecodePage0(uint8_t* inbuf, int32_t* bytesLeft, uint32_t segmentLength);
-int32_t          opusDecodePage3(uint8_t* inbuf, int32_t* bytesLeft, uint32_t segmentLength, short *outbuf);
-int8_t           opus_FramePacking_Code0(uint8_t *inbuf, int32_t *bytesLeft, short *outbuf, int32_t packetLen, uint16_t samplesPerFrame);
-int8_t           opus_FramePacking_Code1(uint8_t *inbuf, int32_t *bytesLeft, short *outbuf, int32_t packetLen, uint16_t samplesPerFrame, uint8_t* frameCount);
-int8_t           opus_FramePacking_Code2(uint8_t *inbuf, int32_t *bytesLeft, short *outbuf, int32_t packetLen, uint16_t samplesPerFrame, uint8_t* frameCount);
-int8_t           opus_FramePacking_Code3(uint8_t *inbuf, int32_t *bytesLeft, short *outbuf, int32_t packetLen, uint16_t samplesPerFrame, uint8_t* frameCount);
+int32_t          opusDecodePage3(uint8_t* inbuf, int32_t* bytesLeft, uint32_t segmentLength, int16_t *outbuf);
+int8_t           opus_FramePacking_Code0(uint8_t *inbuf, int32_t *bytesLeft, int16_t *outbuf, int32_t packetLen, uint16_t samplesPerFrame);
+int8_t           opus_FramePacking_Code1(uint8_t *inbuf, int32_t *bytesLeft, int16_t *outbuf, int32_t packetLen, uint16_t samplesPerFrame, uint8_t* frameCount);
+int8_t           opus_FramePacking_Code2(uint8_t *inbuf, int32_t *bytesLeft, int16_t *outbuf, int32_t packetLen, uint16_t samplesPerFrame, uint8_t* frameCount);
+int8_t           opus_FramePacking_Code3(uint8_t *inbuf, int32_t *bytesLeft, int16_t *outbuf, int32_t packetLen, uint16_t samplesPerFrame, uint8_t* frameCount);
 uint8_t          OPUSGetChannels();
 uint32_t         OPUSGetSampRate();
 uint8_t          OPUSGetBitsPerSample();