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

Zero merge candidate fix for B-frames

Browse source
This commit is contained in:
Marko Viitanen 2015-03-20 10:33:05 +02:00
parent 0c1aa6f73c
commit 26082d5328
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/inter.c
View file

@ -604,6 +604,7 @@ uint8_t inter_get_merge_cand(const encoder_state_t * const state, int32_t x, int
for (int32_t idx = 0; idx<cutoff*(cutoff - 1) && candidates != MRG_MAX_NUM_CANDS; idx++) { for (int32_t idx = 0; idx<cutoff*(cutoff - 1) && candidates != MRG_MAX_NUM_CANDS; idx++) {
uint8_t i = priorityList0[idx]; uint8_t i = priorityList0[idx];
uint8_t j = priorityList1[idx]; uint8_t j = priorityList1[idx];
if (i >= candidates || j >= candidates) break;
// Find one L0 and L1 candidate according to the priority list // Find one L0 and L1 candidate according to the priority list
if ((mv_cand[i].dir & 0x1) && (mv_cand[j].dir & 0x2)) { if ((mv_cand[i].dir & 0x1) && (mv_cand[j].dir & 0x2)) {
@ -626,11 +627,31 @@ 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;
if (state->global->slicetype == SLICE_B) {
int j;
int ref_negative = 0;
int ref_positive = 0;
for (j = 0; j < state->global->ref->used_size; j++) {
if (state->global->ref->images[j]->poc < state->global->poc) {
ref_negative++;
} else {
ref_positive++;
}
if (!ref_negative) ref_negative = 1;
if (!ref_positive) ref_positive = 1;
}
num_ref = MIN(ref_negative, ref_positive);
}
// Add (0,0) prediction // Add (0,0) prediction
if (candidates != MRG_MAX_NUM_CANDS) { while (candidates != MRG_MAX_NUM_CANDS) {
mv_cand[candidates].mv[0][0] = 0; mv_cand[candidates].mv[0][0] = 0;
mv_cand[candidates].mv[0][1] = 0; mv_cand[candidates].mv[0][1] = 0;
mv_cand[candidates].ref = zero_idx; mv_cand[candidates].ref = (zero_idx>=num_ref-1)?0:zero_idx;
mv_cand[candidates].dir = 1; mv_cand[candidates].dir = 1;
if (state->global->slicetype == SLICE_B) { if (state->global->slicetype == SLICE_B) {
mv_cand[candidates].mv[1][0] = 0; mv_cand[candidates].mv[1][0] = 0;

2
src/search.c
View file

@ -701,6 +701,8 @@ static int search_cu_inter(const encoder_state_t * const state, int x, int y, in
mvd.y = mv.y - mv_cand[cu_mv_cand][1]; mvd.y = mv.y - mv_cand[cu_mv_cand][1];
if(temp_cost < cur_cu->inter.cost) { if(temp_cost < cur_cu->inter.cost) {
// Map reference index to L0/L1 pictures
cur_cu->inter.mv_dir = state->global->refmap[ref_idx].list; cur_cu->inter.mv_dir = state->global->refmap[ref_idx].list;
cur_cu->inter.mv_ref_coded = state->global->refmap[ref_idx].idx; cur_cu->inter.mv_ref_coded = state->global->refmap[ref_idx].idx;