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/hevc_cabac.c | |
| parent | c778a9657dc8a425ac65f89d81d64709f2090a9f (diff) | |
| parent | 1bd890ad173d79e7906c5e1d06bf0a06cca4519d (diff) | |
| download | ffmpeg-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/hevc_cabac.c')
| -rw-r--r-- | libavcodec/hevc_cabac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 05b2821840..457e0871a9 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -1476,7 +1476,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, FFSWAP(int16_t, coeffs[i], coeffs[16 - i - 1]); } - s->hevcdsp.transform_skip(coeffs, log2_trafo_size); + s->hevcdsp.dequant(coeffs, log2_trafo_size); if (explicit_rdpcm_flag || (s->ps.sps->implicit_rdpcm_enabled_flag && lc->cu.pred_mode == MODE_INTRA && @@ -1486,7 +1486,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, s->hevcdsp.transform_rdpcm(coeffs, log2_trafo_size, mode); } } else if (lc->cu.pred_mode == MODE_INTRA && c_idx == 0 && log2_trafo_size == 2) { - s->hevcdsp.idct_4x4_luma(coeffs); + s->hevcdsp.transform_4x4_luma(coeffs); } else { int max_xy = FFMAX(last_significant_coeff_x, last_significant_coeff_y); if (max_xy == 0) @@ -1510,7 +1510,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0, int y0, coeffs[i] = coeffs[i] + ((lc->tu.res_scale_val * coeffs_y[i]) >> 3); } } - s->hevcdsp.transform_add[log2_trafo_size-2](dst, coeffs, stride); + s->hevcdsp.add_residual[log2_trafo_size-2](dst, coeffs, stride); } void ff_hevc_hls_mvd_coding(HEVCContext *s, int x0, int y0, int log2_cb_size) |