generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Allow large tx_size in lossless coding with transform skipping" into nextgen

Browse Source
This commit is contained in:
punksu 2014-12-27 20:52:36 -08:00 committed by Gerrit Code Review
commit b0ef621f84
5 changed files with 115 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vp9/decoder/vp9_decodeframe.c
View File

@ -2045,7 +2045,9 @@ static void read_supertx_probs(FRAME_CONTEXT *fc, vp9_reader *r) {
static int read_compressed_header(VP9Decoder *pbi, const uint8_t *data,
size_t partition_size) {
VP9_COMMON *const cm = &pbi->common;
#if !CONFIG_TX_SKIP
MACROBLOCKD *const xd = &pbi->mb;
#endif
FRAME_CONTEXT *const fc = &cm->fc;
vp9_reader r;
int k;
@ -2055,7 +2057,11 @@ static int read_compressed_header(VP9Decoder *pbi, const uint8_t *data,
vpx_internal_error(&cm->error, VPX_CODEC_MEM_ERROR,
"Failed to allocate bool decoder 0");
#if CONFIG_TX_SKIP
cm->tx_mode = read_tx_mode(&r);
#else
cm->tx_mode = xd->lossless ? ONLY_4X4 : read_tx_mode(&r);
#endif
if (cm->tx_mode == TX_MODE_SELECT)
read_tx_mode_probs(&fc->tx_probs, &r);
read_coef_probs(fc, cm->tx_mode, &r);

50
vp9/decoder/vp9_decodemv.c
View File

@ -218,8 +218,22 @@ static void read_intra_frame_mode_info(VP9_COMMON *const cm,
int q_idx = vp9_get_qindex(&cm->seg, mbmi->segment_id, cm->base_qindex);
int try_tx_skip = q_idx <= TX_SKIP_Q_THRESH_INTRA;
if (try_tx_skip) {
mbmi->tx_skip[0] = vp9_read(r, cm->fc.y_tx_skip_prob[0]);
mbmi->tx_skip[1] = vp9_read(r, cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
if (xd->lossless) {
if (mbmi->tx_size == TX_4X4)
mbmi->tx_skip[0] = vp9_read(r, cm->fc.y_tx_skip_prob[0]);
else
mbmi->tx_skip[0] = 1;
if (get_uv_tx_size(mbmi, &xd->plane[1]) == TX_4X4)
mbmi->tx_skip[1] =
vp9_read(r, cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
else
mbmi->tx_skip[1] = 1;
} else {
mbmi->tx_skip[0] = vp9_read(r, cm->fc.y_tx_skip_prob[0]);
mbmi->tx_skip[1] =
vp9_read(r, cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
}
} else {
mbmi->tx_skip[0] = 0;
mbmi->tx_skip[1] = 0;
@ -823,12 +837,38 @@ static void read_inter_frame_mode_info(VP9_COMMON *const cm,
int q_idx = cm->base_qindex;
#else
int q_idx = vp9_get_qindex(&cm->seg, mbmi->segment_id, cm->base_qindex);
#endif
#endif // CONFIG_SUPERTX
int try_tx_skip = inter_block ? q_idx <= TX_SKIP_Q_THRESH_INTER :
q_idx <= TX_SKIP_Q_THRESH_INTRA;
#if CONFIG_SUPERTX
if (try_tx_skip) {
mbmi->tx_skip[0] = vp9_read(r, cm->fc.y_tx_skip_prob[inter_block]);
mbmi->tx_skip[1] = vp9_read(r, cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
#else
if (try_tx_skip && !mbmi->skip) {
#endif // CONFIG_SUPERTX
if (xd->lossless) {
#if CONFIG_SUPERTX
if (1)
#else
if (mbmi->tx_size == TX_4X4)
#endif // CONFIG_SUPERTX
mbmi->tx_skip[0] = vp9_read(r, cm->fc.y_tx_skip_prob[inter_block]);
else
mbmi->tx_skip[0] = 1;
#if CONFIG_SUPERTX
if (1)
#else
if (get_uv_tx_size(mbmi, &xd->plane[1]) == TX_4X4)
#endif // CONFIG_SUPERTX
mbmi->tx_skip[1] =
vp9_read(r, cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
else
mbmi->tx_skip[1] = 1;
} else {
mbmi->tx_skip[0] = vp9_read(r, cm->fc.y_tx_skip_prob[inter_block]);
mbmi->tx_skip[1] =
vp9_read(r, cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
}
#if CONFIG_SUPERTX
if (!cm->frame_parallel_decoding_mode && !supertx_enabled) {
#else

46
vp9/encoder/vp9_bitstream.c
View File

@ -437,12 +437,33 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, const MODE_INFO *mi,
int q_idx = cm->base_qindex;
#else
int q_idx = vp9_get_qindex(seg, segment_id, cm->base_qindex);
#endif
#endif // CONFIG_SUPERTX
int try_tx_skip = is_inter ? q_idx <= TX_SKIP_Q_THRESH_INTER :
q_idx <= TX_SKIP_Q_THRESH_INTRA;
#if CONFIG_SUPERTX
if (try_tx_skip) {
vp9_write(w, mbmi->tx_skip[0], cm->fc.y_tx_skip_prob[is_inter]);
vp9_write(w, mbmi->tx_skip[1], cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
#else
if (try_tx_skip && !skip) {
#endif // CONFIG_SUPERTX
if (xd->lossless) {
#if CONFIG_SUPERTX
if (1)
#else
if (mbmi->tx_size == TX_4X4)
#endif // CONFIG_SUPERTX
vp9_write(w, mbmi->tx_skip[0], cm->fc.y_tx_skip_prob[is_inter]);
#if CONFIG_SUPERTX
if (1)
#else
if (get_uv_tx_size(mbmi, &xd->plane[1]) == TX_4X4)
#endif // CONFIG_SUPERTX
vp9_write(w, mbmi->tx_skip[1],
cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
} else {
vp9_write(w, mbmi->tx_skip[0], cm->fc.y_tx_skip_prob[is_inter]);
vp9_write(w, mbmi->tx_skip[1],
cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
}
}
}
#endif // CONFIG_TX_SKIP
@ -560,8 +581,17 @@ static void write_mb_modes_kf(const VP9_COMMON *cm, const MACROBLOCKD *xd,
int q_idx = vp9_get_qindex(seg, mbmi->segment_id, cm->base_qindex);
int try_tx_skip = q_idx <= TX_SKIP_Q_THRESH_INTRA;
if (try_tx_skip) {
vp9_write(w, mbmi->tx_skip[0], cm->fc.y_tx_skip_prob[0]);
vp9_write(w, mbmi->tx_skip[1], cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
if (xd->lossless) {
if (mbmi->tx_size == TX_4X4)
vp9_write(w, mbmi->tx_skip[0], cm->fc.y_tx_skip_prob[0]);
if (get_uv_tx_size(mbmi, &xd->plane[1]) == TX_4X4)
vp9_write(w, mbmi->tx_skip[1],
cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
} else {
vp9_write(w, mbmi->tx_skip[0], cm->fc.y_tx_skip_prob[0]);
vp9_write(w, mbmi->tx_skip[1],
cm->fc.uv_tx_skip_prob[mbmi->tx_skip[0]]);
}
}
}
#endif
@ -1493,16 +1523,22 @@ static void write_uncompressed_header(VP9_COMP *cpi,
static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) {
VP9_COMMON *const cm = &cpi->common;
#if !CONFIG_TX_SKIP
MACROBLOCKD *const xd = &cpi->mb.e_mbd;
#endif
FRAME_CONTEXT *const fc = &cm->fc;
vp9_writer header_bc;
vp9_start_encode(&header_bc, data);
#if CONFIG_TX_SKIP
encode_txfm_probs(cm, &header_bc);
#else
if (xd->lossless)
cm->tx_mode = ONLY_4X4;
else
encode_txfm_probs(cm, &header_bc);
#endif
update_coef_probs(cpi, &header_bc);
update_skip_probs(cm, &header_bc);

6
vp9/encoder/vp9_encodeframe.c
View File

@ -3479,8 +3479,10 @@ static MV_REFERENCE_FRAME get_frame_type(const VP9_COMP *cpi) {
}
static TX_MODE select_tx_mode(const VP9_COMP *cpi) {
#if !CONFIG_TX_SKIP
if (cpi->mb.e_mbd.lossless)
return ONLY_4X4;
#endif
if (cpi->sf.tx_size_search_method == USE_LARGESTALL)
#if CONFIG_TX64X64
return ALLOW_64X64;
@ -4781,7 +4783,11 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
#endif
int try_tx_skip = is_inter_block(mbmi) ? q_idx <= TX_SKIP_Q_THRESH_INTER :
q_idx <= TX_SKIP_Q_THRESH_INTRA;
#if CONFIG_SUPERTX
if (try_tx_skip) {
#else
if (try_tx_skip && !(mbmi->skip || seg_skip)) {
#endif
++cm->counts.y_tx_skip[is_inter_block(mbmi)][mbmi->tx_skip[0]];
++cm->counts.uv_tx_skip[mbmi->tx_skip[0]][mbmi->tx_skip[1]];
}

17
vp9/encoder/vp9_rdopt.c
View File

@ -603,6 +603,17 @@ static void txfm_rd_in_plane(MACROBLOCK *x,
args.best_rd = ref_best_rd;
args.use_fast_coef_costing = use_fast_coef_casting;
#if CONFIG_TX_SKIP
if (xd->lossless && tx_size != TX_4X4 &&
!xd->mi[0].src_mi->mbmi.tx_skip[plane != 0]) {
*rate = INT_MAX;
*distortion = INT64_MAX;
*sse = INT64_MAX;
*skippable = 0;
return;
}
#endif
if (plane == 0)
xd->mi[0].src_mi->mbmi.tx_size = tx_size;
@ -806,13 +817,19 @@ static void super_block_yrd(VP9_COMP *cpi, MACROBLOCK *x, int *rate,
int64_t *psse, BLOCK_SIZE bs,
int64_t txfm_cache[TX_MODES],
int64_t ref_best_rd) {
#if !CONFIG_TX_SKIP
MACROBLOCKD *xd = &x->e_mbd;
#endif
int64_t sse;
int64_t *ret_sse = psse ? psse : &sse;
assert(bs == xd->mi[0].src_mi->mbmi.sb_type);
#if CONFIG_TX_SKIP
if (cpi->sf.tx_size_search_method == USE_LARGESTALL) {
#else
if (cpi->sf.tx_size_search_method == USE_LARGESTALL || xd->lossless) {
#endif
vpx_memset(txfm_cache, 0, TX_MODES * sizeof(int64_t));
choose_largest_tx_size(cpi, x, rate, distortion, skip, ret_sse, ref_best_rd,
bs);