hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-28 03:34:06 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix coverity warning.

Browse source 
- Dead code due to current value of MRG_MAX_NUM_CANDS. Not sure if this
  fix will work but I think it looks better.
This commit is contained in:
Ari Koivula 2015-05-05 10:06:18 +03:00
parent cf2a406aba
commit e225c5b302
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/inter.c
View file

@ -741,16 +741,13 @@ uint8_t inter_get_merge_cand(const encoder_state_t * const state, int32_t x, int
} }
} }
#if ENABLE_TEMPORAL_MVP #if ENABLE_TEMPORAL_MVP
if(candidates < AMVP_MAX_NUM_CANDS) { if(candidates < AMVP_MAX_NUM_CANDS) {
//TODO: add temporal mv predictor //TODO: add temporal mv predictor
} }
#endif #endif
if (candidates == MRG_MAX_NUM_CANDS) return MRG_MAX_NUM_CANDS; if (candidates < MRG_MAX_NUM_CANDS && state->global->slicetype == SLICE_B) {
if (state->global->slicetype == SLICE_B) {
#define NUM_PRIORITY_LIST 12; #define NUM_PRIORITY_LIST 12;
static const uint8_t priorityList0[] = { 0, 1, 0, 2, 1, 2, 0, 3, 1, 3, 2, 3 }; static const uint8_t priorityList0[] = { 0, 1, 0, 2, 1, 2, 0, 3, 1, 3, 2, 3 };
static const uint8_t priorityList1[] = { 1, 0, 2, 0, 2, 1, 3, 0, 3, 1, 3, 2 }; static const uint8_t priorityList1[] = { 1, 0, 2, 0, 2, 1, 3, 0, 3, 1, 3, 2 };
@ -783,11 +780,9 @@ uint8_t inter_get_merge_cand(const encoder_state_t * const state, int32_t x, int
} }
} }
if (candidates == MRG_MAX_NUM_CANDS) return MRG_MAX_NUM_CANDS;
int num_ref = state->global->ref->used_size; int num_ref = state->global->ref->used_size;
if (state->global->slicetype == SLICE_B) { if (candidates < MRG_MAX_NUM_CANDS && state->global->slicetype == SLICE_B) {
int j; int j;
int ref_negative = 0; int ref_negative = 0;
int ref_positive = 0; int ref_positive = 0;