tizen_src/build/patches/m47_ffmpeg_temp_arm64bit.diff

   1 diff --git a/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c b/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c
   2 index 8514d3b..4860c5f 100644
   3 --- a/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c
   4 +++ b/third_party/ffmpeg/libavcodec/aarch64/fft_init_aarch64.c
   5 @@ -35,12 +35,12 @@ av_cold void ff_fft_init_aarch64(FFTContext *s)
   6      int cpu_flags = av_get_cpu_flags();
   7
   8      if (have_neon(cpu_flags)) {
   9 -        s->fft_permute  = ff_fft_permute_neon;
  10 -        s->fft_calc     = ff_fft_calc_neon;
  11 +//        s->fft_permute  = ff_fft_permute_neon;
  12 +//        s->fft_calc     = ff_fft_calc_neon;
  13  #if CONFIG_MDCT
  14 -        s->imdct_calc   = ff_imdct_calc_neon;
  15 -        s->imdct_half   = ff_imdct_half_neon;
  16 -        s->mdct_calc    = ff_mdct_calc_neon;
  17 +//        s->imdct_calc   = ff_imdct_calc_neon;
  18 +//        s->imdct_half   = ff_imdct_half_neon;
  19 +//        s->mdct_calc    = ff_mdct_calc_neon;
  20          s->mdct_permutation = FF_MDCT_PERM_INTERLEAVE;
  21  #endif
  22      }
  23 diff --git a/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c b/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c
  24 index b144376..db4d4bd 100644
  25 --- a/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c
  26 +++ b/third_party/ffmpeg/libavcodec/aarch64/h264pred_init.c
  27 @@ -53,7 +53,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
  28
  29      if (high_depth)
  30          return;
  31 -
  32 +/*
  33      if (chroma_format_idc <= 1) {
  34          h->pred8x8[VERT_PRED8x8     ] = ff_pred8x8_vert_neon;
  35          h->pred8x8[HOR_PRED8x8      ] = ff_pred8x8_hor_neon;
  36 @@ -81,6 +81,7 @@ static av_cold void h264_pred_init_neon(H264PredContext *h, int codec_id,
  37      if (codec_id != AV_CODEC_ID_SVQ3 && codec_id != AV_CODEC_ID_RV40 &&
  38          codec_id != AV_CODEC_ID_VP7 && codec_id != AV_CODEC_ID_VP8)
  39          h->pred16x16[PLANE_PRED8x8  ] = ff_pred16x16_plane_neon;
  40 +*/
  41  }
  42
  43  av_cold void ff_h264_pred_init_aarch64(H264PredContext *h, int codec_id,
  44 diff --git a/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c b/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c
  45 index 144ae2b..790edbe 100644
  46 --- a/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c
  47 +++ b/third_party/ffmpeg/libavcodec/aarch64/hpeldsp_init_aarch64.c
  48 @@ -86,7 +86,7 @@ void ff_avg_pixels16_xy2_no_rnd_neon(uint8_t *block, const uint8_t *pixels,
  49  av_cold void ff_hpeldsp_init_aarch64(HpelDSPContext *c, int flags)
  50  {
  51      int cpu_flags = av_get_cpu_flags();
  52 -
  53 +/*
  54      if (have_neon(cpu_flags)) {
  55          c->put_pixels_tab[0][0] = ff_put_pixels16_neon;
  56          c->put_pixels_tab[0][1] = ff_put_pixels16_x2_neon;
  57 @@ -120,4 +120,5 @@ av_cold void ff_hpeldsp_init_aarch64(HpelDSPContext *c, int flags)
  58          c->avg_no_rnd_pixels_tab[2] = ff_avg_pixels16_y2_no_rnd_neon;
  59          c->avg_no_rnd_pixels_tab[3] = ff_avg_pixels16_xy2_no_rnd_neon;
  60      }
  61 +*/
  62  }
  63 diff --git a/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c b/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c
  64 index 6f667a6..e7094e0 100644
  65 --- a/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c
  66 +++ b/third_party/ffmpeg/libavcodec/aarch64/videodsp_init.c
  67 @@ -27,6 +27,6 @@ av_cold void ff_videodsp_init_aarch64(VideoDSPContext *ctx, int bpc)
  68  {
  69      int cpu_flags = av_get_cpu_flags();
  70
  71 -    if (have_armv8(cpu_flags))
  72 -        ctx->prefetch = ff_prefetch_aarch64;
  73 +//    if (have_armv8(cpu_flags))
  74 +//        ctx->prefetch = ff_prefetch_aarch64;
  75  }
  76 diff --git a/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c b/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c
  77 index c796f95..84610a6 100644
  78 --- a/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c
  79 +++ b/third_party/ffmpeg/libavcodec/aarch64/vorbisdsp_init.c
  80 @@ -28,7 +28,7 @@ av_cold void ff_vorbisdsp_init_aarch64(VorbisDSPContext *c)
  81  {
  82      int cpu_flags = av_get_cpu_flags();
  83
  84 -    if (have_neon(cpu_flags)) {
  85 -        c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_neon;
  86 -    }
  87 +//    if (have_neon(cpu_flags)) {
  88 +//        c->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_neon;
  89 +//    }
  90  }
  91 diff --git a/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c b/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c
  92 index 4325071..34bf9e9 100644
  93 --- a/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c
  94 +++ b/third_party/ffmpeg/libavutil/aarch64/float_dsp_init.c
  95 @@ -54,7 +54,7 @@ float ff_scalarproduct_float_neon(const float *v1, const float *v2, int len);
  96  av_cold void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp)
  97  {
  98      int cpu_flags = av_get_cpu_flags();
  99 -
 100 +/*
 101      if (have_neon(cpu_flags)) {
 102          fdsp->butterflies_float   = ff_butterflies_float_neon;
 103          fdsp->scalarproduct_float = ff_scalarproduct_float_neon;
 104 @@ -66,4 +66,5 @@ av_cold void ff_float_dsp_init_aarch64(AVFloatDSPContext *fdsp)
 105          fdsp->vector_fmul_scalar  = ff_vector_fmul_scalar_neon;
 106          fdsp->vector_fmul_window  = ff_vector_fmul_window_neon;
 107      }
 108 +*/
 109  }