Commit 6be2b750 authored by Marco Paniconi's avatar Marco Paniconi

Layer based rate control for CBR mode.

This patch adds a buffer-based rate control for temporal layers,
under CBR mode.

Added vpx_temporal_scalable_patters.c encoder for testing temporal
layers, for both vp9 and vp8 (replaces the old vp8_scalable_patterns).

Updated datarate unittest with tests for temporal layer rate-targeting.

Change-Id: I9cb6cce2494390ae6096ee17774af7fb9308bde7
parent 37e5325b
...@@ -64,6 +64,11 @@ vp9_spatial_scalable_encoder.SRCS += ivfenc.c ivfenc.h ...@@ -64,6 +64,11 @@ vp9_spatial_scalable_encoder.SRCS += ivfenc.c ivfenc.h
vp9_spatial_scalable_encoder.SRCS += tools_common.c tools_common.h vp9_spatial_scalable_encoder.SRCS += tools_common.c tools_common.h
vp9_spatial_scalable_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D vp9_spatial_scalable_encoder.GUID = 4A38598D-627D-4505-9C7B-D4020C84100D
vp9_spatial_scalable_encoder.DESCRIPTION = Spatial Scalable Encoder vp9_spatial_scalable_encoder.DESCRIPTION = Spatial Scalable Encoder
UTILS-$(CONFIG_ENCODERS) += vpx_temporal_scalable_patterns.c
vpx_temporal_scalable_patterns.SRCS += ivfenc.c ivfenc.h
vpx_temporal_scalable_patterns.SRCS += tools_common.c tools_common.h
vpx_temporal_scalable_patterns.GUID = B18C08F2-A439-4502-A78E-849BE3D60947
vpx_temporal_scalable_patterns.DESCRIPTION = Temporal Scalability Encoder
ifeq ($(CONFIG_SHARED),no) ifeq ($(CONFIG_SHARED),no)
UTILS-$(CONFIG_VP9_ENCODER) += resize_util.c UTILS-$(CONFIG_VP9_ENCODER) += resize_util.c
......
This diff is collapsed.
...@@ -123,6 +123,11 @@ class Encoder { ...@@ -123,6 +123,11 @@ class Encoder {
ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError(); ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();
} }
void Control(int ctrl_id, struct vpx_svc_layer_id *arg) {
const vpx_codec_err_t res = vpx_codec_control_(&encoder_, ctrl_id, arg);
ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();
}
void set_deadline(unsigned long deadline) { void set_deadline(unsigned long deadline) {
deadline_ = deadline; deadline_ = deadline;
} }
......
...@@ -147,8 +147,12 @@ extern "C" { ...@@ -147,8 +147,12 @@ extern "C" {
// END DATARATE CONTROL OPTIONS // END DATARATE CONTROL OPTIONS
// ---------------------------------------------------------------- // ----------------------------------------------------------------
// Spatial scalability // Spatial and temporal scalability.
int ss_number_layers; int ss_number_layers; // Number of spatial layers.
unsigned int ts_number_layers; // Number of temporal layers.
// Bitrate allocation (CBR mode) and framerate factor, for temporal layers.
unsigned int ts_target_bitrate[VPX_TS_MAX_LAYERS];
unsigned int ts_rate_decimator[VPX_TS_MAX_LAYERS];
// these parameters aren't to be used in final build don't use!!! // these parameters aren't to be used in final build don't use!!!
int play_alternate; int play_alternate;
......
...@@ -1158,6 +1158,107 @@ static int64_t rescale(int val, int64_t num, int denom) { ...@@ -1158,6 +1158,107 @@ static int64_t rescale(int val, int64_t num, int denom) {
return (llval * llnum / llden); return (llval * llnum / llden);
} }
// Initialize layer content data from init_config().
static void init_layer_context(VP9_COMP *const cpi) {
int temporal_layer = 0;
cpi->svc.spatial_layer_id = 0;
cpi->svc.temporal_layer_id = 0;
for (temporal_layer = 0; temporal_layer < cpi->svc.number_temporal_layers;
++temporal_layer) {
LAYER_CONTEXT *lc = &cpi->svc.layer_context[temporal_layer];
lc->rc.active_worst_quality = q_trans[cpi->oxcf.worst_allowed_q];
lc->rc.avg_frame_qindex[INTER_FRAME] = q_trans[cpi->oxcf.worst_allowed_q];
lc->rc.last_q[INTER_FRAME] = q_trans[cpi->oxcf.worst_allowed_q];
lc->rc.ni_av_qi = lc->rc.active_worst_quality;
lc->rc.total_actual_bits = 0;
lc->rc.total_target_vs_actual = 0;
lc->rc.ni_tot_qi = 0;
lc->rc.tot_q = 0.0;
lc->rc.ni_frames = 0;
lc->rc.rate_correction_factor = 1.0;
lc->rc.key_frame_rate_correction_factor = 1.0;
lc->target_bandwidth = cpi->oxcf.ts_target_bitrate[temporal_layer] *
1000;
lc->rc.buffer_level = rescale((int)(cpi->oxcf.starting_buffer_level),
lc->target_bandwidth, 1000);
lc->rc.bits_off_target = lc->rc.buffer_level;
}
}
// Update the layer context from a change_config() call.
static void update_layer_context_change_config(VP9_COMP *const cpi,
const int target_bandwidth) {
int temporal_layer = 0;
float bitrate_alloc = 1.0;
for (temporal_layer = 0; temporal_layer < cpi->svc.number_temporal_layers;
++temporal_layer) {
LAYER_CONTEXT *lc = &cpi->svc.layer_context[temporal_layer];
lc->target_bandwidth = cpi->oxcf.ts_target_bitrate[temporal_layer] * 1000;
bitrate_alloc = (float)lc->target_bandwidth / (float)target_bandwidth;
// Update buffer-related quantities.
lc->starting_buffer_level = cpi->oxcf.starting_buffer_level * bitrate_alloc;
lc->optimal_buffer_level = cpi->oxcf.optimal_buffer_level * bitrate_alloc;
lc->maximum_buffer_size = cpi->oxcf.maximum_buffer_size * bitrate_alloc;
lc->rc.bits_off_target = MIN(lc->rc.bits_off_target,
lc->maximum_buffer_size);
lc->rc.buffer_level = MIN(lc->rc.buffer_level, lc->maximum_buffer_size);
// Update framerate-related quantities.
lc->framerate = cpi->oxcf.framerate /
cpi->oxcf.ts_rate_decimator[temporal_layer];
lc->rc.av_per_frame_bandwidth = (int)(lc->target_bandwidth / lc->framerate);
lc->rc.per_frame_bandwidth = lc->rc.av_per_frame_bandwidth;
lc->rc.max_frame_bandwidth = cpi->rc.max_frame_bandwidth;
// Update qp-related quantities.
lc->rc.worst_quality = cpi->rc.worst_quality;
lc->rc.best_quality = cpi->rc.best_quality;
lc->rc.active_worst_quality = cpi->rc.active_worst_quality;
}
}
// Prior to encoding the frame, update framerate-related quantities
// for the current layer.
static void update_layer_framerate(VP9_COMP *const cpi) {
int temporal_layer = cpi->svc.temporal_layer_id;
LAYER_CONTEXT *lc = &cpi->svc.layer_context[temporal_layer];
lc->framerate = cpi->oxcf.framerate /
cpi->oxcf.ts_rate_decimator[temporal_layer];
lc->rc.av_per_frame_bandwidth = (int)(lc->target_bandwidth /
lc->framerate);
lc->rc.per_frame_bandwidth = lc->rc.av_per_frame_bandwidth;
lc->rc.max_frame_bandwidth = cpi->rc.max_frame_bandwidth;
}
// Prior to encoding the frame, set the layer context, for the current layer
// to be encoded, to the cpi struct.
static void restore_layer_context(VP9_COMP *const cpi) {
int temporal_layer = cpi->svc.temporal_layer_id;
LAYER_CONTEXT *lc = &cpi->svc.layer_context[temporal_layer];
int frame_since_key = cpi->rc.frames_since_key;
int frame_to_key = cpi->rc.frames_to_key;
memcpy(&cpi->rc, &lc->rc, sizeof(RATE_CONTROL));
cpi->target_bandwidth = lc->target_bandwidth;
cpi->oxcf.starting_buffer_level = lc->starting_buffer_level;
cpi->oxcf.optimal_buffer_level = lc->optimal_buffer_level;
cpi->oxcf.maximum_buffer_size = lc->maximum_buffer_size;
cpi->output_framerate = lc->framerate;
// Reset the frames_since_key and frames_to_key counters to their values
// before the layer restore. Keep these defined for the stream (not layer).
cpi->rc.frames_since_key = frame_since_key;
cpi->rc.frames_to_key = frame_to_key;
}
// Save the layer context after encoding the frame.
static void save_layer_context(VP9_COMP *const cpi) {
int temporal_layer = cpi->svc.temporal_layer_id;
LAYER_CONTEXT *lc = &cpi->svc.layer_context[temporal_layer];
memcpy(&lc->rc, &cpi->rc, sizeof(RATE_CONTROL));
lc->target_bandwidth = cpi->target_bandwidth;
lc->starting_buffer_level = cpi->oxcf.starting_buffer_level;
lc->optimal_buffer_level = cpi->oxcf.optimal_buffer_level;
lc->maximum_buffer_size = cpi->oxcf.maximum_buffer_size;
lc->framerate = cpi->output_framerate;
}
static void set_tile_limits(VP9_COMP *cpi) { static void set_tile_limits(VP9_COMP *cpi) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
...@@ -1184,6 +1285,16 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { ...@@ -1184,6 +1285,16 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cm->subsampling_y = 0; cm->subsampling_y = 0;
vp9_alloc_compressor_data(cpi); vp9_alloc_compressor_data(cpi);
// Spatial scalability.
cpi->svc.number_spatial_layers = oxcf->ss_number_layers;
// Temporal scalability.
cpi->svc.number_temporal_layers = oxcf->ts_number_layers;
if (cpi->svc.number_temporal_layers > 1 &&
cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {
init_layer_context(cpi);
}
// change includes all joint functionality // change includes all joint functionality
vp9_change_config(ptr, oxcf); vp9_change_config(ptr, oxcf);
...@@ -1224,9 +1335,6 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { ...@@ -1224,9 +1335,6 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cpi->gld_fb_idx = 1; cpi->gld_fb_idx = 1;
cpi->alt_fb_idx = 2; cpi->alt_fb_idx = 2;
cpi->current_layer = 0;
cpi->use_svc = 0;
set_tile_limits(cpi); set_tile_limits(cpi);
cpi->fixed_divide[0] = 0; cpi->fixed_divide[0] = 0;
...@@ -1234,7 +1342,6 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { ...@@ -1234,7 +1342,6 @@ static void init_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cpi->fixed_divide[i] = 0x80000 / i; cpi->fixed_divide[i] = 0x80000 / i;
} }
void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
VP9_COMP *cpi = (VP9_COMP *)(ptr); VP9_COMP *cpi = (VP9_COMP *)(ptr);
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
...@@ -1326,10 +1433,10 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { ...@@ -1326,10 +1433,10 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
cpi->oxcf.target_bandwidth, 1000); cpi->oxcf.target_bandwidth, 1000);
// Under a configuration change, where maximum_buffer_size may change, // Under a configuration change, where maximum_buffer_size may change,
// keep buffer level clipped to the maximum allowed buffer size. // keep buffer level clipped to the maximum allowed buffer size.
if (cpi->rc.bits_off_target > cpi->oxcf.maximum_buffer_size) { cpi->rc.bits_off_target = MIN(cpi->rc.bits_off_target,
cpi->rc.bits_off_target = cpi->oxcf.maximum_buffer_size; cpi->oxcf.maximum_buffer_size);
cpi->rc.buffer_level = cpi->rc.bits_off_target; cpi->rc.buffer_level = MIN(cpi->rc.buffer_level,
} cpi->oxcf.maximum_buffer_size);
// Set up frame rate and related parameters rate control values. // Set up frame rate and related parameters rate control values.
vp9_new_framerate(cpi, cpi->oxcf.framerate); vp9_new_framerate(cpi, cpi->oxcf.framerate);
...@@ -1366,6 +1473,11 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) { ...@@ -1366,6 +1473,11 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
} }
update_frame_size(cpi); update_frame_size(cpi);
if (cpi->svc.number_temporal_layers > 1 &&
cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {
update_layer_context_change_config(cpi, cpi->oxcf.target_bandwidth);
}
cpi->speed = cpi->oxcf.cpu_used; cpi->speed = cpi->oxcf.cpu_used;
if (cpi->oxcf.lag_in_frames == 0) { if (cpi->oxcf.lag_in_frames == 0) {
...@@ -1589,6 +1701,8 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { ...@@ -1589,6 +1701,8 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) {
vp9_create_common(cm); vp9_create_common(cm);
cpi->use_svc = 0;
init_config((VP9_PTR)cpi, oxcf); init_config((VP9_PTR)cpi, oxcf);
init_pick_mode_context(cpi); init_pick_mode_context(cpi);
...@@ -1604,9 +1718,6 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { ...@@ -1604,9 +1718,6 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) {
cpi->alt_is_last = 0; cpi->alt_is_last = 0;
cpi->gold_is_alt = 0; cpi->gold_is_alt = 0;
// Spatial scalability
cpi->number_spatial_layers = oxcf->ss_number_layers;
// Create the encoder segmentation map and set all entries to 0 // Create the encoder segmentation map and set all entries to 0
CHECK_MEM_ERROR(cm, cpi->segmentation_map, CHECK_MEM_ERROR(cm, cpi->segmentation_map,
vpx_calloc(cm->mi_rows * cm->mi_cols, 1)); vpx_calloc(cm->mi_rows * cm->mi_cols, 1));
...@@ -3558,6 +3669,12 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, ...@@ -3558,6 +3669,12 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
adjust_frame_rate(cpi); adjust_frame_rate(cpi);
} }
if (cpi->svc.number_temporal_layers > 1 &&
cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {
update_layer_framerate(cpi);
restore_layer_context(cpi);
}
// start with a 0 size frame // start with a 0 size frame
*size = 0; *size = 0;
...@@ -3633,6 +3750,12 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, ...@@ -3633,6 +3750,12 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
cpi->droppable = !frame_is_reference(cpi); cpi->droppable = !frame_is_reference(cpi);
} }
// Save layer specific state.
if (cpi->svc.number_temporal_layers > 1 &&
cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {
save_layer_context(cpi);
}
vpx_usec_timer_mark(&cmptimer); vpx_usec_timer_mark(&cmptimer);
cpi->time_compress_data += vpx_usec_timer_elapsed(&cmptimer); cpi->time_compress_data += vpx_usec_timer_elapsed(&cmptimer);
......
...@@ -421,6 +421,15 @@ typedef struct { ...@@ -421,6 +421,15 @@ typedef struct {
int super_fast_rtc; int super_fast_rtc;
} SPEED_FEATURES; } SPEED_FEATURES;
typedef struct {
RATE_CONTROL rc;
int target_bandwidth;
int64_t starting_buffer_level;
int64_t optimal_buffer_level;
int64_t maximum_buffer_size;
double framerate;
} LAYER_CONTEXT;
typedef struct VP9_COMP { typedef struct VP9_COMP {
DECLARE_ALIGNED(16, int16_t, y_quant[QINDEX_RANGE][8]); DECLARE_ALIGNED(16, int16_t, y_quant[QINDEX_RANGE][8]);
DECLARE_ALIGNED(16, int16_t, y_quant_shift[QINDEX_RANGE][8]); DECLARE_ALIGNED(16, int16_t, y_quant_shift[QINDEX_RANGE][8]);
...@@ -465,9 +474,6 @@ typedef struct VP9_COMP { ...@@ -465,9 +474,6 @@ typedef struct VP9_COMP {
int gld_fb_idx; int gld_fb_idx;
int alt_fb_idx; int alt_fb_idx;
int current_layer;
int use_svc;
#if CONFIG_MULTIPLE_ARF #if CONFIG_MULTIPLE_ARF
int alt_ref_fb_idx[REF_FRAMES - 3]; int alt_ref_fb_idx[REF_FRAMES - 3];
#endif #endif
...@@ -684,7 +690,18 @@ typedef struct VP9_COMP { ...@@ -684,7 +690,18 @@ typedef struct VP9_COMP {
int initial_width; int initial_width;
int initial_height; int initial_height;
int number_spatial_layers; int use_svc;
struct svc {
int spatial_layer_id;
int temporal_layer_id;
int number_spatial_layers;
int number_temporal_layers;
// Layer context used for rate control in CBR mode, only defined for
// temporal layers for now.
LAYER_CONTEXT layer_context[VPX_TS_MAX_LAYERS];
} svc;
int enable_encode_breakout; // Default value is 1. From first pass stats, int enable_encode_breakout; // Default value is 1. From first pass stats,
// encode_breakout may be disabled. // encode_breakout may be disabled.
......
...@@ -252,6 +252,26 @@ static void calc_iframe_target_size(VP9_COMP *cpi) { ...@@ -252,6 +252,26 @@ static void calc_iframe_target_size(VP9_COMP *cpi) {
rc->this_frame_target = target; rc->this_frame_target = target;
} }
// Update the buffer level for higher layers, given the encoded current layer.
static void update_layer_buffer_level(VP9_COMP *const cpi,
int encoded_frame_size) {
int temporal_layer = 0;
int current_temporal_layer = cpi->svc.temporal_layer_id;
for (temporal_layer = current_temporal_layer + 1;
temporal_layer < cpi->svc.number_temporal_layers; ++temporal_layer) {
LAYER_CONTEXT *lc = &cpi->svc.layer_context[temporal_layer];
int bits_off_for_this_layer = (int)(lc->target_bandwidth / lc->framerate -
encoded_frame_size);
lc->rc.bits_off_target += bits_off_for_this_layer;
// Clip buffer level to maximum buffer size for the layer.
lc->rc.bits_off_target = MIN(lc->rc.bits_off_target,
lc->maximum_buffer_size);
lc->rc.buffer_level = lc->rc.bits_off_target;
}
}
// Update the buffer level: leaky bucket model. // Update the buffer level: leaky bucket model.
void vp9_update_buffer_level(VP9_COMP *const cpi, int encoded_frame_size) { void vp9_update_buffer_level(VP9_COMP *const cpi, int encoded_frame_size) {
const VP9_COMMON *const cm = &cpi->common; const VP9_COMMON *const cm = &cpi->common;
...@@ -266,14 +286,18 @@ void vp9_update_buffer_level(VP9_COMP *const cpi, int encoded_frame_size) { ...@@ -266,14 +286,18 @@ void vp9_update_buffer_level(VP9_COMP *const cpi, int encoded_frame_size) {
} }
// Clip the buffer level to the maximum specified buffer size. // Clip the buffer level to the maximum specified buffer size.
rc->buffer_level = MIN(rc->bits_off_target, oxcf->maximum_buffer_size); rc->bits_off_target = MIN(rc->bits_off_target, oxcf->maximum_buffer_size);
rc->buffer_level = rc->bits_off_target;
if (cpi->use_svc && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER) {
update_layer_buffer_level(cpi, encoded_frame_size);
}
} }
int vp9_drop_frame(VP9_COMP *const cpi) { int vp9_drop_frame(VP9_COMP *const cpi) {
const VP9_CONFIG *oxcf = &cpi->oxcf; const VP9_CONFIG *oxcf = &cpi->oxcf;
RATE_CONTROL *const rc = &cpi->rc; RATE_CONTROL *const rc = &cpi->rc;
if (!oxcf->drop_frames_water_mark) { if (!oxcf->drop_frames_water_mark) {
return 0; return 0;
} else { } else {
...@@ -284,7 +308,7 @@ int vp9_drop_frame(VP9_COMP *const cpi) { ...@@ -284,7 +308,7 @@ int vp9_drop_frame(VP9_COMP *const cpi) {
// If buffer is below drop_mark, for now just drop every other frame // If buffer is below drop_mark, for now just drop every other frame
// (starting with the next frame) until it increases back over drop_mark. // (starting with the next frame) until it increases back over drop_mark.
int drop_mark = (int)(oxcf->drop_frames_water_mark * int drop_mark = (int)(oxcf->drop_frames_water_mark *
oxcf->optimal_buffer_level / 100); oxcf->optimal_buffer_level / 100);
if ((rc->buffer_level > drop_mark) && if ((rc->buffer_level > drop_mark) &&
(rc->decimation_factor > 0)) { (rc->decimation_factor > 0)) {
--rc->decimation_factor; --rc->decimation_factor;
...@@ -368,7 +392,6 @@ static int target_size_from_buffer_level(const VP9_CONFIG *oxcf, ...@@ -368,7 +392,6 @@ static int target_size_from_buffer_level(const VP9_CONFIG *oxcf,
const int pct_high = MIN(-diff / one_pct_bits, oxcf->over_shoot_pct); const int pct_high = MIN(-diff / one_pct_bits, oxcf->over_shoot_pct);
target += (target * pct_high) / 200; target += (target * pct_high) / 200;
} }
return target; return target;
} }
...@@ -428,7 +451,8 @@ static double get_rate_correction_factor(const VP9_COMP *cpi) { ...@@ -428,7 +451,8 @@ static double get_rate_correction_factor(const VP9_COMP *cpi) {
if (cpi->common.frame_type == KEY_FRAME) { if (cpi->common.frame_type == KEY_FRAME) {
return cpi->rc.key_frame_rate_correction_factor; return cpi->rc.key_frame_rate_correction_factor;
} else { } else {
if (cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) if ((cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) &&
!(cpi->use_svc && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER))
return cpi->rc.gf_rate_correction_factor; return cpi->rc.gf_rate_correction_factor;
else else
return cpi->rc.rate_correction_factor; return cpi->rc.rate_correction_factor;
...@@ -439,7 +463,8 @@ static void set_rate_correction_factor(VP9_COMP *cpi, double factor) { ...@@ -439,7 +463,8 @@ static void set_rate_correction_factor(VP9_COMP *cpi, double factor) {
if (cpi->common.frame_type == KEY_FRAME) { if (cpi->common.frame_type == KEY_FRAME) {
cpi->rc.key_frame_rate_correction_factor = factor; cpi->rc.key_frame_rate_correction_factor = factor;
} else { } else {
if (cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) if ((cpi->refresh_alt_ref_frame || cpi->refresh_golden_frame) &&
!(cpi->use_svc && cpi->oxcf.end_usage == USAGE_STREAM_FROM_SERVER))
cpi->rc.gf_rate_correction_factor = factor; cpi->rc.gf_rate_correction_factor = factor;
else else
cpi->rc.rate_correction_factor = factor; cpi->rc.rate_correction_factor = factor;
......
...@@ -175,6 +175,23 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx, ...@@ -175,6 +175,23 @@ static vpx_codec_err_t validate_config(vpx_codec_alg_priv_t *ctx,
RANGE_CHECK(cfg, ss_number_layers, 1, RANGE_CHECK(cfg, ss_number_layers, 1,
VPX_SS_MAX_LAYERS); /*Spatial layers max */ VPX_SS_MAX_LAYERS); /*Spatial layers max */
RANGE_CHECK(cfg, ts_number_layers, 1, VPX_TS_MAX_LAYERS);
if (cfg->ts_number_layers > 1) {
unsigned int i;
for (i = 1; i <cfg->ts_number_layers; i++) {
if (cfg->ts_target_bitrate[i] < cfg->ts_target_bitrate[i-1]) {
ERROR("ts_target_bitrate entries are not increasing");
}
}
RANGE_CHECK(cfg, ts_rate_decimator[cfg->ts_number_layers-1], 1, 1);
for (i = cfg->ts_number_layers-2; i > 0; i--) {
if (cfg->ts_rate_decimator[i-1] != 2*cfg->ts_rate_decimator[i]) {
ERROR("ts_rate_decimator factors are not powers of 2");
}
}
}
/* VP8 does not support a lower bound on the keyframe interval in /* VP8 does not support a lower bound on the keyframe interval in
* automatic keyframe placement mode. * automatic keyframe placement mode.
*/ */
...@@ -345,6 +362,19 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf, ...@@ -345,6 +362,19 @@ static vpx_codec_err_t set_vp9e_config(VP9_CONFIG *oxcf,
oxcf->aq_mode = vp8_cfg.aq_mode; oxcf->aq_mode = vp8_cfg.aq_mode;
oxcf->ss_number_layers = cfg.ss_number_layers; oxcf->ss_number_layers = cfg.ss_number_layers;
oxcf->ts_number_layers = cfg.ts_number_layers;
if (oxcf->ts_number_layers > 1) {
memcpy(oxcf->ts_target_bitrate, cfg.ts_target_bitrate,
sizeof(cfg.ts_target_bitrate));
memcpy(oxcf->ts_rate_decimator, cfg.ts_rate_decimator,
sizeof(cfg.ts_rate_decimator));
} else if (oxcf->ts_number_layers == 1) {
oxcf->ts_target_bitrate[0] = oxcf->target_bandwidth;
oxcf->ts_rate_decimator[0] = 1;
}
/* /*
printf("Current VP9 Settings: \n"); printf("Current VP9 Settings: \n");
printf("target_bandwidth: %d\n", oxcf->target_bandwidth); printf("target_bandwidth: %d\n", oxcf->target_bandwidth);
...@@ -1016,6 +1046,32 @@ static vpx_codec_err_t vp9e_set_svc(vpx_codec_alg_priv_t *ctx, int ctr_id, ...@@ -1016,6 +1046,32 @@ static vpx_codec_err_t vp9e_set_svc(vpx_codec_alg_priv_t *ctx, int ctr_id,
va_list args) { va_list args) {
int data = va_arg(args, int); int data = va_arg(args, int);
vp9_set_svc(ctx->cpi, data); vp9_set_svc(ctx->cpi, data);
// CBR mode for SVC with both temporal and spatial layers not yet supported.
if (data == 1 &&
ctx->cfg.rc_end_usage == VPX_CBR &&
ctx->cfg.ss_number_layers > 1 &&
ctx->cfg.ts_number_layers > 1) {
return VPX_CODEC_INVALID_PARAM;
}
return VPX_CODEC_OK;
}
static vpx_codec_err_t vp9e_set_svc_layer_id(vpx_codec_alg_priv_t *ctx,
int ctr_id,
va_list args) {
vpx_svc_layer_id_t *data = va_arg(args, vpx_svc_layer_id_t *);
VP9_COMP *cpi = (VP9_COMP *)ctx->cpi;
cpi->svc.spatial_layer_id = data->spatial_layer_id;
cpi->svc.temporal_layer_id = data->temporal_layer_id;
// Checks on valid layer_id input.
if (cpi->svc.temporal_layer_id < 0 ||
cpi->svc.temporal_layer_id >= ctx->cfg.ts_number_layers) {
return VPX_CODEC_INVALID_PARAM;
}
if (cpi->svc.spatial_layer_id < 0 ||
cpi->svc.spatial_layer_id >= ctx->cfg.ss_number_layers) {
return VPX_CODEC_INVALID_PARAM;
}
return VPX_CODEC_OK; return VPX_CODEC_OK;
} }
...@@ -1031,7 +1087,9 @@ static vpx_codec_err_t vp9e_set_svc_parameters(vpx_codec_alg_priv_t *ctx, ...@@ -1031,7 +1087,9 @@ static vpx_codec_err_t vp9e_set_svc_parameters(vpx_codec_alg_priv_t *ctx,
params = *(vpx_svc_parameters_t *)data; params = *(vpx_svc_parameters_t *)data;
cpi->current_layer = params.layer; cpi->svc.spatial_layer_id = params.spatial_layer;
cpi->svc.temporal_layer_id = params.temporal_layer;
cpi->lst_fb_idx = params.lst_fb_idx; cpi->lst_fb_idx = params.lst_fb_idx;
cpi->gld_fb_idx = params.gld_fb_idx; cpi->gld_fb_idx = params.gld_fb_idx;
cpi->alt_fb_idx = params.alt_fb_idx; cpi->alt_fb_idx = params.alt_fb_idx;
...@@ -1080,6 +1138,7 @@ static vpx_codec_ctrl_fn_map_t vp9e_ctf_maps[] = { ...@@ -1080,6 +1138,7 @@ static vpx_codec_ctrl_fn_map_t vp9e_ctf_maps[] = {
{VP9_GET_REFERENCE, get_reference}, {VP9_GET_REFERENCE, get_reference},
{VP9E_SET_SVC, vp9e_set_svc}, {VP9E_SET_SVC, vp9e_set_svc},
{VP9E_SET_SVC_PARAMETERS, vp9e_set_svc_parameters}, {VP9E_SET_SVC_PARAMETERS, vp9e_set_svc_parameters},
{VP9E_SET_SVC_LAYER_ID, vp9e_set_svc_layer_id},
{ -1, NULL}, { -1, NULL},
}; };
...@@ -1130,7 +1189,11 @@ static vpx_codec_enc_cfg_map_t vp9e_usage_cfg_map[] = { ...@@ -1130,7 +1189,11 @@ static vpx_codec_enc_cfg_map_t vp9e_usage_cfg_map[] = {
9999, /* kf_max_dist */ 9999, /* kf_max_dist */
VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */ VPX_SS_DEFAULT_LAYERS, /* ss_number_layers */
1, /* ts_number_layers */
{0}, /* ts_target_bitrate */
{0}, /* ts_rate_decimator */
0, /* ts_periodicity */
{0}, /* ts_layer_id */
#if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION) #if VPX_ENCODER_ABI_VERSION == (1 + VPX_CODEC_ABI_VERSION)
1, /* g_delete_first_pass_file */ 1, /* g_delete_first_pass_file */
"vp8.fpf" /* first pass filename */ "vp8.fpf" /* first pass filename */
......
...@@ -499,6 +499,7 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx, ...@@ -499,6 +499,7 @@ vpx_codec_err_t vpx_svc_init(SvcContext *svc_ctx, vpx_codec_ctx_t *codec_ctx,
// modify encoder configuration // modify encoder configuration