mpegvideo_enc: fix indentation in load_input_picture()

[ffmpeg] / libavcodec / sipr.h

diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h
index 02a2916abfe17a0369ccbe9f75858fc6609d1b4f..5007c75c8a0074589d73b7512a934a5e2be64ac5 100644 (file)
--- a/libavcodec/sipr.h
+++ b/libavcodec/sipr.h
@@ -4,20 +4,20 @@
  * Copyright (c) 2008 Vladimir Voroshilov
  * Copyright (c) 2009 Vitor Sessak
  *
- * This file is part of FFmpeg.
+ * This file is part of Libav.
  *
- * FFmpeg is free software; you can redistribute it and/or
+ * Libav is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * FFmpeg is distributed in the hope that it will be useful,
+ * Libav is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
+ * License along with Libav; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -27,6 +27,12 @@
 #include "avcodec.h"
 #include "dsputil.h"
 #include "acelp_pitch_delay.h"
+#include "libavutil/mem.h"
+
+#define LP_FILTER_ORDER_16k  16
+#define L_SUBFR_16k          80
+#define PITCH_MIN            30
+#define PITCH_MAX            281
 
 #define LSFQ_DIFF_MIN        (0.0125 * M_PI)
 
@@ -38,6 +44,8 @@
 /**  Subframe size for all modes except 16k */
 #define SUBFR_SIZE           48
 
+#define SUBFRAME_COUNT_16k   2
+
 typedef enum {
     MODE_16k,
     MODE_8k5,
@@ -46,18 +54,27 @@ typedef enum {
     MODE_COUNT
 } SiprMode;
 
-typedef struct {
+typedef struct SiprParameters {
+    int ma_pred_switch;        ///< switched moving average predictor
+    int vq_indexes[5];
+    int pitch_delay[5];        ///< pitch delay
+    int gp_index[5];           ///< adaptive-codebook gain indexes
+    int16_t fc_indexes[5][10]; ///< fixed-codebook indexes
+    int gc_index[5];           ///< fixed-codebook gain indexes
+} SiprParameters;
+
+typedef struct SiprContext {
     AVCodecContext *avctx;
-    DSPContext dsp;
+    AVFrame frame;
 
     SiprMode mode;
 
     float past_pitch_gain;
-    float lsf_history[LP_FILTER_ORDER];
+    float lsf_history[LP_FILTER_ORDER_16k];
 
-    float excitation[L_INTERPOL + PITCH_DELAY_MAX + 5*SUBFR_SIZE];
+    float excitation[L_INTERPOL + PITCH_MAX + 2 * L_SUBFR_16k];
 
-    DECLARE_ALIGNED_16(float, synth_buf[LP_FILTER_ORDER + 5*SUBFR_SIZE + 6]);
+    DECLARE_ALIGNED(16, float, synth_buf)[LP_FILTER_ORDER + 5*SUBFR_SIZE + 6];
 
     float lsp_history[LP_FILTER_ORDER];
     float gain_mem;
@@ -70,14 +87,25 @@ typedef struct {
     float postfilter_agc;
     float postfilter_mem5k0[PITCH_DELAY_MAX + LP_FILTER_ORDER];
     float postfilter_syn5k0[LP_FILTER_ORDER + SUBFR_SIZE*5];
+
+    /* 16k */
+    int pitch_lag_prev;
+    float iir_mem[LP_FILTER_ORDER_16k+1];
+    float filt_buf[2][LP_FILTER_ORDER_16k+1];
+    float *filt_mem[2];
+    float mem_preemph[LP_FILTER_ORDER_16k];
+    float synth[LP_FILTER_ORDER_16k];
+    double lsp_history_16k[16];
+
+    void (*decode_frame)(struct SiprContext *ctx, SiprParameters *params,
+                         float *out_data);
 } SiprContext;
 
-typedef struct {
-    int vq_indexes[5];
-    int pitch_delay[5];        ///< pitch delay
-    int gp_index[5];           ///< adaptive-codebook gain indexes
-    int16_t fc_indexes[5][10]; ///< fixed-codebook indexes
-    int gc_index[5];           ///< fixed-codebook gain indexes
-} SiprParameters;
+extern const float ff_pow_0_5[16];
+
+void ff_sipr_init_16k(SiprContext *ctx);
+
+void ff_sipr_decode_frame_16k(SiprContext *ctx, SiprParameters *params,
+                              float *out_data);
 
 #endif /* AVCODEC_SIPR_H */