2010-05-18 11:58:33 -04:00
|
|
|
/*
|
2012-02-27 10:22:38 -08:00
|
|
|
Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
2010-05-18 11:58:33 -04:00
|
|
|
*
|
2010-06-18 12:39:21 -04:00
|
|
|
* Use of this source code is governed by a BSD-style license
|
2010-06-04 16:19:40 -04: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 12:39:21 -04:00
|
|
|
* in the file PATENTS. All contributing project authors may
|
2010-06-04 16:19:40 -04:00
|
|
|
* be found in the AUTHORS file in the root of the source tree.
|
2010-05-18 11:58:33 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
2012-11-28 10:41:40 -08:00
|
|
|
#include "vp9/decoder/vp9_treereader.h"
|
2012-11-27 13:59:17 -08:00
|
|
|
#include "vp9/common/vp9_entropymv.h"
|
|
|
|
#include "vp9/common/vp9_entropymode.h"
|
Spatial resamping of ZEROMV predictors
This patch allows coding frames using references of different
resolution, in ZEROMV mode. For compound prediction, either
reference may be scaled.
To test, I use the resize_test and enable WRITE_RECON_BUFFER
in vp9_onyxd_if.c. It's also useful to apply this patch to
test/i420_video_source.h:
--- a/test/i420_video_source.h
+++ b/test/i420_video_source.h
@@ -93,6 +93,7 @@ class I420VideoSource : public VideoSource {
virtual void FillFrame() {
// Read a frame from input_file.
+ if (frame_ != 3)
if (fread(img_->img_data, raw_sz_, 1, input_file_) == 0) {
limit_ = frame_;
}
This forces the frame that the resolution changes on to be coded
with no motion, only scaling, and improves the quality of the
result.
Change-Id: I1ee75d19a437ff801192f767fd02a36bcbd1d496
2013-02-24 20:55:14 -08:00
|
|
|
#include "vp9/common/vp9_reconinter.h"
|
2012-11-28 10:41:40 -08:00
|
|
|
#include "vp9/decoder/vp9_onyxd_int.h"
|
2012-11-27 13:59:17 -08:00
|
|
|
#include "vp9/common/vp9_findnearmv.h"
|
2013-01-05 18:20:25 -08:00
|
|
|
#include "vp9/common/vp9_common.h"
|
2012-11-27 13:59:17 -08:00
|
|
|
#include "vp9/common/vp9_seg_common.h"
|
|
|
|
#include "vp9/common/vp9_pred_common.h"
|
|
|
|
#include "vp9/common/vp9_entropy.h"
|
|
|
|
#include "vp9/decoder/vp9_decodemv.h"
|
2013-06-04 15:25:16 -07:00
|
|
|
#include "vp9/decoder/vp9_decodframe.h"
|
2012-11-27 13:59:17 -08:00
|
|
|
#include "vp9/common/vp9_mvref_common.h"
|
2010-05-18 11:58:33 -04:00
|
|
|
#if CONFIG_DEBUG
|
|
|
|
#include <assert.h>
|
|
|
|
#endif
|
2012-02-16 09:29:54 -08:00
|
|
|
|
2012-07-13 15:21:29 -07:00
|
|
|
// #define DEBUG_DEC_MV
|
2012-02-16 09:29:54 -08:00
|
|
|
#ifdef DEBUG_DEC_MV
|
|
|
|
int dec_mvcount = 0;
|
|
|
|
#endif
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2012-11-15 15:14:38 -08:00
|
|
|
// #define DEC_DEBUG
|
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
extern int dec_debug;
|
|
|
|
#endif
|
2012-02-16 09:29:54 -08:00
|
|
|
|
2013-05-30 09:58:53 -07:00
|
|
|
static MB_PREDICTION_MODE read_intra_mode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
MB_PREDICTION_MODE m = treed_read(r, vp9_intra_mode_tree, p);
|
2012-10-09 13:19:15 -07:00
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
2013-04-19 10:44:03 -07:00
|
|
|
static int read_mb_segid(vp9_reader *r, MACROBLOCKD *xd) {
|
2013-04-30 14:06:49 -07:00
|
|
|
return treed_read(r, vp9_segment_tree, xd->mb_segment_tree_probs);
|
2010-09-09 14:42:48 -04:00
|
|
|
}
|
2012-03-19 11:02:04 -07:00
|
|
|
|
2013-04-19 10:44:03 -07:00
|
|
|
static void set_segment_id(VP9_COMMON *cm, MB_MODE_INFO *mbmi,
|
2013-04-26 11:57:17 -07:00
|
|
|
int mi_row, int mi_col, int segment_id) {
|
|
|
|
const int mi_index = mi_row * cm->mi_cols + mi_col;
|
2013-04-19 10:44:03 -07:00
|
|
|
const BLOCK_SIZE_TYPE sb_type = mbmi->sb_type;
|
2013-04-26 11:57:17 -07:00
|
|
|
const int bw = 1 << mi_width_log2(sb_type);
|
|
|
|
const int bh = 1 << mi_height_log2(sb_type);
|
|
|
|
const int ymis = MIN(cm->mi_rows - mi_row, bh);
|
|
|
|
const int xmis = MIN(cm->mi_cols - mi_col, bw);
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
for (y = 0; y < ymis; y++) {
|
|
|
|
for (x = 0; x < xmis; x++) {
|
|
|
|
const int index = mi_index + (y * cm->mi_cols + x);
|
|
|
|
cm->last_frame_seg_map[index] = segment_id;
|
2013-04-19 10:44:03 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-22 14:39:21 -07:00
|
|
|
static TX_SIZE select_txfm_size(VP9_COMMON *cm, vp9_reader *r,
|
|
|
|
int allow_16x16, int allow_32x32) {
|
|
|
|
TX_SIZE txfm_size = vp9_read(r, cm->prob_tx[0]); // TX_4X4 or >TX_4X4
|
|
|
|
if (txfm_size != TX_4X4 && allow_16x16) {
|
|
|
|
txfm_size += vp9_read(r, cm->prob_tx[1]); // TX_8X8 or >TX_8X8
|
|
|
|
if (txfm_size != TX_8X8 && allow_32x32)
|
|
|
|
txfm_size += vp9_read(r, cm->prob_tx[2]); // TX_16X16 or >TX_16X16
|
|
|
|
}
|
|
|
|
return txfm_size;
|
|
|
|
}
|
|
|
|
|
2013-05-07 11:56:26 -07:00
|
|
|
|
2013-04-16 14:03:05 -07:00
|
|
|
static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m,
|
2013-04-26 11:57:17 -07:00
|
|
|
int mi_row, int mi_col,
|
2013-04-16 14:03:05 -07:00
|
|
|
vp9_reader *r) {
|
2012-10-30 17:53:32 -07:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2013-04-16 14:03:05 -07:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
2013-05-20 16:04:28 -07:00
|
|
|
const int mis = cm->mode_info_stride;
|
2013-02-19 13:36:38 -08:00
|
|
|
m->mbmi.ref_frame = INTRA_FRAME;
|
|
|
|
|
2013-04-19 14:25:32 -07:00
|
|
|
// Read segmentation map if it is being updated explicitly this frame
|
2012-07-13 15:21:29 -07:00
|
|
|
m->mbmi.segment_id = 0;
|
2013-04-19 10:44:03 -07:00
|
|
|
if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
|
|
|
|
m->mbmi.segment_id = read_mb_segid(r, xd);
|
2013-04-26 11:57:17 -07:00
|
|
|
set_segment_id(cm, &m->mbmi, mi_row, mi_col, m->mbmi.segment_id);
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
|
|
|
|
2013-04-19 14:25:32 -07:00
|
|
|
m->mbmi.mb_skip_coeff = vp9_segfeature_active(xd, m->mbmi.segment_id,
|
2013-04-09 10:54:19 -07:00
|
|
|
SEG_LVL_SKIP);
|
|
|
|
if (!m->mbmi.mb_skip_coeff)
|
2013-04-16 14:03:05 -07:00
|
|
|
m->mbmi.mb_skip_coeff = vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-05-27 10:14:53 +03:00
|
|
|
if (cm->txfm_mode == TX_MODE_SELECT &&
|
|
|
|
m->mbmi.sb_type >= BLOCK_SIZE_SB8X8) {
|
|
|
|
const int allow_16x16 = m->mbmi.sb_type >= BLOCK_SIZE_MB16X16;
|
|
|
|
const int allow_32x32 = m->mbmi.sb_type >= BLOCK_SIZE_SB32X32;
|
|
|
|
m->mbmi.txfm_size = select_txfm_size(cm, r, allow_16x16, allow_32x32);
|
|
|
|
} else if (cm->txfm_mode >= ALLOW_32X32 &&
|
|
|
|
m->mbmi.sb_type >= BLOCK_SIZE_SB32X32) {
|
|
|
|
m->mbmi.txfm_size = TX_32X32;
|
|
|
|
} else if (cm->txfm_mode >= ALLOW_16X16 &&
|
|
|
|
m->mbmi.sb_type >= BLOCK_SIZE_MB16X16) {
|
|
|
|
m->mbmi.txfm_size = TX_16X16;
|
|
|
|
} else if (cm->txfm_mode >= ALLOW_8X8 &&
|
|
|
|
m->mbmi.sb_type >= BLOCK_SIZE_SB8X8) {
|
|
|
|
m->mbmi.txfm_size = TX_8X8;
|
|
|
|
} else {
|
|
|
|
m->mbmi.txfm_size = TX_4X4;
|
|
|
|
}
|
|
|
|
|
2013-04-19 14:25:32 -07:00
|
|
|
// luma mode
|
2013-05-30 09:58:53 -07:00
|
|
|
m->mbmi.ref_frame = INTRA_FRAME;
|
2013-05-20 16:04:28 -07:00
|
|
|
if (m->mbmi.sb_type >= BLOCK_SIZE_SB8X8) {
|
|
|
|
const MB_PREDICTION_MODE A = above_block_mode(m, 0, mis);
|
|
|
|
const MB_PREDICTION_MODE L = xd->left_available ?
|
|
|
|
left_block_mode(m, 0) : DC_PRED;
|
2013-05-30 09:58:53 -07:00
|
|
|
m->mbmi.mode = read_intra_mode(r, cm->kf_y_mode_prob[A][L]);
|
2013-05-20 16:04:28 -07:00
|
|
|
} else {
|
2013-05-20 12:08:22 -07: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-20 16:04:28 -07:00
|
|
|
|
|
|
|
for (idy = 0; idy < 2; idy += bh) {
|
|
|
|
for (idx = 0; idx < 2; idx += bw) {
|
|
|
|
int ib = idy * 2 + idx;
|
|
|
|
int k;
|
|
|
|
const MB_PREDICTION_MODE A = above_block_mode(m, ib, mis);
|
|
|
|
const MB_PREDICTION_MODE L = (xd->left_available || idx) ?
|
|
|
|
left_block_mode(m, ib) : DC_PRED;
|
|
|
|
m->bmi[ib].as_mode.first =
|
2013-05-30 09:58:53 -07:00
|
|
|
read_intra_mode(r, cm->kf_y_mode_prob[A][L]);
|
2013-05-20 16:04:28 -07:00
|
|
|
for (k = 1; k < bh; ++k)
|
|
|
|
m->bmi[ib + k * 2].as_mode.first = m->bmi[ib].as_mode.first;
|
|
|
|
for (k = 1; k < bw; ++k)
|
|
|
|
m->bmi[ib + k].as_mode.first = m->bmi[ib].as_mode.first;
|
|
|
|
}
|
|
|
|
}
|
2013-05-30 11:27:40 -07:00
|
|
|
m->mbmi.mode = m->bmi[3].as_mode.first;
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2013-05-30 09:58:53 -07:00
|
|
|
m->mbmi.uv_mode = read_intra_mode(r, cm->kf_uv_mode_prob[m->mbmi.mode]);
|
2010-09-09 14:42:48 -04:00
|
|
|
}
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-05-15 12:37:03 -07:00
|
|
|
static int read_mv_component(vp9_reader *r,
|
|
|
|
const nmv_component *mvcomp, int usehp) {
|
2013-04-22 14:39:21 -07:00
|
|
|
|
2013-05-15 12:37:03 -07:00
|
|
|
int mag, d, fr, hp;
|
2013-02-27 11:48:13 -08:00
|
|
|
const int sign = vp9_read(r, mvcomp->sign);
|
|
|
|
const int mv_class = treed_read(r, vp9_mv_class_tree, mvcomp->classes);
|
|
|
|
|
2013-05-15 12:37:03 -07:00
|
|
|
// Integer part
|
2013-02-27 11:48:13 -08:00
|
|
|
if (mv_class == MV_CLASS_0) {
|
2012-10-31 14:40:53 -07:00
|
|
|
d = treed_read(r, vp9_mv_class0_tree, mvcomp->class0);
|
2012-07-26 13:42:07 -07:00
|
|
|
} else {
|
2013-02-27 11:48:13 -08:00
|
|
|
int i;
|
2013-05-15 12:37:03 -07:00
|
|
|
const int n = mv_class + CLASS0_BITS - 1; // number of bits
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2012-07-26 13:42:07 -07:00
|
|
|
d = 0;
|
2013-02-27 11:48:13 -08:00
|
|
|
for (i = 0; i < n; ++i)
|
|
|
|
d |= vp9_read(r, mvcomp->bits[i]) << i;
|
2012-07-26 13:42:07 -07:00
|
|
|
}
|
|
|
|
|
2013-05-15 12:37:03 -07:00
|
|
|
// Fractional part
|
|
|
|
fr = treed_read(r, vp9_mv_fp_tree,
|
|
|
|
mv_class == MV_CLASS_0 ? mvcomp->class0_fp[d] : mvcomp->fp);
|
2012-07-26 13:42:07 -07:00
|
|
|
|
|
|
|
|
2013-05-15 12:37:03 -07:00
|
|
|
// High precision part (if hp is not used, the default value of the hp is 1)
|
|
|
|
hp = usehp ? vp9_read(r,
|
|
|
|
mv_class == MV_CLASS_0 ? mvcomp->class0_hp : mvcomp->hp)
|
|
|
|
: 1;
|
2013-04-12 12:31:23 -07:00
|
|
|
|
2013-05-15 12:37:03 -07:00
|
|
|
// result
|
|
|
|
mag = vp9_get_mv_mag(mv_class, (d << 3) | (fr << 1) | hp) + 1;
|
|
|
|
return sign ? -mag : mag;
|
2012-07-26 13:42:07 -07:00
|
|
|
}
|
|
|
|
|
2013-04-16 14:03:05 -07:00
|
|
|
static void update_nmv(vp9_reader *r, vp9_prob *const p,
|
2012-10-31 14:40:53 -07:00
|
|
|
const vp9_prob upd_p) {
|
2013-04-16 14:03:05 -07:00
|
|
|
if (vp9_read(r, upd_p)) {
|
2012-07-26 13:42:07 -07:00
|
|
|
#ifdef LOW_PRECISION_MV_UPDATE
|
2013-04-16 14:03:05 -07:00
|
|
|
*p = (vp9_read_literal(r, 7) << 1) | 1;
|
2012-07-26 13:42:07 -07:00
|
|
|
#else
|
2013-04-16 14:03:05 -07:00
|
|
|
*p = (vp9_read_literal(r, 8));
|
2012-07-26 13:42:07 -07:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-16 14:03:05 -07:00
|
|
|
static void read_nmvprobs(vp9_reader *r, nmv_context *mvctx,
|
2012-07-26 13:42:07 -07:00
|
|
|
int usehp) {
|
|
|
|
int i, j, k;
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2012-07-26 13:42:07 -07:00
|
|
|
#ifdef MV_GROUP_UPDATE
|
2013-04-16 14:03:05 -07:00
|
|
|
if (!vp9_read_bit(r))
|
2013-02-27 11:48:13 -08:00
|
|
|
return;
|
2012-07-26 13:42:07 -07:00
|
|
|
#endif
|
2013-02-27 11:48:13 -08:00
|
|
|
for (j = 0; j < MV_JOINTS - 1; ++j)
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->joints[j], VP9_NMV_UPDATE_PROB);
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2012-07-26 13:42:07 -07:00
|
|
|
for (i = 0; i < 2; ++i) {
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->comps[i].sign, VP9_NMV_UPDATE_PROB);
|
2013-02-27 11:48:13 -08:00
|
|
|
for (j = 0; j < MV_CLASSES - 1; ++j)
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->comps[i].classes[j], VP9_NMV_UPDATE_PROB);
|
2013-02-27 11:48:13 -08:00
|
|
|
|
|
|
|
for (j = 0; j < CLASS0_SIZE - 1; ++j)
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->comps[i].class0[j], VP9_NMV_UPDATE_PROB);
|
2013-02-27 11:48:13 -08:00
|
|
|
|
|
|
|
for (j = 0; j < MV_OFFSET_BITS; ++j)
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->comps[i].bits[j], VP9_NMV_UPDATE_PROB);
|
2012-07-26 13:42:07 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 2; ++i) {
|
2013-04-03 17:43:45 -07:00
|
|
|
for (j = 0; j < CLASS0_SIZE; ++j)
|
2012-07-26 13:42:07 -07:00
|
|
|
for (k = 0; k < 3; ++k)
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->comps[i].class0_fp[j][k], VP9_NMV_UPDATE_PROB);
|
2013-02-27 11:48:13 -08:00
|
|
|
|
|
|
|
for (j = 0; j < 3; ++j)
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->comps[i].fp[j], VP9_NMV_UPDATE_PROB);
|
2012-07-26 13:42:07 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (usehp) {
|
|
|
|
for (i = 0; i < 2; ++i) {
|
2013-04-16 14:03:05 -07:00
|
|
|
update_nmv(r, &mvctx->comps[i].class0_hp, VP9_NMV_UPDATE_PROB);
|
|
|
|
update_nmv(r, &mvctx->comps[i].hp, VP9_NMV_UPDATE_PROB);
|
2012-07-26 13:42:07 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-30 16:45:16 +01:00
|
|
|
// Read the referncence frame
|
2012-10-30 17:53:32 -07:00
|
|
|
static MV_REFERENCE_FRAME read_ref_frame(VP9D_COMP *pbi,
|
2013-04-16 14:03:05 -07:00
|
|
|
vp9_reader *r,
|
2013-04-18 11:05:34 -07:00
|
|
|
int segment_id) {
|
2012-07-13 15:21:29 -07:00
|
|
|
MV_REFERENCE_FRAME ref_frame;
|
2012-10-30 17:53:32 -07:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2012-07-13 15:21:29 -07:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
|
|
|
|
2013-02-27 11:48:13 -08:00
|
|
|
int seg_ref_count = 0;
|
2013-04-12 12:31:23 -07:00
|
|
|
const int seg_ref_active = vp9_segfeature_active(xd, segment_id,
|
|
|
|
SEG_LVL_REF_FRAME);
|
|
|
|
|
|
|
|
const int intra = vp9_check_segref(xd, segment_id, INTRA_FRAME);
|
|
|
|
const int last = vp9_check_segref(xd, segment_id, LAST_FRAME);
|
|
|
|
const int golden = vp9_check_segref(xd, segment_id, GOLDEN_FRAME);
|
|
|
|
const int altref = vp9_check_segref(xd, segment_id, ALTREF_FRAME);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// If segment coding enabled does the segment allow for more than one
|
|
|
|
// possible reference frame
|
2013-04-12 12:31:23 -07:00
|
|
|
if (seg_ref_active)
|
|
|
|
seg_ref_count = intra + last + golden + altref;
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// Segment reference frame features not available or allows for
|
|
|
|
// multiple reference frame options
|
2013-04-03 17:43:45 -07:00
|
|
|
if (!seg_ref_active || seg_ref_count > 1) {
|
2012-07-13 15:21:29 -07:00
|
|
|
// Values used in prediction model coding
|
|
|
|
MV_REFERENCE_FRAME pred_ref;
|
|
|
|
|
|
|
|
// Get the context probability the prediction flag
|
2013-03-15 13:16:58 -07:00
|
|
|
vp9_prob pred_prob = vp9_get_pred_prob(cm, xd, PRED_REF);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// Read the prediction status flag
|
2013-04-16 14:03:05 -07:00
|
|
|
unsigned char prediction_flag = vp9_read(r, pred_prob);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// Store the prediction flag.
|
2012-10-29 13:44:18 +00:00
|
|
|
vp9_set_pred_flag(xd, PRED_REF, prediction_flag);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// Get the predicted reference frame.
|
2012-10-29 13:44:18 +00:00
|
|
|
pred_ref = vp9_get_pred_ref(cm, xd);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// If correctly predicted then use the predicted value
|
|
|
|
if (prediction_flag) {
|
|
|
|
ref_frame = pred_ref;
|
2013-03-15 13:16:58 -07:00
|
|
|
} else {
|
|
|
|
// decode the explicitly coded value
|
2012-10-31 14:40:53 -07:00
|
|
|
vp9_prob mod_refprobs[PREDICTION_PROBS];
|
2013-04-12 12:31:23 -07:00
|
|
|
vpx_memcpy(mod_refprobs, cm->mod_refprobs[pred_ref],
|
|
|
|
sizeof(mod_refprobs));
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// If segment coding enabled blank out options that cant occur by
|
|
|
|
// setting the branch probability to 0.
|
|
|
|
if (seg_ref_active) {
|
2013-04-12 12:31:23 -07:00
|
|
|
mod_refprobs[INTRA_FRAME] *= intra;
|
|
|
|
mod_refprobs[LAST_FRAME] *= last;
|
|
|
|
mod_refprobs[GOLDEN_FRAME] *= golden * altref;
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
// Default to INTRA_FRAME (value 0)
|
|
|
|
ref_frame = INTRA_FRAME;
|
|
|
|
|
|
|
|
// Do we need to decode the Intra/Inter branch
|
|
|
|
if (mod_refprobs[0])
|
2013-04-16 14:03:05 -07:00
|
|
|
ref_frame = vp9_read(r, mod_refprobs[0]);
|
2012-07-13 15:21:29 -07:00
|
|
|
else
|
|
|
|
ref_frame++;
|
|
|
|
|
|
|
|
if (ref_frame) {
|
|
|
|
// Do we need to decode the Last/Gf_Arf branch
|
|
|
|
if (mod_refprobs[1])
|
2013-04-16 14:03:05 -07:00
|
|
|
ref_frame += vp9_read(r, mod_refprobs[1]);
|
2012-01-28 12:20:14 +00:00
|
|
|
else
|
2012-07-13 15:21:29 -07:00
|
|
|
ref_frame++;
|
|
|
|
|
|
|
|
if (ref_frame > 1) {
|
|
|
|
// Do we need to decode the GF/Arf branch
|
2013-04-03 17:43:45 -07:00
|
|
|
if (mod_refprobs[2]) {
|
2013-04-16 14:03:05 -07:00
|
|
|
ref_frame += vp9_read(r, mod_refprobs[2]);
|
2013-04-03 17:43:45 -07:00
|
|
|
} else {
|
2013-04-12 12:31:23 -07:00
|
|
|
if (seg_ref_active)
|
|
|
|
ref_frame = pred_ref == GOLDEN_FRAME || !golden ? ALTREF_FRAME
|
|
|
|
: GOLDEN_FRAME;
|
|
|
|
else
|
|
|
|
ref_frame = pred_ref == GOLDEN_FRAME ? ALTREF_FRAME
|
|
|
|
: GOLDEN_FRAME;
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2012-01-28 12:20:14 +00:00
|
|
|
}
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2011-09-30 16:45:16 +01:00
|
|
|
}
|
2013-03-15 13:16:58 -07:00
|
|
|
} else {
|
|
|
|
// Segment reference frame features are enabled
|
2012-07-13 15:21:29 -07:00
|
|
|
// The reference frame for the mb is considered as correclty predicted
|
|
|
|
// if it is signaled at the segment level for the purposes of the
|
|
|
|
// common prediction model
|
2012-10-29 13:44:18 +00:00
|
|
|
vp9_set_pred_flag(xd, PRED_REF, 1);
|
|
|
|
ref_frame = vp9_get_pred_ref(cm, xd);
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
|
|
|
|
2013-04-03 17:43:45 -07:00
|
|
|
return ref_frame;
|
2011-09-30 16:45:16 +01:00
|
|
|
}
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-04-16 14:03:05 -07:00
|
|
|
static MB_PREDICTION_MODE read_sb_mv_ref(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (MB_PREDICTION_MODE) treed_read(r, vp9_sb_mv_ref_tree, p);
|
2012-08-20 14:43:34 -07:00
|
|
|
}
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2010-09-09 14:42:48 -04:00
|
|
|
#ifdef VPX_MODE_COUNT
|
2012-10-30 16:25:53 -07:00
|
|
|
unsigned int vp9_mv_cont_count[5][4] = {
|
2012-07-13 15:21:29 -07:00
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 }
|
2010-05-18 11:58:33 -04:00
|
|
|
};
|
2010-09-09 14:42:48 -04:00
|
|
|
#endif
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-06-04 15:25:16 -07:00
|
|
|
static void read_switchable_interp_probs(VP9_COMMON* const cm, vp9_reader *r) {
|
2012-07-18 13:43:01 -07:00
|
|
|
int i, j;
|
2013-06-04 15:25:16 -07:00
|
|
|
for (j = 0; j <= VP9_SWITCHABLE_FILTERS; ++j)
|
|
|
|
for (i = 0; i < VP9_SWITCHABLE_FILTERS - 1; ++i) {
|
|
|
|
if (vp9_read(r, VP9_DEF_UPDATE_PROB)) {
|
|
|
|
cm->fc.switchable_interp_prob[j][i] =
|
|
|
|
// vp9_read_prob(r);
|
|
|
|
vp9_read_prob_diff_update(r, cm->fc.switchable_interp_prob[j][i]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_inter_mode_probs(VP9_COMMON *const cm, vp9_reader *r) {
|
|
|
|
int i, j;
|
|
|
|
for (i = 0; i < INTER_MODE_CONTEXTS; ++i)
|
2013-06-05 11:21:44 -07:00
|
|
|
for (j = 0; j < VP9_INTER_MODES - 1; ++j) {
|
2013-06-04 15:25:16 -07:00
|
|
|
if (vp9_read(r, VP9_DEF_UPDATE_PROB)) {
|
|
|
|
// cm->fc.inter_mode_probs[i][j] = vp9_read_prob(r);
|
|
|
|
cm->fc.inter_mode_probs[i][j] =
|
|
|
|
vp9_read_prob_diff_update(r, cm->fc.inter_mode_probs[i][j]);
|
|
|
|
}
|
|
|
|
}
|
2012-07-18 13:43:01 -07:00
|
|
|
}
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-04-12 12:31:23 -07:00
|
|
|
static INLINE COMPPREDMODE_TYPE read_comp_pred_mode(vp9_reader *r) {
|
|
|
|
COMPPREDMODE_TYPE mode = vp9_read_bit(r);
|
|
|
|
if (mode)
|
|
|
|
mode += vp9_read_bit(r);
|
|
|
|
return mode;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mb_mode_mv_init(VP9D_COMP *pbi, vp9_reader *r) {
|
2012-10-30 17:53:32 -07:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-05-30 09:58:53 -07:00
|
|
|
if (cm->frame_type != KEY_FRAME) {
|
2013-04-16 00:18:02 -07:00
|
|
|
nmv_context *const nmvc = &pbi->common.fc.nmvc;
|
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
2013-04-26 21:52:53 -07:00
|
|
|
int i, j;
|
2013-04-12 12:31:23 -07:00
|
|
|
|
2013-06-04 15:25:16 -07:00
|
|
|
read_inter_mode_probs(cm, r);
|
|
|
|
|
2012-07-18 13:43:01 -07:00
|
|
|
if (cm->mcomp_filter_type == SWITCHABLE)
|
2013-06-04 15:25:16 -07:00
|
|
|
read_switchable_interp_probs(cm, r);
|
2013-05-07 16:42:21 +01:00
|
|
|
|
2013-04-12 12:31:23 -07:00
|
|
|
// Baseline probabilities for decoding reference frame
|
|
|
|
cm->prob_intra_coded = vp9_read_prob(r);
|
|
|
|
cm->prob_last_coded = vp9_read_prob(r);
|
|
|
|
cm->prob_gf_coded = vp9_read_prob(r);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// Computes a modified set of probabilities for use when reference
|
|
|
|
// frame prediction fails.
|
2012-10-29 13:44:18 +00:00
|
|
|
vp9_compute_mod_refprobs(cm);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-04-12 12:31:23 -07:00
|
|
|
cm->comp_pred_mode = read_comp_pred_mode(r);
|
|
|
|
if (cm->comp_pred_mode == HYBRID_PREDICTION)
|
2012-07-13 15:21:29 -07:00
|
|
|
for (i = 0; i < COMP_PRED_CONTEXTS; i++)
|
2013-04-12 12:31:23 -07:00
|
|
|
cm->prob_comppred[i] = vp9_read_prob(r);
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-05-30 16:21:48 -07:00
|
|
|
// VP9_INTRA_MODES
|
2013-06-03 10:39:40 -07:00
|
|
|
for (j = 0; j < BLOCK_SIZE_GROUPS; j++) {
|
|
|
|
for (i = 0; i < VP9_INTRA_MODES - 1; ++i) {
|
|
|
|
if (vp9_read(r, VP9_DEF_UPDATE_PROB)) {
|
|
|
|
cm->fc.y_mode_prob[j][i] =
|
|
|
|
vp9_read_prob_diff_update(r, cm->fc.y_mode_prob[j][i]);
|
|
|
|
}
|
2013-06-05 10:42:52 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
for (j = 0; j < NUM_PARTITION_CONTEXTS; ++j) {
|
|
|
|
for (i = 0; i < PARTITION_TYPES - 1; ++i) {
|
|
|
|
if (vp9_read(r, VP9_DEF_UPDATE_PROB)) {
|
2013-06-03 10:39:40 -07:00
|
|
|
cm->fc.partition_prob[INTER_FRAME][j][i] =
|
|
|
|
vp9_read_prob_diff_update(r,
|
|
|
|
cm->fc.partition_prob[INTER_FRAME][j][i]);
|
2013-06-05 10:42:52 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-04-26 21:52:53 -07:00
|
|
|
|
2013-04-16 00:18:02 -07:00
|
|
|
read_nmvprobs(r, nmvc, xd->allow_high_precision_mv);
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2010-09-09 14:42:48 -04:00
|
|
|
}
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2012-01-28 10:24:43 +00:00
|
|
|
// This function either reads the segment id for the current macroblock from
|
|
|
|
// the bitstream or if the value is temporally predicted asserts the predicted
|
|
|
|
// value
|
2013-04-26 11:57:17 -07:00
|
|
|
static int read_mb_segment_id(VP9D_COMP *pbi, int mi_row, int mi_col,
|
2013-04-19 14:25:32 -07:00
|
|
|
vp9_reader *r) {
|
2012-10-30 17:53:32 -07:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2013-03-21 12:51:57 -07:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
2013-04-18 11:05:34 -07:00
|
|
|
MODE_INFO *const mi = xd->mode_info_context;
|
|
|
|
MB_MODE_INFO *const mbmi = &mi->mbmi;
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-04-19 14:25:32 -07:00
|
|
|
if (!xd->segmentation_enabled)
|
|
|
|
return 0; // Default for disabled segmentation
|
|
|
|
|
|
|
|
if (xd->update_mb_segmentation_map) {
|
|
|
|
int segment_id;
|
|
|
|
|
|
|
|
if (cm->temporal_update) {
|
|
|
|
// Temporal coding of the segment id for this mb is enabled.
|
|
|
|
// Get the context based probability for reading the
|
|
|
|
// prediction status flag
|
|
|
|
const vp9_prob pred_prob = vp9_get_pred_prob(cm, xd, PRED_SEG_ID);
|
|
|
|
const int pred_flag = vp9_read(r, pred_prob);
|
|
|
|
vp9_set_pred_flag(xd, PRED_SEG_ID, pred_flag);
|
|
|
|
|
|
|
|
// If the value is flagged as correctly predicted
|
|
|
|
// then use the predicted value, otherwise decode it explicitly
|
2013-04-26 11:57:17 -07:00
|
|
|
segment_id = pred_flag ? vp9_get_pred_mi_segid(cm, mbmi->sb_type,
|
|
|
|
mi_row, mi_col)
|
2013-04-24 10:20:52 +01:00
|
|
|
: read_mb_segid(r, xd);
|
2012-08-20 14:43:34 -07:00
|
|
|
} else {
|
2013-04-19 14:25:32 -07:00
|
|
|
segment_id = read_mb_segid(r, xd); // Normal unpredicted coding mode
|
2012-01-28 10:24:43 +00:00
|
|
|
}
|
2013-04-19 14:25:32 -07:00
|
|
|
|
2013-04-26 11:57:17 -07:00
|
|
|
set_segment_id(cm, mbmi, mi_row, mi_col, segment_id); // Side effect
|
2013-04-19 14:25:32 -07:00
|
|
|
return segment_id;
|
2012-07-13 15:21:29 -07:00
|
|
|
} else {
|
2013-04-26 11:57:17 -07:00
|
|
|
return vp9_get_pred_mi_segid(cm, mbmi->sb_type, mi_row, mi_col);
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2012-01-28 10:24:43 +00:00
|
|
|
}
|
2011-05-02 15:30:51 +02:00
|
|
|
|
2013-03-15 13:16:58 -07:00
|
|
|
|
|
|
|
static INLINE void assign_and_clamp_mv(int_mv *dst, const int_mv *src,
|
|
|
|
int mb_to_left_edge,
|
|
|
|
int mb_to_right_edge,
|
|
|
|
int mb_to_top_edge,
|
|
|
|
int mb_to_bottom_edge) {
|
|
|
|
dst->as_int = src->as_int;
|
|
|
|
clamp_mv(dst, mb_to_left_edge, mb_to_right_edge, mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
|
|
|
}
|
|
|
|
|
2013-05-15 12:37:03 -07:00
|
|
|
static INLINE void decode_mv(vp9_reader *r, MV *mv, const MV *ref,
|
|
|
|
const nmv_context *ctx,
|
|
|
|
nmv_context_counts *counts,
|
|
|
|
int usehp) {
|
|
|
|
const MV_JOINT_TYPE j = treed_read(r, vp9_mv_joint_tree, ctx->joints);
|
|
|
|
MV diff = {0, 0};
|
|
|
|
|
|
|
|
usehp = usehp && vp9_use_nmv_hp(ref);
|
|
|
|
if (mv_joint_vertical(j))
|
|
|
|
diff.row = read_mv_component(r, &ctx->comps[0], usehp);
|
|
|
|
|
|
|
|
if (mv_joint_horizontal(j))
|
|
|
|
diff.col = read_mv_component(r, &ctx->comps[1], usehp);
|
|
|
|
|
|
|
|
vp9_increment_nmv(&diff, ref, counts, usehp);
|
|
|
|
|
|
|
|
mv->row = diff.row + ref->row;
|
|
|
|
mv->col = diff.col + ref->col;
|
2013-03-15 13:16:58 -07:00
|
|
|
}
|
|
|
|
|
2013-04-03 17:43:45 -07:00
|
|
|
static INLINE INTERPOLATIONFILTERTYPE read_switchable_filter_type(
|
2013-04-16 14:03:05 -07:00
|
|
|
VP9D_COMP *pbi, vp9_reader *r) {
|
|
|
|
const int index = treed_read(r, vp9_switchable_interp_tree,
|
2013-04-03 17:43:45 -07:00
|
|
|
vp9_get_pred_probs(&pbi->common, &pbi->mb,
|
|
|
|
PRED_SWITCHABLE_INTERP));
|
2013-06-04 15:25:16 -07:00
|
|
|
++pbi->common.fc.switchable_interp_count
|
|
|
|
[vp9_get_pred_context(
|
|
|
|
&pbi->common, &pbi->mb, PRED_SWITCHABLE_INTERP)][index];
|
2013-04-03 17:43:45 -07:00
|
|
|
return vp9_switchable_interp[index];
|
|
|
|
}
|
|
|
|
|
2012-10-30 17:53:32 -07:00
|
|
|
static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
|
2013-04-26 11:57:17 -07:00
|
|
|
int mi_row, int mi_col,
|
2013-04-16 14:03:05 -07:00
|
|
|
vp9_reader *r) {
|
2012-10-30 17:53:32 -07:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2013-04-16 14:03:05 -07:00
|
|
|
nmv_context *const nmvc = &cm->fc.nmvc;
|
2013-03-21 12:51:57 -07:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-04-18 11:05:34 -07:00
|
|
|
int_mv *const mv0 = &mbmi->mv[0];
|
|
|
|
int_mv *const mv1 = &mbmi->mv[1];
|
2013-05-15 22:28:36 -07:00
|
|
|
BLOCK_SIZE_TYPE bsize = mi->mbmi.sb_type;
|
|
|
|
int bw = 1 << b_width_log2(bsize);
|
|
|
|
int bh = 1 << b_height_log2(bsize);
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2013-03-21 12:51:57 -07:00
|
|
|
int mb_to_left_edge, mb_to_right_edge, mb_to_top_edge, mb_to_bottom_edge;
|
2013-05-15 22:28:36 -07:00
|
|
|
int j, idx, idy;
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2012-07-13 15:21:29 -07:00
|
|
|
mbmi->need_to_clamp_mvs = 0;
|
|
|
|
mbmi->need_to_clamp_secondmv = 0;
|
2012-11-07 06:50:25 -08:00
|
|
|
mbmi->second_ref_frame = NONE;
|
2013-02-27 11:48:13 -08:00
|
|
|
|
2013-02-20 10:16:24 -08:00
|
|
|
// Make sure the MACROBLOCKD mode info pointer is pointed at the
|
|
|
|
// correct entry for the current macroblock.
|
|
|
|
xd->mode_info_context = mi;
|
|
|
|
|
2013-02-27 11:48:13 -08:00
|
|
|
// Distance of Mb to the various image edges.
|
|
|
|
// These specified to 8th pel as they are always compared to MV values
|
|
|
|
// that are in 1/8th pel units
|
2013-05-15 22:28:36 -07:00
|
|
|
set_mi_row_col(cm, xd, mi_row, 1 << mi_height_log2(bsize),
|
|
|
|
mi_col, 1 << mi_width_log2(bsize));
|
2013-02-20 10:16:24 -08:00
|
|
|
|
2013-03-21 12:51:57 -07:00
|
|
|
mb_to_top_edge = xd->mb_to_top_edge - LEFT_TOP_MARGIN;
|
|
|
|
mb_to_bottom_edge = xd->mb_to_bottom_edge + RIGHT_BOTTOM_MARGIN;
|
2013-03-15 13:16:58 -07:00
|
|
|
mb_to_left_edge = xd->mb_to_left_edge - LEFT_TOP_MARGIN;
|
|
|
|
mb_to_right_edge = xd->mb_to_right_edge + RIGHT_BOTTOM_MARGIN;
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// Read the macroblock segment id.
|
2013-04-26 11:57:17 -07:00
|
|
|
mbmi->segment_id = read_mb_segment_id(pbi, mi_row, mi_col, r);
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-04-09 10:54:19 -07:00
|
|
|
mbmi->mb_skip_coeff = vp9_segfeature_active(xd, mbmi->segment_id,
|
|
|
|
SEG_LVL_SKIP);
|
|
|
|
if (!mbmi->mb_skip_coeff)
|
2013-04-16 14:03:05 -07:00
|
|
|
mbmi->mb_skip_coeff = vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
|
2012-07-13 15:21:29 -07:00
|
|
|
|
|
|
|
// Read the reference frame
|
2013-04-16 14:03:05 -07:00
|
|
|
mbmi->ref_frame = read_ref_frame(pbi, r, mbmi->segment_id);
|
2013-01-15 06:43:35 -08:00
|
|
|
|
2013-05-27 10:14:53 +03:00
|
|
|
if (cm->txfm_mode == TX_MODE_SELECT &&
|
|
|
|
(mbmi->mb_skip_coeff == 0 || mbmi->ref_frame == INTRA_FRAME) &&
|
|
|
|
bsize >= BLOCK_SIZE_SB8X8) {
|
|
|
|
const int allow_16x16 = bsize >= BLOCK_SIZE_MB16X16;
|
|
|
|
const int allow_32x32 = bsize >= BLOCK_SIZE_SB32X32;
|
|
|
|
mbmi->txfm_size = select_txfm_size(cm, r, allow_16x16, allow_32x32);
|
|
|
|
} else if (bsize >= BLOCK_SIZE_SB32X32 &&
|
|
|
|
cm->txfm_mode >= ALLOW_32X32) {
|
|
|
|
mbmi->txfm_size = TX_32X32;
|
|
|
|
} else if (cm->txfm_mode >= ALLOW_16X16 &&
|
|
|
|
bsize >= BLOCK_SIZE_MB16X16) {
|
|
|
|
mbmi->txfm_size = TX_16X16;
|
|
|
|
} else if (cm->txfm_mode >= ALLOW_8X8 && (bsize >= BLOCK_SIZE_SB8X8)) {
|
|
|
|
mbmi->txfm_size = TX_8X8;
|
|
|
|
} else {
|
|
|
|
mbmi->txfm_size = TX_4X4;
|
|
|
|
}
|
|
|
|
|
2012-07-13 15:21:29 -07:00
|
|
|
// If reference frame is an Inter frame
|
|
|
|
if (mbmi->ref_frame) {
|
|
|
|
int_mv nearest, nearby, best_mv;
|
|
|
|
int_mv nearest_second, nearby_second, best_mv_second;
|
2013-06-05 11:21:44 -07:00
|
|
|
vp9_prob mv_ref_p[VP9_INTER_MODES - 1];
|
2013-04-03 17:43:45 -07:00
|
|
|
const MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
|
2012-08-06 10:51:20 -07:00
|
|
|
|
|
|
|
{
|
2012-11-15 15:14:38 -08:00
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
if (dec_debug)
|
|
|
|
printf("%d %d\n", xd->mode_info_context->mbmi.mv[0].as_mv.row,
|
|
|
|
xd->mode_info_context->mbmi.mv[0].as_mv.col);
|
|
|
|
#endif
|
2013-05-29 16:42:23 -04:00
|
|
|
vp9_find_mv_refs(cm, xd, mi, xd->prev_mode_info_context, ref_frame,
|
|
|
|
mbmi->ref_mvs[ref_frame], cm->ref_frame_sign_bias);
|
2012-08-24 15:44:01 +01:00
|
|
|
|
2013-04-03 17:43:45 -07:00
|
|
|
vp9_mv_ref_probs(cm, mv_ref_p, mbmi->mb_mode_context[ref_frame]);
|
2012-12-05 16:23:38 +00:00
|
|
|
|
2013-02-06 13:02:53 +00:00
|
|
|
// If the segment level skip mode enabled
|
2013-01-28 15:22:53 +00:00
|
|
|
if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {
|
|
|
|
mbmi->mode = ZEROMV;
|
2013-05-30 12:49:38 -07:00
|
|
|
} else if (bsize >= BLOCK_SIZE_SB8X8) {
|
|
|
|
mbmi->mode = read_sb_mv_ref(r, mv_ref_p);
|
2013-04-03 17:43:45 -07:00
|
|
|
vp9_accum_mv_refs(cm, mbmi->mode, mbmi->mb_mode_context[ref_frame]);
|
2012-12-27 16:04:44 -08:00
|
|
|
}
|
|
|
|
|
2013-05-30 12:49:38 -07:00
|
|
|
if (bsize < BLOCK_SIZE_SB8X8 || mbmi->mode != ZEROMV) {
|
2012-12-27 16:04:44 -08:00
|
|
|
vp9_find_best_ref_mvs(xd,
|
|
|
|
mbmi->ref_mvs[ref_frame],
|
|
|
|
&nearest, &nearby);
|
|
|
|
|
2013-04-03 17:43:45 -07:00
|
|
|
best_mv.as_int = mbmi->ref_mvs[ref_frame][0].as_int;
|
2012-12-27 16:04:44 -08:00
|
|
|
}
|
2012-12-05 16:23:38 +00:00
|
|
|
|
2012-11-15 15:14:38 -08:00
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
if (dec_debug)
|
|
|
|
printf("[D %d %d] %d %d %d %d\n", ref_frame,
|
|
|
|
mbmi->mb_mode_context[ref_frame],
|
|
|
|
mv_ref_p[0], mv_ref_p[1], mv_ref_p[2], mv_ref_p[3]);
|
|
|
|
#endif
|
2012-11-12 15:09:25 +00:00
|
|
|
}
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-05-02 13:44:33 -04:00
|
|
|
mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
|
|
|
|
? read_switchable_filter_type(pbi, r)
|
|
|
|
: cm->mcomp_filter_type;
|
2012-06-25 16:23:58 -07:00
|
|
|
|
2012-07-13 15:21:29 -07:00
|
|
|
if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
|
|
|
|
(cm->comp_pred_mode == HYBRID_PREDICTION &&
|
2013-04-16 14:03:05 -07:00
|
|
|
vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_COMP)))) {
|
2012-07-13 15:21:29 -07:00
|
|
|
/* Since we have 3 reference frames, we can only have 3 unique
|
|
|
|
* combinations of combinations of 2 different reference frames
|
|
|
|
* (A-G, G-L or A-L). In the bitstream, we use this to simply
|
|
|
|
* derive the second reference frame from the first reference
|
|
|
|
* frame, by saying it's the next one in the enumerator, and
|
|
|
|
* if that's > n_refs, then the second reference frame is the
|
|
|
|
* first one in the enumerator. */
|
|
|
|
mbmi->second_ref_frame = mbmi->ref_frame + 1;
|
|
|
|
if (mbmi->second_ref_frame == 4)
|
|
|
|
mbmi->second_ref_frame = 1;
|
2012-11-07 06:50:25 -08:00
|
|
|
if (mbmi->second_ref_frame > 0) {
|
2013-04-03 17:43:45 -07:00
|
|
|
const MV_REFERENCE_FRAME second_ref_frame = mbmi->second_ref_frame;
|
2013-02-20 12:34:31 -08:00
|
|
|
|
2013-05-29 16:42:23 -04:00
|
|
|
vp9_find_mv_refs(cm, xd, mi, xd->prev_mode_info_context,
|
2013-04-03 17:43:45 -07:00
|
|
|
second_ref_frame, mbmi->ref_mvs[second_ref_frame],
|
2012-10-29 13:44:18 +00:00
|
|
|
cm->ref_frame_sign_bias);
|
2012-08-24 15:44:01 +01:00
|
|
|
|
2013-05-30 12:49:38 -07:00
|
|
|
if (bsize < BLOCK_SIZE_SB8X8 || mbmi->mode != ZEROMV) {
|
2012-12-27 16:04:44 -08:00
|
|
|
vp9_find_best_ref_mvs(xd,
|
2013-04-03 17:43:45 -07:00
|
|
|
mbmi->ref_mvs[second_ref_frame],
|
2012-12-27 16:04:44 -08:00
|
|
|
&nearest_second,
|
|
|
|
&nearby_second);
|
2013-04-03 17:43:45 -07:00
|
|
|
best_mv_second.as_int = mbmi->ref_mvs[second_ref_frame][0].as_int;
|
2012-12-27 16:04:44 -08:00
|
|
|
}
|
2012-08-06 10:51:20 -07:00
|
|
|
}
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2012-04-18 13:51:58 -07:00
|
|
|
|
2012-07-13 15:21:29 -07:00
|
|
|
mbmi->uv_mode = DC_PRED;
|
2013-05-30 12:49:38 -07:00
|
|
|
if (mbmi->sb_type < BLOCK_SIZE_SB8X8) {
|
|
|
|
mbmi->need_to_clamp_mvs = 0;
|
|
|
|
for (idy = 0; idy < 2; idy += bh) {
|
|
|
|
for (idx = 0; idx < 2; idx += bw) {
|
|
|
|
int_mv blockmv, secondmv;
|
|
|
|
int blockmode;
|
|
|
|
int i;
|
|
|
|
j = idy * 2 + idx;
|
|
|
|
|
|
|
|
blockmode = read_sb_mv_ref(r, mv_ref_p);
|
|
|
|
vp9_accum_mv_refs(cm, blockmode, mbmi->mb_mode_context[ref_frame]);
|
|
|
|
if (blockmode == NEARESTMV || blockmode == NEARMV) {
|
|
|
|
MV_REFERENCE_FRAME rf2 = mbmi->second_ref_frame;
|
|
|
|
vp9_append_sub8x8_mvs_for_idx(cm, xd, &nearest, &nearby, j, 0);
|
|
|
|
if (rf2 > 0) {
|
|
|
|
vp9_append_sub8x8_mvs_for_idx(cm, xd, &nearest_second,
|
|
|
|
&nearby_second, j, 1);
|
2013-05-15 22:28:36 -07:00
|
|
|
}
|
2013-05-30 12:49:38 -07:00
|
|
|
}
|
2013-05-15 22:28:36 -07:00
|
|
|
|
2013-05-30 12:49:38 -07:00
|
|
|
switch (blockmode) {
|
|
|
|
case NEWMV:
|
|
|
|
decode_mv(r, &blockmv.as_mv, &best_mv.as_mv, nmvc,
|
|
|
|
&cm->fc.NMVcount, xd->allow_high_precision_mv);
|
|
|
|
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
decode_mv(r, &secondmv.as_mv, &best_mv_second.as_mv, nmvc,
|
|
|
|
&cm->fc.NMVcount, xd->allow_high_precision_mv);
|
|
|
|
|
|
|
|
#ifdef VPX_MODE_COUNT
|
|
|
|
vp9_mv_cont_count[mv_contz][3]++;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case NEARESTMV:
|
|
|
|
blockmv.as_int = nearest.as_int;
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
secondmv.as_int = nearest_second.as_int;
|
|
|
|
#ifdef VPX_MODE_COUNT
|
|
|
|
vp9_mv_cont_count[mv_contz][0]++;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case NEARMV:
|
|
|
|
blockmv.as_int = nearby.as_int;
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
secondmv.as_int = nearby_second.as_int;
|
|
|
|
#ifdef VPX_MODE_COUNT
|
|
|
|
vp9_mv_cont_count[mv_contz][1]++;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
case ZEROMV:
|
|
|
|
blockmv.as_int = 0;
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
secondmv.as_int = 0;
|
|
|
|
#ifdef VPX_MODE_COUNT
|
|
|
|
vp9_mv_cont_count[mv_contz][2]++;
|
|
|
|
#endif
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2013-05-30 12:49:38 -07:00
|
|
|
mi->bmi[j].as_mv[0].as_int = blockmv.as_int;
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
mi->bmi[j].as_mv[1].as_int = secondmv.as_int;
|
|
|
|
|
|
|
|
for (i = 1; i < bh; ++i)
|
|
|
|
vpx_memcpy(&mi->bmi[j + i * 2], &mi->bmi[j], sizeof(mi->bmi[j]));
|
|
|
|
for (i = 1; i < bw; ++i)
|
|
|
|
vpx_memcpy(&mi->bmi[j + i], &mi->bmi[j], sizeof(mi->bmi[j]));
|
|
|
|
mi->mbmi.mode = blockmode;
|
2013-05-15 22:28:36 -07:00
|
|
|
}
|
2013-05-30 12:49:38 -07:00
|
|
|
}
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-05-30 12:49:38 -07:00
|
|
|
mv0->as_int = mi->bmi[3].as_mv[0].as_int;
|
|
|
|
mv1->as_int = mi->bmi[3].as_mv[1].as_int;
|
|
|
|
} else {
|
|
|
|
switch (mbmi->mode) {
|
|
|
|
case NEARMV:
|
|
|
|
// Clip "next_nearest" so that it does not extend to far out of image
|
|
|
|
assign_and_clamp_mv(mv0, &nearby, mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
assign_and_clamp_mv(mv1, &nearby_second, mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NEARESTMV:
|
|
|
|
// Clip "next_nearest" so that it does not extend to far out of image
|
|
|
|
assign_and_clamp_mv(mv0, &nearest, mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
assign_and_clamp_mv(mv1, &nearest_second, mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
|
|
|
break;
|
|
|
|
|
|
|
|
case ZEROMV:
|
|
|
|
mv0->as_int = 0;
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
|
|
|
mv1->as_int = 0;
|
|
|
|
break;
|
|
|
|
|
|
|
|
case NEWMV:
|
|
|
|
decode_mv(r, &mv0->as_mv, &best_mv.as_mv, nmvc, &cm->fc.NMVcount,
|
|
|
|
xd->allow_high_precision_mv);
|
|
|
|
mbmi->need_to_clamp_mvs = check_mv_bounds(mv0,
|
|
|
|
mb_to_left_edge,
|
2013-04-18 11:05:34 -07:00
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
2013-05-30 12:49:38 -07:00
|
|
|
|
|
|
|
if (mbmi->second_ref_frame > 0) {
|
|
|
|
decode_mv(r, &mv1->as_mv, &best_mv_second.as_mv, nmvc,
|
|
|
|
&cm->fc.NMVcount, xd->allow_high_precision_mv);
|
|
|
|
mbmi->need_to_clamp_secondmv = check_mv_bounds(mv1,
|
|
|
|
mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
2012-07-13 15:21:29 -07:00
|
|
|
#if CONFIG_DEBUG
|
2013-05-30 12:49:38 -07:00
|
|
|
assert(0);
|
2012-07-13 15:21:29 -07:00
|
|
|
#endif
|
2013-05-30 12:49:38 -07:00
|
|
|
break;
|
|
|
|
}
|
2010-09-09 14:42:48 -04:00
|
|
|
}
|
2012-07-13 15:21:29 -07:00
|
|
|
} else {
|
2013-04-18 11:05:34 -07:00
|
|
|
// required for left and above block mv
|
|
|
|
mv0->as_int = 0;
|
2012-07-13 15:21:29 -07:00
|
|
|
|
2013-05-15 22:28:36 -07:00
|
|
|
if (bsize >= BLOCK_SIZE_SB8X8) {
|
2013-06-03 10:39:40 -07: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);
|
|
|
|
mbmi->mode = read_intra_mode(r, cm->fc.y_mode_prob[MIN(3, bsl)]);
|
|
|
|
cm->fc.y_mode_counts[MIN(3, bsl)][mbmi->mode]++;
|
2013-05-10 17:06:37 -07:00
|
|
|
} else {
|
2013-05-20 12:08:22 -07:00
|
|
|
int idx, idy;
|
|
|
|
for (idy = 0; idy < 2; idy += bh) {
|
|
|
|
for (idx = 0; idx < 2; idx += bw) {
|
2013-05-20 16:04:28 -07:00
|
|
|
int ib = idy * 2 + idx, k;
|
2013-06-03 10:39:40 -07:00
|
|
|
int m = read_intra_mode(r, cm->fc.y_mode_prob[0]);
|
2013-05-20 16:04:28 -07:00
|
|
|
mi->bmi[ib].as_mode.first = m;
|
2013-06-03 10:39:40 -07:00
|
|
|
cm->fc.y_mode_counts[0][m]++;
|
2013-05-20 16:04:28 -07:00
|
|
|
for (k = 1; k < bh; ++k)
|
|
|
|
mi->bmi[ib + k * 2].as_mode.first = m;
|
|
|
|
for (k = 1; k < bw; ++k)
|
|
|
|
mi->bmi[ib + k].as_mode.first = m;
|
2013-05-20 12:08:22 -07:00
|
|
|
}
|
|
|
|
}
|
2013-05-30 11:27:40 -07:00
|
|
|
mbmi->mode = mi->bmi[3].as_mode.first;
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-05-30 09:58:53 -07:00
|
|
|
mbmi->uv_mode = read_intra_mode(r, cm->fc.uv_mode_prob[mbmi->mode]);
|
2013-05-04 22:09:43 -07:00
|
|
|
cm->fc.uv_mode_counts[mbmi->mode][mbmi->uv_mode]++;
|
2012-07-13 15:21:29 -07:00
|
|
|
}
|
2010-09-09 14:42:48 -04:00
|
|
|
}
|
2010-05-18 11:58:33 -04:00
|
|
|
|
2013-04-12 12:31:23 -07:00
|
|
|
void vp9_decode_mode_mvs_init(VP9D_COMP* const pbi, vp9_reader *r) {
|
2012-10-30 17:53:32 -07:00
|
|
|
VP9_COMMON *cm = &pbi->common;
|
2013-04-09 10:54:19 -07:00
|
|
|
int k;
|
2012-10-16 13:52:39 -07:00
|
|
|
|
2013-04-09 10:54:19 -07:00
|
|
|
// TODO(jkoleszar): does this clear more than MBSKIP_CONTEXTS? Maybe remove.
|
2012-10-17 09:38:13 -07:00
|
|
|
vpx_memset(cm->mbskip_pred_probs, 0, sizeof(cm->mbskip_pred_probs));
|
2013-04-09 10:54:19 -07:00
|
|
|
for (k = 0; k < MBSKIP_CONTEXTS; ++k)
|
|
|
|
cm->mbskip_pred_probs[k] = vp9_read_prob(r);
|
2012-10-17 09:38:13 -07:00
|
|
|
|
2013-04-12 12:31:23 -07:00
|
|
|
mb_mode_mv_init(pbi, r);
|
2012-08-03 12:31:38 -07:00
|
|
|
}
|
2013-01-15 06:43:35 -08:00
|
|
|
|
2012-11-05 14:22:59 -08:00
|
|
|
void vp9_decode_mb_mode_mv(VP9D_COMP* const pbi,
|
|
|
|
MACROBLOCKD* const xd,
|
2013-04-26 11:57:17 -07:00
|
|
|
int mi_row,
|
|
|
|
int mi_col,
|
2013-04-16 14:03:05 -07:00
|
|
|
vp9_reader *r) {
|
2013-02-20 10:16:24 -08:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2012-08-03 12:31:38 -07:00
|
|
|
MODE_INFO *mi = xd->mode_info_context;
|
2013-02-20 10:16:24 -08:00
|
|
|
MB_MODE_INFO *const mbmi = &mi->mbmi;
|
2012-08-03 12:31:38 -07:00
|
|
|
|
2013-04-16 14:03:05 -07:00
|
|
|
if (cm->frame_type == KEY_FRAME) {
|
2013-04-26 11:57:17 -07:00
|
|
|
kfread_modes(pbi, mi, mi_row, mi_col, r);
|
Spatial resamping of ZEROMV predictors
This patch allows coding frames using references of different
resolution, in ZEROMV mode. For compound prediction, either
reference may be scaled.
To test, I use the resize_test and enable WRITE_RECON_BUFFER
in vp9_onyxd_if.c. It's also useful to apply this patch to
test/i420_video_source.h:
--- a/test/i420_video_source.h
+++ b/test/i420_video_source.h
@@ -93,6 +93,7 @@ class I420VideoSource : public VideoSource {
virtual void FillFrame() {
// Read a frame from input_file.
+ if (frame_ != 3)
if (fread(img_->img_data, raw_sz_, 1, input_file_) == 0) {
limit_ = frame_;
}
This forces the frame that the resolution changes on to be coded
with no motion, only scaling, and improves the quality of the
result.
Change-Id: I1ee75d19a437ff801192f767fd02a36bcbd1d496
2013-02-24 20:55:14 -08:00
|
|
|
} else {
|
2013-05-20 17:32:50 -07:00
|
|
|
read_mb_modes_mv(pbi, mi, &mi->mbmi, mi_row, mi_col, r);
|
Spatial resamping of ZEROMV predictors
This patch allows coding frames using references of different
resolution, in ZEROMV mode. For compound prediction, either
reference may be scaled.
To test, I use the resize_test and enable WRITE_RECON_BUFFER
in vp9_onyxd_if.c. It's also useful to apply this patch to
test/i420_video_source.h:
--- a/test/i420_video_source.h
+++ b/test/i420_video_source.h
@@ -93,6 +93,7 @@ class I420VideoSource : public VideoSource {
virtual void FillFrame() {
// Read a frame from input_file.
+ if (frame_ != 3)
if (fread(img_->img_data, raw_sz_, 1, input_file_) == 0) {
limit_ = frame_;
}
This forces the frame that the resolution changes on to be coded
with no motion, only scaling, and improves the quality of the
result.
Change-Id: I1ee75d19a437ff801192f767fd02a36bcbd1d496
2013-02-24 20:55:14 -08:00
|
|
|
}
|
2013-02-20 10:16:24 -08:00
|
|
|
|
2013-04-26 11:57:17 -07:00
|
|
|
if (1) {
|
|
|
|
const int bw = 1 << mi_width_log2(mbmi->sb_type);
|
|
|
|
const int bh = 1 << mi_height_log2(mbmi->sb_type);
|
|
|
|
const int y_mis = MIN(bh, cm->mi_rows - mi_row);
|
|
|
|
const int x_mis = MIN(bw, cm->mi_cols - mi_col);
|
2013-02-20 10:16:24 -08:00
|
|
|
const int mis = cm->mode_info_stride;
|
|
|
|
int x, y;
|
|
|
|
|
2013-04-26 11:57:17 -07:00
|
|
|
for (y = 0; y < y_mis; y++)
|
|
|
|
for (x = !y; x < x_mis; x++)
|
2013-02-20 10:16:24 -08:00
|
|
|
mi[y * mis + x] = *mi;
|
|
|
|
}
|
2012-08-03 12:31:38 -07:00
|
|
|
}
|