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

Avoid double copying of key frames into alt and golden buffer

Browse Source 
Change-Id: I726976a297a593a35ed6cba3c660e372562f7b27
This commit is contained in:
Attila Nagy 2011-02-25 08:21:45 +02:00
parent 861175ef00
commit d8fc974ac0
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vp8/encoder/onyx_if.c
View File

@ -3130,8 +3130,11 @@ static void update_golden_frame_and_stats(VP8_COMP *cpi)
// Update the Golden frame reconstruction buffer if signalled and the GF usage counts. // Update the Golden frame reconstruction buffer if signalled and the GF usage counts.
if (cm->refresh_golden_frame) if (cm->refresh_golden_frame)
{ {
// Update the golden frame buffer if (cm->frame_type != KEY_FRAME)
vp8_yv12_copy_frame_ptr(cm->frame_to_show, &cm->yv12_fb[cm->gld_fb_idx]); {
// Update the golden frame buffer
vp8_yv12_copy_frame_ptr(cm->frame_to_show, &cm->yv12_fb[cm->gld_fb_idx]);
}
// Select an interval before next GF // Select an interval before next GF
if (!cpi->auto_gold) if (!cpi->auto_gold)
@ -4748,16 +4751,19 @@ static void encode_frame_to_data_rate
if (cpi->oxcf.error_resilient_mode) if (cpi->oxcf.error_resilient_mode)
{ {
// Is this an alternate reference update if (cm->frame_type != KEY_FRAME)
if (cpi->common.refresh_alt_ref_frame) {
vp8_yv12_copy_frame_ptr(cm->frame_to_show, &cm->yv12_fb[cm->alt_fb_idx]); // Is this an alternate reference update
if (cm->refresh_alt_ref_frame)
vp8_yv12_copy_frame_ptr(cm->frame_to_show, &cm->yv12_fb[cm->alt_fb_idx]);
if (cpi->common.refresh_golden_frame) if (cm->refresh_golden_frame)
vp8_yv12_copy_frame_ptr(cm->frame_to_show, &cm->yv12_fb[cm->gld_fb_idx]); vp8_yv12_copy_frame_ptr(cm->frame_to_show, &cm->yv12_fb[cm->gld_fb_idx]);
}
} }
else else
{ {
if (cpi->oxcf.play_alternate && cpi->common.refresh_alt_ref_frame && (cpi->common.frame_type != KEY_FRAME)) if (cpi->oxcf.play_alternate && cm->refresh_alt_ref_frame && (cm->frame_type != KEY_FRAME))
// Update the alternate reference frame and stats as appropriate. // Update the alternate reference frame and stats as appropriate.
update_alt_ref_frame_and_stats(cpi); update_alt_ref_frame_and_stats(cpi);
else else