From 048e4fd5247e23b8d744807e8461b85b990e2b5f Mon Sep 17 00:00:00 2001
From: Paul Wilkins <paulwilkins@google.com>
Date: Sat, 28 Jan 2012 08:50:33 +0000
Subject: [PATCH] Moved some reference frame data structures into common.
Encoder side changes
Change-Id: I8921800e4fccec5e5a9e4755b80cbd472623107b
---
vp8/encoder/bitstream.c | 81 ++++++++++++++++----------------
vp8/encoder/encodeframe.c | 53 +++++++++++----------
vp8/encoder/onyx_if.c | 98 ++++++++++++++++++++-------------------
vp8/encoder/onyx_int.h | 4 --
4 files changed, 117 insertions(+), 119 deletions(-)
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 32f64999fb..00129f7ae1 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -836,12 +836,10 @@ static void write_mb_segid(vp8_writer *w,
// This function encodes the reference frame
static void encode_ref_frame( vp8_writer *const w,
+ VP8_COMMON *const cm,
MACROBLOCKD *xd,
int segment_id,
- MV_REFERENCE_FRAME rf,
- int prob_intra_coded,
- int prob_last_coded,
- int prob_gf_coded )
+ MV_REFERENCE_FRAME rf )
{
int seg_ref_active;
//#if CONFIG_SEGFEATURES
@@ -849,29 +847,31 @@ static void encode_ref_frame( vp8_writer *const w,
segment_id,
SEG_LVL_REF_FRAME );
- // No segment features or segment reference frame feature is disabled
+ // If segment level coding of this signal is disabled...
if ( !seg_ref_active )
{
if (rf == INTRA_FRAME)
{
- vp8_write(w, 0, prob_intra_coded);
+ vp8_write(w, 0, cm->prob_intra_coded);
}
else /* inter coded */
{
- vp8_write(w, 1, prob_intra_coded);
+ vp8_write(w, 1, cm->prob_intra_coded);
if (rf == LAST_FRAME)
{
- vp8_write(w, 0, prob_last_coded);
+ vp8_write(w, 0, cm->prob_last_coded);
}
else
{
- vp8_write(w, 1, prob_last_coded);
- vp8_write(w, (rf == GOLDEN_FRAME) ? 0 : 1, prob_gf_coded);
+ vp8_write(w, 1, cm->prob_last_coded);
+
+ vp8_write(w, (rf == GOLDEN_FRAME) ? 0 : 1, cm->prob_gf_coded);
}
}
}
//#if CONFIG_SEGFEATURES
+ // Else use the segment
else
{
if (rf == INTRA_FRAME)
@@ -879,13 +879,13 @@ static void encode_ref_frame( vp8_writer *const w,
// This MB intra coded. If inter also allowed we must code
// an explicit inter/intra flag.
if ( check_segref_inter( xd, segment_id ) )
- vp8_write(w, 0, prob_intra_coded);
+ vp8_write(w, 0, cm->prob_intra_coded);
}
else /* inter coded */
{
// If intra also allowed we must code an explicit intra/inter flag.
if ( check_segref( xd, segment_id, INTRA_FRAME ) )
- vp8_write(w, 1, prob_intra_coded);
+ vp8_write(w, 1, cm->prob_intra_coded);
if (rf == LAST_FRAME)
{
@@ -893,7 +893,7 @@ static void encode_ref_frame( vp8_writer *const w,
if ( check_segref( xd, segment_id, GOLDEN_FRAME ) ||
check_segref( xd, segment_id, ALTREF_FRAME ) )
{
- vp8_write(w, 0, prob_last_coded);
+ vp8_write(w, 0, cm->prob_last_coded);
}
}
else
@@ -901,14 +901,14 @@ static void encode_ref_frame( vp8_writer *const w,
// if LAST is allowed we must code explicit flag
if ( check_segref( xd, segment_id, LAST_FRAME ) )
{
- vp8_write(w, 1, prob_last_coded);
+ vp8_write(w, 1, cm->prob_last_coded);
}
// if GOLDEN and ALTREF allowed we must code an explicit flag
if ( check_segref( xd, segment_id, GOLDEN_FRAME ) &&
check_segref( xd, segment_id, ALTREF_FRAME ) )
{
- vp8_write(w, (rf == GOLDEN_FRAME) ? 0 : 1, prob_gf_coded);
+ vp8_write(w, (rf == GOLDEN_FRAME) ? 0 : 1, cm->prob_gf_coded);
}
}
}
@@ -939,8 +939,6 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
const int mis = pc->mode_info_stride;
int mb_row = -1;
- int prob_last_coded;
- int prob_gf_coded;
int prob_skip_false = 0;
#if CONFIG_DUALPRED
int prob_dual_pred[3];
@@ -951,22 +949,22 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
// Calculate the probabilities to be used to code the reference frame
// based on actual useage this frame
//#if CONFIG_SEGFEATURES
- cpi->prob_intra_coded = (rf_intra + rf_inter)
+ pc->prob_intra_coded = (rf_intra + rf_inter)
? rf_intra * 255 / (rf_intra + rf_inter) : 1;
- if (!cpi->prob_intra_coded)
- cpi->prob_intra_coded = 1;
+ if (!pc->prob_intra_coded)
+ pc->prob_intra_coded = 1;
- prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
+ pc->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
- if (!prob_last_coded)
- prob_last_coded = 1;
+ if (!pc->prob_last_coded)
+ pc->prob_last_coded = 1;
- prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
+ pc->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
- if (!prob_gf_coded)
- prob_gf_coded = 1;
+ if (!pc->prob_gf_coded)
+ pc->prob_gf_coded = 1;
#ifdef ENTROPY_STATS
@@ -994,9 +992,9 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
vp8_write_literal(w, prob_skip_false, 8);
}
- vp8_write_literal(w, cpi->prob_intra_coded, 8);
- vp8_write_literal(w, prob_last_coded, 8);
- vp8_write_literal(w, prob_gf_coded, 8);
+ vp8_write_literal(w, pc->prob_intra_coded, 8);
+ vp8_write_literal(w, pc->prob_last_coded, 8);
+ vp8_write_literal(w, pc->prob_gf_coded, 8);
#if CONFIG_DUALPRED
if (cpi->common.dual_pred_mode == HYBRID_PREDICTION)
@@ -1100,9 +1098,8 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
}
// Encode the reference frame.
- encode_ref_frame( w, xd, segment_id, rf,
- cpi->prob_intra_coded,
- prob_last_coded, prob_gf_coded );
+ encode_ref_frame( w, pc, xd,
+ segment_id, rf );
if (rf == INTRA_FRAME)
{
@@ -1605,7 +1602,7 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
#if CONFIG_T8X8
int i=0;
#endif
-
+ VP8_COMMON *const cm = & cpi->common;
const int *const rfct = cpi->count_mb_ref_frame_usage;
const int rf_intra = rfct[INTRA_FRAME];
const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME];
@@ -1647,15 +1644,15 @@ int vp8_estimate_entropy_savings(VP8_COMP *cpi)
// old costs
- ref_frame_cost[INTRA_FRAME] = vp8_cost_zero(cpi->prob_intra_coded);
- ref_frame_cost[LAST_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
- + vp8_cost_zero(cpi->prob_last_coded);
- ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
- + vp8_cost_one(cpi->prob_last_coded)
- + vp8_cost_zero(cpi->prob_gf_coded);
- ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
- + vp8_cost_one(cpi->prob_last_coded)
- + vp8_cost_one(cpi->prob_gf_coded);
+ ref_frame_cost[INTRA_FRAME] = vp8_cost_zero(cm->prob_intra_coded);
+ ref_frame_cost[LAST_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ + vp8_cost_zero(cm->prob_last_coded);
+ ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ + vp8_cost_one(cm->prob_last_coded)
+ + vp8_cost_zero(cm->prob_gf_coded);
+ ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ + vp8_cost_one(cm->prob_last_coded)
+ + vp8_cost_one(cm->prob_gf_coded);
oldtotal =
rfct[INTRA_FRAME] * ref_frame_cost[INTRA_FRAME] +
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index de452b236e..a9af839310 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -880,30 +880,30 @@ void init_encode_frame_mb_context(VP8_COMP *cpi)
vpx_memset(cm->above_context, 0,
sizeof(ENTROPY_CONTEXT_PLANES) * cm->mb_cols);
- xd->ref_frame_cost[INTRA_FRAME] = vp8_cost_zero(cpi->prob_intra_coded);
+ xd->ref_frame_cost[INTRA_FRAME] = vp8_cost_zero(cm->prob_intra_coded);
// Special case treatment when GF and ARF are not sensible options for reference
if (cpi->ref_frame_flags == VP8_LAST_FLAG)
{
- xd->ref_frame_cost[LAST_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
+ xd->ref_frame_cost[LAST_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ vp8_cost_zero(255);
- xd->ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
+ xd->ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ vp8_cost_one(255)
+ vp8_cost_zero(128);
- xd->ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
+ xd->ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ vp8_cost_one(255)
+ vp8_cost_one(128);
}
else
{
- xd->ref_frame_cost[LAST_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
- + vp8_cost_zero(cpi->prob_last_coded);
- xd->ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
- + vp8_cost_one(cpi->prob_last_coded)
- + vp8_cost_zero(cpi->prob_gf_coded);
- xd->ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cpi->prob_intra_coded)
- + vp8_cost_one(cpi->prob_last_coded)
- + vp8_cost_one(cpi->prob_gf_coded);
+ xd->ref_frame_cost[LAST_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ + vp8_cost_zero(cm->prob_last_coded);
+ xd->ref_frame_cost[GOLDEN_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ + vp8_cost_one(cm->prob_last_coded)
+ + vp8_cost_zero(cm->prob_gf_coded);
+ xd->ref_frame_cost[ALTREF_FRAME] = vp8_cost_one(cm->prob_intra_coded)
+ + vp8_cost_one(cm->prob_last_coded)
+ + vp8_cost_one(cm->prob_gf_coded);
}
xd->fullpixel_mask = 0xffffffff;
@@ -1173,32 +1173,35 @@ static void encode_frame_internal(VP8_COMP *cpi)
if ((rf_intra + rf_inter) > 0)
{
- cpi->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
+ cm->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
- if (cpi->prob_intra_coded < 1)
- cpi->prob_intra_coded = 1;
+ if (cm->prob_intra_coded < 1)
+ cm->prob_intra_coded = 1;
if ((cm->frames_since_golden > 0) || cpi->source_alt_ref_active)
{
- cpi->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
+ cm->prob_last_coded =
+ rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
- if (cpi->prob_last_coded < 1)
- cpi->prob_last_coded = 1;
+ if (cm->prob_last_coded < 1)
+ cm->prob_last_coded = 1;
- cpi->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
- ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
+ cm->prob_gf_coded =
+ (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
+ ? (rfct[GOLDEN_FRAME] * 255) /
+ (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
- if (cpi->prob_gf_coded < 1)
- cpi->prob_gf_coded = 1;
+ if (cm->prob_gf_coded < 1)
+ cm->prob_gf_coded = 1;
}
}
//#if CONFIG_SEGFEATURES
else
{
// Trap case where cpi->count_mb_ref_frame_usage[] blank.
- cpi->prob_intra_coded = 63;
- cpi->prob_last_coded = 128;
- cpi->prob_gf_coded = 128;
+ cm->prob_intra_coded = 63;
+ cm->prob_last_coded = 128;
+ cm->prob_gf_coded = 128;
}
}
#if 0
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 9969d3f584..675546dc45 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -2345,9 +2345,9 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf)
cpi->frames_till_gf_update_due = 0;
cpi->gf_overspend_bits = 0;
cpi->non_gf_bitrate_adjustment = 0;
- cpi->prob_last_coded = 128;
- cpi->prob_gf_coded = 128;
- cpi->prob_intra_coded = 63;
+ cm->prob_last_coded = 128;
+ cm->prob_gf_coded = 128;
+ cm->prob_intra_coded = 63;
#if CONFIG_DUALPRED
cpi->prob_dualpred[0] = 128;
cpi->prob_dualpred[1] = 128;
@@ -3424,36 +3424,36 @@ static void update_rd_ref_frame_probs(VP8_COMP *cpi)
if (cm->frame_type == KEY_FRAME)
{
- cpi->prob_intra_coded = 255;
- cpi->prob_last_coded = 128;
- cpi->prob_gf_coded = 128;
+ cm->prob_intra_coded = 255;
+ cm->prob_last_coded = 128;
+ cm->prob_gf_coded = 128;
}
else if (!(rf_intra + rf_inter))
{
// This is a trap in case this function is called with cpi->recent_ref_frame_usage[] blank.
- cpi->prob_intra_coded = 63;
- cpi->prob_last_coded = 128;
- cpi->prob_gf_coded = 128;
+ cm->prob_intra_coded = 63;
+ cm->prob_last_coded = 128;
+ cm->prob_gf_coded = 128;
}
else
{
- cpi->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
+ cm->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
- if (cpi->prob_intra_coded < 1)
- cpi->prob_intra_coded = 1;
+ if (cm->prob_intra_coded < 1)
+ cm->prob_intra_coded = 1;
if ((cm->frames_since_golden > 0) || cpi->source_alt_ref_active)
{
- cpi->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
+ cm->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
- if (cpi->prob_last_coded < 1)
- cpi->prob_last_coded = 1;
+ if (cm->prob_last_coded < 1)
+ cm->prob_last_coded = 1;
- cpi->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
+ cm->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
- if (cpi->prob_gf_coded < 1)
- cpi->prob_gf_coded = 1;
+ if (cm->prob_gf_coded < 1)
+ cm->prob_gf_coded = 1;
}
}
@@ -3464,61 +3464,63 @@ static void update_rd_ref_frame_probs(VP8_COMP *cpi)
if (cm->frame_type == KEY_FRAME)
{
- cpi->prob_intra_coded = 255;
- cpi->prob_last_coded = 128;
- cpi->prob_gf_coded = 128;
+ cm->prob_intra_coded = 255;
+ cm->prob_last_coded = 128;
+ cm->prob_gf_coded = 128;
}
else if (!(rf_intra + rf_inter))
{
- // This is a trap in case this function is called with cpi->recent_ref_frame_usage[] blank.
- cpi->prob_intra_coded = 63;
- cpi->prob_last_coded = 128;
- cpi->prob_gf_coded = 128;
+ // This is a trap in case this function is called with
+ // cpi->recent_ref_frame_usage[] blank.
+ cm->prob_intra_coded = 63;
+ cm->prob_last_coded = 128;
+ cm->prob_gf_coded = 128;
}
else
{
- cpi->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
+ cm->prob_intra_coded = (rf_intra * 255) / (rf_intra + rf_inter);
- if (cpi->prob_intra_coded < 1)
- cpi->prob_intra_coded = 1;
+ if (cm->prob_intra_coded < 1)
+ cm->prob_intra_coded = 1;
- cpi->prob_last_coded = rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
+ cm->prob_last_coded =
+ rf_inter ? (rfct[LAST_FRAME] * 255) / rf_inter : 128;
- if (cpi->prob_last_coded < 1)
- cpi->prob_last_coded = 1;
+ if (cm->prob_last_coded < 1)
+ cm->prob_last_coded = 1;
- cpi->prob_gf_coded = (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
- ? (rfct[GOLDEN_FRAME] * 255) / (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
+ cm->prob_gf_coded =
+ (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME])
+ ? (rfct[GOLDEN_FRAME] * 255) /
+ (rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]) : 128;
- if (cpi->prob_gf_coded < 1)
- cpi->prob_gf_coded = 1;
+ if (cm->prob_gf_coded < 1)
+ cm->prob_gf_coded = 1;
}
- // update reference frame costs since we can do better than what we got last frame.
+ // update reference frame costs since we can do better than what we got
+ // last frame.
if (cpi->common.refresh_alt_ref_frame)
{
- cpi->prob_intra_coded += 40;
- cpi->prob_last_coded = 200;
- cpi->prob_gf_coded = 1;
+ cm->prob_intra_coded += 40;
+ cm->prob_last_coded = 200;
+ cm->prob_gf_coded = 1;
}
else if (cpi->common.frames_since_golden == 0)
{
- cpi->prob_last_coded = 214;
- cpi->prob_gf_coded = 1;
+ cm->prob_last_coded = 214;
+ cm->prob_gf_coded = 1;
}
else if (cpi->common.frames_since_golden == 1)
{
- cpi->prob_last_coded = 192;
- cpi->prob_gf_coded = 220;
+ cm->prob_last_coded = 192;
+ cm->prob_gf_coded = 220;
}
else if (cpi->source_alt_ref_active)
{
- //int dist = cpi->common.frames_till_alt_ref_frame + cpi->common.frames_since_golden;
- cpi->prob_gf_coded -= 20;
-
- if (cpi->prob_gf_coded < 10)
- cpi->prob_gf_coded = 10;
+ cm->prob_gf_coded =
+ ( cm->prob_gf_coded > 30 ) ? cm->prob_gf_coded - 20 : 10;
}
#endif
diff --git a/vp8/encoder/onyx_int.h b/vp8/encoder/onyx_int.h
index 2ba3423cdd..5cb8834e3d 100644
--- a/vp8/encoder/onyx_int.h
+++ b/vp8/encoder/onyx_int.h
@@ -506,10 +506,6 @@ typedef struct VP8_COMP
int vert_scale;
int pass;
-
- int prob_intra_coded;
- int prob_last_coded;
- int prob_gf_coded;
int prob_skip_false;
int last_skip_false_probs[3];
int last_skip_probs_q[3];
--
GitLab