Skip to content

F
ffmpeg.wasm-core
Commit 9d4bdcb7 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files
Options

Fix VP8 aliasing problems. 

Replace * (uint32_t *) buf accesses with AV_WN32A/AV_COPY32.
parent f81c7ac7
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
libavcodec/vp8.c
View file @ 9d4bdcb7
...@@ -1132,9 +1132,9 @@ void intra_predict(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb, ...@@ -1132,9 +1132,9 @@ void intra_predict(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb,
linesize = 8; linesize = 8;
if (!(mb_y + y)) { if (!(mb_y + y)) {
copy_dst[3] = 127U; copy_dst[3] = 127U;
* (uint32_t *) (copy_dst + 4) = 127U * 0x01010101U; AV_WN32A(copy_dst+4, 127U * 0x01010101U);
} else { } else {
* (uint32_t *) (copy_dst + 4) = * (uint32_t *) (ptr+4*x-s->linesize); AV_COPY32(copy_dst+4, ptr+4*x-s->linesize);
if (!(mb_x + x)) { if (!(mb_x + x)) {
copy_dst[3] = 129U; copy_dst[3] = 129U;
} else { } else {
...@@ -1158,10 +1158,10 @@ void intra_predict(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb, ...@@ -1158,10 +1158,10 @@ void intra_predict(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb,
} }
s->hpc.pred4x4[mode](dst, topright, linesize); s->hpc.pred4x4[mode](dst, topright, linesize);
if (copy) { if (copy) {
* (uint32_t *) (ptr+4*x) = * (uint32_t *) (copy_dst + 12); AV_COPY32(ptr+4*x , copy_dst+12);
* (uint32_t *) (ptr+4*x+s->linesize) = * (uint32_t *) (copy_dst + 20); AV_COPY32(ptr+4*x+s->linesize , copy_dst+20);
* (uint32_t *) (ptr+4*x+s->linesize*2) = * (uint32_t *) (copy_dst + 28); AV_COPY32(ptr+4*x+s->linesize*2, copy_dst+28);
* (uint32_t *) (ptr+4*x+s->linesize*3) = * (uint32_t *) (copy_dst + 36); AV_COPY32(ptr+4*x+s->linesize*3, copy_dst+36);
} }
nnz = s->non_zero_count_cache[y][x]; nnz = s->non_zero_count_cache[y][x];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment