shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add rc_max_intra_bitrate_pct control"

--- a/vp8/common/onyx.h

+++ b/vp8/common/onyx.h

@@ -109,6 +109,7 @@

         int noise_sensitivity;   // parameter used for applying pre processing blur: recommendation 0

         int Sharpness;          // parameter used for sharpening output: recommendation 0:

         int cpu_used;

+        unsigned int rc_max_intra_bitrate_pct;

         // mode ->

         //(0)=Realtime/Live Encoding. This mode is optimized for realtim encoding (for example, capturing

--- a/vp8/encoder/onyx_if.c

+++ b/vp8/encoder/onyx_if.c

@@ -2704,6 +2704,19 @@

         }

     }

+    /* Apply limits on keyframe target.

+     *

+     * TODO: move this after consolidating

+     * vp8_calc_iframe_target_size() and vp8_calc_auto_iframe_target_size()

+     */

+    if (cm->frame_type == KEY_FRAME && cpi->oxcf.rc_max_intra_bitrate_pct)

+    {

+        unsigned int max_rate = cpi->av_per_frame_bandwidth

+                                * cpi->oxcf.rc_max_intra_bitrate_pct / 100;

+

+        if (cpi->this_frame_target > max_rate)

+            cpi->this_frame_target = max_rate;

+    }

     return 1;

 }

--- a/vp8/vp8_cx_iface.c

+++ b/vp8/vp8_cx_iface.c

@@ -304,6 +304,7 @@

     }

     oxcf->target_bandwidth       = cfg.rc_target_bitrate;

+    oxcf->rc_max_intra_bitrate_pct = cfg.rc_max_intra_bitrate_pct;

     oxcf->best_allowed_q          = cfg.rc_min_quantizer;

     oxcf->worst_allowed_q         = cfg.rc_max_quantizer;

@@ -1083,7 +1084,7 @@

         {0},                /* rc_twopass_stats_in */

 #endif

         256,                /* rc_target_bandwidth */

-

+        0,                  /* rc_max_intra_bitrate_pct */

         4,                  /* rc_min_quantizer */

         63,                 /* rc_max_quantizer */

         95,                 /* rc_undershoot_pct */

--- a/vpx/vpx_encoder.h

+++ b/vpx/vpx_encoder.h

@@ -398,6 +398,21 @@

         unsigned int           rc_target_bitrate;

+        /*!\brief Max data rate for Intra frames

+         *

+         * This value controls additional clamping on the maximum size of a

+         * keyframe. It is expressed as a percentage of the average

+         * per-frame bitrate, with the special (and default) value 0 meaning

+         * unlimited, or no additional clamping beyond the codec's built-in

+         * algorithm.

+         *

+         * For example, to allocate no more than 4.5 frames worth of bitrate

+         * to a keyframe, set this to 450.

+         *

+         */

+        unsigned int           rc_max_intra_bitrate_pct;

+

+

         /*

          * quantizer settings

          */

--- a/vpxenc.c

+++ b/vpxenc.c

@@ -962,11 +962,14 @@

         "Client initial buffer size (ms)");

 static const arg_def_t buf_optimal_sz     = ARG_DEF(NULL, "buf-optimal-sz", 1,

         "Client optimal buffer size (ms)");

+static const arg_def_t max_intra_rate_pct = ARG_DEF(NULL, "max-intra-rate", 1,

+        "Max I-frame bitrate (pct)");

 static const arg_def_t *rc_args[] =

 {

     &dropframe_thresh, &resize_allowed, &resize_up_thresh, &resize_down_thresh,

     &end_usage, &target_bitrate, &min_quantizer, &max_quantizer,

     &undershoot_pct, &overshoot_pct, &buf_sz, &buf_initial_sz, &buf_optimal_sz,

+    &max_intra_rate_pct,

     NULL

 };

@@ -1279,6 +1282,8 @@

             cfg.rc_end_usage = arg_parse_enum_or_int(&arg);

         else if (arg_match(&arg, &target_bitrate, argi))

             cfg.rc_target_bitrate = arg_parse_uint(&arg);

+        else if (arg_match(&arg, &max_intra_rate_pct, argi))

+            cfg.rc_max_intra_bitrate_pct = arg_parse_uint(&arg);

         else if (arg_match(&arg, &min_quantizer, argi))

             cfg.rc_min_quantizer = arg_parse_uint(&arg);

         else if (arg_match(&arg, &max_quantizer, argi))

-- 

⑨