Commit 331a84a7 authored by reimar's avatar reimar

Move "block" variable in rtjpeg decoder to context to ensure sufficient alignment

for idct_put on architectures/compilers that have problems aligning on the stack.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18924 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 2b13612d
...@@ -98,7 +98,6 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc ...@@ -98,7 +98,6 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc
*/ */
int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
const uint8_t *buf, int buf_size) { const uint8_t *buf, int buf_size) {
DECLARE_ALIGNED_16(DCTELEM, block[64]);
GetBitContext gb; GetBitContext gb;
int w = c->w / 16, h = c->h / 16; int w = c->w / 16, h = c->h / 16;
int x, y; int x, y;
...@@ -107,6 +106,7 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f, ...@@ -107,6 +106,7 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
init_get_bits(&gb, buf, buf_size * 8); init_get_bits(&gb, buf, buf_size * 8);
for (y = 0; y < h; y++) { for (y = 0; y < h; y++) {
for (x = 0; x < w; x++) { for (x = 0; x < w; x++) {
DCTELEM *block = c->block;
if (get_block(&gb, block, c->scan, c->lquant)) if (get_block(&gb, block, c->scan, c->lquant))
c->dsp->idct_put(y1, f->linesize[0], block); c->dsp->idct_put(y1, f->linesize[0], block);
y1 += 8; y1 += 8;
......
...@@ -31,6 +31,7 @@ typedef struct { ...@@ -31,6 +31,7 @@ typedef struct {
uint8_t scan[64]; uint8_t scan[64];
uint32_t lquant[64]; uint32_t lquant[64];
uint32_t cquant[64]; uint32_t cquant[64];
DECLARE_ALIGNED_16(DCTELEM, block[64]);
} RTJpegContext; } RTJpegContext;
void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp, void rtjpeg_decode_init(RTJpegContext *c, DSPContext *dsp,
......
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