diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-27 00:05:10 -0400 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2011-08-27 00:05:10 -0400 |
| commit | 06f30739a52790afdd6ab142d079fbe448749fc7 (patch) | |
| tree | 532ec66e2bc24f3c0c8edcc3fe1cde8fe229a768 | |
| parent | 9deb8459f64d4e9cb8d8a5ee05a6694292f01480 (diff) | |
| parent | 1f20202e2c6c137dd2e3464e2b14bba0fdc289ce (diff) | |
| download | libvpx-06f30739a52790afdd6ab142d079fbe448749fc7.tar libvpx-06f30739a52790afdd6ab142d079fbe448749fc7.tar.gz libvpx-06f30739a52790afdd6ab142d079fbe448749fc7.tar.bz2 libvpx-06f30739a52790afdd6ab142d079fbe448749fc7.zip | |
Merge remote branch 'origin/master' into experimental
Change-Id: I3137fae1f61400f142d58f18663624b62aa0533c
| -rw-r--r-- | vp8/encoder/onyx_if.c | 22 | ||||
| -rw-r--r-- | vp8/encoder/onyx_int.h | 3 |
2 files changed, 12 insertions, 13 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index be94572d9..faa36d66a 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -3312,16 +3312,17 @@ static void encode_frame_to_data_rate // Test code for segmentation of gf/arf (0,0) //segmentation_test_function((VP8_PTR) cpi); -#if CONFIG_REALTIME_ONLY - if(cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME) + if (cpi->compressor_speed == 2) { - if(cpi->force_next_frame_intra) + if(cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME) { - cm->frame_type = KEY_FRAME; /* delayed intra frame */ + if(cpi->force_next_frame_intra) + { + cm->frame_type = KEY_FRAME; /* delayed intra frame */ + } } + cpi->force_next_frame_intra = 0; } - cpi->force_next_frame_intra = 0; -#endif // For an alt ref frame in 2 pass we skip the call to the second pass function that sets the target bandwidth #if !(CONFIG_REALTIME_ONLY) @@ -3861,15 +3862,15 @@ static void encode_frame_to_data_rate // (assuming that we didn't)! if (cpi->pass != 2 && cpi->oxcf.auto_key && cm->frame_type != KEY_FRAME) { + int key_frame_decision = decide_key_frame(cpi); -#if CONFIG_REALTIME_ONLY + if (cpi->compressor_speed == 2) { /* we don't do re-encoding in realtime mode * if key frame is decided than we force it on next frame */ - cpi->force_next_frame_intra = decide_key_frame(cpi); + cpi->force_next_frame_intra = key_frame_decision; } -#else - if (decide_key_frame(cpi)) + else if (key_frame_decision) { // Reset all our sizing numbers and recode cm->frame_type = KEY_FRAME; @@ -3906,7 +3907,6 @@ static void encode_frame_to_data_rate continue; } -#endif } vp8_clear_system_state(); diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h index f75f6cb57..aead2fbb7 100644 --- a/vp8/encoder/onyx_int.h +++ b/vp8/encoder/onyx_int.h @@ -609,9 +609,8 @@ typedef struct VP8_COMP int *lf_ref_frame_sign_bias; int *lf_ref_frame; -#if CONFIG_REALTIME_ONLY int force_next_frame_intra; /* force next frame to intra when kf_auto says so */ -#endif + int droppable; } VP8_COMP; |