Merge COMPRED

Merged in most of the current common prediction changes
that were under the #if CONFIG_COMPRED option.

Change-Id: If4e6f61dbe7b86dd449f6effbe93b5eb7e893885

4 files changed, 0 insertions, 27 deletions

diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h
index cf996af1f..15b5da29f 100644
--- a/vp8/common/blockd.h
+++ b/vp8/common/blockd.h
@@ -193,10 +193,7 @@ typedef struct
 
     // Flags used for prediction status of various bistream signals
     unsigned char seg_id_predicted;
-
-#if CONFIG_COMPRED
     unsigned char ref_predicted;
-#endif
 
     // Indicates if the mb is part of the image (1) vs border (0)
     // This can be useful in determining whether the MB provides
diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h
index d6f5b1315..c424b2a4d 100644
--- a/vp8/common/onyxc_int.h
+++ b/vp8/common/onyxc_int.h
@@ -49,11 +49,7 @@ void vp8_initialize_common(void);
 #define MAX_PARTITIONS 9
 
 #if CONFIG_DUALPRED
-#if CONFIG_COMPRED
 #define DUAL_PRED_CONTEXTS   2
-#else
-#define DUAL_PRED_CONTEXTS   3
-#endif
 #endif /* CONFIG_DUALPRED */
 
 typedef struct frame_contexts
@@ -242,12 +238,10 @@ typedef struct VP8Common
     vp8_prob segment_pred_probs[PREDICTION_PROBS];
     unsigned char temporal_update;
 
-#if CONFIG_COMPRED
     // Context probabilities for reference frame prediction
     unsigned char ref_scores[MAX_REF_FRAMES];
     vp8_prob ref_pred_probs[PREDICTION_PROBS];
     vp8_prob mod_refprobs[MAX_REF_FRAMES][PREDICTION_PROBS];
-#endif
 
 #if CONFIG_DUALPRED
     vp8_prob prob_dualpred[DUAL_PRED_CONTEXTS];
diff --git a/vp8/common/pred_common.c b/vp8/common/pred_common.c
index 6d8256812..c7d303c5d 100644
--- a/vp8/common/pred_common.c
+++ b/vp8/common/pred_common.c
@@ -32,7 +32,6 @@ unsigned char get_pred_context( VP8_COMMON *const cm,
         break;
 
 
-#if CONFIG_COMPRED
     case PRED_REF:
         pred_context = (m - 1)->mbmi.ref_predicted +
                        (m - cm->mode_info_stride)->mbmi.ref_predicted;
@@ -58,7 +57,6 @@ unsigned char get_pred_context( VP8_COMMON *const cm,
             pred_context = 1;
 
         break;
-#endif
 
     default:
         // TODO *** add error trap code.
@@ -87,7 +85,6 @@ vp8_prob get_pred_prob( VP8_COMMON *const cm,
         pred_probability = cm->segment_pred_probs[pred_context];
         break;
 
-#if CONFIG_COMPRED
     case PRED_REF:
         pred_probability = cm->ref_pred_probs[pred_context];
         break;
@@ -98,7 +95,6 @@ vp8_prob get_pred_prob( VP8_COMMON *const cm,
         // probability of dual pred off.
         pred_probability = cm->prob_dualpred[pred_context];
         break;
-#endif
 
     default:
         // TODO *** add error trap code.
@@ -122,12 +118,9 @@ unsigned char get_pred_flag( MACROBLOCKD *const xd,
         pred_flag = xd->mode_info_context->mbmi.seg_id_predicted;
         break;
 
-#if CONFIG_COMPRED
-
     case PRED_REF:
         pred_flag = xd->mode_info_context->mbmi.ref_predicted;
         break;
-#endif
 
     default:
         // TODO *** add error trap code.
@@ -150,12 +143,9 @@ void set_pred_flag( MACROBLOCKD *const xd,
         xd->mode_info_context->mbmi.seg_id_predicted = pred_flag;
         break;
 
-#if CONFIG_COMPRED
-
     case PRED_REF:
         xd->mode_info_context->mbmi.ref_predicted = pred_flag;
         break;
-#endif
 
     default:
         // TODO *** add error trap code.
@@ -175,7 +165,6 @@ unsigned char get_pred_mb_segid( VP8_COMMON *const cm, int MbIndex )
     return cm->last_frame_seg_map[MbIndex];
 }
 
-#if CONFIG_COMPRED
 MV_REFERENCE_FRAME get_pred_ref( VP8_COMMON *const cm,
                                  MACROBLOCKD *const xd )
 {
@@ -348,4 +337,3 @@ void compute_mod_refprobs( VP8_COMMON *const cm )
     cm->ref_scores[GOLDEN_FRAME] = 1 + (gf_count * 16 / 255);
     cm->ref_scores[ALTREF_FRAME] = 1 + (arf_count * 16 / 255);
 }
-#endif
diff --git a/vp8/common/pred_common.h b/vp8/common/pred_common.h
index 94a9ffe2d..2548dc9a6 100644
--- a/vp8/common/pred_common.h
+++ b/vp8/common/pred_common.h
@@ -20,11 +20,8 @@
 typedef enum
 {
     PRED_SEG_ID = 0,               // Segment identifier
-
-#if CONFIG_COMPRED
     PRED_REF = 1,
     PRED_DUAL = 2
-#endif
 
 } PRED_ID;
 
@@ -47,11 +44,8 @@ extern void set_pred_flag( MACROBLOCKD *const xd,
 
 extern unsigned char get_pred_mb_segid( VP8_COMMON *const cm, int MbIndex );
 
-#if CONFIG_COMPRED
 extern MV_REFERENCE_FRAME get_pred_ref( VP8_COMMON *const cm,
                                         MACROBLOCKD *const xd );
 extern void compute_mod_refprobs( VP8_COMMON *const cm );
 
-#endif
-
 #endif /* __INC_PRED_COMMON_H__ */