diff options
author | Clément Bœsch <cboesch@gopro.com> | 2017-01-31 11:20:54 +0100 |
---|---|---|
committer | Clément Bœsch <cboesch@gopro.com> | 2017-01-31 15:31:34 +0100 |
commit | d0e132bab68073588dc55844a31b053fb0ee1c83 (patch) | |
tree | 1c3b3cd8bee776019f2960cfca1d561019cb84d4 /libavcodec/x86/hevcdsp_init.c | |
parent | c778a9657dc8a425ac65f89d81d64709f2090a9f (diff) | |
parent | 1bd890ad173d79e7906c5e1d06bf0a06cca4519d (diff) | |
download | ffmpeg-streaming-d0e132bab68073588dc55844a31b053fb0ee1c83.zip ffmpeg-streaming-d0e132bab68073588dc55844a31b053fb0ee1c83.tar.gz |
Merge commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d'
* commit '1bd890ad173d79e7906c5e1d06bf0a06cca4519d':
hevc: Separate adding residual to prediction from IDCT
This commit should be a noop but isn't because of the following renames:
- transform_add → add_residual
- transform_skip → dequant
- idct_4x4_luma → transform_4x4_luma
Merged-by: Clément Bœsch <cboesch@gopro.com>
Diffstat (limited to 'libavcodec/x86/hevcdsp_init.c')
-rw-r--r-- | libavcodec/x86/hevcdsp_init.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/x86/hevcdsp_init.c b/libavcodec/x86/hevcdsp_init.c index 09eb06d..da73d76 100644 --- a/libavcodec/x86/hevcdsp_init.c +++ b/libavcodec/x86/hevcdsp_init.c @@ -700,7 +700,7 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) if (EXTERNAL_MMXEXT(cpu_flags)) { c->idct_dc[0] = ff_hevc_idct4x4_dc_8_mmxext; c->idct_dc[1] = ff_hevc_idct8x8_dc_8_mmxext; - c->transform_add[0] = ff_hevc_transform_add4_8_mmxext; + c->add_residual[0] = ff_hevc_add_residual4_8_mmxext; } if (EXTERNAL_SSE2(cpu_flags)) { c->hevc_v_loop_filter_chroma = ff_hevc_v_loop_filter_chroma_8_sse2; @@ -716,9 +716,9 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) c->idct_dc[2] = ff_hevc_idct16x16_dc_8_sse2; c->idct_dc[3] = ff_hevc_idct32x32_dc_8_sse2; - c->transform_add[1] = ff_hevc_transform_add8_8_sse2; - c->transform_add[2] = ff_hevc_transform_add16_8_sse2; - c->transform_add[3] = ff_hevc_transform_add32_8_sse2; + c->add_residual[1] = ff_hevc_add_residual8_8_sse2; + c->add_residual[2] = ff_hevc_add_residual16_8_sse2; + c->add_residual[3] = ff_hevc_add_residual32_8_sse2; } if (EXTERNAL_SSSE3(cpu_flags)) { if(ARCH_X86_64) { @@ -748,9 +748,9 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) } SAO_BAND_INIT(8, avx); - c->transform_add[1] = ff_hevc_transform_add8_8_avx; - c->transform_add[2] = ff_hevc_transform_add16_8_avx; - c->transform_add[3] = ff_hevc_transform_add32_8_avx; + c->add_residual[1] = ff_hevc_add_residual8_8_avx; + c->add_residual[2] = ff_hevc_add_residual16_8_avx; + c->add_residual[3] = ff_hevc_add_residual32_8_avx; } if (EXTERNAL_AVX2(cpu_flags)) { c->sao_band_filter[0] = ff_hevc_sao_band_filter_8_8_avx2; @@ -850,11 +850,11 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) c->sao_edge_filter[3] = ff_hevc_sao_edge_filter_48_8_avx2; c->sao_edge_filter[4] = ff_hevc_sao_edge_filter_64_8_avx2; - c->transform_add[3] = ff_hevc_transform_add32_8_avx2; + c->add_residual[3] = ff_hevc_add_residual32_8_avx2; } } else if (bit_depth == 10) { if (EXTERNAL_MMXEXT(cpu_flags)) { - c->transform_add[0] = ff_hevc_transform_add4_10_mmxext; + c->add_residual[0] = ff_hevc_add_residual4_10_mmxext; c->idct_dc[0] = ff_hevc_idct4x4_dc_10_mmxext; c->idct_dc[1] = ff_hevc_idct8x8_dc_10_mmxext; } @@ -872,9 +872,9 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) c->idct_dc[2] = ff_hevc_idct16x16_dc_10_sse2; c->idct_dc[3] = ff_hevc_idct32x32_dc_10_sse2; - c->transform_add[1] = ff_hevc_transform_add8_10_sse2; - c->transform_add[2] = ff_hevc_transform_add16_10_sse2; - c->transform_add[3] = ff_hevc_transform_add32_10_sse2; + c->add_residual[1] = ff_hevc_add_residual8_10_sse2; + c->add_residual[2] = ff_hevc_add_residual16_10_sse2; + c->add_residual[3] = ff_hevc_add_residual32_10_sse2; } if (EXTERNAL_SSSE3(cpu_flags) && ARCH_X86_64) { c->hevc_v_loop_filter_luma = ff_hevc_v_loop_filter_luma_10_ssse3; @@ -1053,8 +1053,8 @@ void ff_hevc_dsp_init_x86(HEVCDSPContext *c, const int bit_depth) SAO_BAND_INIT(10, avx2); SAO_EDGE_INIT(10, avx2); - c->transform_add[2] = ff_hevc_transform_add16_10_avx2; - c->transform_add[3] = ff_hevc_transform_add32_10_avx2; + c->add_residual[2] = ff_hevc_add_residual16_10_avx2; + c->add_residual[3] = ff_hevc_add_residual32_10_avx2; } } else if (bit_depth == 12) { |