diff options
author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:35:20 +0100 |
---|---|---|
committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-05-07 21:35:20 +0100 |
commit | 578fb5a27d4523c958a1907787b659883a2d9b5b (patch) | |
tree | f6fdba3aec0a5072b005e848ca801ec34442632a /libavcodec/intrax8.c | |
parent | eee5a7cd7d150024ff74fc1ffa78ab5dfb06131c (diff) | |
parent | d0540fd02171a6233d2016b199d013299debf7e3 (diff) | |
download | ffmpeg-streaming-578fb5a27d4523c958a1907787b659883a2d9b5b.zip ffmpeg-streaming-578fb5a27d4523c958a1907787b659883a2d9b5b.tar.gz |
Merge commit 'd0540fd02171a6233d2016b199d013299debf7e3'
* commit 'd0540fd02171a6233d2016b199d013299debf7e3':
intrax8: Pass macroblock size to ff_intrax8_common_init
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavcodec/intrax8.c')
-rw-r--r-- | libavcodec/intrax8.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index f6131ee..bd332fa 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -395,7 +395,7 @@ static void x8_get_prediction_chroma(IntraX8Context *const w) w->edges = 1 * (!(s->mb_x >> 1)); w->edges |= 2 * (!(s->mb_y >> 1)); - w->edges |= 4 * (s->mb_x >= (2 * s->mb_width - 1)); // mb_x for chroma would always be odd + w->edges |= 4 * (s->mb_x >= (2 * w->mb_width - 1)); // mb_x for chroma would always be odd w->raw_orient = 0; // lut_co[8] = {inv,4,8,8, inv,4,8,8} <- => {1,1,0,0;1,1,0,0} => 0xCC @@ -414,7 +414,7 @@ static void x8_get_prediction(IntraX8Context *const w) w->edges = 1 * (!s->mb_x); w->edges |= 2 * (!s->mb_y); - w->edges |= 4 * (s->mb_x >= (2 * s->mb_width - 1)); + w->edges |= 4 * (s->mb_x >= (2 * w->mb_width - 1)); switch (w->edges & 3) { case 0: @@ -735,6 +735,7 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame, int mb_y) av_cold int ff_intrax8_common_init(AVCodecContext *avctx, IntraX8Context *w, IDCTDSPContext *idsp, + int mb_width, int mb_height, MpegEncContext *const s) { int ret = x8_vlc_init(); @@ -743,10 +744,14 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, w->avctx = avctx; w->idsp = *idsp; + s->mb_x = 0; + s->mb_y = 0; + w->mb_width = mb_width; + w->mb_height = mb_height; w->s = s; - //two rows, 2 blocks per cannon mb - w->prediction_table = av_mallocz(s->mb_width * 2 * 2); + // two rows, 2 blocks per cannon mb + w->prediction_table = av_mallocz(w->mb_width * 2 * 2); if (!w->prediction_table) return AVERROR(ENOMEM); @@ -798,11 +803,10 @@ int ff_intrax8_decode_picture(IntraX8Context *const w, Picture *pict, } x8_reset_vlc_tables(w); - for (s->mb_y = 0; s->mb_y < s->mb_height * 2; s->mb_y++) { + for (s->mb_y = 0; s->mb_y < w->mb_height * 2; s->mb_y++) { x8_init_block_index(w, w->frame, s->mb_y); - mb_xy = (s->mb_y >> 1) * s->mb_stride; - - for (s->mb_x = 0; s->mb_x < s->mb_width * 2; s->mb_x++) { + mb_xy = (s->mb_y >> 1) * (w->mb_width + 1); + for (s->mb_x = 0; s->mb_x < w->mb_width * 2; s->mb_x++) { x8_get_prediction(w); if (x8_setup_spatial_predictor(w, 0)) goto error; |