Fix possible issues with out-of-spec QP values

Fixes a possible regression in r2228.

diff --git a/common/set.c b/common/set.c
index 56da025f920ef18dd3fd3186db6d544d8da5502e..da25bcb443a2e422ff7e41534f6001766fdf9e95 100644 (file)
--- a/common/set.c
+++ b/common/set.c
@@ -241,7 +241,7 @@ int x264_cqm_init( x264_t *h )
 
     if( !h->mb.b_lossless )
     {
-        while( h->chroma_qp_table[h->param.rc.i_qp_min] <= max_chroma_qp_err )
+        while( h->chroma_qp_table[SPEC_QP(h->param.rc.i_qp_min)] <= max_chroma_qp_err )
             h->param.rc.i_qp_min++;
         if( min_qp_err <= h->param.rc.i_qp_max )
             h->param.rc.i_qp_max = min_qp_err-1;

diff --git a/encoder/analyse.c b/encoder/analyse.c
index 865cd18dac8a3c8043a162593554b01fdb785204..2a1bb43c2fcbc2b7cbe2ee4bb16d7e909156916f 100644 (file)
--- a/encoder/analyse.c
+++ b/encoder/analyse.c
@@ -2922,7 +2922,7 @@ static inline void x264_mb_analyse_qp_rd( x264_t *h, x264_mb_analysis_t *a )
         {
             if( !origcbp )
             {
-                h->mb.i_qp = X264_MAX( h->mb.i_qp - threshold - 1, h->param.rc.i_qp_min );
+                h->mb.i_qp = X264_MAX( h->mb.i_qp - threshold - 1, SPEC_QP( h->param.rc.i_qp_min ) );
                 h->mb.i_chroma_qp = h->chroma_qp_table[h->mb.i_qp];
                 already_checked_cost = x264_rd_cost_mb( h, a->i_lambda2 );
                 if( !h->mb.cbp[h->mb.i_mb_xy] )

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 3a1b70d7257d5d5ee998e5597e2b6844f76b2c10..396894203ba2056c5292d59a2a695e02bc47d9fe 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2239,6 +2239,7 @@ static int x264_slice_write( x264_t *h )
     /* Set the QP equal to the first QP in the slice for more accurate CABAC initialization. */
     h->mb.i_mb_xy = h->sh.i_first_mb;
     h->sh.i_qp = x264_ratecontrol_mb_qp( h );
+    h->sh.i_qp = SPEC_QP( h->sh.i_qp );
     h->sh.i_qp_delta = h->sh.i_qp - h->pps->i_pic_init_qp;
 
     x264_slice_header_write( &h->out.bs, &h->sh, h->i_nal_ref_idc );