har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dsputil: split out mlp dsp function

Browse Source
This commit is contained in:
Luca Barbato 2012-10-11 02:01:41 +02:00
parent 25dc79bc14
commit 2d6caade22
5 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/dsputil.c
View File

@ -2793,10 +2793,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx)
#undef dspfunc #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[0]= ff_put_pixels8x8_c;
c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c; c->put_mspel_pixels_tab[1]= put_mspel8_mc10_c;
c->put_mspel_pixels_tab[2]= put_mspel8_mc20_c; c->put_mspel_pixels_tab[2]= put_mspel8_mc20_c;

8
libavcodec/dsputil.h
View File

@ -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); 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. * Calculate scalar product of two vectors.
* @param len length of vectors, should be multiple of 16 * @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_vis(DSPContext* c, AVCodecContext *avctx);
void ff_dsputil_init_dwt(DSPContext *c); 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 #if (ARCH_ARM && HAVE_NEON) || ARCH_PPC || HAVE_MMI || HAVE_MMX
# define STRIDE_ALIGN 16 # define STRIDE_ALIGN 16

6
libavcodec/mlpdec.c
View File

@ -27,12 +27,12 @@
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "get_bits.h" #include "get_bits.h"
#include "libavutil/crc.h" #include "libavutil/crc.h"
#include "parser.h" #include "parser.h"
#include "mlp_parser.h" #include "mlp_parser.h"
#include "mlpdsp.h"
#include "mlp.h" #include "mlp.h"
/** number of bits used for VLC lookup - longest Huffman code is 9 */ /** 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]; int8_t bypassed_lsbs[MAX_BLOCKSIZE][MAX_CHANNELS];
int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS]; int32_t sample_buffer[MAX_BLOCKSIZE][MAX_CHANNELS];
DSPContext dsp; MLPDSPContext dsp;
} MLPDecodeContext; } MLPDecodeContext;
static VLC huff_vlc[3]; static VLC huff_vlc[3];
@ -232,7 +232,7 @@ static av_cold int mlp_decode_init(AVCodecContext *avctx)
m->avctx = avctx; m->avctx = avctx;
for (substr = 0; substr < MAX_SUBSTREAMS; substr++) for (substr = 0; substr < MAX_SUBSTREAMS; substr++)
m->substream[substr].lossless_check_data = 0xffffffff; m->substream[substr].lossless_check_data = 0xffffffff;
ff_dsputil_init(&m->dsp, avctx); ff_mlpdsp_init(&m->dsp);
avcodec_get_frame_defaults(&m->frame); avcodec_get_frame_defaults(&m->frame);
avctx->coded_frame = &m->frame; avctx->coded_frame = &m->frame;

7
libavcodec/mlpdsp.c
View File

@ -19,7 +19,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "dsputil.h" #include "config.h"
#include "mlpdsp.h"
#include "mlp.h" #include "mlp.h"
static void ff_mlp_filter_channel(int32_t *state, const int32_t *coeff, 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; c->mlp_filter_channel = ff_mlp_filter_channel;
if (ARCH_X86) if (ARCH_X86)
ff_mlp_init_x86(c, avctx); ff_mlpdsp_init_x86(c);
} }

4
libavcodec/x86/mlpdsp.c
View File

@ -21,7 +21,7 @@
#include "libavutil/internal.h" #include "libavutil/internal.h"
#include "libavutil/x86/asm.h" #include "libavutil/x86/asm.h"
#include "libavcodec/dsputil.h" #include "libavcodec/mlpdsp.h"
#include "libavcodec/mlp.h" #include "libavcodec/mlp.h"
#if HAVE_7REGS && HAVE_INLINE_ASM #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 */ #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 #if HAVE_7REGS && HAVE_INLINE_ASM
c->mlp_filter_channel = mlp_filter_channel_x86; c->mlp_filter_channel = mlp_filter_channel_x86;