mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-10-09 08:47:31 +09:00
Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614
This commit is contained in:
trav90
Roy Tam
parent
debbee1e2a
commit
992c6637e3
429 changed files with 76047 additions and 40937 deletions
418
third_party/aom/av1/decoder/decodetxb.c
vendored
418
third_party/aom/av1/decoder/decodetxb.c
vendored
|
|
@ -15,16 +15,20 @@
|
|||
#include "av1/decoder/decodemv.h"
|
||||
#include "av1/decoder/decodetxb.h"
|
||||
#include "av1/decoder/dsubexp.h"
|
||||
#include "av1/decoder/symbolrate.h"
|
||||
|
||||
#define ACCT_STR __func__
|
||||
|
||||
static int read_golomb(MACROBLOCKD *xd, aom_reader *r) {
|
||||
static int read_golomb(MACROBLOCKD *xd, aom_reader *r, FRAME_COUNTS *counts) {
|
||||
#if !CONFIG_SYMBOLRATE
|
||||
(void)counts;
|
||||
#endif
|
||||
int x = 1;
|
||||
int length = 0;
|
||||
int i = 0;
|
||||
|
||||
while (!i) {
|
||||
i = aom_read_bit(r, ACCT_STR);
|
||||
i = av1_read_record_bit(counts, r, ACCT_STR);
|
||||
++length;
|
||||
if (length >= 32) {
|
||||
aom_internal_error(xd->error_info, AOM_CODEC_CORRUPT_FRAME,
|
||||
|
|
@ -35,21 +39,247 @@ static int read_golomb(MACROBLOCKD *xd, aom_reader *r) {
|
|||
|
||||
for (i = 0; i < length - 1; ++i) {
|
||||
x <<= 1;
|
||||
x += aom_read_bit(r, ACCT_STR);
|
||||
x += av1_read_record_bit(counts, r, ACCT_STR);
|
||||
}
|
||||
|
||||
return x - 1;
|
||||
}
|
||||
|
||||
static INLINE int read_nz_map(aom_reader *r, tran_low_t *tcoeffs, int plane,
|
||||
const int16_t *scan, TX_SIZE tx_size,
|
||||
TX_TYPE tx_type, FRAME_CONTEXT *fc,
|
||||
FRAME_COUNTS *counts) {
|
||||
TX_SIZE txs_ctx = get_txsize_context(tx_size);
|
||||
const int bwl = b_width_log2_lookup[txsize_to_bsize[tx_size]] + 2;
|
||||
const int height = tx_size_high[tx_size];
|
||||
#if CONFIG_CTX1D
|
||||
const int width = tx_size_wide[tx_size];
|
||||
const int eob_offset = width + height;
|
||||
const TX_CLASS tx_class = get_tx_class(tx_type);
|
||||
const int seg_eob =
|
||||
(tx_class == TX_CLASS_2D) ? tx_size_2d[tx_size] : eob_offset;
|
||||
#else
|
||||
const int seg_eob = tx_size_2d[tx_size];
|
||||
#endif
|
||||
const PLANE_TYPE plane_type = get_plane_type(plane);
|
||||
unsigned int(*nz_map_count)[SIG_COEF_CONTEXTS][2] =
|
||||
(counts) ? &counts->nz_map[txs_ctx][plane_type] : NULL;
|
||||
#if !LV_MAP_PROB
|
||||
aom_prob *nz_map = fc->nz_map[txs_ctx][plane_type];
|
||||
aom_prob *eob_flag = fc->eob_flag[txs_ctx][plane_type];
|
||||
#endif
|
||||
int c;
|
||||
for (c = 0; c < seg_eob; ++c) {
|
||||
int is_nz;
|
||||
int coeff_ctx = get_nz_map_ctx(tcoeffs, c, scan, bwl, height, tx_type);
|
||||
int eob_ctx = get_eob_ctx(tcoeffs, scan[c], txs_ctx, tx_type);
|
||||
|
||||
if (c < seg_eob - 1) {
|
||||
#if LV_MAP_PROB
|
||||
is_nz = av1_read_record_bin(
|
||||
counts, r, fc->nz_map_cdf[txs_ctx][plane_type][coeff_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
is_nz = aom_read(r, nz_map[coeff_ctx], ACCT_STR);
|
||||
#endif
|
||||
} else {
|
||||
is_nz = 1;
|
||||
}
|
||||
|
||||
// set non-zero coefficient map.
|
||||
tcoeffs[scan[c]] = is_nz;
|
||||
|
||||
if (c == seg_eob - 1) {
|
||||
++c;
|
||||
break;
|
||||
}
|
||||
|
||||
if (counts) ++(*nz_map_count)[coeff_ctx][is_nz];
|
||||
|
||||
if (is_nz) {
|
||||
#if LV_MAP_PROB
|
||||
int is_eob = av1_read_record_bin(
|
||||
counts, r, fc->eob_flag_cdf[txs_ctx][plane_type][eob_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int is_eob = aom_read(r, eob_flag[eob_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (counts) ++counts->eob_flag[txs_ctx][plane_type][eob_ctx][is_eob];
|
||||
if (is_eob) break;
|
||||
}
|
||||
}
|
||||
return AOMMIN(seg_eob, c + 1);
|
||||
}
|
||||
|
||||
#if CONFIG_CTX1D
|
||||
static INLINE int read_nz_map_vert(aom_reader *r, tran_low_t *tcoeffs,
|
||||
int plane, const int16_t *scan,
|
||||
const int16_t *iscan, TX_SIZE tx_size,
|
||||
TX_TYPE tx_type, FRAME_CONTEXT *fc,
|
||||
FRAME_COUNTS *counts) {
|
||||
const TX_SIZE txs_ctx = get_txsize_context(tx_size);
|
||||
const PLANE_TYPE plane_type = get_plane_type(plane);
|
||||
const TX_CLASS tx_class = get_tx_class(tx_type);
|
||||
const int bwl = b_width_log2_lookup[txsize_to_bsize[tx_size]] + 2;
|
||||
const int width = tx_size_wide[tx_size];
|
||||
const int height = tx_size_high[tx_size];
|
||||
int16_t eob_ls[MAX_HVTX_SIZE];
|
||||
int eob = 0;
|
||||
#if !LV_MAP_PROB
|
||||
aom_prob *nz_map = fc->nz_map[txs_ctx][plane_type];
|
||||
#endif
|
||||
for (int col = 0; col < width; ++col) {
|
||||
int el_ctx = get_empty_line_ctx(col, eob_ls);
|
||||
#if LV_MAP_PROB
|
||||
int empty_line = av1_read_record_bin(
|
||||
counts, r, fc->empty_line_cdf[txs_ctx][plane_type][tx_class][el_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int empty_line = aom_read(
|
||||
r, fc->empty_line[txs_ctx][plane_type][tx_class][el_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (counts)
|
||||
++counts->empty_line[txs_ctx][plane_type][tx_class][el_ctx][empty_line];
|
||||
if (!empty_line) {
|
||||
int row;
|
||||
for (row = 0; row < height; ++row) {
|
||||
if (row + 1 != height) {
|
||||
int coeff_idx = row * width + col;
|
||||
int scan_idx = iscan[coeff_idx];
|
||||
int coeff_ctx =
|
||||
get_nz_map_ctx(tcoeffs, scan_idx, scan, bwl, height, tx_type);
|
||||
#if LV_MAP_PROB
|
||||
int is_nz = av1_read_record_bin(
|
||||
counts, r, fc->nz_map_cdf[txs_ctx][plane_type][coeff_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int is_nz = aom_read(r, nz_map[coeff_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (counts) ++counts->nz_map[txs_ctx][plane_type][coeff_ctx][is_nz];
|
||||
tcoeffs[coeff_idx] = is_nz;
|
||||
if (is_nz) {
|
||||
eob = AOMMAX(eob, iscan[coeff_idx] + 1);
|
||||
if (row + 1 != height) {
|
||||
int eob_ctx = get_hv_eob_ctx(col, row, eob_ls);
|
||||
#if LV_MAP_PROB
|
||||
int is_eob = av1_read_record_bin(
|
||||
counts, r,
|
||||
fc->hv_eob_cdf[txs_ctx][plane_type][tx_class][eob_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int is_eob = aom_read(
|
||||
r, fc->hv_eob[txs_ctx][plane_type][tx_class][eob_ctx],
|
||||
ACCT_STR);
|
||||
#endif
|
||||
if (counts)
|
||||
++counts
|
||||
->hv_eob[txs_ctx][plane_type][tx_class][eob_ctx][is_eob];
|
||||
if (is_eob) break;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
int coeff_idx = row * width + col;
|
||||
tcoeffs[coeff_idx] = 1;
|
||||
eob = AOMMAX(eob, iscan[coeff_idx] + 1);
|
||||
}
|
||||
}
|
||||
eob_ls[col] = AOMMIN(height, row + 1);
|
||||
} else {
|
||||
eob_ls[col] = 0;
|
||||
}
|
||||
}
|
||||
return eob;
|
||||
}
|
||||
|
||||
static INLINE int read_nz_map_horiz(aom_reader *r, tran_low_t *tcoeffs,
|
||||
int plane, const int16_t *scan,
|
||||
const int16_t *iscan, TX_SIZE tx_size,
|
||||
TX_TYPE tx_type, FRAME_CONTEXT *fc,
|
||||
FRAME_COUNTS *counts) {
|
||||
const TX_SIZE txs_ctx = get_txsize_context(tx_size);
|
||||
const PLANE_TYPE plane_type = get_plane_type(plane);
|
||||
const TX_CLASS tx_class = get_tx_class(tx_type);
|
||||
const int bwl = b_width_log2_lookup[txsize_to_bsize[tx_size]] + 2;
|
||||
const int width = tx_size_wide[tx_size];
|
||||
const int height = tx_size_high[tx_size];
|
||||
int16_t eob_ls[MAX_HVTX_SIZE];
|
||||
int eob = 0;
|
||||
#if !LV_MAP_PROB
|
||||
aom_prob *nz_map = fc->nz_map[txs_ctx][plane_type];
|
||||
#endif
|
||||
for (int row = 0; row < height; ++row) {
|
||||
int el_ctx = get_empty_line_ctx(row, eob_ls);
|
||||
#if LV_MAP_PROB
|
||||
int empty_line = av1_read_record_bin(
|
||||
counts, r, fc->empty_line_cdf[txs_ctx][plane_type][tx_class][el_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int empty_line = aom_read(
|
||||
r, fc->empty_line[txs_ctx][plane_type][tx_class][el_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (counts)
|
||||
++counts->empty_line[txs_ctx][plane_type][tx_class][el_ctx][empty_line];
|
||||
if (!empty_line) {
|
||||
int col;
|
||||
for (col = 0; col < width; ++col) {
|
||||
if (col + 1 != width) {
|
||||
int coeff_idx = row * width + col;
|
||||
int scan_idx = iscan[coeff_idx];
|
||||
int coeff_ctx =
|
||||
get_nz_map_ctx(tcoeffs, scan_idx, scan, bwl, height, tx_type);
|
||||
#if LV_MAP_PROB
|
||||
int is_nz = av1_read_record_bin(
|
||||
counts, r, fc->nz_map_cdf[txs_ctx][plane_type][coeff_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int is_nz = aom_read(r, nz_map[coeff_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (counts) ++counts->nz_map[txs_ctx][plane_type][coeff_ctx][is_nz];
|
||||
tcoeffs[coeff_idx] = is_nz;
|
||||
if (is_nz) {
|
||||
eob = AOMMAX(eob, iscan[coeff_idx] + 1);
|
||||
int eob_ctx = get_hv_eob_ctx(row, col, eob_ls);
|
||||
#if LV_MAP_PROB
|
||||
int is_eob = av1_read_record_bin(
|
||||
counts, r,
|
||||
fc->hv_eob_cdf[txs_ctx][plane_type][tx_class][eob_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int is_eob =
|
||||
aom_read(r, fc->hv_eob[txs_ctx][plane_type][tx_class][eob_ctx],
|
||||
ACCT_STR);
|
||||
#endif
|
||||
if (counts)
|
||||
++counts->hv_eob[txs_ctx][plane_type][tx_class][eob_ctx][is_eob];
|
||||
if (is_eob) break;
|
||||
}
|
||||
} else {
|
||||
int coeff_idx = row * width + col;
|
||||
tcoeffs[coeff_idx] = 1;
|
||||
eob = AOMMAX(eob, iscan[coeff_idx] + 1);
|
||||
}
|
||||
}
|
||||
eob_ls[row] = AOMMIN(width, col + 1);
|
||||
} else {
|
||||
eob_ls[row] = 0;
|
||||
}
|
||||
}
|
||||
return eob;
|
||||
}
|
||||
#endif
|
||||
|
||||
uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
||||
aom_reader *r, int blk_row, int blk_col, int block,
|
||||
int plane, tran_low_t *tcoeffs, TXB_CTX *txb_ctx,
|
||||
TX_SIZE tx_size, int16_t *max_scan_line, int *eob) {
|
||||
FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
|
||||
FRAME_COUNTS *counts = xd->counts;
|
||||
TX_SIZE txs_ctx = get_txsize_context(tx_size);
|
||||
PLANE_TYPE plane_type = get_plane_type(plane);
|
||||
aom_prob *nz_map = cm->fc->nz_map[txs_ctx][plane_type];
|
||||
aom_prob *eob_flag = cm->fc->eob_flag[txs_ctx][plane_type];
|
||||
#if !LV_MAP_PROB
|
||||
aom_prob *nz_map = ec_ctx->nz_map[txs_ctx][plane_type];
|
||||
aom_prob *eob_flag = ec_ctx->eob_flag[txs_ctx][plane_type];
|
||||
#endif
|
||||
MB_MODE_INFO *mbmi = &xd->mi[0]->mbmi;
|
||||
const int seg_eob = tx_size_2d[tx_size];
|
||||
int c = 0;
|
||||
|
|
@ -59,14 +289,16 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
|||
const int bwl = b_width_log2_lookup[txsize_to_bsize[tx_size]] + 2;
|
||||
const int height = tx_size_high[tx_size];
|
||||
int cul_level = 0;
|
||||
unsigned int(*nz_map_count)[SIG_COEF_CONTEXTS][2];
|
||||
|
||||
nz_map_count = (counts) ? &counts->nz_map[txs_ctx][plane_type] : NULL;
|
||||
|
||||
memset(tcoeffs, 0, sizeof(*tcoeffs) * seg_eob);
|
||||
|
||||
#if LV_MAP_PROB
|
||||
int all_zero = av1_read_record_bin(
|
||||
counts, r, ec_ctx->txb_skip_cdf[txs_ctx][txb_ctx->txb_skip_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
int all_zero =
|
||||
aom_read(r, cm->fc->txb_skip[txs_ctx][txb_ctx->txb_skip_ctx], ACCT_STR);
|
||||
aom_read(r, ec_ctx->txb_skip[txs_ctx][txb_ctx->txb_skip_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (xd->counts)
|
||||
++xd->counts->txb_skip[txs_ctx][txb_ctx->txb_skip_ctx][all_zero];
|
||||
|
||||
|
|
@ -89,42 +321,46 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
|||
av1_get_tx_type(plane_type, xd, blk_row, blk_col, block, tx_size);
|
||||
const SCAN_ORDER *const scan_order = get_scan(cm, tx_size, tx_type, mbmi);
|
||||
const int16_t *scan = scan_order->scan;
|
||||
|
||||
#if CONFIG_CTX1D
|
||||
const int16_t *iscan = scan_order->iscan;
|
||||
|
||||
for (c = 0; c < seg_eob; ++c) {
|
||||
int is_nz;
|
||||
int coeff_ctx = get_nz_map_ctx(tcoeffs, scan[c], bwl, height, iscan);
|
||||
int eob_ctx = get_eob_ctx(tcoeffs, scan[c], txs_ctx);
|
||||
|
||||
if (c < seg_eob - 1)
|
||||
is_nz = aom_read(r, nz_map[coeff_ctx], ACCT_STR);
|
||||
else
|
||||
is_nz = 1;
|
||||
|
||||
// set non-zero coefficient map.
|
||||
tcoeffs[scan[c]] = is_nz;
|
||||
|
||||
if (c == seg_eob - 1) {
|
||||
++c;
|
||||
break;
|
||||
}
|
||||
|
||||
if (counts) ++(*nz_map_count)[coeff_ctx][is_nz];
|
||||
|
||||
if (is_nz) {
|
||||
int is_eob = aom_read(r, eob_flag[eob_ctx], ACCT_STR);
|
||||
if (counts) ++counts->eob_flag[txs_ctx][plane_type][eob_ctx][is_eob];
|
||||
if (is_eob) break;
|
||||
TX_CLASS tx_class = get_tx_class(tx_type);
|
||||
if (tx_class == TX_CLASS_2D) {
|
||||
*eob =
|
||||
read_nz_map(r, tcoeffs, plane, scan, tx_size, tx_type, ec_ctx, counts);
|
||||
} else {
|
||||
#if LV_MAP_PROB
|
||||
const int eob_mode = av1_read_record_bin(
|
||||
counts, r, ec_ctx->eob_mode_cdf[txs_ctx][plane_type][tx_class], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
const int eob_mode =
|
||||
aom_read(r, ec_ctx->eob_mode[txs_ctx][plane_type][tx_class], ACCT_STR);
|
||||
#endif
|
||||
if (counts) ++counts->eob_mode[txs_ctx][plane_type][tx_class][eob_mode];
|
||||
if (eob_mode == 0) {
|
||||
*eob = read_nz_map(r, tcoeffs, plane, scan, tx_size, tx_type, ec_ctx,
|
||||
counts);
|
||||
} else {
|
||||
assert(tx_class == TX_CLASS_VERT || tx_class == TX_CLASS_HORIZ);
|
||||
if (tx_class == TX_CLASS_VERT)
|
||||
*eob = read_nz_map_vert(r, tcoeffs, plane, scan, iscan, tx_size,
|
||||
tx_type, ec_ctx, counts);
|
||||
else
|
||||
*eob = read_nz_map_horiz(r, tcoeffs, plane, scan, iscan, tx_size,
|
||||
tx_type, ec_ctx, counts);
|
||||
}
|
||||
}
|
||||
|
||||
*eob = AOMMIN(seg_eob, c + 1);
|
||||
#else
|
||||
*eob = read_nz_map(r, tcoeffs, plane, scan, tx_size, tx_type, ec_ctx, counts);
|
||||
#endif
|
||||
*max_scan_line = *eob;
|
||||
|
||||
int i;
|
||||
for (i = 0; i < NUM_BASE_LEVELS; ++i) {
|
||||
aom_prob *coeff_base = cm->fc->coeff_base[txs_ctx][plane_type][i];
|
||||
|
||||
#if !LV_MAP_PROB
|
||||
aom_prob *coeff_base = ec_ctx->coeff_base[txs_ctx][plane_type][i];
|
||||
#endif
|
||||
update_eob = 0;
|
||||
for (c = *eob - 1; c >= 0; --c) {
|
||||
tran_low_t *v = &tcoeffs[scan[c]];
|
||||
|
|
@ -135,7 +371,14 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
|||
|
||||
ctx = get_base_ctx(tcoeffs, scan[c], bwl, height, i + 1);
|
||||
|
||||
if (aom_read(r, coeff_base[ctx], ACCT_STR)) {
|
||||
#if LV_MAP_PROB
|
||||
if (av1_read_record_bin(
|
||||
counts, r, ec_ctx->coeff_base_cdf[txs_ctx][plane_type][i][ctx], 2,
|
||||
ACCT_STR))
|
||||
#else
|
||||
if (aom_read(r, coeff_base[ctx], ACCT_STR))
|
||||
#endif
|
||||
{
|
||||
*v = i + 1;
|
||||
cul_level += i + 1;
|
||||
|
||||
|
|
@ -143,11 +386,17 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
|||
|
||||
if (c == 0) {
|
||||
int dc_sign_ctx = txb_ctx->dc_sign_ctx;
|
||||
#if LV_MAP_PROB
|
||||
sign = av1_read_record_bin(
|
||||
counts, r, ec_ctx->dc_sign_cdf[plane_type][dc_sign_ctx], 2,
|
||||
ACCT_STR);
|
||||
#else
|
||||
sign =
|
||||
aom_read(r, cm->fc->dc_sign[plane_type][dc_sign_ctx], ACCT_STR);
|
||||
aom_read(r, ec_ctx->dc_sign[plane_type][dc_sign_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (counts) ++counts->dc_sign[plane_type][dc_sign_ctx][sign];
|
||||
} else {
|
||||
sign = aom_read_bit(r, ACCT_STR);
|
||||
sign = av1_read_record_bit(counts, r, ACCT_STR);
|
||||
}
|
||||
if (sign) *v = -(*v);
|
||||
continue;
|
||||
|
|
@ -170,18 +419,74 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
|||
|
||||
if (c == 0) {
|
||||
int dc_sign_ctx = txb_ctx->dc_sign_ctx;
|
||||
sign = aom_read(r, cm->fc->dc_sign[plane_type][dc_sign_ctx], ACCT_STR);
|
||||
#if LV_MAP_PROB
|
||||
sign = av1_read_record_bin(
|
||||
counts, r, ec_ctx->dc_sign_cdf[plane_type][dc_sign_ctx], 2, ACCT_STR);
|
||||
#else
|
||||
sign = aom_read(r, ec_ctx->dc_sign[plane_type][dc_sign_ctx], ACCT_STR);
|
||||
#endif
|
||||
if (counts) ++counts->dc_sign[plane_type][dc_sign_ctx][sign];
|
||||
} else {
|
||||
sign = aom_read_bit(r, ACCT_STR);
|
||||
sign = av1_read_record_bit(counts, r, ACCT_STR);
|
||||
}
|
||||
|
||||
ctx = get_br_ctx(tcoeffs, scan[c], bwl, height);
|
||||
|
||||
if (cm->fc->coeff_lps[txs_ctx][plane_type][ctx] == 0) exit(0);
|
||||
#if BR_NODE
|
||||
for (idx = 0; idx < BASE_RANGE_SETS; ++idx) {
|
||||
#if LV_MAP_PROB
|
||||
if (av1_read_record_bin(
|
||||
counts, r, ec_ctx->coeff_br_cdf[txs_ctx][plane_type][idx][ctx], 2,
|
||||
ACCT_STR))
|
||||
#else // LV_MAP_PROB
|
||||
if (aom_read(r, ec_ctx->coeff_br[txs_ctx][plane_type][idx][ctx],
|
||||
ACCT_STR))
|
||||
#endif // LV_MAP_PROB
|
||||
{
|
||||
int extra_bits = (1 << br_extra_bits[idx]) - 1;
|
||||
// int br_offset = aom_read_literal(r, extra_bits, ACCT_STR);
|
||||
int br_offset = 0;
|
||||
int tok;
|
||||
if (counts) ++counts->coeff_br[txs_ctx][plane_type][idx][ctx][1];
|
||||
for (tok = 0; tok < extra_bits; ++tok) {
|
||||
#if LV_MAP_PROB
|
||||
if (av1_read_record_bin(
|
||||
counts, r, ec_ctx->coeff_lps_cdf[txs_ctx][plane_type][ctx], 2,
|
||||
ACCT_STR))
|
||||
#else
|
||||
if (aom_read(r, ec_ctx->coeff_lps[txs_ctx][plane_type][ctx],
|
||||
ACCT_STR))
|
||||
#endif
|
||||
{
|
||||
br_offset = tok;
|
||||
if (counts) ++counts->coeff_lps[txs_ctx][plane_type][ctx][1];
|
||||
break;
|
||||
}
|
||||
if (counts) ++counts->coeff_lps[txs_ctx][plane_type][ctx][0];
|
||||
}
|
||||
if (tok == extra_bits) br_offset = extra_bits;
|
||||
|
||||
int br_base = br_index_to_coeff[idx];
|
||||
|
||||
*v = NUM_BASE_LEVELS + 1 + br_base + br_offset;
|
||||
cul_level += *v;
|
||||
if (sign) *v = -(*v);
|
||||
break;
|
||||
}
|
||||
if (counts) ++counts->coeff_br[txs_ctx][plane_type][idx][ctx][0];
|
||||
}
|
||||
|
||||
if (idx < BASE_RANGE_SETS) continue;
|
||||
#else
|
||||
for (idx = 0; idx < COEFF_BASE_RANGE; ++idx) {
|
||||
if (aom_read(r, cm->fc->coeff_lps[txs_ctx][plane_type][ctx], ACCT_STR)) {
|
||||
#if LV_MAP_PROB
|
||||
if (av1_read_record_bin(counts, r,
|
||||
ec_ctx->coeff_lps_cdf[txs_ctx][plane_type][ctx],
|
||||
2, ACCT_STR))
|
||||
#else
|
||||
if (aom_read(r, ec_ctx->coeff_lps[txs_ctx][plane_type][ctx], ACCT_STR))
|
||||
#endif
|
||||
{
|
||||
*v = (idx + 1 + NUM_BASE_LEVELS);
|
||||
if (sign) *v = -(*v);
|
||||
cul_level += abs(*v);
|
||||
|
|
@ -192,9 +497,10 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
|||
if (counts) ++counts->coeff_lps[txs_ctx][plane_type][ctx][0];
|
||||
}
|
||||
if (idx < COEFF_BASE_RANGE) continue;
|
||||
#endif
|
||||
|
||||
// decode 0-th order Golomb code
|
||||
*v = read_golomb(xd, r) + COEFF_BASE_RANGE + 1 + NUM_BASE_LEVELS;
|
||||
*v = read_golomb(xd, r, counts) + COEFF_BASE_RANGE + 1 + NUM_BASE_LEVELS;
|
||||
if (sign) *v = -(*v);
|
||||
cul_level += abs(*v);
|
||||
}
|
||||
|
|
@ -202,6 +508,9 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
|
|||
for (c = 0; c < *eob; ++c) {
|
||||
int16_t dqv = (c == 0) ? dequant[0] : dequant[1];
|
||||
tran_low_t *v = &tcoeffs[scan[c]];
|
||||
#if CONFIG_SYMBOLRATE
|
||||
av1_record_coeff(counts, abs(*v));
|
||||
#endif
|
||||
int sign = (*v) < 0;
|
||||
*v = (abs(*v) * dqv) >> shift;
|
||||
if (sign) *v = -(*v);
|
||||
|
|
@ -251,11 +560,15 @@ uint8_t av1_read_coeffs_txb_facade(AV1_COMMON *cm, MACROBLOCKD *xd,
|
|||
return cul_level;
|
||||
}
|
||||
|
||||
#if !LV_MAP_PROB
|
||||
static void read_txb_probs(FRAME_CONTEXT *fc, const TX_SIZE tx_size,
|
||||
aom_reader *r) {
|
||||
aom_reader *r, FRAME_COUNTS *counts) {
|
||||
#if !CONFIG_SYMBOLRATE
|
||||
(void)counts;
|
||||
#endif
|
||||
int plane, ctx, level;
|
||||
|
||||
if (aom_read_bit(r, ACCT_STR) == 0) return;
|
||||
if (av1_read_record_bit(counts, r, ACCT_STR) == 0) return;
|
||||
|
||||
for (ctx = 0; ctx < TXB_SKIP_CONTEXTS; ++ctx)
|
||||
av1_diff_update_prob(r, &fc->txb_skip[tx_size][ctx], ACCT_STR);
|
||||
|
|
@ -279,14 +592,17 @@ static void read_txb_probs(FRAME_CONTEXT *fc, const TX_SIZE tx_size,
|
|||
av1_diff_update_prob(r, &fc->coeff_lps[tx_size][plane][ctx], ACCT_STR);
|
||||
}
|
||||
|
||||
void av1_read_txb_probs(FRAME_CONTEXT *fc, TX_MODE tx_mode, aom_reader *r) {
|
||||
void av1_read_txb_probs(FRAME_CONTEXT *fc, TX_MODE tx_mode, aom_reader *r,
|
||||
FRAME_COUNTS *counts) {
|
||||
const TX_SIZE max_tx_size = tx_mode_to_biggest_tx_size[tx_mode];
|
||||
TX_SIZE tx_size;
|
||||
int ctx, plane;
|
||||
|
||||
for (plane = 0; plane < PLANE_TYPES; ++plane)
|
||||
for (ctx = 0; ctx < DC_SIGN_CONTEXTS; ++ctx)
|
||||
av1_diff_update_prob(r, &fc->dc_sign[plane][ctx], ACCT_STR);
|
||||
|
||||
for (tx_size = TX_4X4; tx_size <= max_tx_size; ++tx_size)
|
||||
read_txb_probs(fc, tx_size, r);
|
||||
read_txb_probs(fc, tx_size, r, counts);
|
||||
}
|
||||
#endif // !LV_MAP_PROB
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue