Kind of hackish but...
---
libavcodec/hevc.c | 8 ++++----
libavcodec/hevc.h | 1 -
libavcodec/hevc_cabac.c | 4 ++--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
index 4860aec..934abd1 100644
--- a/libavcodec/hevc.c
+++ b/libavcodec/hevc.c
@@ -973,8 +973,8 @@ static int hls_transform_unit(HEVCContext *s, int x0, int
y0,
ptrdiff_t stride = s->frame->linesize[1];
int hshift = s->sps->hshift[1];
int vshift = s->sps->vshift[1];
- int16_t *coeffs_y = lc->tu.coeffs[0];
- int16_t *coeffs = lc->tu.coeffs[1];
+ int16_t *coeffs_y = (int16_t*)lc->edge_emu_buffer;
+ int16_t *coeffs = (int16_t*)lc->edge_emu_buffer2;
int size = 1 << log2_trafo_size_c;
uint8_t *dst = &s->frame->data[1][(y0 >> vshift) *
stride +
@@ -1002,8 +1002,8 @@ static int hls_transform_unit(HEVCContext *s, int x0, int
y0,
ptrdiff_t stride = s->frame->linesize[2];
int hshift = s->sps->hshift[2];
int vshift = s->sps->vshift[2];
- int16_t *coeffs_y = lc->tu.coeffs[0];
- int16_t *coeffs = lc->tu.coeffs[1];
+ int16_t *coeffs_y = (int16_t*)lc->edge_emu_buffer;
+ int16_t *coeffs = (int16_t*)lc->edge_emu_buffer2;
int size = 1 << log2_trafo_size_c;
uint8_t *dst = &s->frame->data[2][(y0 >> vshift) *
stride +
diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h
index 87a59fb..7205a78 100644
--- a/libavcodec/hevc.h
+++ b/libavcodec/hevc.h
@@ -679,7 +679,6 @@ typedef struct PredictionUnit {
} PredictionUnit;
typedef struct TransformUnit {
- DECLARE_ALIGNED(32, int16_t, coeffs[2][MAX_TB_SIZE * MAX_TB_SIZE]);
int cu_qp_delta;
int res_scale_val;
diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c
index e2e5fac..3862df7 100644
--- a/libavcodec/hevc_cabac.c
+++ b/libavcodec/hevc_cabac.c
@@ -1079,7 +1079,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0,
int y0,
int vshift = s->sps->vshift[c_idx];
uint8_t *dst = &s->frame->data[c_idx][(y0 >> vshift) * stride +
((x0 >> hshift) <<
s->sps->pixel_shift)];
- int16_t *coeffs = lc->tu.coeffs[c_idx > 0];
+ int16_t *coeffs = (int16_t*)(c_idx ? lc->edge_emu_buffer2 :
lc->edge_emu_buffer);
uint8_t significant_coeff_group_flag[8][8] = {{0}};
int explicit_rdpcm_flag = 0;
int explicit_rdpcm_dir_flag;
@@ -1552,7 +1552,7 @@ void ff_hevc_hls_residual_coding(HEVCContext *s, int x0,
int y0,
}
}
if (lc->tu.cross_pf) {
- int16_t *coeffs_y = lc->tu.coeffs[0];
+ int16_t *coeffs_y = (int16_t*)lc->edge_emu_buffer;
for (i = 0; i < (trafo_size * trafo_size); i++) {
coeffs[i] = coeffs[i] + ((lc->tu.res_scale_val * coeffs_y[i]) >>
3);
--
1.9.2.msysgit.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
