Fix HRD with intra-refresh

x264 was incorrectly calculating cpb_removal_delay with respect to the first keyframe.
It should have been calculating cpb_removal_delay with respect to the last keyframe.

diff --git a/common/common.h b/common/common.h
index cff6453f58f23df69cefacd51e556898d3bec059..7d571199ef8476f44386ab13c295d369fb53f04a 100644 (file)
--- a/common/common.h
+++ b/common/common.h
@@ -433,6 +433,8 @@ struct x264_t
     int             i_coded_fields_lookahead; /* Use separate counters for lookahead */
     int             i_cpb_delay_lookahead;
 
+    int             i_cpb_delay_pir_offset;
+
     int             b_queued_intra_refresh;
     int64_t         i_last_idr_pts;
 

diff --git a/encoder/encoder.c b/encoder/encoder.c
index 09d1e2f3f766bdcb6daf1b72d3ce52424e77d6cc..a5de9d39a663ef43adecf3b89451816e6779ac39 100644 (file)
--- a/encoder/encoder.c
+++ b/encoder/encoder.c
@@ -2666,6 +2666,9 @@ int     x264_encoder_encode( x264_t *h,
         overhead += h->out.nal[h->out.i_nal-1].i_payload + NALU_OVERHEAD - (h->param.b_annexb && h->out.i_nal-1);
     }
 
+    if( h->fenc->b_keyframe && h->param.b_intra_refresh )
+        h->i_cpb_delay_pir_offset = h->fenc->i_cpb_delay;
+
     /* Init the rate control */
     /* FIXME: Include slice header bit cost. */
     x264_ratecontrol_start( h, h->fenc->i_qpplus1, overhead*8 );

diff --git a/encoder/ratecontrol.c b/encoder/ratecontrol.c
index f47870b35b0550090260f113f42ea52687c566ed..8e2191fe4b36554f5a33a79b09584e9986be9c0c 100644 (file)
--- a/encoder/ratecontrol.c
+++ b/encoder/ratecontrol.c
@@ -1615,7 +1615,7 @@ int x264_ratecontrol_end( x264_t *h, int bits, int *filler )
         }
         else
         {
-            h->fenc->hrd_timing.cpb_removal_time = rc->nrt_first_access_unit + (double)h->fenc->i_cpb_delay *
+            h->fenc->hrd_timing.cpb_removal_time = rc->nrt_first_access_unit + (double)(h->fenc->i_cpb_delay - h->i_cpb_delay_pir_offset) *
                                                    h->sps->vui.i_num_units_in_tick / h->sps->vui.i_time_scale;
 
             double cpb_earliest_arrival_time = h->fenc->hrd_timing.cpb_removal_time - (double)rc->initial_cpb_removal_delay / 90000;

diff --git a/encoder/set.c b/encoder/set.c
index 149d23a5b63c94fb8fcfc6a7d1b358f0cdca9e46..4b0fa51ee0f47ef2aa07bcb396c6ef25885ea20f 100644 (file)
--- a/encoder/set.c
+++ b/encoder/set.c
@@ -618,7 +618,7 @@ void x264_sei_pic_timing_write( x264_t *h, bs_t *s )
 
     if( sps->vui.b_nal_hrd_parameters_present || sps->vui.b_vcl_hrd_parameters_present )
     {
-        bs_write( &q, sps->vui.hrd.i_cpb_removal_delay_length, h->fenc->i_cpb_delay );
+        bs_write( &q, sps->vui.hrd.i_cpb_removal_delay_length, h->fenc->i_cpb_delay - h->i_cpb_delay_pir_offset );
         bs_write( &q, sps->vui.hrd.i_dpb_output_delay_length, h->fenc->i_dpb_output_delay );
     }