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 2d9755a59307366d5c3b748584bfaad2af5d5d2e..39b8d6302db3225d5519a6d5883fd3dc51b28eee 100644 (file)
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -2,20 +2,20 @@
  * 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
  */
 
@@ -30,19 +30,18 @@
 #define AVCODEC_MPC_H
 
 #include "libavutil/lfg.h"
+
 #include "avcodec.h"
-#include "get_bits.h"
-#include "dsputil.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];
@@ -50,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;
@@ -72,6 +71,6 @@ typedef struct {
 } MPCContext;
 
 void ff_mpc_init(void);
-void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, void *dst, int channels);
+void ff_mpc_dequantize_and_synth(MPCContext *c, int maxband, int16_t **out, int channels);
 
 #endif /* AVCODEC_MPC_H */