summaryrefslogtreecommitdiff
path: root/vp8/encoder
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/encoder')
-rw-r--r--vp8/encoder/bitstream.c141
-rw-r--r--vp8/encoder/encodeframe.c21
-rw-r--r--vp8/encoder/onyx_if.c14
-rw-r--r--vp8/encoder/pickinter.c8
-rw-r--r--vp8/encoder/rdopt.c8
5 files changed, 142 insertions, 50 deletions
diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c
index 7df367f11..9eb9de1ca 100644
--- a/vp8/encoder/bitstream.c
+++ b/vp8/encoder/bitstream.c
@@ -873,6 +873,90 @@ static void write_mb_features(vp8_writer *w, const MB_MODE_INFO *mi, const MACRO
}
}
+// This function encodes the reference frame
+static void encode_ref_frame( vp8_writer *const w,
+ MACROBLOCKD *xd,
+ int segment_id,
+ MV_REFERENCE_FRAME rf,
+ int prob_intra_coded,
+ int prob_last_coded,
+ int prob_gf_coded )
+{
+ int seg_ref_active;
+#if CONFIG_SEGFEATURES
+ seg_ref_active = segfeature_active( xd,
+ segment_id,
+ SEG_LVL_REF_FRAME );
+#else
+ seg_ref_active = 0;
+#endif
+
+ // No segment features or segment reference frame featuure is disabled
+ if ( !seg_ref_active )
+ {
+ if (rf == INTRA_FRAME)
+ {
+ vp8_write(w, 0, prob_intra_coded);
+ }
+ else /* inter coded */
+ {
+ vp8_write(w, 1, prob_intra_coded);
+
+ if (rf == LAST_FRAME)
+ {
+ vp8_write(w, 0, prob_last_coded);
+ }
+ else
+ {
+ vp8_write(w, 1, prob_last_coded);
+ vp8_write(w, (rf == GOLDEN_FRAME) ? 0 : 1, prob_gf_coded);
+ }
+ }
+ }
+#if CONFIG_SEGFEATURES
+ else
+ {
+ if (rf == INTRA_FRAME)
+ {
+ // 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);
+ }
+ 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);
+
+ if (rf == LAST_FRAME)
+ {
+ // If GOLDEN or ALTREF allowed we must code explicit flag.
+ if ( check_segref( xd, segment_id, GOLDEN_FRAME ) ||
+ check_segref( xd, segment_id, ALTREF_FRAME ) )
+ {
+ vp8_write(w, 0, prob_last_coded);
+ }
+ }
+ else
+ {
+ // if LAST is allowed we must code explicit flag
+ if ( check_segref( xd, segment_id, LAST_FRAME ) )
+ {
+ vp8_write(w, 1, 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);
+ }
+ }
+ }
+ }
+#endif
+}
static void pack_inter_mode_mvs(VP8_COMP *const cpi)
{
@@ -969,14 +1053,16 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
const MB_PREDICTION_MODE mode = mi->mode;
const int segment_id = mi->segment_id;
- //MACROBLOCKD *xd = &cpi->mb.e_mbd;
-
// Distance of Mb to the various image edges.
// These specified to 8th pel as they are always compared to MV values that are in 1/8th pel units
xd->mb_to_left_edge = -((mb_col * 16) << 3);
xd->mb_to_right_edge = ((pc->mb_cols - 1 - mb_col) * 16) << 3;
xd->mb_to_top_edge = -((mb_row * 16)) << 3;
xd->mb_to_bottom_edge = ((pc->mb_rows - 1 - mb_row) * 16) << 3;
+
+ // Make sure the MacroBlockD mode info pointer is set correctly
+ xd->mode_info_context = m;
+
#if CONFIG_SEGMENTATION
xd->up_available = (mb_row != 0);
xd->left_available = (mb_col != 0);
@@ -1036,20 +1122,23 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
vp8_encode_bool(w, mi->mb_skip_coeff, prob_skip_false);
}
+ // Encode the reference frame.
+ encode_ref_frame( w, xd, segment_id, rf,
+ cpi->prob_intra_coded,
+ prob_last_coded, prob_gf_coded );
+
if (rf == INTRA_FRAME)
{
-#if CONFIG_SEGFEATURES
- // Is the segment coding of reference frame enabled
- if ( !segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) )
-#endif
- {
- vp8_write(w, 0, cpi->prob_intra_coded);
- }
-
-#ifdef ENTROPY_STATS
+ #ifdef ENTROPY_STATS
active_section = 6;
-#endif
+ #endif
+
+#if CONFIG_SEGFEATURES
+ if ( !segfeature_active( xd, segment_id, SEG_LVL_MODE ) )
+ write_ymode(w, mode, pc->fc.ymode_prob);
+#else
write_ymode(w, mode, pc->fc.ymode_prob);
+#endif
if (mode == B_PRED)
{
@@ -1062,28 +1151,11 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
write_uv_mode(w, mi->uv_mode, pc->fc.uv_mode_prob);
}
- else /* inter coded */
+ else
{
int_mv best_mv;
vp8_prob mv_ref_p [VP8_MVREFS-1];
-#if CONFIG_SEGFEATURES
- // Test to see if segment level coding of ref frame is enabled
- if ( !segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) )
-#endif
- {
- vp8_write(w, 1, cpi->prob_intra_coded);
-
- if (rf == LAST_FRAME)
- vp8_write(w, 0, prob_last_coded);
- else
- {
- vp8_write(w, 1, prob_last_coded);
- vp8_write(w, (rf == GOLDEN_FRAME)
- ? 0 : 1, prob_gf_coded);
- }
- }
-
{
int_mv n1, n2;
int ct[4];
@@ -1103,10 +1175,13 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi)
#if CONFIG_SEGFEATURES
// Is the segment coding of reference frame enabled
if ( !segfeature_active( xd, segment_id, SEG_LVL_MODE ) )
-#endif
{
write_mv_ref(w, mode, mv_ref_p);
-
+ }
+#else
+ write_mv_ref(w, mode, mv_ref_p);
+#endif
+ {
switch (mode) /* new, split require MVs */
{
case NEWMV:
@@ -1913,7 +1988,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
oh.version = pc->version;
oh.first_partition_length_in_bytes = 0;
- mb_feature_data_bits = vp8_mb_feature_data_bits;
+ mb_feature_data_bits = vp8_seg_feature_data_bits;
cx_data += 3;
#if defined(SECTIONBITS_OUTPUT)
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c
index ec679846e..7192ae539 100644
--- a/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@ -1584,11 +1584,12 @@ int vp8cx_encode_inter_macroblock
int intra_error = 0;
int rate;
int distortion;
+ int segment_id = xd->mode_info_context->mbmi.segment_id;
x->skip = 0;
if (xd->segmentation_enabled)
- x->encode_breakout = cpi->segment_encode_breakout[xd->mode_info_context->mbmi.segment_id];
+ x->encode_breakout = cpi->segment_encode_breakout[segment_id];
else
x->encode_breakout = cpi->oxcf.encode_breakout;
@@ -1650,7 +1651,7 @@ int vp8cx_encode_inter_macroblock
if (cpi->cyclic_refresh_mode_enabled)
{
// Clear segment_id back to 0 if not coded (last frame 0,0)
- if ( (xd->mode_info_context->mbmi.segment_id == 1) &&
+ if ( (segment_id == 1) &&
( (xd->mode_info_context->mbmi.ref_frame != LAST_FRAME) ||
(xd->mode_info_context->mbmi.mode != ZEROMV) ) )
{
@@ -1711,10 +1712,20 @@ int vp8cx_encode_inter_macroblock
}
#if CONFIG_SEGFEATURES
- // Dont increment usage count if ref frame coded at segment level
- if ( !segfeature_active( xd, xd->mode_info_context->mbmi.segment_id,
- SEG_LVL_REF_FRAME ) )
+
+ // If we have just a single reference frame coded for a segment then
+ // exclude from the reference frame counts used to work out
+ // probabilities. NOTE: At the moment we dont support custom trees
+ // for the reference frame coding for each segment but this is a
+ // possible future action.
+ if ( !segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) ||
+ ( ( check_segref( xd, segment_id, INTRA_FRAME ) +
+ check_segref( xd, segment_id, LAST_FRAME ) +
+ check_segref( xd, segment_id, GOLDEN_FRAME ) +
+ check_segref( xd, segment_id, ALTREF_FRAME ) ) > 1 ) )
+ {
cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame]++;
+ }
#else
cpi->count_mb_ref_frame_usage[xd->mode_info_context->mbmi.ref_frame] ++;
#endif
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c
index 35b45673c..ee3a59eeb 100644
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -531,7 +531,8 @@ static void init_seg_features(VP8_COMP *cpi)
xd->update_mb_segmentation_map = 1;
xd->update_mb_segmentation_data = 1;
- xd->segment_feature_data[1][SEG_LVL_ALT_Q] = -3;
+ xd->segment_feature_data[1][SEG_LVL_ALT_Q] =
+ -(2+(cpi->ni_av_qi >> 3));
xd->segment_feature_data[1][SEG_LVL_ALT_LF] = -2;
enable_segfeature(xd, 1, SEG_LVL_ALT_Q);
@@ -563,8 +564,7 @@ static void init_seg_features(VP8_COMP *cpi)
if ( high_q )
{
- xd->segment_feature_data[1]
- [SEG_LVL_REF_FRAME] = ALTREF_FRAME;
+ set_segref(xd, 1, ALTREF_FRAME);
xd->segment_feature_data[1][SEG_LVL_MODE] = ZEROMV;
xd->segment_feature_data[1][SEG_LVL_EOB] = 0;
@@ -598,10 +598,12 @@ static void init_seg_features(VP8_COMP *cpi)
enable_segfeature(xd, 0, SEG_LVL_REF_FRAME);
enable_segfeature(xd, 0, SEG_LVL_MODE);
- // All mbs should use ALTREF_FRAME, ZEROMV
- xd->segment_feature_data[0][SEG_LVL_REF_FRAME] = ALTREF_FRAME;
+ // All mbs should use ALTREF_FRAME, ZEROMV exclusively
+ clear_segref(xd, 0);
+ set_segref(xd, 0, ALTREF_FRAME);
+ clear_segref(xd, 1);
+ set_segref(xd, 1, ALTREF_FRAME);
xd->segment_feature_data[0][SEG_LVL_MODE] = ZEROMV;
- xd->segment_feature_data[1][SEG_LVL_REF_FRAME] = ALTREF_FRAME;
xd->segment_feature_data[1][SEG_LVL_MODE] = ZEROMV;
// Skip all MBs if high Q
diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c
index cb7a4859b..3eb446e1c 100644
--- a/vp8/encoder/pickinter.c
+++ b/vp8/encoder/pickinter.c
@@ -527,9 +527,11 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset,
{
unsigned char segment_id = xd->mode_info_context->mbmi.segment_id;
- if ( segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) &&
- ( xd->mode_info_context->mbmi.ref_frame !=
- xd->segment_feature_data[segment_id][SEG_LVL_REF_FRAME]))
+ // If the segment reference frame feature is enabled....
+ // then do nothing if the current ref frame is not allowed..
+ if ( segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) &&
+ !check_segref( xd, segment_id,
+ xd->mode_info_context->mbmi.ref_frame ) )
{
continue;
}
diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c
index 2e52a00dc..644739371 100644
--- a/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@ -2130,9 +2130,11 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int
{
unsigned char segment_id = xd->mode_info_context->mbmi.segment_id;
- if ( segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) &&
- ( xd->mode_info_context->mbmi.ref_frame !=
- xd->segment_feature_data[segment_id][SEG_LVL_REF_FRAME]))
+ // If the segment reference frame feature is enabled....
+ // then do nothing if the current ref frame is not allowed..
+ if ( segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) &&
+ !check_segref( xd, segment_id,
+ xd->mode_info_context->mbmi.ref_frame ) )
{
continue;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 03:30:52 +0000