dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

align VP8Encoder::nz_ allocation

Browse Source 
prevents unaligned uint32_t load/store

Change-Id: I3f5e1b434a7452f618009d5e4bbe4f3260e3e321
This commit is contained in:
James Zern 2013-04-13 10:53:20 -07:00 committed by Gerrit Code Review
parent 5da165cfad
commit 9bf312938f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/enc/webpenc.c
View File

@ -173,7 +173,7 @@ static VP8Encoder* InitVP8Encoder(const WebPConfig* const config,
const int preds_h = 4 * mb_h + 1; const int preds_h = 4 * mb_h + 1;
const size_t preds_size = preds_w * preds_h * sizeof(uint8_t); const size_t preds_size = preds_w * preds_h * sizeof(uint8_t);
const int top_stride = mb_w * 16; const int top_stride = mb_w * 16;
const size_t nz_size = (mb_w + 1) * sizeof(uint32_t); const size_t nz_size = (mb_w + 1) * sizeof(uint32_t) + ALIGN_CST;
const size_t cache_size = (3 * YUV_SIZE + PRED_SIZE) * sizeof(uint8_t); const size_t cache_size = (3 * YUV_SIZE + PRED_SIZE) * sizeof(uint8_t);
const size_t info_size = mb_w * mb_h * sizeof(VP8MBInfo); const size_t info_size = mb_w * mb_h * sizeof(VP8MBInfo);
const size_t samples_size = (2 * top_stride + // top-luma/u/v const size_t samples_size = (2 * top_stride + // top-luma/u/v
@ -206,7 +206,7 @@ static VP8Encoder* InitVP8Encoder(const WebPConfig* const config,
" total: %ld\n", " total: %ld\n",
sizeof(VP8Encoder) + ALIGN_CST, cache_size, info_size, sizeof(VP8Encoder) + ALIGN_CST, cache_size, info_size,
preds_size, samples_size, nz_size, lf_stats_size, size); preds_size, samples_size, nz_size, lf_stats_size, size);
printf("Transcient object sizes:\n" printf("Transient object sizes:\n"
" VP8EncIterator: %ld\n" " VP8EncIterator: %ld\n"
" VP8ModeScore: %ld\n" " VP8ModeScore: %ld\n"
" VP8SegmentInfo: %ld\n" " VP8SegmentInfo: %ld\n"
@ -243,6 +243,7 @@ static VP8Encoder* InitVP8Encoder(const WebPConfig* const config,
mem += info_size; mem += info_size;
enc->preds_ = ((uint8_t*)mem) + 1 + enc->preds_w_; enc->preds_ = ((uint8_t*)mem) + 1 + enc->preds_w_;
mem += preds_w * preds_h * sizeof(uint8_t); mem += preds_w * preds_h * sizeof(uint8_t);
mem = (uint8_t*)DO_ALIGN(mem);
enc->nz_ = 1 + (uint32_t*)mem; enc->nz_ = 1 + (uint32_t*)mem;
mem += nz_size; mem += nz_size;
enc->lf_stats_ = lf_stats_size ? (LFStats*)DO_ALIGN(mem) : NULL; enc->lf_stats_ = lf_stats_size ? (LFStats*)DO_ALIGN(mem) : NULL;