Ticket #1241: patchneondsp.diff

File patchneondsp.diff, 2.4 KB (added by Carl Eugen Hoyos, 12 years ago)

  • libavcodec/arm/h264dsp_init_arm.c 

    diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c
index cc4c688..781f89d 100644
    a b void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset,  
    6767                             DCTELEM *block, int stride,
    6868                             const uint8_t nnzc[6*8]);
    6969
    70 static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
     70void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
    7171{
     72    if (HAVE_NEON) {
    7273    if (bit_depth == 8) {
    7374    c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon;
    7475    c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon;
    … … static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i  
    9596    c->h264_idct8_dc_add    = ff_h264_idct8_dc_add_neon;
    9697    c->h264_idct8_add4      = ff_h264_idct8_add4_neon;
    9798    }
    98 }
    99 
    100 void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
    101 {
    102     if (HAVE_NEON) ff_h264dsp_init_neon(c, bit_depth, chroma_format_idc);
     99    }
    103100}

  • libavcodec/arm/h264pred_init_arm.c 

    diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c
index 75653ff..b1fb8ad 100644
    a b void ff_pred8x8_0lt_dc_neon(uint8_t *src, int stride);  
    4242void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride);
    4343void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride);
    4444
    45 static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc)
     45void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc)
    4646{
     47    if (HAVE_NEON) {
    4748    const int high_depth = bit_depth > 8;
    4849
    4950    if (high_depth)
    … … static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int b  
    7374    h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
    7475    if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8)
    7576        h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_neon;
    76 }
    77 
    78 void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc)
    79 {
    80     if (HAVE_NEON)    ff_h264_pred_init_neon(h, codec_id, bit_depth, chroma_format_idc);
     77    }
    8178}