mirror of https://git.ffmpeg.org/ffmpeg.git
Eliminate direct use of s->current_picture in RV30/40 decoder
Originally committed as revision 15890 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
7690351cf3
commit
78a0fa8c8f
|
@ -953,11 +953,11 @@ static void rv34_output_macroblock(RV34DecContext *r, int8_t *intra_types, int c
|
||||||
itype = ittrans16[intra_types[0]];
|
itype = ittrans16[intra_types[0]];
|
||||||
itype = adjust_pred16(itype, r->avail_cache[5-4], r->avail_cache[5-1]);
|
itype = adjust_pred16(itype, r->avail_cache[5-4], r->avail_cache[5-1]);
|
||||||
r->h.pred16x16[itype](Y, s->linesize);
|
r->h.pred16x16[itype](Y, s->linesize);
|
||||||
dsp->add_pixels_clamped(s->block[0], Y, s->current_picture.linesize[0]);
|
dsp->add_pixels_clamped(s->block[0], Y, s->linesize);
|
||||||
dsp->add_pixels_clamped(s->block[1], Y + 8, s->current_picture.linesize[0]);
|
dsp->add_pixels_clamped(s->block[1], Y + 8, s->linesize);
|
||||||
Y += s->current_picture.linesize[0] * 8;
|
Y += s->linesize * 8;
|
||||||
dsp->add_pixels_clamped(s->block[2], Y, s->current_picture.linesize[0]);
|
dsp->add_pixels_clamped(s->block[2], Y, s->linesize);
|
||||||
dsp->add_pixels_clamped(s->block[3], Y + 8, s->current_picture.linesize[0]);
|
dsp->add_pixels_clamped(s->block[3], Y + 8, s->linesize);
|
||||||
|
|
||||||
itype = ittrans16[intra_types[0]];
|
itype = ittrans16[intra_types[0]];
|
||||||
if(itype == PLANE_PRED8x8) itype = DC_PRED8x8;
|
if(itype == PLANE_PRED8x8) itype = DC_PRED8x8;
|
||||||
|
@ -1135,7 +1135,7 @@ static int rv34_decode_macroblock(RV34DecContext *r, int8_t *intra_types)
|
||||||
r->deblock_coefs[mb_pos] = 0;
|
r->deblock_coefs[mb_pos] = 0;
|
||||||
else
|
else
|
||||||
r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r);
|
r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r);
|
||||||
s->current_picture.qscale_table[s->mb_x + s->mb_y * s->mb_stride] = s->qscale;
|
s->current_picture_ptr->qscale_table[s->mb_x + s->mb_y * s->mb_stride] = s->qscale;
|
||||||
|
|
||||||
if(cbp == -1)
|
if(cbp == -1)
|
||||||
return -1;
|
return -1;
|
||||||
|
@ -1234,7 +1234,6 @@ static int rv34_decode_slice(RV34DecContext *r, int end, uint8_t* buf, int buf_s
|
||||||
if(MPV_frame_start(s, s->avctx) < 0)
|
if(MPV_frame_start(s, s->avctx) < 0)
|
||||||
return -1;
|
return -1;
|
||||||
ff_er_frame_start(s);
|
ff_er_frame_start(s);
|
||||||
s->current_picture_ptr = &s->current_picture;
|
|
||||||
r->cur_pts = r->si.pts;
|
r->cur_pts = r->si.pts;
|
||||||
if(s->pict_type != FF_B_TYPE){
|
if(s->pict_type != FF_B_TYPE){
|
||||||
r->last_pts = r->next_pts;
|
r->last_pts = r->next_pts;
|
||||||
|
|
Loading…
Reference in New Issue