|
|
|
@ -1233,8 +1233,7 @@ static void hls_residual_coding(HEVCContext *s, int x0, int y0, |
|
|
|
|
static int hls_transform_unit(HEVCContext *s, int x0, int y0, |
|
|
|
|
int xBase, int yBase, int cb_xBase, int cb_yBase, |
|
|
|
|
int log2_cb_size, int log2_trafo_size, |
|
|
|
|
int trafo_depth, int blk_idx, |
|
|
|
|
int cbf_luma, int cbf_cb, int cbf_cr) |
|
|
|
|
int blk_idx, int cbf_luma, int cbf_cb, int cbf_cr) |
|
|
|
|
{ |
|
|
|
|
HEVCLocalContext *lc = &s->HEVClc; |
|
|
|
|
|
|
|
|
@ -1405,7 +1404,7 @@ do { |
|
|
|
|
cbf_luma = ff_hevc_cbf_luma_decode(s, trafo_depth); |
|
|
|
|
|
|
|
|
|
ret = hls_transform_unit(s, x0, y0, xBase, yBase, cb_xBase, cb_yBase, |
|
|
|
|
log2_cb_size, log2_trafo_size, trafo_depth, |
|
|
|
|
log2_cb_size, log2_trafo_size, |
|
|
|
|
blk_idx, cbf_luma, cbf_cb, cbf_cr); |
|
|
|
|
if (ret < 0) |
|
|
|
|
return ret; |
|
|
|
|