Merge speedcontrol.

[x264] / x264.h

diff --git a/x264.h b/x264.h
index 5581ab9b9971ea8eb9a1b944b0b360280bb998d0..fd5c0f7a9372317a31e141f4d41f57cbaf7759b8 100644 (file)
--- a/x264.h
+++ b/x264.h
@@ -456,6 +456,15 @@ typedef struct x264_param_t
     /* frame packing arrangement flag */
     int i_frame_packing;
 
+    /* Speed control parameters */
+    struct
+    {
+        float       f_speed;        /* ratio from realtime */
+        int         i_buffer_size;  /* number of frames */
+        float       f_buffer_init;  /* fraction of size */
+        int         b_alt_timer;    /* use a different method of measuring encode time FIXME */
+    } sc;
+
     /* Muxing parameters */
     int b_aud;                  /* generate access unit delimiters */
     int b_repeat_headers;       /* put SPS/PPS before each keyframe */
@@ -952,6 +961,10 @@ void    x264_encoder_intra_refresh( x264_t * );
  *      Returns 0 on success, negative on failure. */
 int x264_encoder_invalidate_reference( x264_t *, int64_t pts );
 
+/* x264_speedcontrol_sync:
+ *      override speedcontrol's internal clock */
+void    x264_speedcontrol_sync( x264_t *, float f_buffer_fill, int i_buffer_size );
+
 #ifdef __cplusplus
 }
 #endif