Commit 94bb09ca authored by Tom Finegan's avatar Tom Finegan Committed by Gerrit Code Review
Browse files

Merge "vpxenc: Warn on lagged encoding with real time."

Showing with 13 additions and 6 deletions
...@@ -78,9 +78,17 @@ static void check_quantizer(int min_q, int max_q, ...@@ -78,9 +78,17 @@ static void check_quantizer(int min_q, int max_q,
add_warning(quantizer_warning_string, warning_list); add_warning(quantizer_warning_string, warning_list);
} }
static void check_lag_in_frames_realtime_deadline(
int lag_in_frames,
int deadline,
struct WarningList *warning_list) {
if (deadline == VPX_DL_REALTIME && lag_in_frames != 0)
add_warning(lag_in_frames_with_realtime, warning_list);
}
void check_encoder_config(int disable_prompt, void check_encoder_config(int disable_prompt,
const struct VpxEncoderConfig *global_config, const struct VpxEncoderConfig *global_config,
struct vpx_codec_enc_cfg *stream_config) { const struct vpx_codec_enc_cfg *stream_config) {
int num_warnings = 0; int num_warnings = 0;
struct WarningListNode *warning = NULL; struct WarningListNode *warning = NULL;
struct WarningList warning_list = {0}; struct WarningList warning_list = {0};
...@@ -88,10 +96,9 @@ void check_encoder_config(int disable_prompt, ...@@ -88,10 +96,9 @@ void check_encoder_config(int disable_prompt,
check_quantizer(stream_config->rc_min_quantizer, check_quantizer(stream_config->rc_min_quantizer,
stream_config->rc_max_quantizer, stream_config->rc_max_quantizer,
&warning_list); &warning_list);
check_lag_in_frames_realtime_deadline(stream_config->g_lag_in_frames,
if (global_config->deadline == VPX_DL_REALTIME) global_config->deadline,
stream_config->g_lag_in_frames = 0; &warning_list);
/* Count and print warnings. */ /* Count and print warnings. */
for (warning = warning_list.warning_node; for (warning = warning_list.warning_node;
warning != NULL; warning != NULL;
......
...@@ -20,6 +20,6 @@ struct VpxEncoderConfig; ...@@ -20,6 +20,6 @@ struct VpxEncoderConfig;
*/ */
void check_encoder_config(int disable_prompt, void check_encoder_config(int disable_prompt,
const struct VpxEncoderConfig *global_config, const struct VpxEncoderConfig *global_config,
struct vpx_codec_enc_cfg *stream_config); const struct vpx_codec_enc_cfg *stream_config);
#endif // WARNINGS_H_ #endif // WARNINGS_H_
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment