diff options
author | Ben Avison <bavison@riscosopen.org> | 2014-07-21 16:25:48 +0100 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2014-08-04 22:22:54 +0200 |
commit | db7f1c7c5a1d37e7f4da64a79a97bea1c4b6e9f8 (patch) | |
tree | d5d872aa5916ca99645f2373f053c15a773af30a /libavcodec/h264dsp.c | |
parent | eee813eec7d3c0b0689f80665d3f796401742935 (diff) |
h264: Move start code search functions into separate source files.
This permits re-use with parsers for codecs which use similar start codes.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/h264dsp.c')
-rw-r--r-- | libavcodec/h264dsp.c | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/libavcodec/h264dsp.c b/libavcodec/h264dsp.c index a5b1591482..c8edbd08eb 100644 --- a/libavcodec/h264dsp.c +++ b/libavcodec/h264dsp.c @@ -31,6 +31,7 @@ #include "avcodec.h" #include "h264dsp.h" #include "h264idct.h" +#include "startcode.h" #include "libavutil/common.h" #define BIT_DEPTH 8 @@ -53,34 +54,6 @@ #include "h264addpx_template.c" #undef BIT_DEPTH -static int h264_find_start_code_candidate_c(const uint8_t *buf, int size) -{ - int i = 0; -#if HAVE_FAST_UNALIGNED - /* we check i < size instead of i + 3 / 7 because it is - * simpler and there must be FF_INPUT_BUFFER_PADDING_SIZE - * bytes at the end. - */ -#if HAVE_FAST_64BIT - while (i < size && - !((~*(const uint64_t *)(buf + i) & - (*(const uint64_t *)(buf + i) - 0x0101010101010101ULL)) & - 0x8080808080808080ULL)) - i += 8; -#else - while (i < size && - !((~*(const uint32_t *)(buf + i) & - (*(const uint32_t *)(buf + i) - 0x01010101U)) & - 0x80808080U)) - i += 4; -#endif -#endif - for (; i < size; i++) - if (!buf[i]) - break; - return i; -} - av_cold void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) { @@ -161,7 +134,7 @@ av_cold void ff_h264dsp_init(H264DSPContext *c, const int bit_depth, H264_DSP(8); break; } - c->h264_find_start_code_candidate = h264_find_start_code_candidate_c; + c->startcode_find_candidate = ff_startcode_find_candidate_c; if (ARCH_AARCH64) ff_h264dsp_init_aarch64(c, bit_depth, chroma_format_idc); if (ARCH_ARM) ff_h264dsp_init_arm(c, bit_depth, chroma_format_idc); |