mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-26 09:12:33 +00:00
Setting chroma_qp to 0 for PCM blocks is really an interesting minor
optimization, more interresting would it have been had the author thought about what value chroma_qp would have for the following MB. Or failing that, had actually tested the code. So this reverts this non-functional optimization, and makes the code work. Fixes at least CAPM3_Sony_D.jsv Originally committed as revision 14335 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
3a75616940
commit
a82688b003
@ -2712,6 +2712,8 @@ static av_always_inline void hl_decode_mb_internal(H264Context *h, int simple){
|
||||
tprintf(h->s.avctx, "call filter_mb\n");
|
||||
backup_mb_border(h, dest_y, dest_cb, dest_cr, linesize, uvlinesize, simple);
|
||||
fill_caches(h, mb_type, 1); //FIXME don't fill stuff which isn't used by filter_mb
|
||||
h->chroma_qp[0] = get_chroma_qp(h, 0, s->current_picture.qscale_table[mb_xy]);
|
||||
h->chroma_qp[1] = get_chroma_qp(h, 1, s->current_picture.qscale_table[mb_xy]);
|
||||
filter_mb_fast(h, mb_x, mb_y, dest_y, dest_cb, dest_cr, linesize, uvlinesize);
|
||||
}
|
||||
}
|
||||
@ -4611,8 +4613,6 @@ decode_intra_mb:
|
||||
|
||||
// In deblocking, the quantizer is 0
|
||||
s->current_picture.qscale_table[mb_xy]= 0;
|
||||
h->chroma_qp[0] = get_chroma_qp(h, 0, 0);
|
||||
h->chroma_qp[1] = get_chroma_qp(h, 1, 0);
|
||||
// All coeffs are present
|
||||
memset(h->non_zero_count[mb_xy], 16, 16);
|
||||
|
||||
@ -5756,8 +5756,6 @@ decode_intra_mb:
|
||||
h->chroma_pred_mode_table[mb_xy] = 0;
|
||||
// In deblocking, the quantizer is 0
|
||||
s->current_picture.qscale_table[mb_xy]= 0;
|
||||
h->chroma_qp[0] = get_chroma_qp(h, 0, 0);
|
||||
h->chroma_qp[1] = get_chroma_qp(h, 1, 0);
|
||||
// All coeffs are present
|
||||
memset(h->non_zero_count[mb_xy], 16, 16);
|
||||
s->current_picture.mb_type[mb_xy]= mb_type;
|
||||
|
Loading…
Reference in New Issue
Block a user