diff options
| author | Ben Avison <bavison@riscosopen.org> | 2014-04-16 04:51:32 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-25 04:36:11 +0400 |
| commit | 9d8ecdd8ca6d248e7439e8fdf255e39eda14e0f2 (patch) | |
| tree | e35abe072bfeb91f77ac48c51eb3bd69d9773aed /libavcodec/arm | |
| parent | 270cede3f3772117454a14b620803d731036942d (diff) | |
vc-1: Add platform-specific start code search routine to VC1DSPContext.
Initialise VC1DSPContext for parser as well as for decoder.
Note, the VC-1 code doesn't actually use the function pointer yet.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm')
| -rw-r--r-- | libavcodec/arm/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/arm/vc1dsp_init_arm.c | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/arm/Makefile b/libavcodec/arm/Makefile index 4c7e7d2dbe..1b21906fa6 100644 --- a/libavcodec/arm/Makefile +++ b/libavcodec/arm/Makefile @@ -57,6 +57,8 @@ ARMV6-OBJS-$(CONFIG_HPELDSP) += arm/hpeldsp_init_armv6.o \ ARMV6-OBJS-$(CONFIG_MPEGAUDIODSP) += arm/mpegaudiodsp_fixed_armv6.o ARMV6-OBJS-$(CONFIG_MLP_DECODER) += arm/mlpdsp_armv6.o +ARMV6-OBJS-$(CONFIG_VC1_DECODER) += arm/startcode_armv6.o +ARMV6-OBJS-$(CONFIG_VC1_PARSER) += arm/startcode_armv6.o ARMV6-OBJS-$(CONFIG_VP7_DECODER) += arm/vp8_armv6.o \ arm/vp8dsp_init_armv6.o \ arm/vp8dsp_armv6.o diff --git a/libavcodec/arm/vc1dsp_init_arm.c b/libavcodec/arm/vc1dsp_init_arm.c index 47d412674b..4a84848463 100644 --- a/libavcodec/arm/vc1dsp_init_arm.c +++ b/libavcodec/arm/vc1dsp_init_arm.c @@ -23,10 +23,14 @@ #include "libavcodec/vc1dsp.h" #include "vc1dsp.h" +int ff_startcode_find_candidate_armv6(const uint8_t *buf, int size); + av_cold void ff_vc1dsp_init_arm(VC1DSPContext *dsp) { int cpu_flags = av_get_cpu_flags(); + if (have_armv6(cpu_flags)) + dsp->vc1_find_start_code_candidate = ff_startcode_find_candidate_armv6; if (have_neon(cpu_flags)) ff_vc1dsp_init_neon(dsp); } |