2010-05-18 17:58:33 +02:00
|
|
|
/*
|
2010-09-09 14:16:39 +02:00
|
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
2010-05-18 17:58:33 +02:00
|
|
|
*
|
2010-06-18 18:39:21 +02:00
|
|
|
* Use of this source code is governed by a BSD-style license
|
2010-06-04 22:19:40 +02:00
|
|
|
* that can be found in the LICENSE file in the root of the source
|
|
|
|
* tree. An additional intellectual property rights grant can be found
|
2010-06-18 18:39:21 +02:00
|
|
|
* in the file PATENTS. All contributing project authors may
|
2010-06-04 22:19:40 +02:00
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
2010-05-18 17:58:33 +02:00
|
|
|
*/
|
|
|
|
|
2013-04-09 04:07:29 +02:00
|
|
|
#include <assert.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <limits.h>
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-05-29 03:07:54 +02:00
|
|
|
#include "vpx/vpx_encoder.h"
|
|
|
|
#include "vpx_mem/vpx_mem.h"
|
|
|
|
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_entropymode.h"
|
2012-12-10 13:38:48 +01:00
|
|
|
#include "vp9/common/vp9_entropymv.h"
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_findnearmv.h"
|
2013-02-07 00:30:21 +01:00
|
|
|
#include "vp9/common/vp9_tile_common.h"
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_seg_common.h"
|
|
|
|
#include "vp9/common/vp9_pred_common.h"
|
|
|
|
#include "vp9/common/vp9_entropy.h"
|
|
|
|
#include "vp9/common/vp9_entropymv.h"
|
|
|
|
#include "vp9/common/vp9_mvref_common.h"
|
Consistently use get_prob(), clip_prob() and newly added clip_pixel().
Add a function clip_pixel() to clip a pixel value to the [0,255] range
of allowed values, and use this where-ever appropriate (e.g. prediction,
reconstruction). Likewise, consistently use the recently added function
clip_prob(), which calculates a binary probability in the [1,255] range.
If possible, try to use get_prob() or its sister get_binary_prob() to
calculate binary probabilities, for consistency.
Since in some places, this means that binary probability calculations
are changed (we use {255,256}*count0/(total) in a range of places,
and all of these are now changed to use 256*count0+(total>>1)/total),
this changes the encoding result, so this patch warrants some extensive
testing.
Change-Id: Ibeeff8d886496839b8e0c0ace9ccc552351f7628
2012-12-10 21:09:07 +01:00
|
|
|
#include "vp9/common/vp9_treecoder.h"
|
2013-05-29 03:07:54 +02:00
|
|
|
#include "vp9/common/vp9_systemdependent.h"
|
|
|
|
#include "vp9/common/vp9_pragmas.h"
|
|
|
|
|
|
|
|
#include "vp9/encoder/vp9_mcomp.h"
|
|
|
|
#include "vp9/encoder/vp9_encodemv.h"
|
|
|
|
#include "vp9/encoder/vp9_bitstream.h"
|
|
|
|
#include "vp9/encoder/vp9_segmentation.h"
|
|
|
|
#include "vp9/encoder/vp9_write_bit_buffer.h"
|
|
|
|
|
2012-08-24 16:44:01 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
#if defined(SECTIONBITS_OUTPUT)
|
|
|
|
unsigned __int64 Sectionbits[500];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef ENTROPY_STATS
|
2013-05-31 01:21:48 +02:00
|
|
|
int intra_mode_stats[VP9_INTRA_MODES]
|
|
|
|
[VP9_INTRA_MODES]
|
|
|
|
[VP9_INTRA_MODES];
|
2013-05-31 18:18:59 +02:00
|
|
|
vp9_coeff_stats tree_update_hist[TX_SIZE_MAX_SB][BLOCK_TYPES];
|
2012-05-15 01:21:01 +02:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
extern unsigned int active_section;
|
|
|
|
#endif
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
#define vp9_cost_upd ((int)(vp9_cost_one(upd) - vp9_cost_zero(upd)) >> 8)
|
|
|
|
#define vp9_cost_upd256 ((int)(vp9_cost_one(upd) - vp9_cost_zero(upd)))
|
2012-04-12 18:24:03 +02:00
|
|
|
|
|
|
|
static int update_bits[255];
|
|
|
|
|
2013-04-17 01:26:25 +02:00
|
|
|
static INLINE void write_le32(uint8_t *p, int value) {
|
|
|
|
p[0] = value;
|
|
|
|
p[1] = value >> 8;
|
|
|
|
p[2] = value >> 16;
|
|
|
|
p[3] = value >> 24;
|
|
|
|
}
|
|
|
|
|
2013-06-06 21:33:12 +02:00
|
|
|
|
2013-05-21 01:23:19 +02:00
|
|
|
|
|
|
|
int recenter_nonneg(int v, int m) {
|
|
|
|
if (v > (m << 1))
|
|
|
|
return v;
|
|
|
|
else if (v >= m)
|
|
|
|
return ((v - m) << 1);
|
|
|
|
else
|
|
|
|
return ((m - v) << 1) - 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int get_unsigned_bits(unsigned num_values) {
|
|
|
|
int cat = 0;
|
|
|
|
if ((num_values--) <= 1) return 0;
|
|
|
|
while (num_values > 0) {
|
|
|
|
cat++;
|
|
|
|
num_values >>= 1;
|
|
|
|
}
|
|
|
|
return cat;
|
|
|
|
}
|
|
|
|
|
2013-06-06 21:33:12 +02:00
|
|
|
void vp9_encode_unsigned_max(struct vp9_write_bit_buffer *wb,
|
|
|
|
int data, int max) {
|
|
|
|
vp9_wb_write_literal(wb, data, get_unsigned_bits(max));
|
|
|
|
}
|
|
|
|
|
2013-05-21 01:23:19 +02:00
|
|
|
void encode_uniform(vp9_writer *w, int v, int n) {
|
|
|
|
int l = get_unsigned_bits(n);
|
|
|
|
int m;
|
|
|
|
if (l == 0)
|
|
|
|
return;
|
|
|
|
m = (1 << l) - n;
|
|
|
|
if (v < m) {
|
|
|
|
vp9_write_literal(w, v, l - 1);
|
|
|
|
} else {
|
|
|
|
vp9_write_literal(w, m + ((v - m) >> 1), l - 1);
|
|
|
|
vp9_write_literal(w, (v - m) & 1, 1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int count_uniform(int v, int n) {
|
|
|
|
int l = get_unsigned_bits(n);
|
|
|
|
int m;
|
|
|
|
if (l == 0) return 0;
|
|
|
|
m = (1 << l) - n;
|
|
|
|
if (v < m)
|
|
|
|
return l - 1;
|
|
|
|
else
|
|
|
|
return l;
|
|
|
|
}
|
|
|
|
|
|
|
|
void encode_term_subexp(vp9_writer *w, int word, int k, int num_syms) {
|
|
|
|
int i = 0;
|
|
|
|
int mk = 0;
|
|
|
|
while (1) {
|
|
|
|
int b = (i ? k + i - 1 : k);
|
|
|
|
int a = (1 << b);
|
|
|
|
if (num_syms <= mk + 3 * a) {
|
|
|
|
encode_uniform(w, word - mk, num_syms - mk);
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
int t = (word >= mk + a);
|
|
|
|
vp9_write_literal(w, t, 1);
|
|
|
|
if (t) {
|
|
|
|
i = i + 1;
|
|
|
|
mk += a;
|
|
|
|
} else {
|
|
|
|
vp9_write_literal(w, word - mk, b);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
int count_term_subexp(int word, int k, int num_syms) {
|
|
|
|
int count = 0;
|
|
|
|
int i = 0;
|
|
|
|
int mk = 0;
|
|
|
|
while (1) {
|
|
|
|
int b = (i ? k + i - 1 : k);
|
|
|
|
int a = (1 << b);
|
|
|
|
if (num_syms <= mk + 3 * a) {
|
|
|
|
count += count_uniform(word - mk, num_syms - mk);
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
int t = (word >= mk + a);
|
|
|
|
count++;
|
|
|
|
if (t) {
|
|
|
|
i = i + 1;
|
|
|
|
mk += a;
|
|
|
|
} else {
|
|
|
|
count += b;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
static void compute_update_table() {
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < 255; i++)
|
2013-05-21 01:23:19 +02:00
|
|
|
update_bits[i] = count_term_subexp(i, SUBEXP_PARAM, 255);
|
2012-04-12 18:24:03 +02:00
|
|
|
}
|
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
static int split_index(int i, int n, int modulus) {
|
|
|
|
int max1 = (n - 1 - modulus / 2) / modulus + 1;
|
|
|
|
if (i % modulus == modulus / 2) i = i / modulus;
|
|
|
|
else i = max1 + i - (i + modulus - modulus / 2) / modulus;
|
|
|
|
return i;
|
2012-05-03 11:22:26 +02:00
|
|
|
}
|
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
static int remap_prob(int v, int m) {
|
|
|
|
const int n = 256;
|
|
|
|
const int modulus = MODULUS_PARAM;
|
|
|
|
int i;
|
|
|
|
if ((m << 1) <= n)
|
2013-05-21 01:23:19 +02:00
|
|
|
i = recenter_nonneg(v, m) - 1;
|
2012-07-14 00:21:29 +02:00
|
|
|
else
|
2013-05-21 01:23:19 +02:00
|
|
|
i = recenter_nonneg(n - 1 - v, n - 1 - m) - 1;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
i = split_index(i, n - 1, modulus);
|
|
|
|
return i;
|
2012-04-12 18:24:03 +02:00
|
|
|
}
|
2012-05-03 11:22:26 +02:00
|
|
|
|
2013-05-21 01:23:19 +02:00
|
|
|
static void write_prob_diff_update(vp9_writer *w,
|
2012-10-31 22:40:53 +01:00
|
|
|
vp9_prob newp, vp9_prob oldp) {
|
2012-07-14 00:21:29 +02:00
|
|
|
int delp = remap_prob(newp, oldp);
|
2013-05-21 01:23:19 +02:00
|
|
|
encode_term_subexp(w, delp, SUBEXP_PARAM, 255);
|
2012-05-03 11:22:26 +02:00
|
|
|
}
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static int prob_diff_update_cost(vp9_prob newp, vp9_prob oldp) {
|
2012-07-14 00:21:29 +02:00
|
|
|
int delp = remap_prob(newp, oldp);
|
|
|
|
return update_bits[delp] * 256;
|
2012-05-03 11:22:26 +02:00
|
|
|
}
|
2012-03-29 00:19:45 +02:00
|
|
|
|
2012-03-19 19:02:04 +01:00
|
|
|
static int prob_update_savings(const unsigned int *ct,
|
2012-10-31 22:40:53 +01:00
|
|
|
const vp9_prob oldp, const vp9_prob newp,
|
|
|
|
const vp9_prob upd) {
|
|
|
|
const int old_b = cost_branch256(ct, oldp);
|
|
|
|
const int new_b = cost_branch256(ct, newp);
|
|
|
|
const int update_b = 2048 + vp9_cost_upd256;
|
2013-04-27 01:46:17 +02:00
|
|
|
return old_b - new_b - update_b;
|
2012-05-03 11:22:26 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static int prob_diff_update_savings_search(const unsigned int *ct,
|
2012-10-31 22:40:53 +01:00
|
|
|
const vp9_prob oldp, vp9_prob *bestp,
|
|
|
|
const vp9_prob upd) {
|
|
|
|
const int old_b = cost_branch256(ct, oldp);
|
2012-07-14 00:21:29 +02:00
|
|
|
int new_b, update_b, savings, bestsavings, step;
|
2012-10-31 22:40:53 +01:00
|
|
|
vp9_prob newp, bestnewp;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
bestsavings = 0;
|
|
|
|
bestnewp = oldp;
|
|
|
|
|
|
|
|
step = (*bestp > oldp ? -1 : 1);
|
|
|
|
for (newp = *bestp; newp != oldp; newp += step) {
|
2012-10-31 22:40:53 +01:00
|
|
|
new_b = cost_branch256(ct, newp);
|
|
|
|
update_b = prob_diff_update_cost(newp, oldp) + vp9_cost_upd256;
|
2012-07-14 00:21:29 +02:00
|
|
|
savings = old_b - new_b - update_b;
|
|
|
|
if (savings > bestsavings) {
|
|
|
|
bestsavings = savings;
|
|
|
|
bestnewp = newp;
|
2012-04-12 18:24:03 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
*bestp = bestnewp;
|
|
|
|
return bestsavings;
|
2012-03-19 19:02:04 +01:00
|
|
|
}
|
|
|
|
|
2013-03-13 19:03:17 +01:00
|
|
|
static int prob_diff_update_savings_search_model(const unsigned int *ct,
|
|
|
|
const vp9_prob *oldp,
|
|
|
|
vp9_prob *bestp,
|
|
|
|
const vp9_prob upd,
|
2013-05-17 15:40:25 +02:00
|
|
|
int b, int r) {
|
2013-03-13 19:03:17 +01:00
|
|
|
int i, old_b, new_b, update_b, savings, bestsavings, step;
|
|
|
|
int newp;
|
2013-05-17 15:40:25 +02:00
|
|
|
vp9_prob bestnewp, newplist[ENTROPY_NODES], oldplist[ENTROPY_NODES];
|
2013-05-22 16:28:29 +02:00
|
|
|
vp9_model_to_full_probs(oldp, oldplist);
|
|
|
|
vpx_memcpy(newplist, oldp, sizeof(vp9_prob) * UNCONSTRAINED_NODES);
|
2013-05-17 15:40:25 +02:00
|
|
|
for (i = UNCONSTRAINED_NODES, old_b = 0; i < ENTROPY_NODES; ++i)
|
|
|
|
old_b += cost_branch256(ct + 2 * i, oldplist[i]);
|
|
|
|
old_b += cost_branch256(ct + 2 * PIVOT_NODE, oldplist[PIVOT_NODE]);
|
2013-03-13 19:03:17 +01:00
|
|
|
|
|
|
|
bestsavings = 0;
|
2013-05-17 15:40:25 +02:00
|
|
|
bestnewp = oldp[PIVOT_NODE];
|
2013-03-13 19:03:17 +01:00
|
|
|
|
2013-05-17 15:40:25 +02:00
|
|
|
step = (*bestp > oldp[PIVOT_NODE] ? -1 : 1);
|
2013-03-13 19:03:17 +01:00
|
|
|
newp = *bestp;
|
2013-05-17 15:40:25 +02:00
|
|
|
for (; newp != oldp[PIVOT_NODE]; newp += step) {
|
2013-03-13 19:03:17 +01:00
|
|
|
if (newp < 1 || newp > 255) continue;
|
2013-05-17 15:40:25 +02:00
|
|
|
newplist[PIVOT_NODE] = newp;
|
2013-05-22 16:28:29 +02:00
|
|
|
vp9_model_to_full_probs(newplist, newplist);
|
2013-05-17 15:40:25 +02:00
|
|
|
for (i = UNCONSTRAINED_NODES, new_b = 0; i < ENTROPY_NODES; ++i)
|
2013-03-13 19:03:17 +01:00
|
|
|
new_b += cost_branch256(ct + 2 * i, newplist[i]);
|
2013-05-17 15:40:25 +02:00
|
|
|
new_b += cost_branch256(ct + 2 * PIVOT_NODE, newplist[PIVOT_NODE]);
|
|
|
|
update_b = prob_diff_update_cost(newp, oldp[PIVOT_NODE]) +
|
2013-03-13 19:03:17 +01:00
|
|
|
vp9_cost_upd256;
|
|
|
|
savings = old_b - new_b - update_b;
|
|
|
|
if (savings > bestsavings) {
|
|
|
|
bestsavings = savings;
|
|
|
|
bestnewp = newp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
*bestp = bestnewp;
|
|
|
|
return bestsavings;
|
|
|
|
}
|
|
|
|
|
2012-11-07 15:50:25 +01:00
|
|
|
static void vp9_cond_prob_update(vp9_writer *bc, vp9_prob *oldp, vp9_prob upd,
|
|
|
|
unsigned int *ct) {
|
|
|
|
vp9_prob newp;
|
|
|
|
int savings;
|
|
|
|
newp = get_binary_prob(ct[0], ct[1]);
|
2013-06-05 00:25:16 +02:00
|
|
|
assert(newp >= 1);
|
2012-11-07 15:50:25 +01:00
|
|
|
savings = prob_update_savings(ct, *oldp, newp, upd);
|
|
|
|
if (savings > 0) {
|
|
|
|
vp9_write(bc, 1, upd);
|
2013-04-17 01:23:17 +02:00
|
|
|
vp9_write_prob(bc, newp);
|
2012-11-07 15:50:25 +01:00
|
|
|
*oldp = newp;
|
|
|
|
} else {
|
|
|
|
vp9_write(bc, 0, upd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-05 00:25:16 +02:00
|
|
|
static void vp9_cond_prob_diff_update(vp9_writer *bc, vp9_prob *oldp,
|
|
|
|
vp9_prob upd,
|
|
|
|
unsigned int *ct) {
|
|
|
|
vp9_prob newp;
|
|
|
|
int savings;
|
|
|
|
newp = get_binary_prob(ct[0], ct[1]);
|
|
|
|
assert(newp >= 1);
|
|
|
|
savings = prob_diff_update_savings_search(ct, *oldp, &newp, upd);
|
|
|
|
if (savings > 0) {
|
|
|
|
vp9_write(bc, 1, upd);
|
|
|
|
write_prob_diff_update(bc, newp, *oldp);
|
|
|
|
*oldp = newp;
|
|
|
|
} else {
|
|
|
|
vp9_write(bc, 0, upd);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-05 19:42:52 +02:00
|
|
|
static void update_mode(
|
|
|
|
vp9_writer *w,
|
|
|
|
int n,
|
|
|
|
const struct vp9_token tok[/* n */],
|
|
|
|
vp9_tree tree,
|
|
|
|
vp9_prob Pnew[/* n-1 */],
|
|
|
|
vp9_prob Pcur[/* n-1 */],
|
|
|
|
unsigned int bct[/* n-1 */] [2],
|
|
|
|
const unsigned int num_events[/* n */]
|
|
|
|
) {
|
|
|
|
int i = 0;
|
|
|
|
|
|
|
|
vp9_tree_probs_from_distribution(tree, Pnew, bct, num_events, 0);
|
|
|
|
n--;
|
|
|
|
|
|
|
|
for (i = 0; i < n; ++i) {
|
|
|
|
vp9_cond_prob_diff_update(w, &Pcur[i], VP9_DEF_UPDATE_PROB, bct[i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_mbintra_mode_probs(VP9_COMP* const cpi,
|
|
|
|
vp9_writer* const bc) {
|
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
2013-06-03 19:39:40 +02:00
|
|
|
int j;
|
2013-06-05 19:42:52 +02:00
|
|
|
vp9_prob pnew[VP9_INTRA_MODES - 1];
|
|
|
|
unsigned int bct[VP9_INTRA_MODES - 1][2];
|
|
|
|
|
2013-06-03 19:39:40 +02:00
|
|
|
for (j = 0; j < BLOCK_SIZE_GROUPS; j++)
|
|
|
|
update_mode(bc, VP9_INTRA_MODES, vp9_intra_mode_encodings,
|
|
|
|
vp9_intra_mode_tree, pnew,
|
|
|
|
cm->fc.y_mode_prob[j], bct,
|
|
|
|
(unsigned int *)cpi->y_mode_count[j]);
|
2013-06-05 19:42:52 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void vp9_update_skip_probs(VP9_COMP *cpi) {
|
|
|
|
VP9_COMMON *const pc = &cpi->common;
|
|
|
|
int k;
|
|
|
|
|
|
|
|
for (k = 0; k < MBSKIP_CONTEXTS; ++k)
|
|
|
|
pc->mbskip_pred_probs[k] = get_binary_prob(cpi->skip_false_count[k],
|
|
|
|
cpi->skip_true_count[k]);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_intra_mode(vp9_writer *bc, int m, const vp9_prob *p) {
|
|
|
|
write_token(bc, vp9_intra_mode_tree, p, vp9_intra_mode_encodings + m);
|
|
|
|
}
|
|
|
|
|
2013-06-05 00:25:16 +02:00
|
|
|
static void update_switchable_interp_probs(VP9_COMMON *const pc,
|
|
|
|
vp9_writer* const bc) {
|
|
|
|
unsigned int branch_ct[VP9_SWITCHABLE_FILTERS + 1]
|
|
|
|
[VP9_SWITCHABLE_FILTERS - 1][2];
|
|
|
|
vp9_prob new_prob[VP9_SWITCHABLE_FILTERS + 1][VP9_SWITCHABLE_FILTERS - 1];
|
|
|
|
int i, j;
|
|
|
|
for (j = 0; j <= VP9_SWITCHABLE_FILTERS; ++j) {
|
|
|
|
vp9_tree_probs_from_distribution(
|
|
|
|
vp9_switchable_interp_tree,
|
|
|
|
new_prob[j], branch_ct[j],
|
|
|
|
pc->fc.switchable_interp_count[j], 0);
|
|
|
|
}
|
|
|
|
for (j = 0; j <= VP9_SWITCHABLE_FILTERS; ++j) {
|
|
|
|
for (i = 0; i < VP9_SWITCHABLE_FILTERS - 1; ++i) {
|
|
|
|
// vp9_cond_prob_update(bc, &pc->fc.switchable_interp_prob[j][i],
|
|
|
|
// VP9_DEF_UPDATE_PROB, branch_ct[j][i]);
|
|
|
|
vp9_cond_prob_diff_update(bc, &pc->fc.switchable_interp_prob[j][i],
|
|
|
|
VP9_DEF_UPDATE_PROB, branch_ct[j][i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void update_inter_mode_probs(VP9_COMMON *pc, vp9_writer* const bc) {
|
|
|
|
int i, j;
|
|
|
|
|
|
|
|
for (i = 0; i < INTER_MODE_CONTEXTS; i++) {
|
2013-06-05 20:21:44 +02:00
|
|
|
for (j = 0; j < VP9_INTER_MODES - 1; j++) {
|
2013-06-05 00:25:16 +02:00
|
|
|
vp9_cond_prob_diff_update(bc, &pc->fc.inter_mode_probs[i][j],
|
|
|
|
VP9_DEF_UPDATE_PROB,
|
|
|
|
pc->fc.inter_mode_counts[i][j]);
|
|
|
|
// vp9_cond_prob_update(
|
|
|
|
// bc, &pc->fc.inter_mode_probs[i][j],
|
|
|
|
// VP9_DEF_UPDATE_PROB, pc->fc.inter_mode_counts[i][j]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static void pack_mb_tokens(vp9_writer* const bc,
|
2012-10-16 22:52:39 +02:00
|
|
|
TOKENEXTRA **tp,
|
|
|
|
const TOKENEXTRA *const stop) {
|
|
|
|
TOKENEXTRA *p = *tp;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
while (p < stop) {
|
2013-04-19 01:18:08 +02:00
|
|
|
const int t = p->token;
|
2013-04-11 22:01:52 +02:00
|
|
|
const struct vp9_token *const a = vp9_coef_encodings + t;
|
2013-04-19 20:14:33 +02:00
|
|
|
const vp9_extra_bit *const b = vp9_extra_bits + t;
|
2012-07-14 00:21:29 +02:00
|
|
|
int i = 0;
|
2013-05-17 15:40:25 +02:00
|
|
|
const vp9_prob *pp;
|
2012-07-14 00:21:29 +02:00
|
|
|
int v = a->value;
|
2013-04-11 22:01:52 +02:00
|
|
|
int n = a->len;
|
2013-05-17 15:40:25 +02:00
|
|
|
vp9_prob probs[ENTROPY_NODES];
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-05-17 15:40:25 +02:00
|
|
|
if (t == EOSB_TOKEN) {
|
2012-10-16 22:52:39 +02:00
|
|
|
++p;
|
|
|
|
break;
|
|
|
|
}
|
2013-05-17 15:40:25 +02:00
|
|
|
if (t >= TWO_TOKEN) {
|
2013-05-22 16:28:29 +02:00
|
|
|
vp9_model_to_full_probs(p->context_tree, probs);
|
2013-05-17 15:40:25 +02:00
|
|
|
pp = probs;
|
|
|
|
} else {
|
|
|
|
pp = p->context_tree;
|
|
|
|
}
|
2013-03-28 18:42:23 +01:00
|
|
|
assert(pp != 0);
|
2012-10-16 22:52:39 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
/* skip one or two nodes */
|
2013-05-08 19:04:14 +02:00
|
|
|
#if !CONFIG_BALANCED_COEFTREE
|
2012-07-14 00:21:29 +02:00
|
|
|
if (p->skip_eob_node) {
|
|
|
|
n -= p->skip_eob_node;
|
|
|
|
i = 2 * p->skip_eob_node;
|
|
|
|
}
|
2013-05-08 19:04:14 +02:00
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
do {
|
|
|
|
const int bb = (v >> --n) & 1;
|
2013-05-08 19:04:14 +02:00
|
|
|
#if CONFIG_BALANCED_COEFTREE
|
|
|
|
if (i == 2 && p->skip_eob_node) {
|
|
|
|
i += 2;
|
|
|
|
assert(bb == 1);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
#endif
|
2013-04-09 04:07:29 +02:00
|
|
|
vp9_write(bc, bb, pp[i >> 1]);
|
2012-10-31 01:12:12 +01:00
|
|
|
i = vp9_coef_tree[i + bb];
|
2013-05-08 19:04:14 +02:00
|
|
|
} while (n);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
if (b->base_val) {
|
2013-04-19 20:14:33 +02:00
|
|
|
const int e = p->extra, l = b->len;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-19 20:14:33 +02:00
|
|
|
if (l) {
|
2013-05-17 15:40:25 +02:00
|
|
|
const unsigned char *pb = b->prob;
|
2012-07-14 00:21:29 +02:00
|
|
|
int v = e >> 1;
|
2013-04-19 20:14:33 +02:00
|
|
|
int n = l; /* number of bits in v, assumed nonzero */
|
2012-07-14 00:21:29 +02:00
|
|
|
int i = 0;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
do {
|
|
|
|
const int bb = (v >> --n) & 1;
|
2013-05-17 15:40:25 +02:00
|
|
|
vp9_write(bc, bb, pb[i >> 1]);
|
2012-07-14 00:21:29 +02:00
|
|
|
i = b->tree[i + bb];
|
|
|
|
} while (n);
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-09 04:07:29 +02:00
|
|
|
vp9_write_bit(bc, e & 1);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
++p;
|
|
|
|
}
|
|
|
|
|
2012-10-16 22:52:39 +02:00
|
|
|
*tp = p;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static void write_sb_mv_ref(vp9_writer *bc, MB_PREDICTION_MODE m,
|
|
|
|
const vp9_prob *p) {
|
2012-08-20 23:43:34 +02:00
|
|
|
#if CONFIG_DEBUG
|
2013-05-30 21:49:38 +02:00
|
|
|
assert(NEARESTMV <= m && m <= NEWMV);
|
2012-08-20 23:43:34 +02:00
|
|
|
#endif
|
2012-10-31 22:40:53 +01:00
|
|
|
write_token(bc, vp9_sb_mv_ref_tree, p,
|
|
|
|
vp9_sb_mv_ref_encoding_array - NEARESTMV + m);
|
2012-08-20 23:43:34 +02:00
|
|
|
}
|
|
|
|
|
2011-11-11 11:10:06 +01:00
|
|
|
// This function writes the current macro block's segnment id to the bitstream
|
|
|
|
// It should only be called if a segment map update is indicated.
|
2012-10-31 22:40:53 +01:00
|
|
|
static void write_mb_segid(vp9_writer *bc,
|
2012-08-15 12:00:53 +02:00
|
|
|
const MB_MODE_INFO *mi, const MACROBLOCKD *xd) {
|
2013-04-30 23:06:49 +02:00
|
|
|
if (xd->segmentation_enabled && xd->update_mb_segmentation_map)
|
|
|
|
treed_write(bc, vp9_segment_tree, xd->mb_segment_tree_probs,
|
|
|
|
mi->segment_id, 3);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2011-11-02 14:30:10 +01:00
|
|
|
// This function encodes the reference frame
|
2013-06-06 22:44:34 +02:00
|
|
|
static void encode_ref_frame(VP9_COMP *cpi, vp9_writer *bc) {
|
|
|
|
VP9_COMMON *const pc = &cpi->common;
|
|
|
|
MACROBLOCK *const x = &cpi->mb;
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
|
|
|
MB_MODE_INFO *mi = &xd->mode_info_context->mbmi;
|
|
|
|
const int segment_id = mi->segment_id;
|
|
|
|
int seg_ref_active = vp9_segfeature_active(xd, segment_id,
|
|
|
|
SEG_LVL_REF_FRAME);
|
2012-07-14 00:21:29 +02:00
|
|
|
// If segment level coding of this signal is disabled...
|
|
|
|
// or the segment allows multiple reference frame options
|
2013-06-07 15:59:53 +02:00
|
|
|
if (!seg_ref_active) {
|
2013-06-06 22:44:34 +02:00
|
|
|
// does the feature use compound prediction or not
|
|
|
|
// (if not specified at the frame/segment level)
|
|
|
|
if (pc->comp_pred_mode == HYBRID_PREDICTION) {
|
|
|
|
vp9_write(bc, mi->ref_frame[1] > INTRA_FRAME,
|
|
|
|
vp9_get_pred_prob(pc, xd, PRED_COMP_INTER_INTER));
|
|
|
|
} else {
|
|
|
|
assert((mi->ref_frame[1] <= INTRA_FRAME) ==
|
|
|
|
(pc->comp_pred_mode == SINGLE_PREDICTION_ONLY));
|
|
|
|
}
|
2012-01-28 13:20:14 +01:00
|
|
|
|
2013-06-06 22:44:34 +02:00
|
|
|
if (mi->ref_frame[1] > INTRA_FRAME) {
|
|
|
|
vp9_write(bc, mi->ref_frame[0] == GOLDEN_FRAME,
|
|
|
|
vp9_get_pred_prob(pc, xd, PRED_COMP_REF_P));
|
|
|
|
} else {
|
|
|
|
vp9_write(bc, mi->ref_frame[0] != LAST_FRAME,
|
|
|
|
vp9_get_pred_prob(pc, xd, PRED_SINGLE_REF_P1));
|
|
|
|
if (mi->ref_frame[0] != LAST_FRAME)
|
|
|
|
vp9_write(bc, mi->ref_frame[0] != GOLDEN_FRAME,
|
|
|
|
vp9_get_pred_prob(pc, xd, PRED_SINGLE_REF_P2));
|
2011-11-02 14:30:10 +01:00
|
|
|
}
|
2013-06-06 22:44:34 +02:00
|
|
|
} else {
|
|
|
|
assert(mi->ref_frame[1] <= INTRA_FRAME);
|
2013-06-07 15:59:53 +02:00
|
|
|
assert(vp9_get_segdata(xd, segment_id, SEG_LVL_REF_FRAME) ==
|
|
|
|
mi->ref_frame[0]);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2012-01-31 13:45:30 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
// if using the prediction mdoel we have nothing further to do because
|
|
|
|
// the reference frame is fully coded by the segment
|
2011-11-02 14:30:10 +01:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
static void pack_inter_mode_mvs(VP9_COMP *cpi, MODE_INFO *m,
|
2013-04-26 20:57:17 +02:00
|
|
|
vp9_writer *bc, int mi_row, int mi_col) {
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const pc = &cpi->common;
|
2012-07-26 22:42:07 +02:00
|
|
|
const nmv_context *nmvc = &pc->fc.nmvc;
|
2013-01-06 03:20:25 +01:00
|
|
|
MACROBLOCK *const x = &cpi->mb;
|
|
|
|
MACROBLOCKD *const xd = &x->e_mbd;
|
|
|
|
MB_MODE_INFO *const mi = &m->mbmi;
|
2013-06-06 22:44:34 +02:00
|
|
|
const MV_REFERENCE_FRAME rf = mi->ref_frame[0];
|
2013-01-06 03:20:25 +01:00
|
|
|
const MB_PREDICTION_MODE mode = mi->mode;
|
|
|
|
const int segment_id = mi->segment_id;
|
|
|
|
int skip_coeff;
|
2012-04-07 01:38:34 +02:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
xd->prev_mode_info_context = pc->prev_mi + (m - pc->mi);
|
|
|
|
x->partition_info = x->pi + (m - pc->mi);
|
2012-05-31 18:51:54 +02:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
#ifdef ENTROPY_STATS
|
|
|
|
active_section = 9;
|
2012-11-13 00:43:11 +01:00
|
|
|
#endif
|
2012-01-28 11:24:43 +01:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
if (cpi->mb.e_mbd.update_mb_segmentation_map) {
|
|
|
|
// Is temporal coding of the segment map enabled
|
|
|
|
if (pc->temporal_update) {
|
|
|
|
unsigned char prediction_flag = vp9_get_pred_flag(xd, PRED_SEG_ID);
|
|
|
|
vp9_prob pred_prob = vp9_get_pred_prob(pc, xd, PRED_SEG_ID);
|
2011-11-02 14:30:10 +01:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
// Code the segment id prediction flag for this mb
|
|
|
|
vp9_write(bc, prediction_flag, pred_prob);
|
2012-01-28 11:24:43 +01:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
// If the mb segment id wasn't predicted code explicitly
|
|
|
|
if (!prediction_flag)
|
2013-04-24 11:20:52 +02:00
|
|
|
write_mb_segid(bc, mi, &cpi->mb.e_mbd);
|
2013-01-06 03:20:25 +01:00
|
|
|
} else {
|
|
|
|
// Normal unpredicted coding
|
|
|
|
write_mb_segid(bc, mi, &cpi->mb.e_mbd);
|
|
|
|
}
|
|
|
|
}
|
2011-11-15 16:22:26 +01:00
|
|
|
|
2013-04-09 19:54:19 +02:00
|
|
|
if (vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)) {
|
2013-01-06 03:20:25 +01:00
|
|
|
skip_coeff = 1;
|
|
|
|
} else {
|
2013-02-20 19:16:24 +01:00
|
|
|
skip_coeff = m->mbmi.mb_skip_coeff;
|
2013-01-06 03:20:25 +01:00
|
|
|
vp9_write(bc, skip_coeff,
|
|
|
|
vp9_get_pred_prob(pc, xd, PRED_MBSKIP));
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-06-07 20:54:20 +02:00
|
|
|
if (!vp9_segfeature_active(xd, segment_id, SEG_LVL_REF_FRAME))
|
|
|
|
vp9_write(bc, rf != INTRA_FRAME,
|
|
|
|
vp9_get_pred_prob(pc, xd, PRED_INTRA_INTER));
|
2011-11-02 14:30:10 +01:00
|
|
|
|
2013-05-27 09:14:53 +02:00
|
|
|
if (mi->sb_type >= BLOCK_SIZE_SB8X8 && pc->txfm_mode == TX_MODE_SELECT &&
|
|
|
|
!(rf != INTRA_FRAME &&
|
|
|
|
(skip_coeff || vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)))) {
|
|
|
|
TX_SIZE sz = mi->txfm_size;
|
2013-06-06 20:14:04 +02:00
|
|
|
int tx_probs_offset = get_tx_probs_offset(mi->sb_type);
|
|
|
|
vp9_write(bc, sz != TX_4X4, pc->fc.tx_probs[tx_probs_offset]);
|
2013-05-27 09:14:53 +02:00
|
|
|
if (mi->sb_type >= BLOCK_SIZE_MB16X16 && sz != TX_4X4) {
|
2013-06-06 20:14:04 +02:00
|
|
|
vp9_write(bc, sz != TX_8X8, pc->fc.tx_probs[tx_probs_offset + 1]);
|
2013-05-27 09:14:53 +02:00
|
|
|
if (mi->sb_type >= BLOCK_SIZE_SB32X32 && sz != TX_8X8)
|
2013-06-06 20:14:04 +02:00
|
|
|
vp9_write(bc, sz != TX_16X16, pc->fc.tx_probs[tx_probs_offset + 2]);
|
2013-05-27 09:14:53 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
if (rf == INTRA_FRAME) {
|
2012-02-27 19:22:38 +01:00
|
|
|
#ifdef ENTROPY_STATS
|
2013-01-06 03:20:25 +01:00
|
|
|
active_section = 6;
|
2012-02-27 19:22:38 +01:00
|
|
|
#endif
|
2011-11-02 14:30:10 +01:00
|
|
|
|
2013-05-30 18:58:53 +02:00
|
|
|
if (m->mbmi.sb_type >= BLOCK_SIZE_SB8X8) {
|
2013-06-03 19:39:40 +02:00
|
|
|
const BLOCK_SIZE_TYPE bsize = xd->mode_info_context->mbmi.sb_type;
|
|
|
|
const int bwl = b_width_log2(bsize), bhl = b_height_log2(bsize);
|
|
|
|
const int bsl = MIN(bwl, bhl);
|
|
|
|
write_intra_mode(bc, mode, pc->fc.y_mode_prob[MIN(3, bsl)]);
|
2013-05-30 18:58:53 +02:00
|
|
|
} else {
|
2013-05-20 21:08:22 +02:00
|
|
|
int idx, idy;
|
|
|
|
int bw = 1 << b_width_log2(mi->sb_type);
|
|
|
|
int bh = 1 << b_height_log2(mi->sb_type);
|
|
|
|
for (idy = 0; idy < 2; idy += bh)
|
2013-06-03 19:39:40 +02:00
|
|
|
for (idx = 0; idx < 2; idx += bw) {
|
|
|
|
MB_PREDICTION_MODE bm = m->bmi[idy * 2 + idx].as_mode.first;
|
|
|
|
write_intra_mode(bc, bm, pc->fc.y_mode_prob[0]);
|
|
|
|
}
|
2013-01-06 03:20:25 +01:00
|
|
|
}
|
2013-05-30 18:58:53 +02:00
|
|
|
write_intra_mode(bc, mi->uv_mode,
|
|
|
|
pc->fc.uv_mode_prob[mode]);
|
2013-01-06 03:20:25 +01:00
|
|
|
} else {
|
2013-06-05 20:21:44 +02:00
|
|
|
vp9_prob mv_ref_p[VP9_INTER_MODES - 1];
|
2012-10-25 14:58:21 +02:00
|
|
|
|
2013-06-06 22:44:34 +02:00
|
|
|
encode_ref_frame(cpi, bc);
|
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
vp9_mv_ref_probs(&cpi->common, mv_ref_p, mi->mb_mode_context[rf]);
|
2011-12-06 21:03:42 +01:00
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
#ifdef ENTROPY_STATS
|
2013-01-06 03:20:25 +01:00
|
|
|
active_section = 3;
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
|
|
|
|
2013-02-06 14:02:53 +01:00
|
|
|
// If segment skip is not enabled code the mode.
|
2013-01-28 16:22:53 +01:00
|
|
|
if (!vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)) {
|
2013-05-30 21:49:38 +02:00
|
|
|
if (mi->sb_type >= BLOCK_SIZE_SB8X8) {
|
2013-05-11 02:06:37 +02:00
|
|
|
write_sb_mv_ref(bc, mode, mv_ref_p);
|
2013-05-30 21:49:38 +02:00
|
|
|
vp9_accum_mv_refs(&cpi->common, mode, mi->mb_mode_context[rf]);
|
|
|
|
}
|
2013-01-06 03:20:25 +01:00
|
|
|
}
|
2011-11-03 13:50:09 +01:00
|
|
|
|
2013-05-30 21:49:38 +02:00
|
|
|
if (cpi->common.mcomp_filter_type == SWITCHABLE) {
|
|
|
|
write_token(bc, vp9_switchable_interp_tree,
|
|
|
|
vp9_get_pred_probs(&cpi->common, xd,
|
|
|
|
PRED_SWITCHABLE_INTERP),
|
|
|
|
vp9_switchable_interp_encodings +
|
|
|
|
vp9_switchable_interp_map[mi->interp_filter]);
|
|
|
|
} else {
|
|
|
|
assert(mi->interp_filter == cpi->common.mcomp_filter_type);
|
2013-01-06 03:20:25 +01:00
|
|
|
}
|
2012-11-08 20:03:00 +01:00
|
|
|
|
2013-05-30 21:49:38 +02:00
|
|
|
if (xd->mode_info_context->mbmi.sb_type < BLOCK_SIZE_SB8X8) {
|
|
|
|
int j;
|
|
|
|
MB_PREDICTION_MODE blockmode;
|
|
|
|
int_mv blockmv;
|
|
|
|
int bwl = b_width_log2(mi->sb_type), bw = 1 << bwl;
|
|
|
|
int bhl = b_height_log2(mi->sb_type), bh = 1 << bhl;
|
|
|
|
int idx, idy;
|
|
|
|
for (idy = 0; idy < 2; idy += bh) {
|
|
|
|
for (idx = 0; idx < 2; idx += bw) {
|
|
|
|
j = idy * 2 + idx;
|
|
|
|
blockmode = cpi->mb.partition_info->bmi[j].mode;
|
|
|
|
blockmv = cpi->mb.partition_info->bmi[j].mv;
|
|
|
|
write_sb_mv_ref(bc, blockmode, mv_ref_p);
|
|
|
|
vp9_accum_mv_refs(&cpi->common, blockmode, mi->mb_mode_context[rf]);
|
|
|
|
if (blockmode == NEWMV) {
|
2012-02-27 19:22:38 +01:00
|
|
|
#ifdef ENTROPY_STATS
|
2013-05-30 21:49:38 +02:00
|
|
|
active_section = 11;
|
2012-02-27 19:22:38 +01:00
|
|
|
#endif
|
2013-05-30 21:49:38 +02:00
|
|
|
vp9_encode_mv(bc, &blockmv.as_mv, &mi->best_mv.as_mv,
|
|
|
|
nmvc, xd->allow_high_precision_mv);
|
2013-05-15 21:37:03 +02:00
|
|
|
|
2013-06-06 22:44:34 +02:00
|
|
|
if (mi->ref_frame[1] > INTRA_FRAME)
|
2013-05-30 21:49:38 +02:00
|
|
|
vp9_encode_mv(bc,
|
|
|
|
&cpi->mb.partition_info->bmi[j].second_mv.as_mv,
|
|
|
|
&mi->best_second_mv.as_mv,
|
2013-05-15 21:37:03 +02:00
|
|
|
nmvc, xd->allow_high_precision_mv);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2013-05-16 07:28:36 +02:00
|
|
|
}
|
2013-05-30 21:49:38 +02:00
|
|
|
}
|
2013-05-16 07:28:36 +02:00
|
|
|
|
|
|
|
#ifdef MODE_STATS
|
2013-05-30 21:49:38 +02:00
|
|
|
++count_mb_seg[mi->partitioning];
|
2013-05-16 07:28:36 +02:00
|
|
|
#endif
|
2013-05-30 21:49:38 +02:00
|
|
|
} else if (mode == NEWMV) {
|
|
|
|
#ifdef ENTROPY_STATS
|
|
|
|
active_section = 5;
|
|
|
|
#endif
|
|
|
|
vp9_encode_mv(bc,
|
|
|
|
&mi->mv[0].as_mv, &mi->best_mv.as_mv,
|
|
|
|
nmvc, xd->allow_high_precision_mv);
|
|
|
|
|
2013-06-06 22:44:34 +02:00
|
|
|
if (mi->ref_frame[1] > INTRA_FRAME)
|
2013-05-30 21:49:38 +02:00
|
|
|
vp9_encode_mv(bc,
|
|
|
|
&mi->mv[1].as_mv, &mi->best_second_mv.as_mv,
|
|
|
|
nmvc, xd->allow_high_precision_mv);
|
2013-01-06 03:20:25 +01:00
|
|
|
}
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-02-02 18:04:40 +01:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
static void write_mb_modes_kf(const VP9_COMP *cpi,
|
2013-02-20 19:16:24 +01:00
|
|
|
MODE_INFO *m,
|
2013-04-26 20:57:17 +02:00
|
|
|
vp9_writer *bc, int mi_row, int mi_col) {
|
2013-01-06 03:20:25 +01:00
|
|
|
const VP9_COMMON *const c = &cpi->common;
|
|
|
|
const MACROBLOCKD *const xd = &cpi->mb.e_mbd;
|
|
|
|
const int ym = m->mbmi.mode;
|
2013-05-21 01:04:28 +02:00
|
|
|
const int mis = c->mode_info_stride;
|
2013-01-06 03:20:25 +01:00
|
|
|
const int segment_id = m->mbmi.segment_id;
|
|
|
|
int skip_coeff;
|
2012-10-16 22:52:39 +02:00
|
|
|
|
2013-04-27 01:46:17 +02:00
|
|
|
if (xd->update_mb_segmentation_map)
|
2012-10-16 22:52:39 +02:00
|
|
|
write_mb_segid(bc, &m->mbmi, xd);
|
|
|
|
|
2013-04-09 19:54:19 +02:00
|
|
|
if (vp9_segfeature_active(xd, segment_id, SEG_LVL_SKIP)) {
|
2013-01-06 03:20:25 +01:00
|
|
|
skip_coeff = 1;
|
|
|
|
} else {
|
2013-02-20 19:16:24 +01:00
|
|
|
skip_coeff = m->mbmi.mb_skip_coeff;
|
2013-04-27 01:46:17 +02:00
|
|
|
vp9_write(bc, skip_coeff, vp9_get_pred_prob(c, xd, PRED_MBSKIP));
|
2012-10-16 22:52:39 +02:00
|
|
|
}
|
|
|
|
|
2013-05-27 09:14:53 +02:00
|
|
|
if (m->mbmi.sb_type >= BLOCK_SIZE_SB8X8 && c->txfm_mode == TX_MODE_SELECT) {
|
|
|
|
TX_SIZE sz = m->mbmi.txfm_size;
|
2013-06-06 20:14:04 +02:00
|
|
|
int tx_probs_offset = get_tx_probs_offset(m->mbmi.sb_type);
|
|
|
|
vp9_write(bc, sz != TX_4X4, c->fc.tx_probs[tx_probs_offset]);
|
2013-05-27 09:14:53 +02:00
|
|
|
if (m->mbmi.sb_type >= BLOCK_SIZE_MB16X16 && sz != TX_4X4) {
|
2013-06-06 20:14:04 +02:00
|
|
|
vp9_write(bc, sz != TX_8X8, c->fc.tx_probs[tx_probs_offset + 1]);
|
2013-05-27 09:14:53 +02:00
|
|
|
if (m->mbmi.sb_type >= BLOCK_SIZE_SB32X32 && sz != TX_8X8)
|
2013-06-06 20:14:04 +02:00
|
|
|
vp9_write(bc, sz != TX_16X16, c->fc.tx_probs[tx_probs_offset + 2]);
|
2013-05-27 09:14:53 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-21 01:04:28 +02:00
|
|
|
if (m->mbmi.sb_type >= BLOCK_SIZE_SB8X8) {
|
2013-05-25 01:13:54 +02:00
|
|
|
const MB_PREDICTION_MODE A = above_block_mode(m, 0, mis);
|
|
|
|
const MB_PREDICTION_MODE L = xd->left_available ?
|
2013-05-21 01:04:28 +02:00
|
|
|
left_block_mode(m, 0) : DC_PRED;
|
2013-05-30 18:58:53 +02:00
|
|
|
write_intra_mode(bc, ym, c->kf_y_mode_prob[A][L]);
|
|
|
|
} else {
|
2013-05-20 21:08:22 +02:00
|
|
|
int idx, idy;
|
|
|
|
int bw = 1 << b_width_log2(m->mbmi.sb_type);
|
|
|
|
int bh = 1 << b_height_log2(m->mbmi.sb_type);
|
2013-05-21 01:04:28 +02:00
|
|
|
for (idy = 0; idy < 2; idy += bh) {
|
|
|
|
for (idx = 0; idx < 2; idx += bw) {
|
|
|
|
int i = idy * 2 + idx;
|
2013-05-25 01:13:54 +02:00
|
|
|
const MB_PREDICTION_MODE A = above_block_mode(m, i, mis);
|
|
|
|
const MB_PREDICTION_MODE L = (xd->left_available || idx) ?
|
2013-05-21 01:04:28 +02:00
|
|
|
left_block_mode(m, i) : DC_PRED;
|
2013-05-08 19:04:14 +02:00
|
|
|
const int bm = m->bmi[i].as_mode.first;
|
|
|
|
#ifdef ENTROPY_STATS
|
|
|
|
++intra_mode_stats[A][L][bm];
|
|
|
|
#endif
|
2013-05-30 18:58:53 +02:00
|
|
|
write_intra_mode(bc, bm, c->kf_y_mode_prob[A][L]);
|
2013-05-21 01:04:28 +02:00
|
|
|
}
|
|
|
|
}
|
2012-10-16 22:52:39 +02:00
|
|
|
}
|
|
|
|
|
2013-05-30 18:58:53 +02:00
|
|
|
write_intra_mode(bc, m->mbmi.uv_mode, c->kf_uv_mode_prob[ym]);
|
2012-10-16 22:52:39 +02:00
|
|
|
}
|
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
static void write_modes_b(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
|
|
|
|
TOKENEXTRA **tok, TOKENEXTRA *tok_end,
|
2013-04-26 20:57:17 +02:00
|
|
|
int mi_row, int mi_col) {
|
2013-02-20 19:16:24 +01:00
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
2013-01-06 03:20:25 +01:00
|
|
|
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
|
|
|
|
|
2013-05-16 07:28:36 +02:00
|
|
|
if (m->mbmi.sb_type < BLOCK_SIZE_SB8X8)
|
|
|
|
if (xd->ab_index > 0)
|
|
|
|
return;
|
2013-01-06 03:20:25 +01:00
|
|
|
xd->mode_info_context = m;
|
2013-04-26 20:57:17 +02:00
|
|
|
set_mi_row_col(&cpi->common, xd, mi_row,
|
|
|
|
1 << mi_height_log2(m->mbmi.sb_type),
|
|
|
|
mi_col, 1 << mi_width_log2(m->mbmi.sb_type));
|
2013-02-20 19:16:24 +01:00
|
|
|
if (cm->frame_type == KEY_FRAME) {
|
2013-04-26 20:57:17 +02:00
|
|
|
write_mb_modes_kf(cpi, m, bc, mi_row, mi_col);
|
2013-01-06 03:20:25 +01:00
|
|
|
#ifdef ENTROPY_STATS
|
|
|
|
active_section = 8;
|
|
|
|
#endif
|
|
|
|
} else {
|
2013-04-26 20:57:17 +02:00
|
|
|
pack_inter_mode_mvs(cpi, m, bc, mi_row, mi_col);
|
2013-01-06 03:20:25 +01:00
|
|
|
#ifdef ENTROPY_STATS
|
|
|
|
active_section = 1;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
assert(*tok < tok_end);
|
|
|
|
pack_mb_tokens(bc, tok, tok_end);
|
|
|
|
}
|
|
|
|
|
2013-04-16 09:18:02 +02:00
|
|
|
static void write_modes_sb(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc,
|
|
|
|
TOKENEXTRA **tok, TOKENEXTRA *tok_end,
|
2013-04-26 20:57:17 +02:00
|
|
|
int mi_row, int mi_col,
|
2013-04-16 09:18:02 +02:00
|
|
|
BLOCK_SIZE_TYPE bsize) {
|
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
2013-04-23 19:12:18 +02:00
|
|
|
MACROBLOCKD *xd = &cpi->mb.e_mbd;
|
2013-04-16 09:18:02 +02:00
|
|
|
const int mis = cm->mode_info_stride;
|
|
|
|
int bwl, bhl;
|
2013-05-16 22:30:00 +02:00
|
|
|
int bsl = b_width_log2(bsize);
|
|
|
|
int bs = (1 << bsl) / 4; // mode_info step for subsize
|
2013-04-16 09:18:02 +02:00
|
|
|
int n;
|
|
|
|
PARTITION_TYPE partition;
|
|
|
|
BLOCK_SIZE_TYPE subsize;
|
|
|
|
|
2013-04-26 20:57:17 +02:00
|
|
|
if (mi_row >= cm->mi_rows || mi_col >= cm->mi_cols)
|
2013-04-16 09:18:02 +02:00
|
|
|
return;
|
|
|
|
|
2013-05-16 22:30:00 +02:00
|
|
|
bwl = b_width_log2(m->mbmi.sb_type);
|
|
|
|
bhl = b_height_log2(m->mbmi.sb_type);
|
2013-04-16 09:18:02 +02:00
|
|
|
|
|
|
|
// parse the partition type
|
|
|
|
if ((bwl == bsl) && (bhl == bsl))
|
|
|
|
partition = PARTITION_NONE;
|
|
|
|
else if ((bwl == bsl) && (bhl < bsl))
|
|
|
|
partition = PARTITION_HORZ;
|
|
|
|
else if ((bwl < bsl) && (bhl == bsl))
|
|
|
|
partition = PARTITION_VERT;
|
|
|
|
else if ((bwl < bsl) && (bhl < bsl))
|
|
|
|
partition = PARTITION_SPLIT;
|
|
|
|
else
|
|
|
|
assert(0);
|
|
|
|
|
2013-05-11 02:06:37 +02:00
|
|
|
if (bsize < BLOCK_SIZE_SB8X8)
|
2013-05-16 07:28:36 +02:00
|
|
|
if (xd->ab_index > 0)
|
2013-05-11 02:06:37 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
if (bsize >= BLOCK_SIZE_SB8X8) {
|
2013-04-23 19:12:18 +02:00
|
|
|
int pl;
|
2013-05-08 00:36:30 +02:00
|
|
|
xd->left_seg_context = cm->left_seg_context + (mi_row & MI_MASK);
|
|
|
|
xd->above_seg_context = cm->above_seg_context + mi_col;
|
2013-04-23 19:12:18 +02:00
|
|
|
pl = partition_plane_context(xd, bsize);
|
2013-04-16 09:18:02 +02:00
|
|
|
// encode the partition information
|
2013-06-03 19:39:40 +02:00
|
|
|
write_token(bc, vp9_partition_tree,
|
|
|
|
cm->fc.partition_prob[cm->frame_type][pl],
|
2013-04-16 09:18:02 +02:00
|
|
|
vp9_partition_encodings + partition);
|
2013-04-23 19:12:18 +02:00
|
|
|
}
|
2013-04-16 09:18:02 +02:00
|
|
|
|
2013-05-01 18:43:59 +02:00
|
|
|
subsize = get_subsize(bsize, partition);
|
2013-05-16 07:28:36 +02:00
|
|
|
*(get_sb_index(xd, subsize)) = 0;
|
2013-05-01 18:43:59 +02:00
|
|
|
|
2013-04-16 09:18:02 +02:00
|
|
|
switch (partition) {
|
|
|
|
case PARTITION_NONE:
|
2013-04-26 20:57:17 +02:00
|
|
|
write_modes_b(cpi, m, bc, tok, tok_end, mi_row, mi_col);
|
2013-04-16 09:18:02 +02:00
|
|
|
break;
|
|
|
|
case PARTITION_HORZ:
|
2013-04-26 20:57:17 +02:00
|
|
|
write_modes_b(cpi, m, bc, tok, tok_end, mi_row, mi_col);
|
2013-05-16 07:28:36 +02:00
|
|
|
*(get_sb_index(xd, subsize)) = 1;
|
2013-05-16 22:30:00 +02:00
|
|
|
if ((mi_row + bs) < cm->mi_rows)
|
|
|
|
write_modes_b(cpi, m + bs * mis, bc, tok, tok_end, mi_row + bs, mi_col);
|
2013-04-16 09:18:02 +02:00
|
|
|
break;
|
|
|
|
case PARTITION_VERT:
|
2013-04-26 20:57:17 +02:00
|
|
|
write_modes_b(cpi, m, bc, tok, tok_end, mi_row, mi_col);
|
2013-05-16 07:28:36 +02:00
|
|
|
*(get_sb_index(xd, subsize)) = 1;
|
2013-05-16 22:30:00 +02:00
|
|
|
if ((mi_col + bs) < cm->mi_cols)
|
|
|
|
write_modes_b(cpi, m + bs, bc, tok, tok_end, mi_row, mi_col + bs);
|
2013-04-16 09:18:02 +02:00
|
|
|
break;
|
|
|
|
case PARTITION_SPLIT:
|
|
|
|
for (n = 0; n < 4; n++) {
|
|
|
|
int j = n >> 1, i = n & 0x01;
|
2013-05-11 22:24:03 +02:00
|
|
|
*(get_sb_index(xd, subsize)) = n;
|
2013-04-16 09:18:02 +02:00
|
|
|
write_modes_sb(cpi, m + j * bs * mis + i * bs, bc, tok, tok_end,
|
2013-04-26 20:57:17 +02:00
|
|
|
mi_row + j * bs, mi_col + i * bs, subsize);
|
2013-04-16 09:18:02 +02:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
assert(0);
|
|
|
|
}
|
2013-04-23 19:12:18 +02:00
|
|
|
|
|
|
|
// update partition context
|
2013-05-11 02:06:37 +02:00
|
|
|
if (bsize >= BLOCK_SIZE_SB8X8 &&
|
|
|
|
(bsize == BLOCK_SIZE_SB8X8 || partition != PARTITION_SPLIT)) {
|
2013-05-12 00:19:56 +02:00
|
|
|
set_partition_seg_context(cm, xd, mi_row, mi_col);
|
|
|
|
update_partition_context(xd, subsize, bsize);
|
|
|
|
}
|
2013-04-16 09:18:02 +02:00
|
|
|
}
|
|
|
|
|
[WIP] Add column-based tiling.
This patch adds column-based tiling. The idea is to make each tile
independently decodable (after reading the common frame header) and
also independendly encodable (minus within-frame cost adjustments in
the RD loop) to speed-up hardware & software en/decoders if they used
multi-threading. Column-based tiling has the added advantage (over
other tiling methods) that it minimizes realtime use-case latency,
since all threads can start encoding data as soon as the first SB-row
worth of data is available to the encoder.
There is some test code that does random tile ordering in the decoder,
to confirm that each tile is indeed independently decodable from other
tiles in the same frame. At tile edges, all contexts assume default
values (i.e. 0, 0 motion vector, no coefficients, DC intra4x4 mode),
and motion vector search and ordering do not cross tiles in the same
frame.
t log
Tile independence is not maintained between frames ATM, i.e. tile 0 of
frame 1 is free to use motion vectors that point into any tile of frame
0. We support 1 (i.e. no tiling), 2 or 4 column-tiles.
The loopfilter crosses tile boundaries. I discussed this briefly with Aki
and he says that's OK. An in-loop loopfilter would need to do some sync
between tile threads, but that shouldn't be a big issue.
Resuls: with tiling disabled, we go up slightly because of improved edge
use in the intra4x4 prediction. With 2 tiles, we lose about ~1% on derf,
~0.35% on HD and ~0.55% on STD/HD. With 4 tiles, we lose another ~1.5%
on derf ~0.77% on HD and ~0.85% on STD/HD. Most of this loss is
concentrated in the low-bitrate end of clips, and most of it is because
of the loss of edges at tile boundaries and the resulting loss of intra
predictors.
TODO:
- more tiles (perhaps allow row-based tiling also, and max. 8 tiles)?
- maybe optionally (for EC purposes), motion vectors themselves
should not cross tile edges, or we should emulate such borders as
if they were off-frame, to limit error propagation to within one
tile only. This doesn't have to be the default behaviour but could
be an optional bitstream flag.
Change-Id: I5951c3a0742a767b20bc9fb5af685d9892c2c96f
2013-02-01 18:35:28 +01:00
|
|
|
static void write_modes(VP9_COMP *cpi, vp9_writer* const bc,
|
2013-02-08 20:33:11 +01:00
|
|
|
TOKENEXTRA **tok, TOKENEXTRA *tok_end) {
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const c = &cpi->common;
|
2012-07-14 00:21:29 +02:00
|
|
|
const int mis = c->mode_info_stride;
|
2013-02-08 20:33:11 +01:00
|
|
|
MODE_INFO *m, *m_ptr = c->mi;
|
2013-04-26 20:57:17 +02:00
|
|
|
int mi_row, mi_col;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-26 20:57:17 +02:00
|
|
|
m_ptr += c->cur_tile_mi_col_start + c->cur_tile_mi_row_start * mis;
|
2013-04-23 19:12:18 +02:00
|
|
|
vpx_memset(c->above_seg_context, 0, sizeof(PARTITION_CONTEXT) *
|
2013-05-08 00:36:30 +02:00
|
|
|
mi_cols_aligned_to_sb(c));
|
2013-04-23 19:12:18 +02:00
|
|
|
|
2013-04-26 20:57:17 +02:00
|
|
|
for (mi_row = c->cur_tile_mi_row_start;
|
|
|
|
mi_row < c->cur_tile_mi_row_end;
|
2013-05-05 07:09:43 +02:00
|
|
|
mi_row += 8, m_ptr += 8 * mis) {
|
2013-01-06 03:20:25 +01:00
|
|
|
m = m_ptr;
|
2013-04-23 19:12:18 +02:00
|
|
|
vpx_memset(c->left_seg_context, 0, sizeof(c->left_seg_context));
|
2013-04-26 20:57:17 +02:00
|
|
|
for (mi_col = c->cur_tile_mi_col_start;
|
|
|
|
mi_col < c->cur_tile_mi_col_end;
|
2013-05-24 20:11:06 +02:00
|
|
|
mi_col += 64 / MI_SIZE, m += 64 / MI_SIZE)
|
2013-04-26 20:57:17 +02:00
|
|
|
write_modes_sb(cpi, m, bc, tok, tok_end, mi_row, mi_col,
|
2013-04-16 09:18:02 +02:00
|
|
|
BLOCK_SIZE_SB64X64);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-02-02 18:04:40 +01:00
|
|
|
|
2011-06-10 11:11:15 +02:00
|
|
|
/* This function is used for debugging probability trees. */
|
2013-02-19 22:36:38 +01:00
|
|
|
static void print_prob_tree(vp9_coeff_probs *coef_probs, int block_types) {
|
2012-07-14 00:21:29 +02:00
|
|
|
/* print coef probability tree */
|
2013-02-19 22:36:38 +01:00
|
|
|
int i, j, k, l, m;
|
2012-07-14 00:21:29 +02:00
|
|
|
FILE *f = fopen("enc_tree_probs.txt", "a");
|
|
|
|
fprintf(f, "{\n");
|
2013-02-19 22:36:38 +01:00
|
|
|
for (i = 0; i < block_types; i++) {
|
2012-07-14 00:21:29 +02:00
|
|
|
fprintf(f, " {\n");
|
2013-02-19 22:36:38 +01:00
|
|
|
for (j = 0; j < REF_TYPES; ++j) {
|
|
|
|
fprintf(f, " {\n");
|
|
|
|
for (k = 0; k < COEF_BANDS; k++) {
|
|
|
|
fprintf(f, " {\n");
|
|
|
|
for (l = 0; l < PREV_COEF_CONTEXTS; l++) {
|
|
|
|
fprintf(f, " {");
|
|
|
|
for (m = 0; m < ENTROPY_NODES; m++) {
|
|
|
|
fprintf(f, "%3u, ",
|
|
|
|
(unsigned int)(coef_probs[i][j][k][l][m]));
|
|
|
|
}
|
2011-06-10 11:11:15 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
fprintf(f, " }\n");
|
|
|
|
}
|
|
|
|
fprintf(f, " }\n");
|
2011-06-10 11:11:15 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
fprintf(f, " }\n");
|
|
|
|
}
|
|
|
|
fprintf(f, "}\n");
|
|
|
|
fclose(f);
|
2011-06-10 11:11:15 +02:00
|
|
|
}
|
|
|
|
|
2013-05-31 18:18:59 +02:00
|
|
|
static void build_tree_distribution(VP9_COMP *cpi, TX_SIZE txfm_size) {
|
|
|
|
vp9_coeff_probs_model *coef_probs = cpi->frame_coef_probs[txfm_size];
|
|
|
|
vp9_coeff_count *coef_counts = cpi->coef_counts[txfm_size];
|
|
|
|
unsigned int (*eob_branch_ct)[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] =
|
|
|
|
cpi->common.fc.eob_branch_counts[txfm_size];
|
|
|
|
vp9_coeff_stats *coef_branch_ct = cpi->frame_branch_ct[txfm_size];
|
2013-05-30 21:20:03 +02:00
|
|
|
vp9_prob full_probs[ENTROPY_NODES];
|
2013-05-31 18:18:59 +02:00
|
|
|
int i, j, k, l;
|
2012-12-08 01:09:59 +01:00
|
|
|
|
2013-05-31 18:18:59 +02:00
|
|
|
for (i = 0; i < BLOCK_TYPES; ++i) {
|
2013-02-19 22:36:38 +01:00
|
|
|
for (j = 0; j < REF_TYPES; ++j) {
|
|
|
|
for (k = 0; k < COEF_BANDS; ++k) {
|
|
|
|
for (l = 0; l < PREV_COEF_CONTEXTS; ++l) {
|
|
|
|
if (l >= 3 && k == 0)
|
|
|
|
continue;
|
2013-05-30 21:20:03 +02:00
|
|
|
vp9_tree_probs_from_distribution(vp9_coef_tree,
|
|
|
|
full_probs,
|
2013-02-19 22:36:38 +01:00
|
|
|
coef_branch_ct[i][j][k][l],
|
2013-05-30 21:20:03 +02:00
|
|
|
coef_counts[i][j][k][l], 0);
|
|
|
|
vpx_memcpy(coef_probs[i][j][k][l], full_probs,
|
|
|
|
sizeof(vp9_prob) * UNCONSTRAINED_NODES);
|
2013-05-08 19:04:14 +02:00
|
|
|
#if CONFIG_BALANCED_COEFTREE
|
|
|
|
coef_branch_ct[i][j][k][l][1][1] = eob_branch_ct[i][j][k][l] -
|
|
|
|
coef_branch_ct[i][j][k][l][1][0];
|
|
|
|
coef_probs[i][j][k][l][1] =
|
|
|
|
get_binary_prob(coef_branch_ct[i][j][k][l][1][0],
|
|
|
|
coef_branch_ct[i][j][k][l][1][1]);
|
|
|
|
#else
|
2013-03-27 00:46:09 +01:00
|
|
|
coef_branch_ct[i][j][k][l][0][1] = eob_branch_ct[i][j][k][l] -
|
|
|
|
coef_branch_ct[i][j][k][l][0][0];
|
|
|
|
coef_probs[i][j][k][l][0] =
|
|
|
|
get_binary_prob(coef_branch_ct[i][j][k][l][0][0],
|
|
|
|
coef_branch_ct[i][j][k][l][0][1]);
|
2013-05-08 19:04:14 +02:00
|
|
|
#endif
|
2012-04-12 18:24:03 +02:00
|
|
|
#ifdef ENTROPY_STATS
|
2013-03-27 00:46:09 +01:00
|
|
|
if (!cpi->dummy_packing) {
|
2013-05-31 19:05:37 +02:00
|
|
|
int t;
|
2013-03-27 00:46:09 +01:00
|
|
|
for (t = 0; t < MAX_ENTROPY_TOKENS; ++t)
|
2013-05-31 19:05:37 +02:00
|
|
|
context_counters[txfm_size][i][j][k][l][t] +=
|
|
|
|
coef_counts[i][j][k][l][t];
|
|
|
|
context_counters[txfm_size][i][j][k][l][MAX_ENTROPY_TOKENS] +=
|
2013-03-27 00:46:09 +01:00
|
|
|
eob_branch_ct[i][j][k][l];
|
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
#endif
|
2013-02-19 22:36:38 +01:00
|
|
|
}
|
2012-08-03 02:03:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-12-08 01:09:59 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
static void build_coeff_contexts(VP9_COMP *cpi) {
|
2013-05-31 18:18:59 +02:00
|
|
|
TX_SIZE t;
|
|
|
|
for (t = TX_4X4; t <= TX_32X32; t++)
|
|
|
|
build_tree_distribution(cpi, t);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2013-05-31 18:18:59 +02:00
|
|
|
static void update_coef_probs_common(vp9_writer* const bc, VP9_COMP *cpi,
|
|
|
|
TX_SIZE tx_size) {
|
|
|
|
vp9_coeff_probs_model *new_frame_coef_probs = cpi->frame_coef_probs[tx_size];
|
|
|
|
vp9_coeff_probs_model *old_frame_coef_probs =
|
|
|
|
cpi->common.fc.coef_probs[tx_size];
|
|
|
|
vp9_coeff_stats *frame_branch_ct = cpi->frame_branch_ct[tx_size];
|
2013-02-19 22:36:38 +01:00
|
|
|
int i, j, k, l, t;
|
2012-07-14 00:21:29 +02:00
|
|
|
int update[2] = {0, 0};
|
|
|
|
int savings;
|
2013-05-17 15:40:25 +02:00
|
|
|
|
|
|
|
const int entropy_nodes_update = UNCONSTRAINED_NODES;
|
2012-04-12 18:24:03 +02:00
|
|
|
|
2013-03-26 23:23:30 +01:00
|
|
|
const int tstart = 0;
|
2012-07-14 00:21:29 +02:00
|
|
|
/* dry run to see if there is any udpate at all needed */
|
|
|
|
savings = 0;
|
2013-03-26 23:23:30 +01:00
|
|
|
for (i = 0; i < BLOCK_TYPES; ++i) {
|
2013-02-19 22:36:38 +01:00
|
|
|
for (j = 0; j < REF_TYPES; ++j) {
|
|
|
|
for (k = 0; k < COEF_BANDS; ++k) {
|
2013-03-13 19:03:17 +01:00
|
|
|
// int prev_coef_savings[ENTROPY_NODES] = {0};
|
2013-02-19 22:36:38 +01:00
|
|
|
for (l = 0; l < PREV_COEF_CONTEXTS; ++l) {
|
2013-03-26 23:23:30 +01:00
|
|
|
for (t = tstart; t < entropy_nodes_update; ++t) {
|
2013-02-19 22:36:38 +01:00
|
|
|
vp9_prob newp = new_frame_coef_probs[i][j][k][l][t];
|
|
|
|
const vp9_prob oldp = old_frame_coef_probs[i][j][k][l][t];
|
2013-03-13 19:03:17 +01:00
|
|
|
const vp9_prob upd = vp9_coef_update_prob[t];
|
2013-05-30 21:20:03 +02:00
|
|
|
int s;
|
2013-02-19 22:36:38 +01:00
|
|
|
int u = 0;
|
|
|
|
|
|
|
|
if (l >= 3 && k == 0)
|
|
|
|
continue;
|
2013-05-17 15:40:25 +02:00
|
|
|
if (t == PIVOT_NODE)
|
2013-03-13 19:03:17 +01:00
|
|
|
s = prob_diff_update_savings_search_model(
|
|
|
|
frame_branch_ct[i][j][k][l][0],
|
2013-05-17 15:40:25 +02:00
|
|
|
old_frame_coef_probs[i][j][k][l], &newp, upd, i, j);
|
2013-03-13 19:03:17 +01:00
|
|
|
else
|
|
|
|
s = prob_diff_update_savings_search(
|
|
|
|
frame_branch_ct[i][j][k][l][t], oldp, &newp, upd);
|
2013-02-19 22:36:38 +01:00
|
|
|
if (s > 0 && newp != oldp)
|
|
|
|
u = 1;
|
|
|
|
if (u)
|
|
|
|
savings += s - (int)(vp9_cost_zero(upd));
|
|
|
|
else
|
|
|
|
savings -= (int)(vp9_cost_zero(upd));
|
|
|
|
update[u]++;
|
|
|
|
}
|
2012-08-03 02:03:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// printf("Update %d %d, savings %d\n", update[0], update[1], savings);
|
|
|
|
/* Is coef updated at all */
|
2012-10-18 01:47:38 +02:00
|
|
|
if (update[1] == 0 || savings < 0) {
|
2012-10-31 22:40:53 +01:00
|
|
|
vp9_write_bit(bc, 0);
|
2013-03-13 19:03:17 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
vp9_write_bit(bc, 1);
|
2013-03-26 23:23:30 +01:00
|
|
|
for (i = 0; i < BLOCK_TYPES; ++i) {
|
2013-03-13 19:03:17 +01:00
|
|
|
for (j = 0; j < REF_TYPES; ++j) {
|
|
|
|
for (k = 0; k < COEF_BANDS; ++k) {
|
|
|
|
// int prev_coef_savings[ENTROPY_NODES] = {0};
|
|
|
|
for (l = 0; l < PREV_COEF_CONTEXTS; ++l) {
|
|
|
|
// calc probs and branch cts for this frame only
|
2013-03-26 23:23:30 +01:00
|
|
|
for (t = tstart; t < entropy_nodes_update; ++t) {
|
2013-03-13 19:03:17 +01:00
|
|
|
vp9_prob newp = new_frame_coef_probs[i][j][k][l][t];
|
|
|
|
vp9_prob *oldp = old_frame_coef_probs[i][j][k][l] + t;
|
|
|
|
const vp9_prob upd = vp9_coef_update_prob[t];
|
2013-05-30 21:20:03 +02:00
|
|
|
int s;
|
2013-03-13 19:03:17 +01:00
|
|
|
int u = 0;
|
|
|
|
if (l >= 3 && k == 0)
|
|
|
|
continue;
|
2013-05-17 15:40:25 +02:00
|
|
|
if (t == PIVOT_NODE)
|
2013-03-13 19:03:17 +01:00
|
|
|
s = prob_diff_update_savings_search_model(
|
|
|
|
frame_branch_ct[i][j][k][l][0],
|
2013-05-17 15:40:25 +02:00
|
|
|
old_frame_coef_probs[i][j][k][l], &newp, upd, i, j);
|
2013-03-13 19:03:17 +01:00
|
|
|
else
|
2013-02-19 22:36:38 +01:00
|
|
|
s = prob_diff_update_savings_search(
|
2013-03-13 19:03:17 +01:00
|
|
|
frame_branch_ct[i][j][k][l][t],
|
|
|
|
*oldp, &newp, upd);
|
|
|
|
if (s > 0 && newp != *oldp)
|
|
|
|
u = 1;
|
|
|
|
vp9_write(bc, u, upd);
|
2012-02-07 00:10:13 +01:00
|
|
|
#ifdef ENTROPY_STATS
|
2013-03-13 19:03:17 +01:00
|
|
|
if (!cpi->dummy_packing)
|
2013-05-31 19:05:37 +02:00
|
|
|
++tree_update_hist[tx_size][i][j][k][l][t][u];
|
2013-03-13 19:03:17 +01:00
|
|
|
#endif
|
|
|
|
if (u) {
|
|
|
|
/* send/use new probability */
|
|
|
|
write_prob_diff_update(bc, newp, *oldp);
|
|
|
|
*oldp = newp;
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-08-03 02:03:14 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2012-10-20 00:35:36 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static void update_coef_probs(VP9_COMP* const cpi, vp9_writer* const bc) {
|
2013-06-06 05:56:37 +02:00
|
|
|
const TXFM_MODE txfm_mode = cpi->common.txfm_mode;
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
vp9_clear_system_state();
|
2012-09-10 07:42:35 +02:00
|
|
|
|
2012-10-20 00:35:36 +02:00
|
|
|
// Build the cofficient contexts based on counts collected in encode loop
|
|
|
|
build_coeff_contexts(cpi);
|
2012-09-10 07:42:35 +02:00
|
|
|
|
2013-05-31 18:18:59 +02:00
|
|
|
update_coef_probs_common(bc, cpi, TX_4X4);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-06-06 05:56:37 +02:00
|
|
|
// do not do this if not even allowed
|
|
|
|
if (txfm_mode > ONLY_4X4)
|
2013-05-31 18:18:59 +02:00
|
|
|
update_coef_probs_common(bc, cpi, TX_8X8);
|
2012-08-03 02:03:14 +02:00
|
|
|
|
2013-06-06 05:56:37 +02:00
|
|
|
if (txfm_mode > ALLOW_8X8)
|
2013-05-31 18:18:59 +02:00
|
|
|
update_coef_probs_common(bc, cpi, TX_16X16);
|
32x32 transform for superblocks.
This adds Debargha's DCT/DWT hybrid and a regular 32x32 DCT, and adds
code all over the place to wrap that in the bitstream/encoder/decoder/RD.
Some implementation notes (these probably need careful review):
- token range is extended by 1 bit, since the value range out of this
transform is [-16384,16383].
- the coefficients coming out of the FDCT are manually scaled back by
1 bit, or else they won't fit in int16_t (they are 17 bits). Because
of this, the RD error scoring does not right-shift the MSE score by
two (unlike for 4x4/8x8/16x16).
- to compensate for this loss in precision, the quantizer is halved
also. This is currently a little hacky.
- FDCT and IDCT is double-only right now. Needs a fixed-point impl.
- There are no default probabilities for the 32x32 transform yet; I'm
simply using the 16x16 luma ones. A future commit will add newly
generated probabilities for all transforms.
- No ADST version. I don't think we'll add one for this level; if an
ADST is desired, transform-size selection can scale back to 16x16
or lower, and use an ADST at that level.
Additional notes specific to Debargha's DWT/DCT hybrid:
- coefficient scale is different for the top/left 16x16 (DCT-over-DWT)
block than for the rest (DWT pixel differences) of the block. Therefore,
RD error scoring isn't easily scalable between coefficient and pixel
domain. Thus, unfortunately, we need to compute the RD distortion in
the pixel domain until we figure out how to scale these appropriately.
Change-Id: I00386f20f35d7fabb19aba94c8162f8aee64ef2b
2012-12-07 23:45:05 +01:00
|
|
|
|
2013-06-06 05:56:37 +02:00
|
|
|
if (txfm_mode > ALLOW_16X16)
|
2013-05-31 18:18:59 +02:00
|
|
|
update_coef_probs_common(bc, cpi, TX_32X32);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-04-12 18:24:03 +02:00
|
|
|
|
2013-06-03 19:50:57 +02:00
|
|
|
static void encode_loopfilter(VP9_COMMON *pc, MACROBLOCKD *xd,
|
|
|
|
struct vp9_write_bit_buffer *wb) {
|
2013-05-02 23:23:56 +02:00
|
|
|
int i;
|
|
|
|
|
2013-05-14 03:05:20 +02:00
|
|
|
// Encode the loop filter level and type
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_literal(wb, pc->filter_level, 6);
|
|
|
|
vp9_wb_write_literal(wb, pc->sharpness_level, 3);
|
2013-05-14 03:05:20 +02:00
|
|
|
|
2013-05-02 23:23:56 +02:00
|
|
|
// Write out loop filter deltas applied at the MB level based on mode or
|
|
|
|
// ref frame (if they are enabled).
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, xd->mode_ref_lf_delta_enabled);
|
2013-05-02 23:23:56 +02:00
|
|
|
|
|
|
|
if (xd->mode_ref_lf_delta_enabled) {
|
|
|
|
// Do the deltas need to be updated
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, xd->mode_ref_lf_delta_update);
|
2013-05-02 23:23:56 +02:00
|
|
|
if (xd->mode_ref_lf_delta_update) {
|
|
|
|
// Send update
|
|
|
|
for (i = 0; i < MAX_REF_LF_DELTAS; i++) {
|
|
|
|
const int delta = xd->ref_lf_deltas[i];
|
|
|
|
|
|
|
|
// Frame level data
|
|
|
|
if (delta != xd->last_ref_lf_deltas[i]) {
|
|
|
|
xd->last_ref_lf_deltas[i] = delta;
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, 1);
|
2013-05-02 23:23:56 +02:00
|
|
|
|
2013-06-03 19:50:57 +02:00
|
|
|
assert(delta != 0);
|
|
|
|
vp9_wb_write_literal(wb, abs(delta) & 0x3F, 6);
|
|
|
|
vp9_wb_write_bit(wb, delta < 0);
|
2013-05-02 23:23:56 +02:00
|
|
|
} else {
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, 0);
|
2013-05-02 23:23:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Send update
|
|
|
|
for (i = 0; i < MAX_MODE_LF_DELTAS; i++) {
|
|
|
|
const int delta = xd->mode_lf_deltas[i];
|
|
|
|
if (delta != xd->last_mode_lf_deltas[i]) {
|
|
|
|
xd->last_mode_lf_deltas[i] = delta;
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, 1);
|
2013-05-02 23:23:56 +02:00
|
|
|
|
2013-06-03 19:50:57 +02:00
|
|
|
assert(delta != 0);
|
|
|
|
vp9_wb_write_literal(wb, abs(delta) & 0x3F, 6);
|
|
|
|
vp9_wb_write_bit(wb, delta < 0);
|
2013-05-02 23:23:56 +02:00
|
|
|
} else {
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, 0);
|
2013-05-02 23:23:56 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-03 19:50:57 +02:00
|
|
|
static void write_delta_q(struct vp9_write_bit_buffer *wb, int delta_q) {
|
2013-05-14 03:05:20 +02:00
|
|
|
if (delta_q != 0) {
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, 1);
|
|
|
|
vp9_wb_write_literal(wb, abs(delta_q), 4);
|
|
|
|
vp9_wb_write_bit(wb, delta_q < 0);
|
2013-05-14 03:05:20 +02:00
|
|
|
} else {
|
2013-06-03 19:50:57 +02:00
|
|
|
vp9_wb_write_bit(wb, 0);
|
2013-05-14 03:05:20 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-03 19:50:57 +02:00
|
|
|
static void encode_quantization(VP9_COMMON *cm,
|
|
|
|
struct vp9_write_bit_buffer *wb) {
|
|
|
|
vp9_wb_write_literal(wb, cm->base_qindex, QINDEX_BITS);
|
|
|
|
write_delta_q(wb, cm->y_dc_delta_q);
|
|
|
|
write_delta_q(wb, cm->uv_dc_delta_q);
|
|
|
|
write_delta_q(wb, cm->uv_ac_delta_q);
|
2013-05-14 03:05:20 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-06-06 21:33:12 +02:00
|
|
|
static void encode_segmentation(VP9_COMP *cpi,
|
|
|
|
struct vp9_write_bit_buffer *wb) {
|
2012-07-14 00:21:29 +02:00
|
|
|
int i, j;
|
2013-06-06 21:33:12 +02:00
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
2013-04-30 01:07:17 +02:00
|
|
|
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
|
|
|
|
|
2013-06-06 21:33:12 +02:00
|
|
|
vp9_wb_write_bit(wb, xd->segmentation_enabled);
|
2013-04-30 01:07:17 +02:00
|
|
|
if (!xd->segmentation_enabled)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// Segmentation map
|
2013-06-06 21:33:12 +02:00
|
|
|
vp9_wb_write_bit(wb, xd->update_mb_segmentation_map);
|
2013-04-30 01:07:17 +02:00
|
|
|
if (xd->update_mb_segmentation_map) {
|
|
|
|
// Select the coding strategy (temporal or spatial)
|
|
|
|
vp9_choose_segmap_coding_method(cpi);
|
|
|
|
// Write out probabilities used to decode unpredicted macro-block segments
|
|
|
|
for (i = 0; i < MB_SEG_TREE_PROBS; i++) {
|
|
|
|
const int prob = xd->mb_segment_tree_probs[i];
|
2013-06-06 21:33:12 +02:00
|
|
|
const int update = prob != MAX_PROB;
|
|
|
|
vp9_wb_write_bit(wb, update);
|
|
|
|
if (update)
|
|
|
|
vp9_wb_write_literal(wb, prob, 8);
|
2013-04-30 01:07:17 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
// Write out the chosen coding method.
|
2013-06-06 21:33:12 +02:00
|
|
|
vp9_wb_write_bit(wb, cm->temporal_update);
|
|
|
|
if (cm->temporal_update) {
|
2013-04-30 01:07:17 +02:00
|
|
|
for (i = 0; i < PREDICTION_PROBS; i++) {
|
2013-06-06 21:33:12 +02:00
|
|
|
const int prob = cm->segment_pred_probs[i];
|
|
|
|
const int update = prob != MAX_PROB;
|
|
|
|
vp9_wb_write_bit(wb, update);
|
|
|
|
if (update)
|
|
|
|
vp9_wb_write_literal(wb, prob, 8);
|
2013-04-30 01:07:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Segmentation data
|
2013-06-06 21:33:12 +02:00
|
|
|
vp9_wb_write_bit(wb, xd->update_mb_segmentation_data);
|
2013-04-30 01:07:17 +02:00
|
|
|
if (xd->update_mb_segmentation_data) {
|
2013-06-06 21:33:12 +02:00
|
|
|
vp9_wb_write_bit(wb, xd->mb_segment_abs_delta);
|
2013-04-30 01:07:17 +02:00
|
|
|
|
|
|
|
for (i = 0; i < MAX_MB_SEGMENTS; i++) {
|
|
|
|
for (j = 0; j < SEG_LVL_MAX; j++) {
|
2013-06-06 21:33:12 +02:00
|
|
|
const int active = vp9_segfeature_active(xd, i, j);
|
|
|
|
vp9_wb_write_bit(wb, active);
|
|
|
|
if (active) {
|
|
|
|
const int data = vp9_get_segdata(xd, i, j);
|
|
|
|
const int data_max = vp9_seg_feature_data_max(j);
|
2013-04-30 01:07:17 +02:00
|
|
|
|
|
|
|
if (vp9_is_segfeature_signed(j)) {
|
2013-06-06 21:33:12 +02:00
|
|
|
vp9_encode_unsigned_max(wb, abs(data), data_max);
|
|
|
|
vp9_wb_write_bit(wb, data < 0);
|
2013-04-30 01:07:17 +02:00
|
|
|
} else {
|
2013-06-06 21:33:12 +02:00
|
|
|
vp9_encode_unsigned_max(wb, data, data_max);
|
2013-04-30 01:07:17 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-05-30 23:50:41 +02:00
|
|
|
|
2013-06-06 20:14:04 +02:00
|
|
|
static void encode_txfm_probs(VP9_COMP *cpi, vp9_writer *w) {
|
2013-05-30 23:50:41 +02:00
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
|
|
|
|
|
|
|
// Mode
|
|
|
|
vp9_write_literal(w, MIN(cm->txfm_mode, ALLOW_32X32), 2);
|
|
|
|
if (cm->txfm_mode >= ALLOW_32X32)
|
|
|
|
vp9_write_bit(w, cm->txfm_mode == TX_MODE_SELECT);
|
|
|
|
|
|
|
|
// Probabilities
|
|
|
|
if (cm->txfm_mode == TX_MODE_SELECT) {
|
2013-06-06 20:14:04 +02:00
|
|
|
int i;
|
|
|
|
unsigned int ct[TX_SIZE_PROBS][2];
|
|
|
|
tx_counts_to_branch_counts(cm->fc.tx_count_32x32p,
|
|
|
|
cm->fc.tx_count_16x16p,
|
|
|
|
cm->fc.tx_count_8x8p, ct);
|
|
|
|
|
|
|
|
for (i = 0; i < TX_SIZE_PROBS; i++) {
|
|
|
|
vp9_cond_prob_diff_update(w, &cm->fc.tx_probs[i],
|
|
|
|
VP9_DEF_UPDATE_PROB, ct[i]);
|
|
|
|
}
|
2013-05-30 23:50:41 +02:00
|
|
|
} else {
|
2013-06-06 20:14:04 +02:00
|
|
|
vpx_memcpy(cm->fc.tx_probs, vp9_default_tx_probs,
|
|
|
|
sizeof(vp9_default_tx_probs));
|
2013-05-30 23:50:41 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-06 05:56:37 +02:00
|
|
|
static void write_interp_filter_type(INTERPOLATIONFILTERTYPE type,
|
|
|
|
struct vp9_write_bit_buffer *wb) {
|
|
|
|
vp9_wb_write_bit(wb, type == SWITCHABLE);
|
|
|
|
if (type != SWITCHABLE)
|
|
|
|
vp9_wb_write_literal(wb, type, 2);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void fix_mcomp_filter_type(VP9_COMP *cpi) {
|
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
|
|
|
|
|
|
|
if (cm->mcomp_filter_type == SWITCHABLE) {
|
|
|
|
// Check to see if only one of the filters is actually used
|
|
|
|
int count[VP9_SWITCHABLE_FILTERS];
|
|
|
|
int i, j, c = 0;
|
|
|
|
for (i = 0; i < VP9_SWITCHABLE_FILTERS; ++i) {
|
|
|
|
count[i] = 0;
|
|
|
|
for (j = 0; j <= VP9_SWITCHABLE_FILTERS; ++j)
|
|
|
|
count[i] += cm->fc.switchable_interp_count[j][i];
|
|
|
|
c += (count[i] > 0);
|
|
|
|
}
|
|
|
|
if (c == 1) {
|
|
|
|
// Only one filter is used. So set the filter at frame level
|
|
|
|
for (i = 0; i < VP9_SWITCHABLE_FILTERS; ++i) {
|
|
|
|
if (count[i]) {
|
|
|
|
cm->mcomp_filter_type = vp9_switchable_interp[i];
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-06-06 21:33:12 +02:00
|
|
|
static void write_tile_info(VP9_COMMON *cm, struct vp9_write_bit_buffer *wb) {
|
|
|
|
int min_log2_tiles, delta_log2_tiles, n_tile_bits, n;
|
|
|
|
vp9_get_tile_n_bits(cm, &min_log2_tiles, &delta_log2_tiles);
|
|
|
|
n_tile_bits = cm->log2_tile_columns - min_log2_tiles;
|
|
|
|
for (n = 0; n < delta_log2_tiles; n++) {
|
|
|
|
if (n_tile_bits--) {
|
|
|
|
vp9_wb_write_bit(wb, 1);
|
|
|
|
} else {
|
|
|
|
vp9_wb_write_bit(wb, 0);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
vp9_wb_write_bit(wb, cm->log2_tile_rows != 0);
|
|
|
|
if (cm->log2_tile_rows != 0)
|
|
|
|
vp9_wb_write_bit(wb, cm->log2_tile_rows != 1);
|
|
|
|
}
|
|
|
|
|
2013-06-07 22:41:44 +02:00
|
|
|
static int get_refresh_mask(VP9_COMP *cpi) {
|
|
|
|
// Should the GF or ARF be updated using the transmitted frame or buffer
|
|
|
|
#if CONFIG_MULTIPLE_ARF
|
|
|
|
if (!cpi->multi_arf_enabled && cpi->refresh_golden_frame &&
|
|
|
|
!cpi->refresh_alt_ref_frame) {
|
|
|
|
#else
|
|
|
|
if (cpi->refresh_golden_frame && !cpi->refresh_alt_ref_frame) {
|
|
|
|
#endif
|
|
|
|
// Preserve the previously existing golden frame and update the frame in
|
|
|
|
// the alt ref slot instead. This is highly specific to the use of
|
|
|
|
// alt-ref as a forward reference, and this needs to be generalized as
|
|
|
|
// other uses are implemented (like RTC/temporal scaling)
|
|
|
|
//
|
|
|
|
// gld_fb_idx and alt_fb_idx need to be swapped for future frames, but
|
|
|
|
// that happens in vp9_onyx_if.c:update_reference_frames() so that it can
|
|
|
|
// be done outside of the recode loop.
|
|
|
|
return (cpi->refresh_last_frame << cpi->lst_fb_idx) |
|
|
|
|
(cpi->refresh_golden_frame << cpi->alt_fb_idx);
|
|
|
|
} else {
|
|
|
|
int arf_idx = cpi->alt_fb_idx;
|
|
|
|
#if CONFIG_MULTIPLE_ARF
|
|
|
|
// Determine which ARF buffer to use to encode this ARF frame.
|
|
|
|
if (cpi->multi_arf_enabled) {
|
|
|
|
int sn = cpi->sequence_number;
|
|
|
|
arf_idx = (cpi->frame_coding_order[sn] < 0) ?
|
|
|
|
cpi->arf_buffer_idx[sn + 1] :
|
|
|
|
cpi->arf_buffer_idx[sn];
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
return (cpi->refresh_last_frame << cpi->lst_fb_idx) |
|
|
|
|
(cpi->refresh_golden_frame << cpi->gld_fb_idx) |
|
|
|
|
(cpi->refresh_alt_ref_frame << arf_idx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_display_size(VP9_COMP *cpi, struct vp9_write_bit_buffer *wb) {
|
2013-06-03 19:50:57 +02:00
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
|
|
|
|
2013-05-29 03:07:54 +02:00
|
|
|
const int scaling_active = cm->width != cm->display_width ||
|
|
|
|
cm->height != cm->display_height;
|
2013-06-07 22:41:44 +02:00
|
|
|
vp9_wb_write_bit(wb, scaling_active);
|
|
|
|
if (scaling_active) {
|
|
|
|
vp9_wb_write_literal(wb, cm->display_width, 16);
|
|
|
|
vp9_wb_write_literal(wb, cm->display_height, 16);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void write_uncompressed_header(VP9_COMP *cpi,
|
|
|
|
struct vp9_write_bit_buffer *wb) {
|
|
|
|
VP9_COMMON *const cm = &cpi->common;
|
|
|
|
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-06-07 08:53:56 +02:00
|
|
|
// frame marker bits
|
2013-06-07 22:41:44 +02:00
|
|
|
vp9_wb_write_literal(wb, 0x2, 2);
|
2013-06-07 08:53:56 +02:00
|
|
|
|
|
|
|
// bitstream version.
|
|
|
|
// 00 - profile 0. 4:2:0 only
|
|
|
|
// 10 - profile 1. adds 4:4:4, 4:2:2, alpha
|
|
|
|
vp9_wb_write_bit(wb, cm->version);
|
|
|
|
vp9_wb_write_bit(wb, 0);
|
|
|
|
|
2012-10-03 21:11:05 +02:00
|
|
|
vp9_wb_write_bit(wb, 0);
|
2013-05-29 03:07:54 +02:00
|
|
|
vp9_wb_write_bit(wb, cm->frame_type);
|
|
|
|
vp9_wb_write_bit(wb, cm->show_frame);
|
2013-06-07 22:41:44 +02:00
|
|
|
vp9_wb_write_bit(wb, cm->error_resilient_mode);
|
2013-05-28 11:24:52 +02:00
|
|
|
|
2013-05-29 03:07:54 +02:00
|
|
|
if (cm->frame_type == KEY_FRAME) {
|
|
|
|
vp9_wb_write_literal(wb, SYNC_CODE_0, 8);
|
|
|
|
vp9_wb_write_literal(wb, SYNC_CODE_1, 8);
|
|
|
|
vp9_wb_write_literal(wb, SYNC_CODE_2, 8);
|
2013-06-07 08:53:56 +02:00
|
|
|
// colorspaces
|
|
|
|
// 000 - Unknown
|
|
|
|
// 001 - BT.601
|
|
|
|
// 010 - BT.709
|
|
|
|
// 011 - xvYCC
|
|
|
|
// 1xx - Reserved
|
|
|
|
vp9_wb_write_literal(wb, 0, 3);
|
|
|
|
if (cm->version == 1) {
|
|
|
|
vp9_wb_write_bit(wb, cm->subsampling_x);
|
|
|
|
vp9_wb_write_bit(wb, cm->subsampling_y);
|
|
|
|
vp9_wb_write_bit(wb, 0); // has extra plane
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-06-07 22:41:44 +02:00
|
|
|
// frame size
|
|
|
|
vp9_wb_write_literal(wb, cm->width, 16);
|
|
|
|
vp9_wb_write_literal(wb, cm->height, 16);
|
|
|
|
write_display_size(cpi, wb);
|
|
|
|
} else {
|
|
|
|
// When there is a key frame all reference buffers are updated using the
|
|
|
|
// new key frame
|
2013-06-03 19:50:57 +02:00
|
|
|
|
2013-06-07 22:41:44 +02:00
|
|
|
int i;
|
|
|
|
int refs[ALLOWED_REFS_PER_FRAME] = {cpi->lst_fb_idx, cpi->gld_fb_idx,
|
|
|
|
cpi->alt_fb_idx};
|
2013-01-16 21:19:42 +01:00
|
|
|
|
2013-06-07 22:41:44 +02:00
|
|
|
vp9_wb_write_literal(wb, get_refresh_mask(cpi), NUM_REF_FRAMES);
|
|
|
|
for (i = 0; i < ALLOWED_REFS_PER_FRAME; ++i) {
|
|
|
|
vp9_wb_write_literal(wb, refs[i], NUM_REF_FRAMES_LG2);
|
|
|
|
vp9_wb_write_bit(wb, cm->ref_frame_sign_bias[LAST_FRAME + i]);
|
2013-01-16 21:19:42 +01:00
|
|
|
}
|
2013-04-03 00:08:50 +02:00
|
|
|
|
2013-06-07 22:41:44 +02:00
|
|
|
// frame size
|
|
|
|
vp9_wb_write_literal(wb, cm->width, 16);
|
|
|
|
vp9_wb_write_literal(wb, cm->height, 16);
|
|
|
|
write_display_size(cpi, wb);
|
2013-06-06 05:56:37 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
// Signal whether to allow high MV precision
|
2013-06-06 05:56:37 +02:00
|
|
|
vp9_wb_write_bit(wb, xd->allow_high_precision_mv);
|
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
// Signal the type of subpel filter to use
|
2013-06-06 05:56:37 +02:00
|
|
|
fix_mcomp_filter_type(cpi);
|
|
|
|
write_interp_filter_type(cm->mcomp_filter_type, wb);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-06-07 22:41:44 +02:00
|
|
|
if (!cm->error_resilient_mode) {
|
|
|
|
vp9_wb_write_bit(wb, cm->reset_frame_context);
|
|
|
|
vp9_wb_write_bit(wb, cm->refresh_frame_context);
|
|
|
|
vp9_wb_write_bit(wb, cm->frame_parallel_decoding_mode);
|
|
|
|
}
|
|
|
|
|
2013-06-06 05:56:37 +02:00
|
|
|
if (!cm->show_frame)
|
|
|
|
vp9_wb_write_bit(wb, cm->intra_only);
|
|
|
|
|
|
|
|
vp9_wb_write_literal(wb, cm->frame_context_idx, NUM_FRAME_CONTEXTS_LG2);
|
|
|
|
vp9_wb_write_bit(wb, cm->clr_type);
|
|
|
|
|
|
|
|
encode_loopfilter(cm, xd, wb);
|
|
|
|
encode_quantization(cm, wb);
|
2013-06-06 21:33:12 +02:00
|
|
|
encode_segmentation(cpi, wb);
|
|
|
|
|
|
|
|
write_tile_info(cm, wb);
|
2013-06-06 05:56:37 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, unsigned long *size) {
|
|
|
|
int i, bytes_packed;
|
|
|
|
VP9_COMMON *const pc = &cpi->common;
|
|
|
|
vp9_writer header_bc, residual_bc;
|
|
|
|
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
|
|
|
|
|
|
|
|
uint8_t *cx_data = dest;
|
|
|
|
struct vp9_write_bit_buffer wb = {dest, 0};
|
|
|
|
struct vp9_write_bit_buffer first_partition_size_wb;
|
|
|
|
|
|
|
|
write_uncompressed_header(cpi, &wb);
|
|
|
|
first_partition_size_wb = wb;
|
|
|
|
vp9_wb_write_literal(&wb, 0, 16); // don't know in advance first part. size
|
|
|
|
|
|
|
|
bytes_packed = vp9_rb_bytes_written(&wb);
|
|
|
|
cx_data += bytes_packed;
|
|
|
|
|
|
|
|
compute_update_table();
|
|
|
|
|
|
|
|
vp9_start_encode(&header_bc, cx_data);
|
|
|
|
|
2010-05-18 17:58:33 +02:00
|
|
|
#ifdef ENTROPY_STATS
|
2012-07-14 00:21:29 +02:00
|
|
|
if (pc->frame_type == INTER_FRAME)
|
|
|
|
active_section = 0;
|
|
|
|
else
|
|
|
|
active_section = 7;
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
vp9_clear_system_state(); // __asm emms;
|
|
|
|
|
2013-06-06 05:56:37 +02:00
|
|
|
vp9_copy(pc->fc.pre_coef_probs, pc->fc.coef_probs);
|
|
|
|
vp9_copy(pc->fc.pre_y_mode_prob, pc->fc.y_mode_prob);
|
|
|
|
vp9_copy(pc->fc.pre_uv_mode_prob, pc->fc.uv_mode_prob);
|
2013-06-07 22:41:44 +02:00
|
|
|
vp9_copy(pc->fc.pre_partition_prob, pc->fc.partition_prob[INTER_FRAME]);
|
2013-06-06 05:56:37 +02:00
|
|
|
pc->fc.pre_nmvc = pc->fc.nmvc;
|
|
|
|
vp9_copy(pc->fc.pre_switchable_interp_prob, pc->fc.switchable_interp_prob);
|
|
|
|
vp9_copy(pc->fc.pre_inter_mode_probs, pc->fc.inter_mode_probs);
|
2013-06-06 22:44:34 +02:00
|
|
|
vp9_copy(pc->fc.pre_intra_inter_prob, pc->fc.intra_inter_prob);
|
|
|
|
vp9_copy(pc->fc.pre_comp_inter_prob, pc->fc.comp_inter_prob);
|
|
|
|
vp9_copy(pc->fc.pre_comp_ref_prob, pc->fc.comp_ref_prob);
|
|
|
|
vp9_copy(pc->fc.pre_single_ref_prob, pc->fc.single_ref_prob);
|
2013-06-07 22:41:44 +02:00
|
|
|
vp9_copy(pc->fc.pre_tx_probs, pc->fc.tx_probs);
|
2013-06-06 20:14:04 +02:00
|
|
|
|
|
|
|
if (xd->lossless) {
|
|
|
|
pc->txfm_mode = ONLY_4X4;
|
|
|
|
} else {
|
|
|
|
encode_txfm_probs(cpi, &header_bc);
|
|
|
|
}
|
2012-09-10 07:42:35 +02:00
|
|
|
|
2012-10-18 01:47:38 +02:00
|
|
|
update_coef_probs(cpi, &header_bc);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
|
|
|
#ifdef ENTROPY_STATS
|
2012-07-14 00:21:29 +02:00
|
|
|
active_section = 2;
|
2010-05-18 17:58:33 +02:00
|
|
|
#endif
|
|
|
|
|
2013-04-09 19:54:19 +02:00
|
|
|
vp9_update_skip_probs(cpi);
|
2013-06-06 05:56:37 +02:00
|
|
|
for (i = 0; i < MBSKIP_CONTEXTS; ++i)
|
2013-04-17 01:23:17 +02:00
|
|
|
vp9_write_prob(&header_bc, pc->mbskip_pred_probs[i]);
|
2012-10-17 18:38:13 +02:00
|
|
|
|
2013-05-30 18:58:53 +02:00
|
|
|
if (pc->frame_type != KEY_FRAME) {
|
2012-10-17 18:38:13 +02:00
|
|
|
#ifdef ENTROPY_STATS
|
|
|
|
active_section = 1;
|
|
|
|
#endif
|
|
|
|
|
2013-06-05 00:25:16 +02:00
|
|
|
update_inter_mode_probs(pc, &header_bc);
|
|
|
|
vp9_zero(cpi->common.fc.inter_mode_counts);
|
|
|
|
|
2012-10-17 18:38:13 +02:00
|
|
|
if (pc->mcomp_filter_type == SWITCHABLE)
|
2013-06-05 00:25:16 +02:00
|
|
|
update_switchable_interp_probs(pc, &header_bc);
|
|
|
|
|
2013-06-06 22:44:34 +02:00
|
|
|
for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
|
|
|
|
vp9_cond_prob_diff_update(&header_bc, &pc->fc.intra_inter_prob[i],
|
|
|
|
VP9_DEF_UPDATE_PROB, cpi->intra_inter_count[i]);
|
2012-10-17 18:38:13 +02:00
|
|
|
|
2013-06-06 22:44:34 +02:00
|
|
|
if (pc->allow_comp_inter_inter) {
|
2012-10-17 18:38:13 +02:00
|
|
|
const int comp_pred_mode = cpi->common.comp_pred_mode;
|
|
|
|
const int use_compound_pred = (comp_pred_mode != SINGLE_PREDICTION_ONLY);
|
|
|
|
const int use_hybrid_pred = (comp_pred_mode == HYBRID_PREDICTION);
|
|
|
|
|
2013-04-09 04:07:29 +02:00
|
|
|
vp9_write_bit(&header_bc, use_compound_pred);
|
2012-10-17 18:38:13 +02:00
|
|
|
if (use_compound_pred) {
|
2013-04-09 04:07:29 +02:00
|
|
|
vp9_write_bit(&header_bc, use_hybrid_pred);
|
2012-10-17 18:38:13 +02:00
|
|
|
if (use_hybrid_pred) {
|
2013-06-06 22:44:34 +02:00
|
|
|
for (i = 0; i < COMP_INTER_CONTEXTS; i++)
|
|
|
|
vp9_cond_prob_diff_update(&header_bc, &pc->fc.comp_inter_prob[i],
|
|
|
|
VP9_DEF_UPDATE_PROB,
|
|
|
|
cpi->comp_inter_count[i]);
|
2012-10-17 18:38:13 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-06-06 22:44:34 +02:00
|
|
|
|
|
|
|
if (pc->comp_pred_mode != COMP_PREDICTION_ONLY) {
|
|
|
|
for (i = 0; i < REF_CONTEXTS; i++) {
|
|
|
|
vp9_cond_prob_diff_update(&header_bc, &pc->fc.single_ref_prob[i][0],
|
|
|
|
VP9_DEF_UPDATE_PROB,
|
|
|
|
cpi->single_ref_count[i][0]);
|
|
|
|
vp9_cond_prob_diff_update(&header_bc, &pc->fc.single_ref_prob[i][1],
|
|
|
|
VP9_DEF_UPDATE_PROB,
|
|
|
|
cpi->single_ref_count[i][1]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (pc->comp_pred_mode != SINGLE_PREDICTION_ONLY) {
|
|
|
|
for (i = 0; i < REF_CONTEXTS; i++)
|
|
|
|
vp9_cond_prob_diff_update(&header_bc, &pc->fc.comp_ref_prob[i],
|
|
|
|
VP9_DEF_UPDATE_PROB,
|
|
|
|
cpi->comp_ref_count[i]);
|
|
|
|
}
|
|
|
|
|
2012-10-18 01:47:38 +02:00
|
|
|
update_mbintra_mode_probs(cpi, &header_bc);
|
2012-10-17 18:38:13 +02:00
|
|
|
|
2013-04-27 06:52:53 +02:00
|
|
|
for (i = 0; i < NUM_PARTITION_CONTEXTS; ++i) {
|
|
|
|
vp9_prob Pnew[PARTITION_TYPES - 1];
|
|
|
|
unsigned int bct[PARTITION_TYPES - 1][2];
|
|
|
|
update_mode(&header_bc, PARTITION_TYPES, vp9_partition_encodings,
|
2013-06-03 19:39:40 +02:00
|
|
|
vp9_partition_tree, Pnew,
|
|
|
|
pc->fc.partition_prob[pc->frame_type][i], bct,
|
2013-04-27 06:52:53 +02:00
|
|
|
(unsigned int *)cpi->partition_count[i]);
|
|
|
|
}
|
|
|
|
|
2012-11-09 19:52:08 +01:00
|
|
|
vp9_write_nmv_probs(cpi, xd->allow_high_precision_mv, &header_bc);
|
2012-10-17 18:38:13 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
[WIP] Add column-based tiling.
This patch adds column-based tiling. The idea is to make each tile
independently decodable (after reading the common frame header) and
also independendly encodable (minus within-frame cost adjustments in
the RD loop) to speed-up hardware & software en/decoders if they used
multi-threading. Column-based tiling has the added advantage (over
other tiling methods) that it minimizes realtime use-case latency,
since all threads can start encoding data as soon as the first SB-row
worth of data is available to the encoder.
There is some test code that does random tile ordering in the decoder,
to confirm that each tile is indeed independently decodable from other
tiles in the same frame. At tile edges, all contexts assume default
values (i.e. 0, 0 motion vector, no coefficients, DC intra4x4 mode),
and motion vector search and ordering do not cross tiles in the same
frame.
t log
Tile independence is not maintained between frames ATM, i.e. tile 0 of
frame 1 is free to use motion vectors that point into any tile of frame
0. We support 1 (i.e. no tiling), 2 or 4 column-tiles.
The loopfilter crosses tile boundaries. I discussed this briefly with Aki
and he says that's OK. An in-loop loopfilter would need to do some sync
between tile threads, but that shouldn't be a big issue.
Resuls: with tiling disabled, we go up slightly because of improved edge
use in the intra4x4 prediction. With 2 tiles, we lose about ~1% on derf,
~0.35% on HD and ~0.55% on STD/HD. With 4 tiles, we lose another ~1.5%
on derf ~0.77% on HD and ~0.85% on STD/HD. Most of this loss is
concentrated in the low-bitrate end of clips, and most of it is because
of the loss of edges at tile boundaries and the resulting loss of intra
predictors.
TODO:
- more tiles (perhaps allow row-based tiling also, and max. 8 tiles)?
- maybe optionally (for EC purposes), motion vectors themselves
should not cross tile edges, or we should emulate such borders as
if they were off-frame, to limit error propagation to within one
tile only. This doesn't have to be the default behaviour but could
be an optional bitstream flag.
Change-Id: I5951c3a0742a767b20bc9fb5af685d9892c2c96f
2013-02-01 18:35:28 +01:00
|
|
|
|
2012-10-30 20:58:42 +01:00
|
|
|
vp9_stop_encode(&header_bc);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2011-03-11 11:34:57 +01:00
|
|
|
|
2013-05-29 03:07:54 +02:00
|
|
|
// first partition size
|
|
|
|
assert(header_bc.pos <= 0xffff);
|
|
|
|
vp9_wb_write_literal(&first_partition_size_wb, header_bc.pos, 16);
|
|
|
|
*size = bytes_packed + header_bc.pos;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
[WIP] Add column-based tiling.
This patch adds column-based tiling. The idea is to make each tile
independently decodable (after reading the common frame header) and
also independendly encodable (minus within-frame cost adjustments in
the RD loop) to speed-up hardware & software en/decoders if they used
multi-threading. Column-based tiling has the added advantage (over
other tiling methods) that it minimizes realtime use-case latency,
since all threads can start encoding data as soon as the first SB-row
worth of data is available to the encoder.
There is some test code that does random tile ordering in the decoder,
to confirm that each tile is indeed independently decodable from other
tiles in the same frame. At tile edges, all contexts assume default
values (i.e. 0, 0 motion vector, no coefficients, DC intra4x4 mode),
and motion vector search and ordering do not cross tiles in the same
frame.
t log
Tile independence is not maintained between frames ATM, i.e. tile 0 of
frame 1 is free to use motion vectors that point into any tile of frame
0. We support 1 (i.e. no tiling), 2 or 4 column-tiles.
The loopfilter crosses tile boundaries. I discussed this briefly with Aki
and he says that's OK. An in-loop loopfilter would need to do some sync
between tile threads, but that shouldn't be a big issue.
Resuls: with tiling disabled, we go up slightly because of improved edge
use in the intra4x4 prediction. With 2 tiles, we lose about ~1% on derf,
~0.35% on HD and ~0.55% on STD/HD. With 4 tiles, we lose another ~1.5%
on derf ~0.77% on HD and ~0.85% on STD/HD. Most of this loss is
concentrated in the low-bitrate end of clips, and most of it is because
of the loss of edges at tile boundaries and the resulting loss of intra
predictors.
TODO:
- more tiles (perhaps allow row-based tiling also, and max. 8 tiles)?
- maybe optionally (for EC purposes), motion vectors themselves
should not cross tile edges, or we should emulate such borders as
if they were off-frame, to limit error propagation to within one
tile only. This doesn't have to be the default behaviour but could
be an optional bitstream flag.
Change-Id: I5951c3a0742a767b20bc9fb5af685d9892c2c96f
2013-02-01 18:35:28 +01:00
|
|
|
{
|
2013-02-08 20:33:11 +01:00
|
|
|
int tile_row, tile_col, total_size = 0;
|
[WIP] Add column-based tiling.
This patch adds column-based tiling. The idea is to make each tile
independently decodable (after reading the common frame header) and
also independendly encodable (minus within-frame cost adjustments in
the RD loop) to speed-up hardware & software en/decoders if they used
multi-threading. Column-based tiling has the added advantage (over
other tiling methods) that it minimizes realtime use-case latency,
since all threads can start encoding data as soon as the first SB-row
worth of data is available to the encoder.
There is some test code that does random tile ordering in the decoder,
to confirm that each tile is indeed independently decodable from other
tiles in the same frame. At tile edges, all contexts assume default
values (i.e. 0, 0 motion vector, no coefficients, DC intra4x4 mode),
and motion vector search and ordering do not cross tiles in the same
frame.
t log
Tile independence is not maintained between frames ATM, i.e. tile 0 of
frame 1 is free to use motion vectors that point into any tile of frame
0. We support 1 (i.e. no tiling), 2 or 4 column-tiles.
The loopfilter crosses tile boundaries. I discussed this briefly with Aki
and he says that's OK. An in-loop loopfilter would need to do some sync
between tile threads, but that shouldn't be a big issue.
Resuls: with tiling disabled, we go up slightly because of improved edge
use in the intra4x4 prediction. With 2 tiles, we lose about ~1% on derf,
~0.35% on HD and ~0.55% on STD/HD. With 4 tiles, we lose another ~1.5%
on derf ~0.77% on HD and ~0.85% on STD/HD. Most of this loss is
concentrated in the low-bitrate end of clips, and most of it is because
of the loss of edges at tile boundaries and the resulting loss of intra
predictors.
TODO:
- more tiles (perhaps allow row-based tiling also, and max. 8 tiles)?
- maybe optionally (for EC purposes), motion vectors themselves
should not cross tile edges, or we should emulate such borders as
if they were off-frame, to limit error propagation to within one
tile only. This doesn't have to be the default behaviour but could
be an optional bitstream flag.
Change-Id: I5951c3a0742a767b20bc9fb5af685d9892c2c96f
2013-02-01 18:35:28 +01:00
|
|
|
unsigned char *data_ptr = cx_data + header_bc.pos;
|
2013-02-08 20:33:11 +01:00
|
|
|
TOKENEXTRA *tok[1 << 6], *tok_end;
|
|
|
|
|
|
|
|
tok[0] = cpi->tok;
|
|
|
|
for (tile_col = 1; tile_col < pc->tile_columns; tile_col++)
|
|
|
|
tok[tile_col] = tok[tile_col - 1] + cpi->tok_count[tile_col - 1];
|
|
|
|
|
|
|
|
for (tile_row = 0; tile_row < pc->tile_rows; tile_row++) {
|
|
|
|
vp9_get_tile_row_offsets(pc, tile_row);
|
|
|
|
tok_end = cpi->tok + cpi->tok_count[0];
|
|
|
|
for (tile_col = 0; tile_col < pc->tile_columns;
|
|
|
|
tile_col++, tok_end += cpi->tok_count[tile_col]) {
|
|
|
|
vp9_get_tile_col_offsets(pc, tile_col);
|
|
|
|
|
|
|
|
if (tile_col < pc->tile_columns - 1 || tile_row < pc->tile_rows - 1)
|
|
|
|
vp9_start_encode(&residual_bc, data_ptr + total_size + 4);
|
|
|
|
else
|
|
|
|
vp9_start_encode(&residual_bc, data_ptr + total_size);
|
|
|
|
write_modes(cpi, &residual_bc, &tok[tile_col], tok_end);
|
|
|
|
vp9_stop_encode(&residual_bc);
|
|
|
|
if (tile_col < pc->tile_columns - 1 || tile_row < pc->tile_rows - 1) {
|
2013-04-17 01:26:25 +02:00
|
|
|
// size of this tile
|
|
|
|
write_le32(data_ptr + total_size, residual_bc.pos);
|
2013-02-08 20:33:11 +01:00
|
|
|
total_size += 4;
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-02-08 20:33:11 +01:00
|
|
|
total_size += residual_bc.pos;
|
|
|
|
}
|
[WIP] Add column-based tiling.
This patch adds column-based tiling. The idea is to make each tile
independently decodable (after reading the common frame header) and
also independendly encodable (minus within-frame cost adjustments in
the RD loop) to speed-up hardware & software en/decoders if they used
multi-threading. Column-based tiling has the added advantage (over
other tiling methods) that it minimizes realtime use-case latency,
since all threads can start encoding data as soon as the first SB-row
worth of data is available to the encoder.
There is some test code that does random tile ordering in the decoder,
to confirm that each tile is indeed independently decodable from other
tiles in the same frame. At tile edges, all contexts assume default
values (i.e. 0, 0 motion vector, no coefficients, DC intra4x4 mode),
and motion vector search and ordering do not cross tiles in the same
frame.
t log
Tile independence is not maintained between frames ATM, i.e. tile 0 of
frame 1 is free to use motion vectors that point into any tile of frame
0. We support 1 (i.e. no tiling), 2 or 4 column-tiles.
The loopfilter crosses tile boundaries. I discussed this briefly with Aki
and he says that's OK. An in-loop loopfilter would need to do some sync
between tile threads, but that shouldn't be a big issue.
Resuls: with tiling disabled, we go up slightly because of improved edge
use in the intra4x4 prediction. With 2 tiles, we lose about ~1% on derf,
~0.35% on HD and ~0.55% on STD/HD. With 4 tiles, we lose another ~1.5%
on derf ~0.77% on HD and ~0.85% on STD/HD. Most of this loss is
concentrated in the low-bitrate end of clips, and most of it is because
of the loss of edges at tile boundaries and the resulting loss of intra
predictors.
TODO:
- more tiles (perhaps allow row-based tiling also, and max. 8 tiles)?
- maybe optionally (for EC purposes), motion vectors themselves
should not cross tile edges, or we should emulate such borders as
if they were off-frame, to limit error propagation to within one
tile only. This doesn't have to be the default behaviour but could
be an optional bitstream flag.
Change-Id: I5951c3a0742a767b20bc9fb5af685d9892c2c96f
2013-02-01 18:35:28 +01:00
|
|
|
}
|
|
|
|
|
2013-02-08 20:33:11 +01:00
|
|
|
assert((unsigned int)(tok[0] - cpi->tok) == cpi->tok_count[0]);
|
|
|
|
for (tile_col = 1; tile_col < pc->tile_columns; tile_col++)
|
|
|
|
assert((unsigned int)(tok[tile_col] - tok[tile_col - 1]) ==
|
|
|
|
cpi->tok_count[tile_col]);
|
|
|
|
|
[WIP] Add column-based tiling.
This patch adds column-based tiling. The idea is to make each tile
independently decodable (after reading the common frame header) and
also independendly encodable (minus within-frame cost adjustments in
the RD loop) to speed-up hardware & software en/decoders if they used
multi-threading. Column-based tiling has the added advantage (over
other tiling methods) that it minimizes realtime use-case latency,
since all threads can start encoding data as soon as the first SB-row
worth of data is available to the encoder.
There is some test code that does random tile ordering in the decoder,
to confirm that each tile is indeed independently decodable from other
tiles in the same frame. At tile edges, all contexts assume default
values (i.e. 0, 0 motion vector, no coefficients, DC intra4x4 mode),
and motion vector search and ordering do not cross tiles in the same
frame.
t log
Tile independence is not maintained between frames ATM, i.e. tile 0 of
frame 1 is free to use motion vectors that point into any tile of frame
0. We support 1 (i.e. no tiling), 2 or 4 column-tiles.
The loopfilter crosses tile boundaries. I discussed this briefly with Aki
and he says that's OK. An in-loop loopfilter would need to do some sync
between tile threads, but that shouldn't be a big issue.
Resuls: with tiling disabled, we go up slightly because of improved edge
use in the intra4x4 prediction. With 2 tiles, we lose about ~1% on derf,
~0.35% on HD and ~0.55% on STD/HD. With 4 tiles, we lose another ~1.5%
on derf ~0.77% on HD and ~0.85% on STD/HD. Most of this loss is
concentrated in the low-bitrate end of clips, and most of it is because
of the loss of edges at tile boundaries and the resulting loss of intra
predictors.
TODO:
- more tiles (perhaps allow row-based tiling also, and max. 8 tiles)?
- maybe optionally (for EC purposes), motion vectors themselves
should not cross tile edges, or we should emulate such borders as
if they were off-frame, to limit error propagation to within one
tile only. This doesn't have to be the default behaviour but could
be an optional bitstream flag.
Change-Id: I5951c3a0742a767b20bc9fb5af685d9892c2c96f
2013-02-01 18:35:28 +01:00
|
|
|
*size += total_size;
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef ENTROPY_STATS
|
2012-12-08 01:09:59 +01:00
|
|
|
static void print_tree_update_for_type(FILE *f,
|
|
|
|
vp9_coeff_stats *tree_update_hist,
|
|
|
|
int block_types, const char *header) {
|
2013-02-19 22:36:38 +01:00
|
|
|
int i, j, k, l, m;
|
2012-08-03 02:03:14 +02:00
|
|
|
|
2012-12-08 01:09:59 +01:00
|
|
|
fprintf(f, "const vp9_coeff_prob %s = {\n", header);
|
|
|
|
for (i = 0; i < block_types; i++) {
|
2012-07-14 00:21:29 +02:00
|
|
|
fprintf(f, " { \n");
|
2013-02-19 22:36:38 +01:00
|
|
|
for (j = 0; j < REF_TYPES; j++) {
|
|
|
|
fprintf(f, " { \n");
|
|
|
|
for (k = 0; k < COEF_BANDS; k++) {
|
|
|
|
fprintf(f, " {\n");
|
|
|
|
for (l = 0; l < PREV_COEF_CONTEXTS; l++) {
|
|
|
|
fprintf(f, " {");
|
|
|
|
for (m = 0; m < ENTROPY_NODES; m++) {
|
|
|
|
fprintf(f, "%3d, ",
|
|
|
|
get_binary_prob(tree_update_hist[i][j][k][l][m][0],
|
|
|
|
tree_update_hist[i][j][k][l][m][1]));
|
|
|
|
}
|
|
|
|
fprintf(f, "},\n");
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
fprintf(f, "},\n");
|
|
|
|
}
|
|
|
|
fprintf(f, " },\n");
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
fprintf(f, " },\n");
|
|
|
|
}
|
|
|
|
fprintf(f, "};\n");
|
2012-12-08 01:09:59 +01:00
|
|
|
}
|
2012-05-08 21:38:39 +02:00
|
|
|
|
2012-12-08 01:09:59 +01:00
|
|
|
void print_tree_update_probs() {
|
|
|
|
FILE *f = fopen("coefupdprob.h", "w");
|
|
|
|
fprintf(f, "\n/* Update probabilities for token entropy tree. */\n\n");
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-05-31 18:18:59 +02:00
|
|
|
print_tree_update_for_type(f, tree_update_hist[TX_4X4], BLOCK_TYPES,
|
2013-03-04 23:12:17 +01:00
|
|
|
"vp9_coef_update_probs_4x4[BLOCK_TYPES]");
|
2013-05-31 18:18:59 +02:00
|
|
|
print_tree_update_for_type(f, tree_update_hist[TX_8X8], BLOCK_TYPES,
|
2013-03-04 23:12:17 +01:00
|
|
|
"vp9_coef_update_probs_8x8[BLOCK_TYPES]");
|
2013-05-31 18:18:59 +02:00
|
|
|
print_tree_update_for_type(f, tree_update_hist[TX_16X16], BLOCK_TYPES,
|
2013-03-04 23:12:17 +01:00
|
|
|
"vp9_coef_update_probs_16x16[BLOCK_TYPES]");
|
2013-05-31 18:18:59 +02:00
|
|
|
print_tree_update_for_type(f, tree_update_hist[TX_32X32], BLOCK_TYPES,
|
2013-03-04 23:12:17 +01:00
|
|
|
"vp9_coef_update_probs_32x32[BLOCK_TYPES]");
|
2012-08-03 02:03:14 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
fclose(f);
|
|
|
|
f = fopen("treeupdate.bin", "wb");
|
2013-05-31 18:18:59 +02:00
|
|
|
fwrite(tree_update_hist, sizeof(tree_update_hist), 1, f);
|
2012-07-14 00:21:29 +02:00
|
|
|
fclose(f);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
#endif
|