3e1cad9c69
This is the first patch for refactoring of the code related to high-precision mv, so that 1/4 and 1/8 pel motion vectors can co-exist in the same bit-stream by use of a frame level flag. The current patch works fine for only use of 1/4th and only use of 1/8th pel mv, but there are some issues with the mode switching in between. Subsequent patches on this change Id will fix the remaining issues. Patch 2: Adds fixes to make sure that multiple mv precisions can co-exist in the bit-stream. Frame level switching has been tested to work correctly. Patch 3: Fixes lines exceeding 80 char Patch 4: http://www.corp.google.com/~debargha/vp8_results/enhinterp.html Results on derf after ssse3 bugfix, compared to everything enabled but the 8-tap, 1/8-subpel and 1/16-subpel uv. Overall the gains are about 3% now. Hopefully there are no more bugs lingering. Apparently the sse3 bug affected the quartel subpel results more than the eighth pel ones (which is understandabale because one bad predictor due to the bug, matters less if there are a lot more subpel options available as in the 1/8 subpel case). The results in the 4th column correspond to the current settings. The first two columns correspond to two settings of adaptive switching of the 1/4 or 1/8 subpel mode based on initial Q estimate. These do not work as good as just using 1/8 all the time yet. Change-Id: I3ef392ad338329f4d68a85257a49f2b14f3af472
77 lines
2.8 KiB
C
77 lines
2.8 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#ifndef __INC_ENTROPYMV_H
|
|
#define __INC_ENTROPYMV_H
|
|
|
|
#include "treecoder.h"
|
|
#include "vpx_config.h"
|
|
|
|
enum
|
|
{
|
|
mv_max = 1023, /* max absolute value of a MV component */
|
|
MVvals = (2 * mv_max) + 1, /* # possible values "" */
|
|
mvlong_width = 10, /* Large MVs have 9 bit magnitudes */
|
|
mvnum_short = 8, /* magnitudes 0 through 7 */
|
|
mvnum_short_bits = 3, /* number of bits for short mvs */
|
|
|
|
mvfp_max = 255, /* max absolute value of a full pixel MV component */
|
|
MVfpvals = (2 * mvfp_max) + 1, /* # possible full pixel MV values */
|
|
|
|
/* probability offsets for coding each MV component */
|
|
|
|
mvpis_short = 0, /* short (<= 7) vs long (>= 8) */
|
|
MVPsign, /* sign for non-zero */
|
|
MVPshort, /* 8 short values = 7-position tree */
|
|
|
|
MVPbits = MVPshort + mvnum_short - 1, /* mvlong_width long value bits */
|
|
MVPcount = MVPbits + mvlong_width /* (with independent probabilities) */
|
|
};
|
|
|
|
typedef struct mv_context
|
|
{
|
|
vp8_prob prob[MVPcount]; /* often come in row, col pairs */
|
|
} MV_CONTEXT;
|
|
|
|
extern const MV_CONTEXT vp8_mv_update_probs[2], vp8_default_mv_context[2];
|
|
|
|
#if CONFIG_HIGH_PRECISION_MV
|
|
enum
|
|
{
|
|
mv_max_hp = 2047, /* max absolute value of a MV component */
|
|
MVvals_hp = (2 * mv_max_hp) + 1, /* # possible values "" */
|
|
mvlong_width_hp = 11, /* Large MVs have 9 bit magnitudes */
|
|
mvnum_short_hp = 16, /* magnitudes 0 through 15 */
|
|
mvnum_short_bits_hp = 4, /* number of bits for short mvs */
|
|
|
|
mvfp_max_hp = 255, /* max absolute value of a full pixel MV component */
|
|
MVfpvals_hp = (2 * mvfp_max_hp) + 1, /* # possible full pixel MV values */
|
|
|
|
/* probability offsets for coding each MV component */
|
|
|
|
mvpis_short_hp = 0, /* short (<= 7) vs long (>= 8) */
|
|
MVPsign_hp, /* sign for non-zero */
|
|
MVPshort_hp, /* 8 short values = 7-position tree */
|
|
|
|
MVPbits_hp = MVPshort_hp + mvnum_short_hp - 1, /* mvlong_width long value bits */
|
|
MVPcount_hp = MVPbits_hp + mvlong_width_hp /* (with independent probabilities) */
|
|
};
|
|
|
|
typedef struct mv_context_hp
|
|
{
|
|
vp8_prob prob[MVPcount_hp]; /* often come in row, col pairs */
|
|
} MV_CONTEXT_HP;
|
|
|
|
extern const MV_CONTEXT_HP vp8_mv_update_probs_hp[2], vp8_default_mv_context_hp[2];
|
|
#endif /* CONFIG_HIGH_PRECISION_MV */
|
|
|
|
#endif
|