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

Merge "decodframe.c: use vpx_memset instead of cast"

Browse Source
This commit is contained in:
Johann 2013-10-29 18:39:24 -07:00 committed by Gerrit Code Review
commit 272d76e3ce
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vp8/decoder/decodframe.c
View File

@ -211,7 +211,7 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
(b->qcoeff[0] * DQC[0], (b->qcoeff[0] * DQC[0],
dst, dst_stride, dst, dst_stride,
dst, dst_stride); dst, dst_stride);
((int *)b->qcoeff)[0] = 0; vpx_memset(b->qcoeff, 0, 2 * sizeof(b->qcoeff[0]));
} }
} }
} }
@ -248,21 +248,14 @@ static void decode_macroblock(VP8D_COMP *pbi, MACROBLOCKD *xd,
vp8_short_inv_walsh4x4(&b->dqcoeff[0], vp8_short_inv_walsh4x4(&b->dqcoeff[0],
xd->qcoeff); xd->qcoeff);
((int *)b->qcoeff)[0] = 0; vpx_memset(b->qcoeff, 0, 16 * sizeof(b->qcoeff[0]));
((int *)b->qcoeff)[1] = 0;
((int *)b->qcoeff)[2] = 0;
((int *)b->qcoeff)[3] = 0;
((int *)b->qcoeff)[4] = 0;
((int *)b->qcoeff)[5] = 0;
((int *)b->qcoeff)[6] = 0;
((int *)b->qcoeff)[7] = 0;
} }
else else
{ {
b->dqcoeff[0] = b->qcoeff[0] * xd->dequant_y2[0]; b->dqcoeff[0] = b->qcoeff[0] * xd->dequant_y2[0];
vp8_short_inv_walsh4x4_1(&b->dqcoeff[0], vp8_short_inv_walsh4x4_1(&b->dqcoeff[0],
xd->qcoeff); xd->qcoeff);
((int *)b->qcoeff)[0] = 0; vpx_memset(b->qcoeff, 0, 2 * sizeof(b->qcoeff[0]));
} }
/* override the dc dequant constant in order to preserve the /* override the dc dequant constant in order to preserve the