vp9: split superframes in the filtering stage before actual decoding

[ffmpeg] / libavcodec / mpc.h

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 0c1548992fb9771c954772a5af4427b4ca8bd33f..39b8d6302db3225d5519a6d5883fd3dc51b28eee 100644 (file)
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -2,50 +2,46 @@
  * Musepack decoder
  * Copyright (c) 2006 Konstantin Shishkov
  *
- * 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
  */
 
 /**
- * @file mpc.h Musepack decoder
+ * @file
+ * Musepack decoder
  * MPEG Audio Layer 1/2 -like codec with frames of 1152 samples
  * divided into 32 subbands.
  */
 
-#ifndef FFMPEG_MPC_H
-#define FFMPEG_MPC_H
+#ifndef AVCODEC_MPC_H
+#define AVCODEC_MPC_H
 
-#include "libavutil/random.h"
-#include "avcodec.h"
-#include "bitstream.h"
-#include "dsputil.h"
+#include "libavutil/lfg.h"
 
-#ifdef CONFIG_MPEGAUDIO_HP
-#define USE_HIGHPRECISION
-#endif
+#include "avcodec.h"
+#include "bswapdsp.h"
 #include "mpegaudio.h"
-
-#include "mpcdata.h"
+#include "mpegaudiodsp.h"
 
 #define BANDS            32
 #define SAMPLES_PER_BAND 36
 #define MPC_FRAME_SIZE   (BANDS * SAMPLES_PER_BAND)
 
 /** Subband structure - hold all variables for each subband */
-typedef struct {
+typedef struct Band {
     int msf; ///< mid-stereo flag
     int res[2];
     int scfi[2];
@@ -53,9 +49,9 @@ typedef struct {
     int Q[2];
 }Band;
 
-typedef struct {
-    DSPContext dsp;
-    GetBitContext gb;
+typedef struct MPCContext {
+    BswapDSPContext bdsp;
+    MPADSPContext mpadsp;
     int IS, MSS, gapless;
     int lastframelen;
     int maxbands, last_max_band;
@@ -66,15 +62,15 @@ typedef struct {
     int cur_frame, frames;
     uint8_t *bits;
     int buf_size;
-    AVRandomState rnd;
+    AVLFG rnd;
     int frames_to_skip;
     /* for synthesis */
-    DECLARE_ALIGNED_16(MPA_INT, synth_buf[MPA_MAX_CHANNELS][512*2]);
+    DECLARE_ALIGNED(16, MPA_INT, synth_buf)[MPA_MAX_CHANNELS][512*2];
     int synth_buf_offset[MPA_MAX_CHANNELS];
-    DECLARE_ALIGNED_16(int32_t, sb_samples[MPA_MAX_CHANNELS][36][SBLIMIT]);
+    DECLARE_ALIGNED(16, int32_t, sb_samples)[MPA_MAX_CHANNELS][36][SBLIMIT];
 } MPCContext;
 
-extern void ff_mpc_init();
-extern void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst);
+void ff_mpc_init(void);
+void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, int16_t **out, int channels);
 
-#endif /* FFMPEG_MPC_H */
+#endif /* AVCODEC_MPC_H */