diff options
| author | Tim Redfern <tim@eclectronics.org> | 2014-02-17 13:36:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2014-02-17 13:36:38 +0000 |
| commit | 22e28216336da876e1fd17f380ce42eaf1446769 (patch) | |
| tree | 444dad3dc7e2656992d29f34f7bce31970c122a5 /ffmpeg/libavcodec/arm/h264pred_init_arm.c | |
| parent | ae5e8541f6e06e64c28719467cdf366ac57aff31 (diff) | |
chasing indexing error
Diffstat (limited to 'ffmpeg/libavcodec/arm/h264pred_init_arm.c')
| -rw-r--r-- | ffmpeg/libavcodec/arm/h264pred_init_arm.c | 92 |
1 files changed, 0 insertions, 92 deletions
diff --git a/ffmpeg/libavcodec/arm/h264pred_init_arm.c b/ffmpeg/libavcodec/arm/h264pred_init_arm.c deleted file mode 100644 index 1562f0b..0000000 --- a/ffmpeg/libavcodec/arm/h264pred_init_arm.c +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright (c) 2009 Mans Rullgard <mans@mansr.com> - * - * This file is part of FFmpeg. - * - * FFmpeg 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, - * 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 - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <stdint.h> - -#include "libavutil/attributes.h" -#include "libavutil/arm/cpu.h" -#include "libavcodec/avcodec.h" -#include "libavcodec/h264pred.h" - -void ff_pred16x16_vert_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred16x16_hor_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred16x16_plane_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred16x16_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred16x16_128_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred16x16_left_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred16x16_top_dc_neon(uint8_t *src, ptrdiff_t stride); - -void ff_pred8x8_vert_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_hor_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_plane_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_128_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_left_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_top_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_l0t_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_0lt_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_l00_dc_neon(uint8_t *src, ptrdiff_t stride); -void ff_pred8x8_0l0_dc_neon(uint8_t *src, ptrdiff_t stride); - -static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id, - const int bit_depth, - const int chroma_format_idc) -{ -#if HAVE_NEON - const int high_depth = bit_depth > 8; - - if (high_depth) - return; - if(chroma_format_idc == 1){ - h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; - h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon; - if (codec_id != AV_CODEC_ID_VP8) - h->pred8x8[PLANE_PRED8x8] = ff_pred8x8_plane_neon; - h->pred8x8[DC_128_PRED8x8 ] = ff_pred8x8_128_dc_neon; - if (codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP8) { - h->pred8x8[DC_PRED8x8 ] = ff_pred8x8_dc_neon; - h->pred8x8[LEFT_DC_PRED8x8] = ff_pred8x8_left_dc_neon; - h->pred8x8[TOP_DC_PRED8x8 ] = ff_pred8x8_top_dc_neon; - h->pred8x8[ALZHEIMER_DC_L0T_PRED8x8] = ff_pred8x8_l0t_dc_neon; - h->pred8x8[ALZHEIMER_DC_0LT_PRED8x8] = ff_pred8x8_0lt_dc_neon; - h->pred8x8[ALZHEIMER_DC_L00_PRED8x8] = ff_pred8x8_l00_dc_neon; - h->pred8x8[ALZHEIMER_DC_0L0_PRED8x8] = ff_pred8x8_0l0_dc_neon; - } - } - - h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_neon; - h->pred16x16[VERT_PRED8x8 ] = ff_pred16x16_vert_neon; - h->pred16x16[HOR_PRED8x8 ] = ff_pred16x16_hor_neon; - h->pred16x16[LEFT_DC_PRED8x8] = ff_pred16x16_left_dc_neon; - h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon; - h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon; - if (codec_id != AV_CODEC_ID_SVQ3 && codec_id != AV_CODEC_ID_RV40 && codec_id != AV_CODEC_ID_VP8) - h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; -#endif // HAVE_NEON -} - -av_cold void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, - int bit_depth, const int chroma_format_idc) -{ - int cpu_flags = av_get_cpu_flags(); - - if (have_neon(cpu_flags)) - h264_pred_init_neon(h, codec_id, bit_depth, chroma_format_idc); -} |
