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

Fix a compiler warning in ext-inter experiment

Browse Source 
Change-Id: If36417c1384646da57453344b208e7653a4d31e5
This commit is contained in:
Debargha Mukherjee
2016-10-04 13:10:23 -07:00
parent 1a16a987ee
commit cb603790b0
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
av1/common/reconinter.c
View File

@@ -1788,12 +1788,6 @@ static void build_intra_predictors_for_interintra(MACROBLOCKD *xd, uint8_t *ref,
} }
} }
// Mapping of interintra to intra mode for use in the intra component
static const int interintra_to_intra_mode[INTERINTRA_MODES] = {
DC_PRED, V_PRED, H_PRED, D45_PRED, D135_PRED,
D117_PRED, D153_PRED, D207_PRED, D63_PRED, TM_PRED
};
void av1_build_intra_predictors_for_interintra(MACROBLOCKD *xd, void av1_build_intra_predictors_for_interintra(MACROBLOCKD *xd,
BLOCK_SIZE bsize, int plane, BLOCK_SIZE bsize, int plane,
uint8_t *dst, int dst_stride) { uint8_t *dst, int dst_stride) {

14
av1/common/reconintra.h
View File

@@ -28,6 +28,20 @@ void av1_predict_intra_block(const MACROBLOCKD *xd, int bwl_in, int bhl_in,
#if CONFIG_EXT_INTRA #if CONFIG_EXT_INTRA
int av1_is_intra_filter_switchable(int angle); int av1_is_intra_filter_switchable(int angle);
#endif // CONFIG_EXT_INTRA #endif // CONFIG_EXT_INTRA
#if CONFIG_EXT_INTER
// Mapping of interintra to intra mode for use in the intra component
static const PREDICTION_MODE interintra_to_intra_mode[INTERINTRA_MODES] = {
DC_PRED, V_PRED, H_PRED, D45_PRED, D135_PRED,
D117_PRED, D153_PRED, D207_PRED, D63_PRED, TM_PRED
};
// Mapping of intra mode to the interintra mode
static const INTERINTRA_MODE intra_to_interintra_mode[INTRA_MODES] = {
II_DC_PRED, II_V_PRED, II_H_PRED, II_D45_PRED, II_D135_PRED,
II_D117_PRED, II_D153_PRED, II_D207_PRED, II_D63_PRED, II_TM_PRED
};
#endif // CONFIG_EXT_INTER
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif

4
av1/encoder/rdopt.c
View File

@@ -8738,7 +8738,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
} }
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
mbmi->interintra_mode = (PREDICTION_MODE)(DC_PRED - 1); mbmi->interintra_mode = (INTERINTRA_MODE)(II_DC_PRED - 1);
#endif // CONFIG_EXT_INTER #endif // CONFIG_EXT_INTER
if (ref_frame == INTRA_FRAME) { if (ref_frame == INTRA_FRAME) {
@@ -8892,7 +8892,7 @@ void av1_rd_pick_inter_mode_sb(AV1_COMP *cpi, TileDataEnc *tile_data,
#if CONFIG_EXT_INTER #if CONFIG_EXT_INTER
if (second_ref_frame == INTRA_FRAME) { if (second_ref_frame == INTRA_FRAME) {
if (best_single_inter_ref != ref_frame) continue; if (best_single_inter_ref != ref_frame) continue;
mbmi->interintra_mode = best_intra_mode; mbmi->interintra_mode = intra_to_interintra_mode[best_intra_mode];
#if CONFIG_EXT_INTRA #if CONFIG_EXT_INTRA
// TODO(debargha|geza.lore): // TODO(debargha|geza.lore):
// Should we use ext_intra modes for interintra? // Should we use ext_intra modes for interintra?