Commit 4c568cbc authored by Michael Niedermayer's avatar Michael Niedermayer

Consider slice_beta_offet in qp_thresh.

Originally committed as revision 21244 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2e36c931
...@@ -2110,7 +2110,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){ ...@@ -2110,7 +2110,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
return 1; // deblocking switched inside frame return 1; // deblocking switched inside frame
} }
} }
h->qp_thresh= 15 - h->slice_alpha_c0_offset - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]); h->qp_thresh= 15 - FFMIN(h->slice_alpha_c0_offset, h->slice_beta_offset) - FFMAX3(0, h->pps.chroma_qp_index_offset[0], h->pps.chroma_qp_index_offset[1]);
#if 0 //FMO #if 0 //FMO
if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5) if( h->pps.num_slice_groups > 1 && h->pps.mb_slice_group_map_type >= 3 && h->pps.mb_slice_group_map_type <= 5)
......
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