Ticket #1241: 1241-new.diff

File 1241-new.diff, 1.9 KB (added by notzed, 4 years ago)

similar patch against git head

  • libavcodec/arm/h264dsp_init_arm.c

    diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c
    index 367ba81..53a8333 100644
    a b void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset, 
    6868                             DCTELEM *block, int stride, 
    6969                             const uint8_t nnzc[6*8]); 
    7070 
    71 static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) 
     71void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc); 
     72 
     73void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) 
    7274{ 
     75    int cpu_flags = av_get_cpu_flags(); 
     76 
     77    if (!have_neon(cpu_flags)) 
     78            return; 
     79 
    7380    if (bit_depth == 8) { 
    7481    c->h264_v_loop_filter_luma   = ff_h264_v_loop_filter_luma_neon; 
    7582    c->h264_h_loop_filter_luma   = ff_h264_h_loop_filter_luma_neon; 
  • libavcodec/arm/h264pred_init_arm.c

    diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c
    index 13aea32..75a2392 100644
    a b void ff_pred8x8_0lt_dc_neon(uint8_t *src, int stride); 
    4343void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride); 
    4444void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride); 
    4545 
    46 static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc) 
     46void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc); 
     47 
     48void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc) 
    4749{ 
     50    int cpu_flags = av_get_cpu_flags(); 
    4851    const int high_depth = bit_depth > 8; 
    4952 
     53    if (!have_neon(cpu_flags)) 
     54            return; 
     55 
    5056    if (high_depth) 
    5157        return; 
    5258    if(chroma_format_idc == 1){