Commit cdf4a3bc authored by Michael Bradshaw's avatar Michael Bradshaw Committed by Ronald S. Bultje
Browse files

Allow skip mode

parent dfcd6ea9
...@@ -933,19 +933,20 @@ static int parse_frame_hdr(Dav1dContext *const c, GetBits *const gb) { ...@@ -933,19 +933,20 @@ static int parse_frame_hdr(Dav1dContext *const c, GetBits *const gb) {
off_after = refpoc; off_after = refpoc;
off_after_idx = i; off_after_idx = i;
} }
} else if (diff < 0) { } else if (diff < 0 && (off_before[0] == 0xFFFFFFFFU ||
if (off_before[0] == 0xFFFFFFFFU || get_poc_diff(seqhdr->order_hint_n_bits,
get_poc_diff(seqhdr->order_hint_n_bits, refpoc, off_before[0]) > 0))
refpoc, off_before[0]) > 0) {
{ off_before[1] = off_before[0];
off_before[1] = off_before[0]; off_before[0] = refpoc;
off_before[0] = refpoc; off_before_idx[1] = off_before_idx[0];
off_before_idx[1] = off_before_idx[0]; off_before_idx[0] = i;
off_before_idx[0] = i; } else if (off_before[0] != 0xFFFFFFFFU) {
} else if (refpoc != off_before[0] && const int diff = get_poc_diff(seqhdr->order_hint_n_bits,
(off_before[1] == 0xFFFFFFFFU || refpoc, off_before[0]);
get_poc_diff(seqhdr->order_hint_n_bits, if (diff < 0 && (off_before[1] == 0xFFFFFFFFU ||
refpoc, off_before[1]) > 0)) get_poc_diff(seqhdr->order_hint_n_bits,
refpoc, off_before[1]) > 0))
{ {
off_before[1] = refpoc; off_before[1] = refpoc;
off_before_idx[1] = i; off_before_idx[1] = i;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment