diff options
| author | peng.chen <peng.c.chen@intel.com> | 2016-11-21 15:41:37 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2016-11-30 12:42:56 +0800 |
| commit | 0e99d2830e90a1b333025275b2e88ac47ca96ebf (patch) | |
| tree | 0bc53960909b24831bd89282437ce9b3acc93b93 | |
| parent | f7e3269f64d4bebeaa0f44ac8da6bb82b4aeba2b (diff) | |
Save other bitrate control parameters in the common encoder context
These parameters can be used for all codecs
v2: Save mb_rate_control/target_percentage per layer too
Signed-off-by: peng.chen <peng.c.chen@intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
| -rw-r--r-- | src/i965_encoder.c | 14 | ||||
| -rw-r--r-- | src/i965_encoder.h | 2 |
2 files changed, 15 insertions, 1 deletions
diff --git a/src/i965_encoder.c b/src/i965_encoder.c index 4aa3ee1..bca8ebd 100644 --- a/src/i965_encoder.c +++ b/src/i965_encoder.c @@ -393,11 +393,23 @@ intel_encoder_check_rate_control_parameter(VADriverContextP ctx, if (temporal_id >= encoder_context->layer.num_layers) return; - // TODO: for VBR + if (misc->rc_flags.bits.reset) + encoder_context->brc.need_reset = 1; + if (encoder_context->brc.bits_per_second[temporal_id] != misc->bits_per_second) { encoder_context->brc.bits_per_second[temporal_id] = misc->bits_per_second; encoder_context->brc.need_reset = 1; } + + if (encoder_context->brc.mb_rate_control[temporal_id] != misc->rc_flags.bits.mb_rate_control) { + encoder_context->brc.mb_rate_control[temporal_id] = misc->rc_flags.bits.mb_rate_control; + encoder_context->brc.need_reset = 1; + } + + if (encoder_context->brc.target_percentage[temporal_id] != misc->target_percentage) { + encoder_context->brc.target_percentage[temporal_id] = misc->target_percentage; + encoder_context->brc.need_reset = 1; + } } static void diff --git a/src/i965_encoder.h b/src/i965_encoder.h index fe5a595..0b636d6 100644 --- a/src/i965_encoder.h +++ b/src/i965_encoder.h @@ -81,6 +81,8 @@ struct intel_encoder_context unsigned short num_bframes_in_gop; unsigned int bits_per_second[MAX_TEMPORAL_LAYERS]; unsigned int framerate_per_100s[MAX_TEMPORAL_LAYERS]; + unsigned int mb_rate_control[MAX_TEMPORAL_LAYERS]; + unsigned int target_percentage[MAX_TEMPORAL_LAYERS]; unsigned int hrd_buffer_size; unsigned int hrd_initial_buffer_fullness; unsigned int need_reset; |