X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fsipr.h;h=951532167facc7c045eb34ba6c838661405e506e;hb=f666276fa61623f4d6fa97b99d6b336ec0eba8c3;hp=5b2198ea87fe5d0b13902c940c788a5437ea7ba7;hpb=4b84d5114d760627a990e66724e3a1e9e1d1286f;p=ffmpeg diff --git a/libavcodec/sipr.h b/libavcodec/sipr.h index 5b2198ea87f..951532167fa 100644 --- a/libavcodec/sipr.h +++ b/libavcodec/sipr.h @@ -53,8 +53,18 @@ 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; + AVFrame frame; SiprMode mode; @@ -85,16 +95,10 @@ typedef struct { float mem_preemph[LP_FILTER_ORDER_16k]; float synth[LP_FILTER_ORDER_16k]; double lsp_history_16k[16]; -} SiprContext; -typedef struct { - 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; + void (*decode_frame)(struct SiprContext *ctx, SiprParameters *params, + float *out_data); +} SiprContext; extern const float ff_pow_0_5[16];