generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Removing last_source field from VP9_COMP."

Browse Source
This commit is contained in:
Dmitry Kovalev 2014-08-22 14:19:49 -07:00 committed by Gerrit Code Review
commit 3c810ef79c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vp9/encoder/vp9_encoder.c
View File

@ -2461,6 +2461,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
RATE_CONTROL *const rc = &cpi->rc; RATE_CONTROL *const rc = &cpi->rc;
struct vpx_usec_timer cmptimer; struct vpx_usec_timer cmptimer;
YV12_BUFFER_CONFIG *force_src_buffer = NULL; YV12_BUFFER_CONFIG *force_src_buffer = NULL;
struct lookahead_entry *last_source = NULL;
MV_REFERENCE_FRAME ref_frame; MV_REFERENCE_FRAME ref_frame;
int arf_src_index; int arf_src_index;
@ -2474,7 +2475,6 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
vpx_usec_timer_start(&cmptimer); vpx_usec_timer_start(&cmptimer);
cpi->source = NULL; cpi->source = NULL;
cpi->last_source = NULL;
vp9_set_high_precision_mv(cpi, ALTREF_HIGH_PRECISION_MV); vp9_set_high_precision_mv(cpi, ALTREF_HIGH_PRECISION_MV);
@ -2537,11 +2537,11 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
if (cm->current_video_frame > 0) { if (cm->current_video_frame > 0) {
#if CONFIG_SPATIAL_SVC #if CONFIG_SPATIAL_SVC
if (is_spatial_svc(cpi)) 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 else
#endif #endif
cpi->last_source = vp9_lookahead_peek(cpi->lookahead, -1); last_source = vp9_lookahead_peek(cpi->lookahead, -1);
if (cpi->last_source == NULL) if (last_source == NULL)
return -1; return -1;
} }
@ -2565,8 +2565,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
cpi->un_scaled_source = cpi->Source = force_src_buffer ? force_src_buffer cpi->un_scaled_source = cpi->Source = force_src_buffer ? force_src_buffer
: &cpi->source->img; : &cpi->source->img;
cpi->unscaled_last_source = cpi->last_source != NULL ? cpi->unscaled_last_source = last_source != NULL ? &last_source->img : NULL;
&cpi->last_source->img : NULL;
*time_stamp = cpi->source->ts_start; *time_stamp = cpi->source->ts_start;
*time_end = cpi->source->ts_end; *time_end = cpi->source->ts_end;

1
vp9/encoder/vp9_encoder.h
View File

@ -235,7 +235,6 @@ typedef struct VP9_COMP {
struct lookahead_ctx *lookahead; struct lookahead_ctx *lookahead;
struct lookahead_entry *source; struct lookahead_entry *source;
struct lookahead_entry *alt_ref_source; struct lookahead_entry *alt_ref_source;
struct lookahead_entry *last_source;
YV12_BUFFER_CONFIG *Source; YV12_BUFFER_CONFIG *Source;
YV12_BUFFER_CONFIG *Last_Source; // NULL for first frame and alt_ref frames YV12_BUFFER_CONFIG *Last_Source; // NULL for first frame and alt_ref frames