2010-05-18 17:58:33 +02:00
|
|
|
/*
|
2012-02-27 19:22:38 +01: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
|
|
|
*/
|
|
|
|
|
|
|
|
|
2012-11-28 19:41:40 +01:00
|
|
|
#include "vp9/decoder/vp9_treereader.h"
|
2012-11-27 22:59:17 +01: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-25 05:55:14 +01:00
|
|
|
#include "vp9/common/vp9_reconinter.h"
|
2012-11-28 19:41:40 +01:00
|
|
|
#include "vp9/decoder/vp9_onyxd_int.h"
|
2012-11-27 22:59:17 +01:00
|
|
|
#include "vp9/common/vp9_findnearmv.h"
|
2013-01-06 03:20:25 +01:00
|
|
|
#include "vp9/common/vp9_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/decoder/vp9_decodemv.h"
|
|
|
|
#include "vp9/common/vp9_mvref_common.h"
|
2010-05-18 17:58:33 +02:00
|
|
|
#if CONFIG_DEBUG
|
|
|
|
#include <assert.h>
|
|
|
|
#endif
|
2012-02-16 18:29:54 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
// #define DEBUG_DEC_MV
|
2012-02-16 18:29:54 +01:00
|
|
|
#ifdef DEBUG_DEC_MV
|
|
|
|
int dec_mvcount = 0;
|
|
|
|
#endif
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2012-11-16 00:14:38 +01:00
|
|
|
// #define DEC_DEBUG
|
|
|
|
#ifdef DEC_DEBUG
|
|
|
|
extern int dec_debug;
|
|
|
|
#endif
|
2012-02-16 18:29:54 +01:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static B_PREDICTION_MODE read_bmode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
B_PREDICTION_MODE m = treed_read(r, vp9_bmode_tree, p);
|
2012-10-09 22:19:15 +02:00
|
|
|
#if CONFIG_NEWBINTRAMODES
|
|
|
|
if (m == B_CONTEXT_PRED - CONTEXT_PRED_REPLACEMENTS)
|
|
|
|
m = B_CONTEXT_PRED;
|
|
|
|
assert(m < B_CONTEXT_PRED - CONTEXT_PRED_REPLACEMENTS || m == B_CONTEXT_PRED);
|
|
|
|
#endif
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static B_PREDICTION_MODE read_kf_bmode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (B_PREDICTION_MODE)treed_read(r, vp9_kf_bmode_tree, p);
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static MB_PREDICTION_MODE read_ymode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (MB_PREDICTION_MODE)treed_read(r, vp9_ymode_tree, p);
|
2012-08-20 23:43:34 +02:00
|
|
|
}
|
2010-09-09 20:42:48 +02:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static MB_PREDICTION_MODE read_sb_ymode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (MB_PREDICTION_MODE)treed_read(r, vp9_sb_ymode_tree, p);
|
2012-11-16 00:50:07 +01:00
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static MB_PREDICTION_MODE read_kf_sb_ymode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (MB_PREDICTION_MODE)treed_read(r, vp9_uv_mode_tree, p);
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static MB_PREDICTION_MODE read_kf_mb_ymode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (MB_PREDICTION_MODE)treed_read(r, vp9_kf_ymode_tree, p);
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static int read_i8x8_mode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return treed_read(r, vp9_i8x8_mode_tree, p);
|
2011-08-05 01:30:27 +02:00
|
|
|
}
|
2010-09-09 20:42:48 +02:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static MB_PREDICTION_MODE read_uv_mode(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (MB_PREDICTION_MODE)treed_read(r, vp9_uv_mode_tree, p);
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
|
|
|
|
2012-02-02 18:04:40 +01:00
|
|
|
// This function reads the current macro block's segnent id from the bitstream
|
2011-11-11 11:10:06 +01:00
|
|
|
// It should only be called if a segment map update is indicated.
|
2013-02-27 20:48:13 +01:00
|
|
|
static void read_mb_segid(vp9_reader *r, MB_MODE_INFO *mi, MACROBLOCKD *xd) {
|
2012-08-15 12:00:53 +02:00
|
|
|
if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
|
2013-03-21 20:51:57 +01:00
|
|
|
const vp9_prob *const p = xd->mb_segment_tree_probs;
|
|
|
|
mi->segment_id = vp9_read(r, p[0]) ? 2 + vp9_read(r, p[2])
|
|
|
|
: vp9_read(r, p[1]);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
2012-03-19 19:02:04 +01:00
|
|
|
|
2013-01-30 18:30:46 +01:00
|
|
|
// This function reads the current macro block's segnent id from the bitstream
|
|
|
|
// It should only be called if a segment map update is indicated.
|
|
|
|
static void read_mb_segid_except(VP9_COMMON *cm,
|
|
|
|
vp9_reader *r, MB_MODE_INFO *mi,
|
|
|
|
MACROBLOCKD *xd, int mb_row, int mb_col) {
|
2013-03-21 20:51:57 +01:00
|
|
|
const int mb_index = mb_row * cm->mb_cols + mb_col;
|
|
|
|
const int pred_seg_id = vp9_get_pred_mb_segid(cm, xd, mb_index);
|
|
|
|
const vp9_prob *const p = xd->mb_segment_tree_probs;
|
|
|
|
const vp9_prob prob = xd->mb_segment_mispred_tree_probs[pred_seg_id];
|
2013-01-30 18:30:46 +01:00
|
|
|
|
|
|
|
if (xd->segmentation_enabled && xd->update_mb_segmentation_map) {
|
2013-03-21 20:51:57 +01:00
|
|
|
mi->segment_id = vp9_read(r, prob)
|
|
|
|
? 2 + (pred_seg_id < 2 ? vp9_read(r, p[2]) : (pred_seg_id == 2))
|
|
|
|
: (pred_seg_id >= 2 ? vp9_read(r, p[1]) : (pred_seg_id == 0));
|
2013-01-30 18:30:46 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-25 14:58:21 +02:00
|
|
|
#if CONFIG_NEW_MVREF
|
2013-02-27 20:48:13 +01:00
|
|
|
int vp9_read_mv_ref_id(vp9_reader *r, vp9_prob *ref_id_probs) {
|
2012-10-25 14:58:21 +02:00
|
|
|
int ref_index = 0;
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
if (vp9_read(r, ref_id_probs[0])) {
|
2012-10-25 14:58:21 +02:00
|
|
|
ref_index++;
|
2012-10-31 22:40:53 +01:00
|
|
|
if (vp9_read(r, ref_id_probs[1])) {
|
2012-10-25 14:58:21 +02:00
|
|
|
ref_index++;
|
2012-10-31 22:40:53 +01:00
|
|
|
if (vp9_read(r, ref_id_probs[2]))
|
2012-10-25 14:58:21 +02:00
|
|
|
ref_index++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ref_index;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-10-31 01:12:12 +01:00
|
|
|
extern const int vp9_i8x8_block[4];
|
2013-04-16 23:03:05 +02:00
|
|
|
static void kfread_modes(VP9D_COMP *pbi, MODE_INFO *m,
|
|
|
|
int mb_row, int mb_col,
|
|
|
|
vp9_reader *r) {
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2013-04-16 23:03:05 +02:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
|
|
|
const int mis = cm->mode_info_stride;
|
|
|
|
const int map_index = mb_row * cm->mb_cols + mb_col;
|
2013-02-19 22:36:38 +01:00
|
|
|
m->mbmi.ref_frame = INTRA_FRAME;
|
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
// Read the Macroblock segmentation map if it is being updated explicitly
|
|
|
|
// this frame (reset to 0 by default).
|
|
|
|
m->mbmi.segment_id = 0;
|
2013-04-16 23:03:05 +02:00
|
|
|
if (xd->update_mb_segmentation_map) {
|
|
|
|
read_mb_segid(r, &m->mbmi, xd);
|
2013-01-06 03:20:25 +01:00
|
|
|
if (m->mbmi.sb_type) {
|
2013-04-11 01:50:01 +02:00
|
|
|
const int bw = 1 << mb_width_log2(m->mbmi.sb_type);
|
|
|
|
const int bh = 1 << mb_height_log2(m->mbmi.sb_type);
|
|
|
|
const int ymbs = MIN(cm->mb_rows - mb_row, bh);
|
|
|
|
const int xmbs = MIN(cm->mb_cols - mb_col, bw);
|
2013-01-06 03:20:25 +01:00
|
|
|
int x, y;
|
|
|
|
|
|
|
|
for (y = 0; y < ymbs; y++) {
|
|
|
|
for (x = 0; x < xmbs; x++) {
|
2013-04-16 23:03:05 +02:00
|
|
|
const int index = y * cm->mb_cols + x;
|
|
|
|
cm->last_frame_seg_map[map_index + index] = m->mbmi.segment_id;
|
2013-01-06 03:20:25 +01:00
|
|
|
}
|
|
|
|
}
|
2013-01-08 19:29:22 +01:00
|
|
|
} else {
|
2013-01-06 03:20:25 +01:00
|
|
|
cm->last_frame_seg_map[map_index] = m->mbmi.segment_id;
|
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
|
2013-04-09 19:54:19 +02:00
|
|
|
m->mbmi.mb_skip_coeff = vp9_segfeature_active(&pbi->mb, m->mbmi.segment_id,
|
|
|
|
SEG_LVL_SKIP);
|
|
|
|
if (!m->mbmi.mb_skip_coeff)
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.mb_skip_coeff = vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.mode = m->mbmi.sb_type ?
|
|
|
|
read_kf_sb_ymode(r, cm->sb_kf_ymode_prob[cm->kf_ymode_probs_index]):
|
|
|
|
read_kf_mb_ymode(r, cm->kf_ymode_prob[cm->kf_ymode_probs_index]);
|
2012-01-27 19:35:14 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
m->mbmi.ref_frame = INTRA_FRAME;
|
2011-11-21 12:07:28 +01:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
if (m->mbmi.mode == I4X4_PRED) {
|
2012-07-14 00:21:29 +02:00
|
|
|
int i = 0;
|
|
|
|
do {
|
2013-02-27 20:48:13 +01:00
|
|
|
const B_PREDICTION_MODE a = above_block_mode(m, i, mis);
|
2013-04-16 23:03:05 +02:00
|
|
|
const B_PREDICTION_MODE l = xd->left_available || (i & 3) ?
|
[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
|
|
|
left_block_mode(m, i) : B_DC_PRED;
|
2011-11-21 12:07:28 +01:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
m->bmi[i].as_mode.first = read_kf_bmode(r, cm->kf_bmode_prob[a][l]);
|
2012-07-14 00:21:29 +02:00
|
|
|
} while (++i < 16);
|
|
|
|
}
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
if (m->mbmi.mode == I8X8_PRED) {
|
2012-07-14 00:21:29 +02:00
|
|
|
int i;
|
|
|
|
for (i = 0; i < 4; i++) {
|
2013-02-27 20:48:13 +01:00
|
|
|
const int ib = vp9_i8x8_block[i];
|
2013-04-16 23:03:05 +02:00
|
|
|
const int mode8x8 = read_i8x8_mode(r, cm->fc.i8x8_mode_prob);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
m->bmi[ib + 0].as_mode.first = mode8x8;
|
|
|
|
m->bmi[ib + 1].as_mode.first = mode8x8;
|
|
|
|
m->bmi[ib + 4].as_mode.first = mode8x8;
|
|
|
|
m->bmi[ib + 5].as_mode.first = mode8x8;
|
|
|
|
}
|
2013-02-27 20:48:13 +01:00
|
|
|
} else {
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.uv_mode = read_uv_mode(r, cm->kf_uv_mode_prob[m->mbmi.mode]);
|
2013-02-27 20:48:13 +01:00
|
|
|
}
|
2012-04-18 18:08:55 +02:00
|
|
|
|
2013-02-27 20:48:13 +01:00
|
|
|
if (cm->txfm_mode == TX_MODE_SELECT &&
|
|
|
|
m->mbmi.mb_skip_coeff == 0 &&
|
2012-10-11 02:18:22 +02:00
|
|
|
m->mbmi.mode <= I8X8_PRED) {
|
2012-10-09 18:18:21 +02:00
|
|
|
// FIXME(rbultje) code ternary symbol once all experiments are merged
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.txfm_size = vp9_read(r, cm->prob_tx[0]);
|
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
|
|
|
if (m->mbmi.txfm_size != TX_4X4 && m->mbmi.mode != I8X8_PRED) {
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.txfm_size += vp9_read(r, cm->prob_tx[1]);
|
2013-04-11 01:50:01 +02:00
|
|
|
if (m->mbmi.txfm_size != TX_8X8 && m->mbmi.sb_type >= BLOCK_SIZE_SB32X32)
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.txfm_size += vp9_read(r, cm->prob_tx[2]);
|
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-04-11 01:50:01 +02:00
|
|
|
} else if (cm->txfm_mode >= ALLOW_32X32 &&
|
|
|
|
m->mbmi.sb_type >= BLOCK_SIZE_SB32X32) {
|
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
|
|
|
m->mbmi.txfm_size = TX_32X32;
|
2012-10-23 01:52:28 +02:00
|
|
|
} else if (cm->txfm_mode >= ALLOW_16X16 && m->mbmi.mode <= TM_PRED) {
|
2012-10-09 18:18:21 +02:00
|
|
|
m->mbmi.txfm_size = TX_16X16;
|
2013-04-11 21:16:35 +02:00
|
|
|
} else if (cm->txfm_mode >= ALLOW_8X8 && m->mbmi.mode != I4X4_PRED) {
|
2012-10-09 18:18:21 +02:00
|
|
|
m->mbmi.txfm_size = TX_8X8;
|
|
|
|
} else {
|
|
|
|
m->mbmi.txfm_size = TX_4X4;
|
|
|
|
}
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static int read_nmv_component(vp9_reader *r,
|
2012-07-26 22:42:07 +02:00
|
|
|
int rv,
|
|
|
|
const nmv_component *mvcomp) {
|
2013-02-27 20:48:13 +01:00
|
|
|
int mag, d;
|
|
|
|
const int sign = vp9_read(r, mvcomp->sign);
|
|
|
|
const int mv_class = treed_read(r, vp9_mv_class_tree, mvcomp->classes);
|
|
|
|
|
|
|
|
if (mv_class == MV_CLASS_0) {
|
2012-10-31 22:40:53 +01:00
|
|
|
d = treed_read(r, vp9_mv_class0_tree, mvcomp->class0);
|
2012-07-26 22:42:07 +02:00
|
|
|
} else {
|
2013-02-27 20:48:13 +01:00
|
|
|
int i;
|
|
|
|
int n = mv_class + CLASS0_BITS - 1; // number of bits
|
|
|
|
|
2012-07-26 22:42:07 +02:00
|
|
|
d = 0;
|
2013-02-27 20:48:13 +01:00
|
|
|
for (i = 0; i < n; ++i)
|
|
|
|
d |= vp9_read(r, mvcomp->bits[i]) << i;
|
2012-07-26 22:42:07 +02:00
|
|
|
}
|
|
|
|
|
2013-02-27 20:48:13 +01:00
|
|
|
mag = vp9_get_mv_mag(mv_class, d << 3);
|
|
|
|
return sign ? -(mag + 8) : (mag + 8);
|
2012-07-26 22:42:07 +02:00
|
|
|
}
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static int read_nmv_component_fp(vp9_reader *r,
|
2012-07-26 22:42:07 +02:00
|
|
|
int v,
|
|
|
|
int rv,
|
|
|
|
const nmv_component *mvcomp,
|
|
|
|
int usehp) {
|
2013-02-27 20:48:13 +01:00
|
|
|
const int sign = v < 0;
|
|
|
|
int mag = ((sign ? -v : v) - 1) & ~7; // magnitude - 1
|
|
|
|
int offset;
|
|
|
|
const int mv_class = vp9_get_mv_class(mag, &offset);
|
|
|
|
const int f = mv_class == MV_CLASS_0 ?
|
|
|
|
treed_read(r, vp9_mv_fp_tree, mvcomp->class0_fp[offset >> 3]):
|
|
|
|
treed_read(r, vp9_mv_fp_tree, mvcomp->fp);
|
2012-07-26 22:42:07 +02:00
|
|
|
|
2013-02-27 20:48:13 +01:00
|
|
|
offset += f << 1;
|
2012-07-26 22:42:07 +02:00
|
|
|
|
|
|
|
if (usehp) {
|
2013-03-21 20:51:57 +01:00
|
|
|
const vp9_prob p = mv_class == MV_CLASS_0 ? mvcomp->class0_hp : mvcomp->hp;
|
|
|
|
offset += vp9_read(r, p);
|
2012-07-26 22:42:07 +02:00
|
|
|
} else {
|
2013-02-27 20:48:13 +01:00
|
|
|
offset += 1; // If hp is not used, the default value of the hp bit is 1
|
2012-07-26 22:42:07 +02:00
|
|
|
}
|
2013-02-27 20:48:13 +01:00
|
|
|
mag = vp9_get_mv_mag(mv_class, offset);
|
|
|
|
return sign ? -(mag + 1) : (mag + 1);
|
2012-07-26 22:42:07 +02:00
|
|
|
}
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static void read_nmv(vp9_reader *r, MV *mv, const MV *ref,
|
2012-07-26 22:42:07 +02:00
|
|
|
const nmv_context *mvctx) {
|
2013-02-27 20:48:13 +01:00
|
|
|
const MV_JOINT_TYPE j = treed_read(r, vp9_mv_joint_tree, mvctx->joints);
|
2013-04-12 21:31:23 +02:00
|
|
|
mv->row = mv->col = 0;
|
|
|
|
|
2013-04-15 21:07:26 +02:00
|
|
|
if (mv_joint_vertical(j))
|
2012-07-26 22:42:07 +02:00
|
|
|
mv->row = read_nmv_component(r, ref->row, &mvctx->comps[0]);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2013-04-15 21:07:26 +02:00
|
|
|
if (mv_joint_horizontal(j))
|
2012-07-26 22:42:07 +02:00
|
|
|
mv->col = read_nmv_component(r, ref->col, &mvctx->comps[1]);
|
|
|
|
}
|
|
|
|
|
2012-10-31 22:40:53 +01:00
|
|
|
static void read_nmv_fp(vp9_reader *r, MV *mv, const MV *ref,
|
2012-07-26 22:42:07 +02:00
|
|
|
const nmv_context *mvctx, int usehp) {
|
2013-02-27 20:48:13 +01:00
|
|
|
const MV_JOINT_TYPE j = vp9_get_mv_joint(*mv);
|
2012-10-31 00:25:53 +01:00
|
|
|
usehp = usehp && vp9_use_nmv_hp(ref);
|
2013-04-15 21:07:26 +02:00
|
|
|
if (mv_joint_vertical(j))
|
2012-07-26 22:42:07 +02:00
|
|
|
mv->row = read_nmv_component_fp(r, mv->row, ref->row, &mvctx->comps[0],
|
|
|
|
usehp);
|
2013-04-12 21:31:23 +02:00
|
|
|
|
2013-04-15 21:07:26 +02:00
|
|
|
if (mv_joint_horizontal(j))
|
2012-07-26 22:42:07 +02:00
|
|
|
mv->col = read_nmv_component_fp(r, mv->col, ref->col, &mvctx->comps[1],
|
|
|
|
usehp);
|
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static void update_nmv(vp9_reader *r, vp9_prob *const p,
|
2012-10-31 22:40:53 +01:00
|
|
|
const vp9_prob upd_p) {
|
2013-04-16 23:03:05 +02:00
|
|
|
if (vp9_read(r, upd_p)) {
|
2012-07-26 22:42:07 +02:00
|
|
|
#ifdef LOW_PRECISION_MV_UPDATE
|
2013-04-16 23:03:05 +02:00
|
|
|
*p = (vp9_read_literal(r, 7) << 1) | 1;
|
2012-07-26 22:42:07 +02:00
|
|
|
#else
|
2013-04-16 23:03:05 +02:00
|
|
|
*p = (vp9_read_literal(r, 8));
|
2012-07-26 22:42:07 +02:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static void read_nmvprobs(vp9_reader *r, nmv_context *mvctx,
|
2012-07-26 22:42:07 +02:00
|
|
|
int usehp) {
|
|
|
|
int i, j, k;
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2012-07-26 22:42:07 +02:00
|
|
|
#ifdef MV_GROUP_UPDATE
|
2013-04-16 23:03:05 +02:00
|
|
|
if (!vp9_read_bit(r))
|
2013-02-27 20:48:13 +01:00
|
|
|
return;
|
2012-07-26 22:42:07 +02:00
|
|
|
#endif
|
2013-02-27 20:48:13 +01:00
|
|
|
for (j = 0; j < MV_JOINTS - 1; ++j)
|
2013-04-16 23:03:05 +02:00
|
|
|
update_nmv(r, &mvctx->joints[j], VP9_NMV_UPDATE_PROB);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2012-07-26 22:42:07 +02:00
|
|
|
for (i = 0; i < 2; ++i) {
|
2013-04-16 23:03:05 +02:00
|
|
|
update_nmv(r, &mvctx->comps[i].sign, VP9_NMV_UPDATE_PROB);
|
2013-02-27 20:48:13 +01:00
|
|
|
for (j = 0; j < MV_CLASSES - 1; ++j)
|
2013-04-16 23:03:05 +02:00
|
|
|
update_nmv(r, &mvctx->comps[i].classes[j], VP9_NMV_UPDATE_PROB);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
|
|
|
for (j = 0; j < CLASS0_SIZE - 1; ++j)
|
2013-04-16 23:03:05 +02:00
|
|
|
update_nmv(r, &mvctx->comps[i].class0[j], VP9_NMV_UPDATE_PROB);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
|
|
|
for (j = 0; j < MV_OFFSET_BITS; ++j)
|
2013-04-16 23:03:05 +02:00
|
|
|
update_nmv(r, &mvctx->comps[i].bits[j], VP9_NMV_UPDATE_PROB);
|
2012-07-26 22:42:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < 2; ++i) {
|
2013-04-04 02:43:45 +02:00
|
|
|
for (j = 0; j < CLASS0_SIZE; ++j)
|
2012-07-26 22:42:07 +02:00
|
|
|
for (k = 0; k < 3; ++k)
|
2013-04-16 23:03:05 +02:00
|
|
|
update_nmv(r, &mvctx->comps[i].class0_fp[j][k], VP9_NMV_UPDATE_PROB);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
|
|
|
for (j = 0; j < 3; ++j)
|
2013-04-16 23:03:05 +02:00
|
|
|
update_nmv(r, &mvctx->comps[i].fp[j], VP9_NMV_UPDATE_PROB);
|
2012-07-26 22:42:07 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
if (usehp) {
|
|
|
|
for (i = 0; i < 2; ++i) {
|
2013-04-16 23:03:05 +02: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 22:42:07 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-09-30 17:45:16 +02:00
|
|
|
// Read the referncence frame
|
2012-10-31 01:53:32 +01:00
|
|
|
static MV_REFERENCE_FRAME read_ref_frame(VP9D_COMP *pbi,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r,
|
2012-07-14 00:21:29 +02:00
|
|
|
unsigned char segment_id) {
|
|
|
|
MV_REFERENCE_FRAME ref_frame;
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2012-07-14 00:21:29 +02:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
|
|
|
|
2013-02-27 20:48:13 +01:00
|
|
|
int seg_ref_count = 0;
|
2013-04-12 21:31:23 +02: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-14 00:21:29 +02:00
|
|
|
|
|
|
|
// If segment coding enabled does the segment allow for more than one
|
|
|
|
// possible reference frame
|
2013-04-12 21:31:23 +02:00
|
|
|
if (seg_ref_active)
|
|
|
|
seg_ref_count = intra + last + golden + altref;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// Segment reference frame features not available or allows for
|
|
|
|
// multiple reference frame options
|
2013-04-04 02:43:45 +02:00
|
|
|
if (!seg_ref_active || seg_ref_count > 1) {
|
2012-07-14 00:21:29 +02:00
|
|
|
// Values used in prediction model coding
|
|
|
|
MV_REFERENCE_FRAME pred_ref;
|
|
|
|
|
|
|
|
// Get the context probability the prediction flag
|
2013-03-15 21:16:58 +01:00
|
|
|
vp9_prob pred_prob = vp9_get_pred_prob(cm, xd, PRED_REF);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// Read the prediction status flag
|
2013-04-16 23:03:05 +02:00
|
|
|
unsigned char prediction_flag = vp9_read(r, pred_prob);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// Store the prediction flag.
|
2012-10-29 14:44:18 +01:00
|
|
|
vp9_set_pred_flag(xd, PRED_REF, prediction_flag);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// Get the predicted reference frame.
|
2012-10-29 14:44:18 +01:00
|
|
|
pred_ref = vp9_get_pred_ref(cm, xd);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// If correctly predicted then use the predicted value
|
|
|
|
if (prediction_flag) {
|
|
|
|
ref_frame = pred_ref;
|
2013-03-15 21:16:58 +01:00
|
|
|
} else {
|
|
|
|
// decode the explicitly coded value
|
2012-10-31 22:40:53 +01:00
|
|
|
vp9_prob mod_refprobs[PREDICTION_PROBS];
|
2013-04-12 21:31:23 +02:00
|
|
|
vpx_memcpy(mod_refprobs, cm->mod_refprobs[pred_ref],
|
|
|
|
sizeof(mod_refprobs));
|
2012-07-14 00:21:29 +02: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 21:31:23 +02:00
|
|
|
mod_refprobs[INTRA_FRAME] *= intra;
|
|
|
|
mod_refprobs[LAST_FRAME] *= last;
|
|
|
|
mod_refprobs[GOLDEN_FRAME] *= golden * altref;
|
2012-07-14 00:21:29 +02: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 23:03:05 +02:00
|
|
|
ref_frame = vp9_read(r, mod_refprobs[0]);
|
2012-07-14 00:21:29 +02:00
|
|
|
else
|
|
|
|
ref_frame++;
|
|
|
|
|
|
|
|
if (ref_frame) {
|
|
|
|
// Do we need to decode the Last/Gf_Arf branch
|
|
|
|
if (mod_refprobs[1])
|
2013-04-16 23:03:05 +02:00
|
|
|
ref_frame += vp9_read(r, mod_refprobs[1]);
|
2012-01-28 13:20:14 +01:00
|
|
|
else
|
2012-07-14 00:21:29 +02:00
|
|
|
ref_frame++;
|
|
|
|
|
|
|
|
if (ref_frame > 1) {
|
|
|
|
// Do we need to decode the GF/Arf branch
|
2013-04-04 02:43:45 +02:00
|
|
|
if (mod_refprobs[2]) {
|
2013-04-16 23:03:05 +02:00
|
|
|
ref_frame += vp9_read(r, mod_refprobs[2]);
|
2013-04-04 02:43:45 +02:00
|
|
|
} else {
|
2013-04-12 21:31:23 +02: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-14 00:21:29 +02:00
|
|
|
}
|
2012-01-28 13:20:14 +01:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2011-09-30 17:45:16 +02:00
|
|
|
}
|
2013-03-15 21:16:58 +01:00
|
|
|
} else {
|
|
|
|
// Segment reference frame features are enabled
|
2012-07-14 00:21:29 +02: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 14:44:18 +01:00
|
|
|
vp9_set_pred_flag(xd, PRED_REF, 1);
|
|
|
|
ref_frame = vp9_get_pred_ref(cm, xd);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
return ref_frame;
|
2011-09-30 17:45:16 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-16 23:03:05 +02: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 23:43:34 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static MB_PREDICTION_MODE read_mv_ref(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (MB_PREDICTION_MODE) treed_read(r, vp9_mv_ref_tree, p);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static B_PREDICTION_MODE sub_mv_ref(vp9_reader *r, const vp9_prob *p) {
|
|
|
|
return (B_PREDICTION_MODE) treed_read(r, vp9_sub_mv_ref_tree, p);
|
2010-05-18 17:58:33 +02:00
|
|
|
}
|
2010-09-09 20:42:48 +02:00
|
|
|
|
|
|
|
#ifdef VPX_MODE_COUNT
|
2012-10-31 00:25:53 +01:00
|
|
|
unsigned int vp9_mv_cont_count[5][4] = {
|
2012-07-14 00:21:29 +02:00
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 },
|
|
|
|
{ 0, 0, 0, 0 }
|
2010-05-18 17:58:33 +02:00
|
|
|
};
|
2010-09-09 20:42:48 +02:00
|
|
|
#endif
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-02-27 20:48:13 +01:00
|
|
|
static const unsigned char mbsplit_fill_count[4] = { 8, 8, 4, 1 };
|
2011-03-17 22:07:59 +01:00
|
|
|
static const unsigned char mbsplit_fill_offset[4][16] = {
|
2013-02-27 20:48:13 +01:00
|
|
|
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 },
|
|
|
|
{ 0, 1, 4, 5, 8, 9, 12, 13, 2, 3, 6, 7, 10, 11, 14, 15 },
|
|
|
|
{ 0, 1, 4, 5, 2, 3, 6, 7, 8, 9, 12, 13, 10, 11, 14, 15 },
|
|
|
|
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15 }
|
2010-09-09 20:42:48 +02:00
|
|
|
};
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
static void read_switchable_interp_probs(VP9D_COMP* const pbi, vp9_reader *r) {
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2012-07-18 22:43:01 +02:00
|
|
|
int i, j;
|
2013-04-16 23:03:05 +02:00
|
|
|
for (j = 0; j < VP9_SWITCHABLE_FILTERS + 1; ++j)
|
|
|
|
for (i = 0; i < VP9_SWITCHABLE_FILTERS - 1; ++i)
|
|
|
|
cm->fc.switchable_interp_prob[j][i] = vp9_read_prob(r);
|
2012-07-18 22:43:01 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-12 21:31:23 +02: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-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-10-17 18:38:13 +02:00
|
|
|
if (cm->frame_type == KEY_FRAME) {
|
|
|
|
if (!cm->kf_ymode_probs_update)
|
2013-04-12 21:31:23 +02:00
|
|
|
cm->kf_ymode_probs_index = vp9_read_literal(r, 3);
|
2012-10-17 18:38:13 +02:00
|
|
|
} else {
|
2013-04-16 09:18:02 +02:00
|
|
|
nmv_context *const nmvc = &pbi->common.fc.nmvc;
|
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
|
|
|
int i, j;
|
2013-04-12 21:31:23 +02:00
|
|
|
|
2012-07-18 22:43:01 +02:00
|
|
|
if (cm->mcomp_filter_type == SWITCHABLE)
|
2013-04-12 21:31:23 +02:00
|
|
|
read_switchable_interp_probs(pbi, r);
|
2012-11-07 15:50:25 +01:00
|
|
|
#if CONFIG_COMP_INTERINTRA_PRED
|
|
|
|
if (cm->use_interintra) {
|
2013-04-12 21:31:23 +02:00
|
|
|
if (vp9_read(r, VP9_UPD_INTERINTRA_PROB))
|
|
|
|
cm->fc.interintra_prob = vp9_read_prob(r);
|
2012-11-07 15:50:25 +01:00
|
|
|
}
|
|
|
|
#endif
|
2013-04-12 21:31:23 +02: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-14 00:21:29 +02:00
|
|
|
|
|
|
|
// Computes a modified set of probabilities for use when reference
|
|
|
|
// frame prediction fails.
|
2012-10-29 14:44:18 +01:00
|
|
|
vp9_compute_mod_refprobs(cm);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-04-12 21:31:23 +02:00
|
|
|
cm->comp_pred_mode = read_comp_pred_mode(r);
|
|
|
|
if (cm->comp_pred_mode == HYBRID_PREDICTION)
|
2012-07-14 00:21:29 +02:00
|
|
|
for (i = 0; i < COMP_PRED_CONTEXTS; i++)
|
2013-04-12 21:31:23 +02:00
|
|
|
cm->prob_comppred[i] = vp9_read_prob(r);
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-12 21:31:23 +02:00
|
|
|
// VP9_YMODES
|
|
|
|
if (vp9_read_bit(r))
|
2013-04-04 02:43:45 +02:00
|
|
|
for (i = 0; i < VP9_YMODES - 1; ++i)
|
2013-04-12 21:31:23 +02:00
|
|
|
cm->fc.ymode_prob[i] = vp9_read_prob(r);
|
2012-10-25 14:58:21 +02:00
|
|
|
|
2013-04-12 21:31:23 +02:00
|
|
|
// VP9_I32X32_MODES
|
|
|
|
if (vp9_read_bit(r))
|
2013-04-04 02:43:45 +02:00
|
|
|
for (i = 0; i < VP9_I32X32_MODES - 1; ++i)
|
2013-04-12 21:31:23 +02:00
|
|
|
cm->fc.sb_ymode_prob[i] = vp9_read_prob(r);
|
2012-11-16 00:50:07 +01:00
|
|
|
|
2013-04-16 09:18:02 +02:00
|
|
|
for (j = 0; j < PARTITION_PLANES; j++) {
|
|
|
|
if (vp9_read_bit(r)) {
|
|
|
|
for (i = 0; i < PARTITION_TYPES - 1; i++)
|
|
|
|
cm->fc.partition_prob[j][i] = vp9_read_prob(r);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
read_nmvprobs(r, nmvc, xd->allow_high_precision_mv);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-01-28 11:24:43 +01: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
|
2012-10-31 01:53:32 +01:00
|
|
|
static void read_mb_segment_id(VP9D_COMP *pbi,
|
2012-10-18 01:47:38 +02:00
|
|
|
int mb_row, int mb_col,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r) {
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2013-03-21 20:51:57 +01:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
2012-07-14 00:21:29 +02:00
|
|
|
MODE_INFO *mi = xd->mode_info_context;
|
|
|
|
MB_MODE_INFO *mbmi = &mi->mbmi;
|
2013-04-16 23:03:05 +02:00
|
|
|
int mb_index = mb_row * cm->mb_cols + mb_col;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
if (xd->segmentation_enabled) {
|
|
|
|
if (xd->update_mb_segmentation_map) {
|
|
|
|
// Is temporal coding of the segment id for this mb enabled.
|
|
|
|
if (cm->temporal_update) {
|
|
|
|
// Get the context based probability for reading the
|
|
|
|
// prediction status flag
|
2013-03-15 21:16:58 +01:00
|
|
|
vp9_prob pred_prob = vp9_get_pred_prob(cm, xd, PRED_SEG_ID);
|
2012-01-28 11:24:43 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
// Read the prediction status flag
|
2013-04-16 23:03:05 +02:00
|
|
|
unsigned char seg_pred_flag = vp9_read(r, pred_prob);
|
2012-01-28 11:24:43 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
// Store the prediction flag.
|
2012-10-29 14:44:18 +01:00
|
|
|
vp9_set_pred_flag(xd, PRED_SEG_ID, seg_pred_flag);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// If the value is flagged as correctly predicted
|
|
|
|
// then use the predicted value
|
|
|
|
if (seg_pred_flag) {
|
2013-03-21 20:51:57 +01:00
|
|
|
mbmi->segment_id = vp9_get_pred_mb_segid(cm, xd, mb_index);
|
2013-03-15 21:16:58 +01:00
|
|
|
} else {
|
|
|
|
// Decode it explicitly
|
2013-04-16 23:03:05 +02:00
|
|
|
read_mb_segid_except(cm, r, mbmi, xd, mb_row, mb_col);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2013-03-15 21:16:58 +01:00
|
|
|
} else {
|
|
|
|
// Normal unpredicted coding mode
|
2013-04-16 23:03:05 +02:00
|
|
|
read_mb_segid(r, mbmi, xd);
|
2012-08-20 23:43:34 +02:00
|
|
|
}
|
2013-03-15 21:16:58 +01:00
|
|
|
|
2013-01-06 03:20:25 +01:00
|
|
|
if (mbmi->sb_type) {
|
2013-04-11 01:50:01 +02:00
|
|
|
const int bw = 1 << mb_width_log2(mbmi->sb_type);
|
|
|
|
const int bh = 1 << mb_height_log2(mbmi->sb_type);
|
|
|
|
const int ymbs = MIN(cm->mb_rows - mb_row, bh);
|
|
|
|
const int xmbs = MIN(cm->mb_cols - mb_col, bw);
|
2013-01-06 03:20:25 +01:00
|
|
|
int x, y;
|
|
|
|
|
|
|
|
for (y = 0; y < ymbs; y++) {
|
|
|
|
for (x = 0; x < xmbs; x++) {
|
2013-04-16 23:03:05 +02:00
|
|
|
const int index = y * cm->mb_cols + x;
|
|
|
|
cm->last_frame_seg_map[mb_index + index] = mbmi->segment_id;
|
2013-01-06 03:20:25 +01:00
|
|
|
}
|
2012-10-30 01:58:18 +01:00
|
|
|
}
|
2013-01-08 19:29:22 +01:00
|
|
|
} else {
|
2013-03-21 20:51:57 +01:00
|
|
|
cm->last_frame_seg_map[mb_index] = mbmi->segment_id;
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2012-08-20 23:43:34 +02:00
|
|
|
} else {
|
2013-01-06 03:20:25 +01:00
|
|
|
if (mbmi->sb_type) {
|
2013-04-11 01:50:01 +02:00
|
|
|
const int bw = 1 << mb_width_log2(mbmi->sb_type);
|
|
|
|
const int bh = 1 << mb_height_log2(mbmi->sb_type);
|
|
|
|
const int ymbs = MIN(cm->mb_rows - mb_row, bh);
|
|
|
|
const int xmbs = MIN(cm->mb_cols - mb_col, bw);
|
2013-01-06 03:20:25 +01:00
|
|
|
unsigned segment_id = -1;
|
|
|
|
int x, y;
|
|
|
|
|
|
|
|
for (y = 0; y < ymbs; y++) {
|
|
|
|
for (x = 0; x < xmbs; x++) {
|
|
|
|
segment_id = MIN(segment_id,
|
2013-03-21 20:51:57 +01:00
|
|
|
cm->last_frame_seg_map[mb_index + x + y * cm->mb_cols]);
|
2013-01-06 03:20:25 +01:00
|
|
|
}
|
2012-10-30 01:58:18 +01:00
|
|
|
}
|
2013-01-06 03:20:25 +01:00
|
|
|
mbmi->segment_id = segment_id;
|
2013-01-08 19:29:22 +01:00
|
|
|
} else {
|
2013-03-21 20:51:57 +01:00
|
|
|
mbmi->segment_id = cm->last_frame_seg_map[mb_index];
|
2012-08-20 23:43:34 +02:00
|
|
|
}
|
2012-01-28 11:24:43 +01:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
} else {
|
|
|
|
// The encoder explicitly sets the segment_id to 0
|
|
|
|
// when segmentation is disabled
|
|
|
|
mbmi->segment_id = 0;
|
|
|
|
}
|
2012-01-28 11:24:43 +01:00
|
|
|
}
|
2011-05-02 15:30:51 +02:00
|
|
|
|
2013-03-15 21:16:58 +01: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-04-16 23:03:05 +02:00
|
|
|
static INLINE void process_mv(vp9_reader *r, MV *mv, MV *ref,
|
2013-03-15 21:16:58 +01:00
|
|
|
nmv_context *nmvc, nmv_context_counts *mvctx,
|
|
|
|
int usehp) {
|
2013-04-16 23:03:05 +02:00
|
|
|
read_nmv(r, mv, ref, nmvc);
|
|
|
|
read_nmv_fp(r, mv, ref, nmvc, usehp);
|
2013-03-15 21:16:58 +01:00
|
|
|
vp9_increment_nmv(mv, ref, mvctx, usehp);
|
|
|
|
mv->row += ref->row;
|
|
|
|
mv->col += ref->col;
|
|
|
|
}
|
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
static INLINE INTERPOLATIONFILTERTYPE read_switchable_filter_type(
|
2013-04-16 23:03:05 +02:00
|
|
|
VP9D_COMP *pbi, vp9_reader *r) {
|
|
|
|
const int index = treed_read(r, vp9_switchable_interp_tree,
|
2013-04-04 02:43:45 +02:00
|
|
|
vp9_get_pred_probs(&pbi->common, &pbi->mb,
|
|
|
|
PRED_SWITCHABLE_INTERP));
|
|
|
|
return vp9_switchable_interp[index];
|
|
|
|
}
|
|
|
|
|
2012-10-31 01:53:32 +01:00
|
|
|
static void read_mb_modes_mv(VP9D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi,
|
2011-11-16 01:16:30 +01:00
|
|
|
MODE_INFO *prev_mi,
|
2012-10-18 01:47:38 +02:00
|
|
|
int mb_row, int mb_col,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r) {
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2013-04-16 23:03:05 +02:00
|
|
|
nmv_context *const nmvc = &cm->fc.nmvc;
|
|
|
|
const int mis = cm->mode_info_stride;
|
2013-03-21 20:51:57 +01:00
|
|
|
MACROBLOCKD *const xd = &pbi->mb;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2012-11-05 23:22:59 +01:00
|
|
|
int_mv *const mv = &mbmi->mv[0];
|
2013-04-11 01:50:01 +02:00
|
|
|
const int bw = 1 << mb_width_log2(mi->mbmi.sb_type);
|
|
|
|
const int bh = 1 << mb_height_log2(mi->mbmi.sb_type);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2013-03-21 00:41:30 +01:00
|
|
|
const int use_prev_in_find_mv_refs = cm->width == cm->last_width &&
|
|
|
|
cm->height == cm->last_height &&
|
2013-02-20 21:34:31 +01:00
|
|
|
!cm->error_resilient_mode;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-03-21 20:51:57 +01:00
|
|
|
int mb_to_left_edge, mb_to_right_edge, mb_to_top_edge, mb_to_bottom_edge;
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
mbmi->need_to_clamp_mvs = 0;
|
|
|
|
mbmi->need_to_clamp_secondmv = 0;
|
2012-11-07 15:50:25 +01:00
|
|
|
mbmi->second_ref_frame = NONE;
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2013-02-20 19:16:24 +01:00
|
|
|
// Make sure the MACROBLOCKD mode info pointer is pointed at the
|
|
|
|
// correct entry for the current macroblock.
|
|
|
|
xd->mode_info_context = mi;
|
|
|
|
xd->prev_mode_info_context = prev_mi;
|
|
|
|
|
2013-02-27 20:48:13 +01: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-04-11 01:50:01 +02:00
|
|
|
set_mb_row(cm, xd, mb_row, bh);
|
|
|
|
set_mb_col(cm, xd, mb_col, bw);
|
2013-02-20 19:16:24 +01:00
|
|
|
|
2013-03-21 20:51:57 +01: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 21:16:58 +01: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-14 00:21:29 +02:00
|
|
|
|
|
|
|
// Read the macroblock segment id.
|
2013-04-16 23:03:05 +02:00
|
|
|
read_mb_segment_id(pbi, mb_row, mb_col, r);
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-04-09 19:54:19 +02:00
|
|
|
mbmi->mb_skip_coeff = vp9_segfeature_active(xd, mbmi->segment_id,
|
|
|
|
SEG_LVL_SKIP);
|
|
|
|
if (!mbmi->mb_skip_coeff)
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->mb_skip_coeff = vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_MBSKIP));
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
// Read the reference frame
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->ref_frame = read_ref_frame(pbi, r, mbmi->segment_id);
|
2013-01-15 15:43:35 +01:00
|
|
|
|
2012-07-14 00:21:29 +02: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-02-27 20:48:13 +01:00
|
|
|
vp9_prob mv_ref_p[VP9_MVREFS - 1];
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
const MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
|
|
|
|
struct scale_factors *sf0 = &xd->scale_factor[0];
|
|
|
|
struct scale_factors *sf_uv0 = &xd->scale_factor_uv[0];
|
|
|
|
*sf0 = cm->active_ref_scale[mbmi->ref_frame - 1];
|
2012-08-06 19:51:20 +02:00
|
|
|
|
|
|
|
{
|
2013-04-04 02:43:45 +02:00
|
|
|
const int use_prev_in_find_best_ref = sf0->x_num == sf0->x_den &&
|
|
|
|
sf0->y_num == sf0->y_den &&
|
|
|
|
!cm->error_resilient_mode &&
|
|
|
|
!cm->frame_parallel_decoding_mode;
|
2012-08-06 19:51:20 +02:00
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
// Select the appropriate reference frame for this MB
|
2013-03-15 21:16:58 +01:00
|
|
|
const int ref_fb_idx = cm->active_ref_idx[ref_frame - 1];
|
2012-08-06 19:51:20 +02:00
|
|
|
|
2013-02-20 21:34:31 +01:00
|
|
|
setup_pred_block(&xd->pre, &cm->yv12_fb[ref_fb_idx],
|
2013-04-04 02:43:45 +02:00
|
|
|
mb_row, mb_col, sf0, sf_uv0);
|
2012-08-06 19:51:20 +02:00
|
|
|
|
2012-11-16 00:14:38 +01: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-02-20 21:34:31 +01:00
|
|
|
vp9_find_mv_refs(cm, xd, mi, use_prev_in_find_mv_refs ? prev_mi : NULL,
|
2012-10-29 14:44:18 +01:00
|
|
|
ref_frame, mbmi->ref_mvs[ref_frame],
|
|
|
|
cm->ref_frame_sign_bias);
|
2012-08-24 16:44:01 +02:00
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
vp9_mv_ref_probs(cm, mv_ref_p, mbmi->mb_mode_context[ref_frame]);
|
2012-12-05 17:23:38 +01:00
|
|
|
|
2013-02-06 14:02:53 +01:00
|
|
|
// If the segment level skip mode enabled
|
2013-01-28 16:22:53 +01:00
|
|
|
if (vp9_segfeature_active(xd, mbmi->segment_id, SEG_LVL_SKIP)) {
|
|
|
|
mbmi->mode = ZEROMV;
|
2012-12-28 01:04:44 +01:00
|
|
|
} else {
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->mode = mbmi->sb_type ? read_sb_mv_ref(r, mv_ref_p)
|
|
|
|
: read_mv_ref(r, mv_ref_p);
|
2013-04-04 02:43:45 +02:00
|
|
|
vp9_accum_mv_refs(cm, mbmi->mode, mbmi->mb_mode_context[ref_frame]);
|
2012-12-28 01:04:44 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (mbmi->mode != ZEROMV) {
|
|
|
|
vp9_find_best_ref_mvs(xd,
|
2013-04-04 02:43:45 +02:00
|
|
|
use_prev_in_find_best_ref ? xd->pre.y_buffer
|
|
|
|
: NULL,
|
2013-02-20 21:34:31 +01:00
|
|
|
xd->pre.y_stride,
|
2012-12-28 01:04:44 +01:00
|
|
|
mbmi->ref_mvs[ref_frame],
|
|
|
|
&nearest, &nearby);
|
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
best_mv.as_int = mbmi->ref_mvs[ref_frame][0].as_int;
|
2012-12-28 01:04:44 +01:00
|
|
|
}
|
2012-12-05 17:23:38 +01:00
|
|
|
|
2012-11-16 00:14:38 +01: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 16:09:25 +01:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-02-27 20:48:13 +01:00
|
|
|
if (mbmi->mode >= NEARESTMV && mbmi->mode <= SPLITMV) {
|
2013-04-04 02:43:45 +02:00
|
|
|
mbmi->interp_filter = cm->mcomp_filter_type == SWITCHABLE
|
2013-04-16 23:03:05 +02:00
|
|
|
? read_switchable_filter_type(pbi, r)
|
2013-04-04 02:43:45 +02:00
|
|
|
: cm->mcomp_filter_type;
|
2012-07-18 22:43:01 +02:00
|
|
|
}
|
2012-06-26 01:23:58 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
if (cm->comp_pred_mode == COMP_PREDICTION_ONLY ||
|
|
|
|
(cm->comp_pred_mode == HYBRID_PREDICTION &&
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_read(r, vp9_get_pred_prob(cm, xd, PRED_COMP)))) {
|
2012-07-14 00:21:29 +02: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 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0) {
|
2013-04-04 02:43:45 +02:00
|
|
|
const MV_REFERENCE_FRAME second_ref_frame = mbmi->second_ref_frame;
|
|
|
|
struct scale_factors *sf1 = &xd->scale_factor[1];
|
|
|
|
struct scale_factors *sf_uv1 = &xd->scale_factor_uv[1];
|
|
|
|
const int use_prev_in_find_best_ref = sf1->x_num == sf1->x_den &&
|
|
|
|
sf1->y_num == sf1->y_den &&
|
|
|
|
!cm->error_resilient_mode &&
|
|
|
|
!cm->frame_parallel_decoding_mode;
|
|
|
|
const int second_ref_fb_idx = cm->active_ref_idx[second_ref_frame - 1];
|
|
|
|
*sf1 = cm->active_ref_scale[second_ref_frame - 1];
|
2012-08-06 19:51:20 +02:00
|
|
|
|
2013-02-20 21:34:31 +01:00
|
|
|
setup_pred_block(&xd->second_pre, &cm->yv12_fb[second_ref_fb_idx],
|
2013-04-04 02:43:45 +02:00
|
|
|
mb_row, mb_col, sf1, sf_uv1);
|
2013-02-20 21:34:31 +01:00
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
vp9_find_mv_refs(cm, xd, mi,
|
|
|
|
use_prev_in_find_mv_refs ? prev_mi : NULL,
|
|
|
|
second_ref_frame, mbmi->ref_mvs[second_ref_frame],
|
2012-10-29 14:44:18 +01:00
|
|
|
cm->ref_frame_sign_bias);
|
2012-08-24 16:44:01 +02:00
|
|
|
|
2012-12-28 01:04:44 +01:00
|
|
|
if (mbmi->mode != ZEROMV) {
|
|
|
|
vp9_find_best_ref_mvs(xd,
|
2013-02-20 21:34:31 +01:00
|
|
|
use_prev_in_find_best_ref ?
|
|
|
|
xd->second_pre.y_buffer : NULL,
|
|
|
|
xd->second_pre.y_stride,
|
2013-04-04 02:43:45 +02:00
|
|
|
mbmi->ref_mvs[second_ref_frame],
|
2012-12-28 01:04:44 +01:00
|
|
|
&nearest_second,
|
|
|
|
&nearby_second);
|
2013-04-04 02:43:45 +02:00
|
|
|
best_mv_second.as_int = mbmi->ref_mvs[second_ref_frame][0].as_int;
|
2012-12-28 01:04:44 +01:00
|
|
|
}
|
2012-08-06 19:51:20 +02:00
|
|
|
}
|
2012-11-07 19:41:04 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
} else {
|
2012-11-07 15:50:25 +01:00
|
|
|
#if CONFIG_COMP_INTERINTRA_PRED
|
|
|
|
if (pbi->common.use_interintra &&
|
|
|
|
mbmi->mode >= NEARESTMV && mbmi->mode < SPLITMV &&
|
|
|
|
mbmi->second_ref_frame == NONE) {
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->second_ref_frame = (vp9_read(r, pbi->common.fc.interintra_prob) ?
|
2012-11-07 15:50:25 +01:00
|
|
|
INTRA_FRAME : NONE);
|
|
|
|
// printf("-- %d (%d)\n", mbmi->second_ref_frame == INTRA_FRAME,
|
|
|
|
// pbi->common.fc.interintra_prob);
|
|
|
|
pbi->common.fc.interintra_counts[
|
|
|
|
mbmi->second_ref_frame == INTRA_FRAME]++;
|
|
|
|
if (mbmi->second_ref_frame == INTRA_FRAME) {
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->interintra_mode = read_ymode(r, pbi->common.fc.ymode_prob);
|
2012-11-07 15:50:25 +01:00
|
|
|
pbi->common.fc.ymode_counts[mbmi->interintra_mode]++;
|
|
|
|
#if SEPARATE_INTERINTRA_UV
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->interintra_uv_mode = read_uv_mode(r,
|
2013-02-27 20:48:13 +01:00
|
|
|
pbi->common.fc.uv_mode_prob[mbmi->interintra_mode]);
|
2012-11-07 15:50:25 +01:00
|
|
|
pbi->common.fc.uv_mode_counts[mbmi->interintra_mode]
|
|
|
|
[mbmi->interintra_uv_mode]++;
|
|
|
|
#else
|
|
|
|
mbmi->interintra_uv_mode = mbmi->interintra_mode;
|
|
|
|
#endif
|
|
|
|
// printf("** %d %d\n",
|
|
|
|
// mbmi->interintra_mode, mbmi->interintra_uv_mode);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2012-04-18 22:51:58 +02:00
|
|
|
|
2012-12-05 17:23:38 +01:00
|
|
|
#if CONFIG_NEW_MVREF
|
|
|
|
// if ((mbmi->mode == NEWMV) || (mbmi->mode == SPLITMV))
|
|
|
|
if (mbmi->mode == NEWMV) {
|
|
|
|
int best_index;
|
|
|
|
MV_REFERENCE_FRAME ref_frame = mbmi->ref_frame;
|
|
|
|
|
|
|
|
// Encode the index of the choice.
|
|
|
|
best_index =
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_read_mv_ref_id(r, xd->mb_mv_ref_probs[ref_frame]);
|
2012-12-05 17:23:38 +01:00
|
|
|
|
|
|
|
best_mv.as_int = mbmi->ref_mvs[ref_frame][best_index].as_int;
|
|
|
|
|
|
|
|
if (mbmi->second_ref_frame > 0) {
|
|
|
|
ref_frame = mbmi->second_ref_frame;
|
|
|
|
|
|
|
|
// Encode the index of the choice.
|
|
|
|
best_index =
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_read_mv_ref_id(r, xd->mb_mv_ref_probs[ref_frame]);
|
2012-12-05 17:23:38 +01:00
|
|
|
best_mv_second.as_int = mbmi->ref_mvs[ref_frame][best_index].as_int;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
mbmi->uv_mode = DC_PRED;
|
|
|
|
switch (mbmi->mode) {
|
|
|
|
case SPLITMV: {
|
2013-04-16 23:03:05 +02:00
|
|
|
const int s = treed_read(r, vp9_mbsplit_tree, cm->fc.mbsplit_prob);
|
2013-03-21 20:51:57 +01:00
|
|
|
const int num_p = vp9_mbsplit_count[s];
|
2012-07-14 00:21:29 +02:00
|
|
|
int j = 0;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-03-21 20:51:57 +01:00
|
|
|
cm->fc.mbsplit_counts[s]++;
|
2012-07-14 00:21:29 +02:00
|
|
|
mbmi->need_to_clamp_mvs = 0;
|
2013-03-21 20:51:57 +01:00
|
|
|
mbmi->partitioning = s;
|
2013-02-27 20:48:13 +01:00
|
|
|
do { // for each subset j
|
2012-07-14 00:21:29 +02:00
|
|
|
int_mv leftmv, abovemv, second_leftmv, second_abovemv;
|
|
|
|
int_mv blockmv, secondmv;
|
|
|
|
int mv_contz;
|
|
|
|
int blockmode;
|
2013-02-27 20:48:13 +01:00
|
|
|
int k = vp9_mbsplit_offset[s][j]; // first block in subset j
|
2012-07-14 00:21:29 +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
|
|
|
leftmv.as_int = left_block_mv(xd, mi, k);
|
2012-07-14 00:21:29 +02:00
|
|
|
abovemv.as_int = above_block_mv(mi, k, mis);
|
2012-11-29 19:10:51 +01:00
|
|
|
second_leftmv.as_int = 0;
|
|
|
|
second_abovemv.as_int = 0;
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 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
|
|
|
second_leftmv.as_int = left_block_second_mv(xd, mi, k);
|
2012-07-14 00:21:29 +02:00
|
|
|
second_abovemv.as_int = above_block_second_mv(mi, k, mis);
|
|
|
|
}
|
2012-10-31 00:25:53 +01:00
|
|
|
mv_contz = vp9_mv_cont(&leftmv, &abovemv);
|
2013-04-16 23:03:05 +02:00
|
|
|
blockmode = sub_mv_ref(r, cm->fc.sub_mv_ref_prob[mv_contz]);
|
2012-07-14 00:21:29 +02:00
|
|
|
cm->fc.sub_mv_ref_counts[mv_contz][blockmode - LEFT4X4]++;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
switch (blockmode) {
|
|
|
|
case NEW4X4:
|
2013-04-16 23:03:05 +02:00
|
|
|
process_mv(r, &blockmv.as_mv, &best_mv.as_mv, nmvc,
|
2013-03-15 21:16:58 +01:00
|
|
|
&cm->fc.NMVcount, xd->allow_high_precision_mv);
|
|
|
|
|
|
|
|
if (mbmi->second_ref_frame > 0)
|
2013-04-16 23:03:05 +02:00
|
|
|
process_mv(r, &secondmv.as_mv, &best_mv_second.as_mv, nmvc,
|
2013-03-15 21:16:58 +01:00
|
|
|
&cm->fc.NMVcount, xd->allow_high_precision_mv);
|
|
|
|
|
2012-06-06 00:25:07 +02:00
|
|
|
#ifdef VPX_MODE_COUNT
|
2012-10-31 00:25:53 +01:00
|
|
|
vp9_mv_cont_count[mv_contz][3]++;
|
2012-06-06 00:25:07 +02:00
|
|
|
#endif
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
|
|
|
case LEFT4X4:
|
|
|
|
blockmv.as_int = leftmv.as_int;
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0)
|
2012-07-14 00:21:29 +02:00
|
|
|
secondmv.as_int = second_leftmv.as_int;
|
2012-06-06 00:25:07 +02:00
|
|
|
#ifdef VPX_MODE_COUNT
|
2012-10-31 00:25:53 +01:00
|
|
|
vp9_mv_cont_count[mv_contz][0]++;
|
2012-06-06 00:25:07 +02:00
|
|
|
#endif
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
|
|
|
case ABOVE4X4:
|
|
|
|
blockmv.as_int = abovemv.as_int;
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0)
|
2012-07-14 00:21:29 +02:00
|
|
|
secondmv.as_int = second_abovemv.as_int;
|
2012-06-06 00:25:07 +02:00
|
|
|
#ifdef VPX_MODE_COUNT
|
2012-10-31 00:25:53 +01:00
|
|
|
vp9_mv_cont_count[mv_contz][1]++;
|
2012-06-06 00:25:07 +02:00
|
|
|
#endif
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
|
|
|
case ZERO4X4:
|
|
|
|
blockmv.as_int = 0;
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0)
|
2012-07-14 00:21:29 +02:00
|
|
|
secondmv.as_int = 0;
|
2012-06-20 14:07:24 +02:00
|
|
|
#ifdef VPX_MODE_COUNT
|
2012-10-31 00:25:53 +01:00
|
|
|
vp9_mv_cont_count[mv_contz][2]++;
|
2012-06-20 14:07:24 +02:00
|
|
|
#endif
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2012-11-30 01:39:15 +01:00
|
|
|
/* Commenting this section out, not sure why this was needed, and
|
|
|
|
* there are mismatches with this section in rare cases since it is
|
|
|
|
* not done in the encoder at all.
|
2012-10-31 22:40:53 +01:00
|
|
|
mbmi->need_to_clamp_mvs |= check_mv_bounds(&blockmv,
|
|
|
|
mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0) {
|
2012-10-31 22:40:53 +01:00
|
|
|
mbmi->need_to_clamp_mvs |= check_mv_bounds(&secondmv,
|
|
|
|
mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2012-11-30 01:39:15 +01:00
|
|
|
*/
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
{
|
|
|
|
/* Fill (uniform) modes, mvs of jth subset.
|
|
|
|
Must do it here because ensuing subsets can
|
|
|
|
refer back to us via "left" or "above". */
|
|
|
|
unsigned int fill_count = mbsplit_fill_count[s];
|
2013-02-27 20:48:13 +01:00
|
|
|
const unsigned char *fill_offset =
|
|
|
|
&mbsplit_fill_offset[s][j * fill_count];
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
do {
|
2013-02-27 20:48:13 +01:00
|
|
|
mi->bmi[*fill_offset].as_mv[0].as_int = blockmv.as_int;
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0)
|
2013-02-27 20:48:13 +01:00
|
|
|
mi->bmi[*fill_offset].as_mv[1].as_int = secondmv.as_int;
|
2012-07-14 00:21:29 +02:00
|
|
|
fill_offset++;
|
|
|
|
} while (--fill_count);
|
|
|
|
}
|
|
|
|
|
|
|
|
} while (++j < num_p);
|
|
|
|
}
|
|
|
|
|
2013-02-09 04:46:36 +01:00
|
|
|
mv->as_int = mi->bmi[15].as_mv[0].as_int;
|
|
|
|
mbmi->mv[1].as_int = mi->bmi[15].as_mv[1].as_int;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
|
|
|
break; /* done with SPLITMV */
|
|
|
|
|
|
|
|
case NEARMV:
|
2013-03-15 21:16:58 +01:00
|
|
|
// Clip "next_nearest" so that it does not extend to far out of image
|
|
|
|
assign_and_clamp_mv(mv, &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(&mbmi->mv[1], &nearby_second, mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case NEARESTMV:
|
2013-03-15 21:16:58 +01:00
|
|
|
// Clip "next_nearest" so that it does not extend to far out of image
|
|
|
|
assign_and_clamp_mv(mv, &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(&mbmi->mv[1], &nearest_second, mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
|
|
|
|
|
|
|
case ZEROMV:
|
|
|
|
mv->as_int = 0;
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0)
|
2012-08-10 01:07:41 +02:00
|
|
|
mbmi->mv[1].as_int = 0;
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
case NEWMV:
|
2013-04-16 23:03:05 +02:00
|
|
|
process_mv(r, &mv->as_mv, &best_mv.as_mv, nmvc, &cm->fc.NMVcount,
|
2013-03-15 21:16:58 +01:00
|
|
|
xd->allow_high_precision_mv);
|
2012-10-31 22:40:53 +01:00
|
|
|
mbmi->need_to_clamp_mvs = check_mv_bounds(mv,
|
|
|
|
mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
2012-10-25 14:58:21 +02:00
|
|
|
|
2012-11-07 15:50:25 +01:00
|
|
|
if (mbmi->second_ref_frame > 0) {
|
2013-04-16 23:03:05 +02:00
|
|
|
process_mv(r, &mbmi->mv[1].as_mv, &best_mv_second.as_mv, nmvc,
|
2013-03-15 21:16:58 +01:00
|
|
|
&cm->fc.NMVcount, xd->allow_high_precision_mv);
|
2013-04-06 19:00:53 +02:00
|
|
|
mbmi->need_to_clamp_secondmv = check_mv_bounds(&mbmi->mv[1],
|
|
|
|
mb_to_left_edge,
|
|
|
|
mb_to_right_edge,
|
|
|
|
mb_to_top_edge,
|
|
|
|
mb_to_bottom_edge);
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
;
|
|
|
|
#if CONFIG_DEBUG
|
|
|
|
assert(0);
|
|
|
|
#endif
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
2012-07-14 00:21:29 +02:00
|
|
|
} else {
|
|
|
|
/* required for left and above block mv */
|
2012-08-10 01:07:41 +02:00
|
|
|
mbmi->mv[0].as_int = 0;
|
2012-07-14 00:21:29 +02:00
|
|
|
|
2013-01-28 16:22:53 +01:00
|
|
|
if (mbmi->sb_type) {
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->mode = read_sb_ymode(r, cm->fc.sb_ymode_prob);
|
|
|
|
cm->fc.sb_ymode_counts[mbmi->mode]++;
|
2012-11-16 00:50:07 +01:00
|
|
|
} else {
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->mode = read_ymode(r, cm->fc.ymode_prob);
|
|
|
|
cm->fc.ymode_counts[mbmi->mode]++;
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
2011-11-02 14:30:10 +01:00
|
|
|
|
2013-04-11 21:16:35 +02:00
|
|
|
// If MB mode is I4X4_PRED read the block modes
|
|
|
|
if (mbmi->mode == I4X4_PRED) {
|
2012-07-14 00:21:29 +02:00
|
|
|
int j = 0;
|
|
|
|
do {
|
2013-04-16 23:03:05 +02:00
|
|
|
int m = read_bmode(r, cm->fc.bmode_prob);
|
2013-03-21 20:51:57 +01:00
|
|
|
mi->bmi[j].as_mode.first = m;
|
2012-10-09 22:19:15 +02:00
|
|
|
#if CONFIG_NEWBINTRAMODES
|
|
|
|
if (m == B_CONTEXT_PRED) m -= CONTEXT_PRED_REPLACEMENTS;
|
|
|
|
#endif
|
2013-04-16 23:03:05 +02:00
|
|
|
cm->fc.bmode_counts[m]++;
|
2012-07-14 00:21:29 +02:00
|
|
|
} while (++j < 16);
|
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
if (mbmi->mode == I8X8_PRED) {
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < 4; i++) {
|
2013-02-27 20:48:13 +01:00
|
|
|
const int ib = vp9_i8x8_block[i];
|
2013-04-16 23:03:05 +02:00
|
|
|
const int mode8x8 = read_i8x8_mode(r, cm->fc.i8x8_mode_prob);
|
2013-02-27 20:48:13 +01:00
|
|
|
|
2012-07-14 00:21:29 +02:00
|
|
|
mi->bmi[ib + 0].as_mode.first = mode8x8;
|
|
|
|
mi->bmi[ib + 1].as_mode.first = mode8x8;
|
|
|
|
mi->bmi[ib + 4].as_mode.first = mode8x8;
|
|
|
|
mi->bmi[ib + 5].as_mode.first = mode8x8;
|
2013-04-16 23:03:05 +02:00
|
|
|
cm->fc.i8x8_mode_counts[mode8x8]++;
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
} else {
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->uv_mode = read_uv_mode(r, cm->fc.uv_mode_prob[mbmi->mode]);
|
|
|
|
cm->fc.uv_mode_counts[mbmi->mode][mbmi->uv_mode]++;
|
2012-07-14 00:21:29 +02:00
|
|
|
}
|
|
|
|
}
|
2013-01-15 15:43:35 +01:00
|
|
|
/*
|
2013-04-16 23:03:05 +02:00
|
|
|
if (cm->current_video_frame == 1)
|
2013-01-15 15:43:35 +01:00
|
|
|
printf("mode: %d skip: %d\n", mbmi->mode, mbmi->mb_skip_coeff);
|
|
|
|
*/
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2012-10-09 18:18:21 +02:00
|
|
|
if (cm->txfm_mode == TX_MODE_SELECT && mbmi->mb_skip_coeff == 0 &&
|
2012-10-11 02:18:22 +02:00
|
|
|
((mbmi->ref_frame == INTRA_FRAME && mbmi->mode <= I8X8_PRED) ||
|
2012-10-22 20:49:00 +02:00
|
|
|
(mbmi->ref_frame != INTRA_FRAME && !(mbmi->mode == SPLITMV &&
|
|
|
|
mbmi->partitioning == PARTITIONING_4X4)))) {
|
2012-10-09 18:18:21 +02:00
|
|
|
// FIXME(rbultje) code ternary symbol once all experiments are merged
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->txfm_size = vp9_read(r, cm->prob_tx[0]);
|
2012-10-22 20:49:00 +02:00
|
|
|
if (mbmi->txfm_size != TX_4X4 && mbmi->mode != I8X8_PRED &&
|
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
|
|
|
mbmi->mode != SPLITMV) {
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->txfm_size += vp9_read(r, cm->prob_tx[1]);
|
2013-04-11 01:50:01 +02:00
|
|
|
if (mbmi->sb_type >= BLOCK_SIZE_SB32X32 && mbmi->txfm_size != TX_8X8)
|
2013-04-16 23:03:05 +02:00
|
|
|
mbmi->txfm_size += vp9_read(r, cm->prob_tx[2]);
|
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-04-11 01:50:01 +02:00
|
|
|
} else if (mbmi->sb_type >= BLOCK_SIZE_SB32X32 &&
|
|
|
|
cm->txfm_mode >= ALLOW_32X32) {
|
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
|
|
|
mbmi->txfm_size = TX_32X32;
|
2012-10-23 01:52:28 +02:00
|
|
|
} else if (cm->txfm_mode >= ALLOW_16X16 &&
|
2012-10-09 18:18:21 +02:00
|
|
|
((mbmi->ref_frame == INTRA_FRAME && mbmi->mode <= TM_PRED) ||
|
|
|
|
(mbmi->ref_frame != INTRA_FRAME && mbmi->mode != SPLITMV))) {
|
|
|
|
mbmi->txfm_size = TX_16X16;
|
2012-10-10 20:20:33 +02:00
|
|
|
} else if (cm->txfm_mode >= ALLOW_8X8 &&
|
2013-04-11 21:16:35 +02:00
|
|
|
(!(mbmi->ref_frame == INTRA_FRAME && mbmi->mode == I4X4_PRED) &&
|
2012-10-22 20:49:00 +02:00
|
|
|
!(mbmi->ref_frame != INTRA_FRAME && mbmi->mode == SPLITMV &&
|
|
|
|
mbmi->partitioning == PARTITIONING_4X4))) {
|
2012-10-09 18:18:21 +02:00
|
|
|
mbmi->txfm_size = TX_8X8;
|
|
|
|
} else {
|
|
|
|
mbmi->txfm_size = TX_4X4;
|
|
|
|
}
|
2010-09-09 20:42:48 +02:00
|
|
|
}
|
2010-05-18 17:58:33 +02:00
|
|
|
|
2013-04-12 21:31:23 +02:00
|
|
|
void vp9_decode_mode_mvs_init(VP9D_COMP* const pbi, vp9_reader *r) {
|
2012-10-31 01:53:32 +01:00
|
|
|
VP9_COMMON *cm = &pbi->common;
|
2013-04-09 19:54:19 +02:00
|
|
|
int k;
|
2012-10-16 22:52:39 +02:00
|
|
|
|
2013-04-09 19:54:19 +02:00
|
|
|
// TODO(jkoleszar): does this clear more than MBSKIP_CONTEXTS? Maybe remove.
|
2012-10-17 18:38:13 +02:00
|
|
|
vpx_memset(cm->mbskip_pred_probs, 0, sizeof(cm->mbskip_pred_probs));
|
2013-04-09 19:54:19 +02:00
|
|
|
for (k = 0; k < MBSKIP_CONTEXTS; ++k)
|
|
|
|
cm->mbskip_pred_probs[k] = vp9_read_prob(r);
|
2012-10-17 18:38:13 +02:00
|
|
|
|
2013-04-12 21:31:23 +02:00
|
|
|
mb_mode_mv_init(pbi, r);
|
2012-08-03 21:31:38 +02:00
|
|
|
}
|
2013-01-15 15:43:35 +01:00
|
|
|
|
2013-02-20 19:16:24 +01:00
|
|
|
#if CONFIG_CODE_NONZEROCOUNT
|
|
|
|
static uint16_t read_nzc(VP9_COMMON *const cm,
|
|
|
|
int nzc_context,
|
|
|
|
TX_SIZE tx_size,
|
|
|
|
int ref,
|
|
|
|
int type,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r) {
|
2013-02-20 19:16:24 +01:00
|
|
|
int c, e;
|
|
|
|
uint16_t nzc;
|
2013-03-26 23:23:30 +01:00
|
|
|
if (!get_nzc_used(tx_size)) return 0;
|
2013-02-20 19:16:24 +01:00
|
|
|
if (tx_size == TX_32X32) {
|
2013-04-16 23:03:05 +02:00
|
|
|
c = treed_read(r, vp9_nzc32x32_tree,
|
2013-02-20 19:16:24 +01:00
|
|
|
cm->fc.nzc_probs_32x32[nzc_context][ref][type]);
|
|
|
|
cm->fc.nzc_counts_32x32[nzc_context][ref][type][c]++;
|
|
|
|
} else if (tx_size == TX_16X16) {
|
2013-04-16 23:03:05 +02:00
|
|
|
c = treed_read(r, vp9_nzc16x16_tree,
|
2013-02-20 19:16:24 +01:00
|
|
|
cm->fc.nzc_probs_16x16[nzc_context][ref][type]);
|
|
|
|
cm->fc.nzc_counts_16x16[nzc_context][ref][type][c]++;
|
|
|
|
} else if (tx_size == TX_8X8) {
|
2013-04-16 23:03:05 +02:00
|
|
|
c = treed_read(r, vp9_nzc8x8_tree,
|
2013-02-20 19:16:24 +01:00
|
|
|
cm->fc.nzc_probs_8x8[nzc_context][ref][type]);
|
|
|
|
cm->fc.nzc_counts_8x8[nzc_context][ref][type][c]++;
|
|
|
|
} else if (tx_size == TX_4X4) {
|
2013-04-16 23:03:05 +02:00
|
|
|
c = treed_read(r, vp9_nzc4x4_tree,
|
2013-02-20 19:16:24 +01:00
|
|
|
cm->fc.nzc_probs_4x4[nzc_context][ref][type]);
|
|
|
|
cm->fc.nzc_counts_4x4[nzc_context][ref][type][c]++;
|
|
|
|
} else {
|
|
|
|
assert(0);
|
|
|
|
}
|
2013-03-08 05:56:34 +01:00
|
|
|
nzc = vp9_basenzcvalue[c];
|
|
|
|
if ((e = vp9_extranzcbits[c])) {
|
2013-02-20 19:16:24 +01:00
|
|
|
int x = 0;
|
2013-03-08 05:56:34 +01:00
|
|
|
while (e--) {
|
|
|
|
int b = vp9_read(
|
2013-04-16 23:03:05 +02:00
|
|
|
r, cm->fc.nzc_pcat_probs[nzc_context][c - NZC_TOKENS_NOEXTRA][e]);
|
2013-03-08 05:56:34 +01:00
|
|
|
x |= (b << e);
|
|
|
|
cm->fc.nzc_pcat_counts[nzc_context][c - NZC_TOKENS_NOEXTRA][e][b]++;
|
|
|
|
}
|
2013-02-20 19:16:24 +01:00
|
|
|
nzc += x;
|
|
|
|
}
|
|
|
|
if (tx_size == TX_32X32)
|
|
|
|
assert(nzc <= 1024);
|
|
|
|
else if (tx_size == TX_16X16)
|
|
|
|
assert(nzc <= 256);
|
|
|
|
else if (tx_size == TX_8X8)
|
|
|
|
assert(nzc <= 64);
|
|
|
|
else if (tx_size == TX_4X4)
|
|
|
|
assert(nzc <= 16);
|
|
|
|
return nzc;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_nzcs_sb64(VP9_COMMON *const cm,
|
|
|
|
MACROBLOCKD* xd,
|
|
|
|
int mb_row,
|
|
|
|
int mb_col,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r) {
|
2013-02-20 19:16:24 +01:00
|
|
|
MODE_INFO *m = xd->mode_info_context;
|
|
|
|
MB_MODE_INFO *const mi = &m->mbmi;
|
|
|
|
int j, nzc_context;
|
|
|
|
const int ref = m->mbmi.ref_frame != INTRA_FRAME;
|
|
|
|
|
|
|
|
assert(mb_col == get_mb_col(xd));
|
|
|
|
assert(mb_row == get_mb_row(xd));
|
|
|
|
|
|
|
|
vpx_memset(m->mbmi.nzcs, 0, 384 * sizeof(m->mbmi.nzcs[0]));
|
|
|
|
|
|
|
|
if (mi->mb_skip_coeff)
|
|
|
|
return;
|
|
|
|
|
|
|
|
switch (mi->txfm_size) {
|
|
|
|
case TX_32X32:
|
|
|
|
for (j = 0; j < 256; j += 64) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_32X32, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 256; j < 384; j += 64) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_32X32, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_16X16:
|
|
|
|
for (j = 0; j < 256; j += 16) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_16X16, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 256; j < 384; j += 16) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_16X16, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_8X8:
|
|
|
|
for (j = 0; j < 256; j += 4) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_8X8, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 256; j < 384; j += 4) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_8X8, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_4X4:
|
|
|
|
for (j = 0; j < 256; ++j) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_4X4, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 256; j < 384; ++j) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb64(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_4X4, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_nzcs_sb32(VP9_COMMON *const cm,
|
|
|
|
MACROBLOCKD* xd,
|
|
|
|
int mb_row,
|
|
|
|
int mb_col,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r) {
|
2013-02-20 19:16:24 +01:00
|
|
|
MODE_INFO *m = xd->mode_info_context;
|
|
|
|
MB_MODE_INFO *const mi = &m->mbmi;
|
|
|
|
int j, nzc_context;
|
|
|
|
const int ref = m->mbmi.ref_frame != INTRA_FRAME;
|
|
|
|
|
|
|
|
assert(mb_col == get_mb_col(xd));
|
|
|
|
assert(mb_row == get_mb_row(xd));
|
|
|
|
|
|
|
|
vpx_memset(m->mbmi.nzcs, 0, 384 * sizeof(m->mbmi.nzcs[0]));
|
|
|
|
|
|
|
|
if (mi->mb_skip_coeff)
|
|
|
|
return;
|
|
|
|
|
|
|
|
switch (mi->txfm_size) {
|
|
|
|
case TX_32X32:
|
|
|
|
for (j = 0; j < 64; j += 64) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_32X32, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 64; j < 96; j += 16) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_16X16, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_16X16:
|
|
|
|
for (j = 0; j < 64; j += 16) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_16X16, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 64; j < 96; j += 16) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_16X16, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_8X8:
|
|
|
|
for (j = 0; j < 64; j += 4) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_8X8, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 64; j < 96; j += 4) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_8X8, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_4X4:
|
|
|
|
for (j = 0; j < 64; ++j) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_4X4, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 64; j < 96; ++j) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_sb32(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_4X4, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void read_nzcs_mb16(VP9_COMMON *const cm,
|
|
|
|
MACROBLOCKD* xd,
|
|
|
|
int mb_row,
|
|
|
|
int mb_col,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r) {
|
2013-02-20 19:16:24 +01:00
|
|
|
MODE_INFO *m = xd->mode_info_context;
|
|
|
|
MB_MODE_INFO *const mi = &m->mbmi;
|
|
|
|
int j, nzc_context;
|
|
|
|
const int ref = m->mbmi.ref_frame != INTRA_FRAME;
|
|
|
|
|
|
|
|
assert(mb_col == get_mb_col(xd));
|
|
|
|
assert(mb_row == get_mb_row(xd));
|
|
|
|
|
|
|
|
vpx_memset(m->mbmi.nzcs, 0, 384 * sizeof(m->mbmi.nzcs[0]));
|
|
|
|
|
|
|
|
if (mi->mb_skip_coeff)
|
|
|
|
return;
|
|
|
|
|
|
|
|
switch (mi->txfm_size) {
|
|
|
|
case TX_16X16:
|
|
|
|
for (j = 0; j < 16; j += 16) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_mb16(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_16X16, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 16; j < 24; j += 4) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_mb16(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_8X8, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_8X8:
|
|
|
|
for (j = 0; j < 16; j += 4) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_mb16(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_8X8, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
if (mi->mode == I8X8_PRED || mi->mode == SPLITMV) {
|
|
|
|
for (j = 16; j < 24; ++j) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_mb16(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_4X4, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (j = 16; j < 24; j += 4) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_mb16(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_8X8, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TX_4X4:
|
|
|
|
for (j = 0; j < 16; ++j) {
|
|
|
|
nzc_context = vp9_get_nzc_context_y_mb16(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_4X4, ref, 0, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
for (j = 16; j < 24; ++j) {
|
|
|
|
nzc_context = vp9_get_nzc_context_uv_mb16(cm, m, mb_row, mb_col, j);
|
2013-04-16 23:03:05 +02:00
|
|
|
m->mbmi.nzcs[j] = read_nzc(cm, nzc_context, TX_4X4, ref, 1, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif // CONFIG_CODE_NONZEROCOUNT
|
|
|
|
|
2012-11-05 23:22:59 +01:00
|
|
|
void vp9_decode_mb_mode_mv(VP9D_COMP* const pbi,
|
|
|
|
MACROBLOCKD* const xd,
|
2012-08-03 21:31:38 +02:00
|
|
|
int mb_row,
|
2012-10-18 01:47:38 +02:00
|
|
|
int mb_col,
|
2013-04-16 23:03:05 +02:00
|
|
|
vp9_reader *r) {
|
2013-02-20 19:16:24 +01:00
|
|
|
VP9_COMMON *const cm = &pbi->common;
|
2012-08-03 21:31:38 +02:00
|
|
|
MODE_INFO *mi = xd->mode_info_context;
|
|
|
|
MODE_INFO *prev_mi = xd->prev_mode_info_context;
|
2013-02-20 19:16:24 +01:00
|
|
|
MB_MODE_INFO *const mbmi = &mi->mbmi;
|
2012-08-03 21:31:38 +02:00
|
|
|
|
2013-04-16 23:03:05 +02:00
|
|
|
if (cm->frame_type == KEY_FRAME) {
|
|
|
|
kfread_modes(pbi, mi, mb_row, mb_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-25 05:55:14 +01:00
|
|
|
} else {
|
2013-04-16 23:03:05 +02:00
|
|
|
read_mb_modes_mv(pbi, mi, &mi->mbmi, prev_mi, mb_row, mb_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-25 05:55:14 +01:00
|
|
|
set_scale_factors(xd,
|
|
|
|
mi->mbmi.ref_frame - 1, mi->mbmi.second_ref_frame - 1,
|
2013-04-16 23:03:05 +02:00
|
|
|
cm->active_ref_scale);
|
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-25 05:55:14 +01:00
|
|
|
}
|
2013-02-20 19:16:24 +01:00
|
|
|
#if CONFIG_CODE_NONZEROCOUNT
|
|
|
|
if (mbmi->sb_type == BLOCK_SIZE_SB64X64)
|
2013-04-16 23:03:05 +02:00
|
|
|
read_nzcs_sb64(cm, xd, mb_row, mb_col, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
else if (mbmi->sb_type == BLOCK_SIZE_SB32X32)
|
2013-04-16 23:03:05 +02:00
|
|
|
read_nzcs_sb32(cm, xd, mb_row, mb_col, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
else
|
2013-04-16 23:03:05 +02:00
|
|
|
read_nzcs_mb16(cm, xd, mb_row, mb_col, r);
|
2013-02-20 19:16:24 +01:00
|
|
|
#endif // CONFIG_CODE_NONZEROCOUNT
|
|
|
|
|
|
|
|
if (mbmi->sb_type) {
|
2013-04-11 01:50:01 +02:00
|
|
|
const int bw = 1 << mb_width_log2(mbmi->sb_type);
|
|
|
|
const int bh = 1 << mb_height_log2(mbmi->sb_type);
|
|
|
|
const int y_mbs = MIN(bh, cm->mb_rows - mb_row);
|
|
|
|
const int x_mbs = MIN(bw, cm->mb_cols - mb_col);
|
2013-02-20 19:16:24 +01:00
|
|
|
const int mis = cm->mode_info_stride;
|
|
|
|
int x, y;
|
|
|
|
|
2013-04-04 02:43:45 +02:00
|
|
|
for (y = 0; y < y_mbs; y++)
|
|
|
|
for (x = !y; x < x_mbs; x++)
|
2013-02-20 19:16:24 +01:00
|
|
|
mi[y * mis + x] = *mi;
|
|
|
|
} else {
|
|
|
|
update_blockd_bmi(xd);
|
|
|
|
}
|
2012-08-03 21:31:38 +02:00
|
|
|
}
|