ref: 3c810ef79cfebdfb9512811e4424acf360a4dea4
parent: 8fa9d183795a2336032a2f7d37a637f8e579f062
parent: 10da24a4943fbc39f1443bed1d495ea9874e7b24
author: Dmitry Kovalev <[email protected]>
date: Fri Aug 22 10:19:49 EDT 2014
Merge "Removing last_source field from VP9_COMP."
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2461,6 +2461,7 @@
RATE_CONTROL *const rc = &cpi->rc;
struct vpx_usec_timer cmptimer;
YV12_BUFFER_CONFIG *force_src_buffer = NULL;
+ struct lookahead_entry *last_source = NULL;
MV_REFERENCE_FRAME ref_frame;
int arf_src_index;
@@ -2474,7 +2475,6 @@
vpx_usec_timer_start(&cmptimer);
cpi->source = NULL;
- cpi->last_source = NULL;
vp9_set_high_precision_mv(cpi, ALTREF_HIGH_PRECISION_MV);
@@ -2537,11 +2537,11 @@
if (cm->current_video_frame > 0) {#if CONFIG_SPATIAL_SVC
if (is_spatial_svc(cpi))
- cpi->last_source = vp9_svc_lookahead_peek(cpi, cpi->lookahead, -1, 0);
+ last_source = vp9_svc_lookahead_peek(cpi, cpi->lookahead, -1, 0);
else
#endif
- cpi->last_source = vp9_lookahead_peek(cpi->lookahead, -1);
- if (cpi->last_source == NULL)
+ last_source = vp9_lookahead_peek(cpi->lookahead, -1);
+ if (last_source == NULL)
return -1;
}
@@ -2565,8 +2565,7 @@
cpi->un_scaled_source = cpi->Source = force_src_buffer ? force_src_buffer
: &cpi->source->img;
- cpi->unscaled_last_source = cpi->last_source != NULL ?
- &cpi->last_source->img : NULL;
+ cpi->unscaled_last_source = last_source != NULL ? &last_source->img : NULL;
*time_stamp = cpi->source->ts_start;
*time_end = cpi->source->ts_end;
--- a/vp9/encoder/vp9_encoder.h
+++ b/vp9/encoder/vp9_encoder.h
@@ -235,7 +235,6 @@
struct lookahead_ctx *lookahead;
struct lookahead_entry *source;
struct lookahead_entry *alt_ref_source;
- struct lookahead_entry *last_source;
YV12_BUFFER_CONFIG *Source;
YV12_BUFFER_CONFIG *Last_Source; // NULL for first frame and alt_ref frames