diff options
| -rw-r--r-- | libavcodec/dsputil.c | 4 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 8 | ||||
| -rw-r--r-- | libavcodec/mlpdec.c | 6 | ||||
| -rw-r--r-- | libavcodec/mlpdsp.c | 7 | ||||
| -rw-r--r-- | libavcodec/x86/mlpdsp.c | 4 |
5 files changed, 9 insertions, 20 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 5c705ea169..cdd4b731f1 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2793,10 +2793,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) #undef dspfunc -#if CONFIG_MLP_DECODER || CONFIG_TRUEHD_DECODER - ff_mlp_init(c, avctx); -#endif - c->put_mspel_pixels_tab[0]= ff_put_pixels8x8_c; c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c; c->put_mspel_pixels_tab[2]= put_mspel8_mc20_c; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 6ce41df006..da3e7586e2 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -479,12 +479,6 @@ typedef struct DSPContext { void (*shrink[4])(uint8_t *dst, int dst_wrap, const uint8_t *src, int src_wrap, int width, int height); - /* mlp/truehd functions */ - void (*mlp_filter_channel)(int32_t *state, const int32_t *coeff, - int firorder, int iirorder, - unsigned int filter_shift, int32_t mask, int blocksize, - int32_t *sample_buffer); - /** * Calculate scalar product of two vectors. * @param len length of vectors, should be multiple of 16 @@ -612,8 +606,6 @@ void ff_dsputil_init_sh4(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_vis(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_dwt(DSPContext *c); -void ff_mlp_init(DSPContext* c, AVCodecContext *avctx); -void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx); #if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMI || HAVE_MMX # define STRIDE_ALIGN 16 diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c index afd8f887ec..cae5136efb 100644 --- a/libavcodec/mlpdec.c +++ b/libavcodec/mlpdec.c @@ -27,12 +27,12 @@ #include <stdint.h> #include "avcodec.h" -#include "dsputil.h" #include "libavutil/intreadwrite.h" #include "get_bits.h" #include "libavutil/crc.h" #include "parser.h" #include "mlp_parser.h" +#include "mlpdsp.h" #include "mlp.h" /** number of bits used for VLC lookup - longest Huffman code is 9 */ @@ -142,7 +142,7 @@ typedef struct MLPDecodeContext { int8_t bypassed_lsbs[MAX_BLOCKSIZE][MAX_CHANNELS]; int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS]; - DSPContext dsp; + MLPDSPContext dsp; } MLPDecodeContext; static VLC huff_vlc[3]; @@ -232,7 +232,7 @@ static av_cold int mlp_decode_init(AVCodecContext *avctx) m->avctx = avctx; for (substr = 0; substr < MAX_SUBSTREAMS; substr++) m->substream[substr].lossless_check_data = 0xffffffff; - ff_dsputil_init(&m->dsp, avctx); + ff_mlpdsp_init(&m->dsp); avcodec_get_frame_defaults(&m->frame); avctx->coded_frame = &m->frame; diff --git a/libavcodec/mlpdsp.c b/libavcodec/mlpdsp.c index 7d01c7586d..2944ce8432 100644 --- a/libavcodec/mlpdsp.c +++ b/libavcodec/mlpdsp.c @@ -19,7 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "dsputil.h" +#include "config.h" +#include "mlpdsp.h" #include "mlp.h" static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff, @@ -55,9 +56,9 @@ static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff, } } -void ff_mlp_init(DSPContext* c, AVCodecContext *avctx) +void ff_mlpdsp_init(MLPDSPContext *c) { c->mlp_filter_channel = ff_mlp_filter_channel; if (ARCH_X86) - ff_mlp_init_x86(c, avctx); + ff_mlpdsp_init_x86(c); } diff --git a/libavcodec/x86/mlpdsp.c b/libavcodec/x86/mlpdsp.c index 8f886aacbf..a18e9fa67b 100644 --- a/libavcodec/x86/mlpdsp.c +++ b/libavcodec/x86/mlpdsp.c @@ -21,7 +21,7 @@ #include "libavutil/internal.h" #include "libavutil/x86/asm.h" -#include "libavcodec/dsputil.h" +#include "libavcodec/mlpdsp.h" #include "libavcodec/mlp.h" #if HAVE_7REGS && HAVE_INLINE_ASM @@ -174,7 +174,7 @@ static void mlp_filter_channel_x86(int32_t *state, const int32_t *coeff, #endif /* HAVE_7REGS && HAVE_INLINE_ASM */ -void ff_mlp_init_x86(DSPContext* c, AVCodecContext *avctx) +void ff_mlpdsp_init_x86(MLPDSPContext *c) { #if HAVE_7REGS && HAVE_INLINE_ASM c->mlp_filter_channel = mlp_filter_channel_x86; |