generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for crash in highbitdepth rt mode

Browse Source 
Change 72141 introduced a new use of vp9_avg_4x4.
This call needs to switch to using vp9_highbd_avg_4x4
when performing high bitdepth encodes.

Change-Id: I6a8ba4b62f8a75d0a917b365a55245e2f0438ea1
This commit is contained in:
Peter de Rivaz 2014-12-16 10:55:49 +00:00
parent a2fed22b6c
commit e3d19bfc63
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
vp9/encoder/vp9_encodeframe.c
View File

@ -593,7 +593,16 @@ static void choose_partitioning(VP9_COMP *cpi,
unsigned int sse = 0; unsigned int sse = 0;
int sum = 0; int sum = 0;
if (x4_idx < pixels_wide && y4_idx < pixels_high) { if (x4_idx < pixels_wide && y4_idx < pixels_high) {
#if CONFIG_VP9_HIGHBITDEPTH
int s_avg;
if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
s_avg = vp9_highbd_avg_4x4(s + y4_idx * sp + x4_idx, sp);
} else {
s_avg = vp9_avg_4x4(s + y4_idx * sp + x4_idx, sp);
}
#else
int s_avg = vp9_avg_4x4(s + y4_idx * sp + x4_idx, sp); int s_avg = vp9_avg_4x4(s + y4_idx * sp + x4_idx, sp);
#endif
// For key frame, reference is set to 128. // For key frame, reference is set to 128.
sum = s_avg - 128; sum = s_avg - 128;
sse = sum * sum; sse = sum * sum;