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

Merge "Use derived variable size for memcpy" into nextgenv2

Browse Source
This commit is contained in:
Yaowu Xu
2016-10-11 16:15:43 +00:00
committed by Gerrit Code Review
parent 4960f7c3bd c648a9fd83
commit 12fcf74c8a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
av1/common/reconintra.c
View File

@@ -1257,11 +1257,12 @@ static void build_intra_predictors_high(
const int need_right = !!(extend_modes[mode] & NEED_ABOVERIGHT); const int need_right = !!(extend_modes[mode] & NEED_ABOVERIGHT);
#endif // CONFIG_EXT_INTRA #endif // CONFIG_EXT_INTRA
if (n_top_px > 0) { if (n_top_px > 0) {
memcpy(above_row, above_ref, n_top_px * 2); memcpy(above_row, above_ref, n_top_px * sizeof(above_ref[0]));
i = n_top_px; i = n_top_px;
if (need_right && n_topright_px > 0) { if (need_right && n_topright_px > 0) {
assert(n_top_px == bs); assert(n_top_px == bs);
memcpy(above_row + bs, above_ref + bs, n_topright_px * 2); memcpy(above_row + bs, above_ref + bs,
n_topright_px * sizeof(above_ref[0]));
i += n_topright_px; i += n_topright_px;
} }
if (i < (bs << need_right)) if (i < (bs << need_right))

4
test/convolve_test.cc
View File

@@ -396,8 +396,8 @@ class ConvolveTest : public ::testing::TestWithParam<ConvolveParam> {
void CopyOutputToRef() { void CopyOutputToRef() {
memcpy(output_ref_, output_, kOutputBufferSize); memcpy(output_ref_, output_, kOutputBufferSize);
#if CONFIG_AOM_HIGHBITDEPTH #if CONFIG_AOM_HIGHBITDEPTH
memcpy(output16_ref_, output16_, // Copy 16-bit pixels values. The effective number of bytes is double.
kOutputBufferSize * sizeof(output16_ref_[0])); memcpy(output16_ref_, output16_, sizeof(output16_[0]) * kOutputBufferSize);
#endif #endif
} }