Revision 7c4dcf81 libavcodec/vp8data.h

View differences:

libavcodec/vp8data.h
62 62
    VP8_SUBMVMODE_NEW4X4
63 63
};
64 64

  
65
enum inter_splitmvmode {
66
    VP8_SPLITMVMODE_16x8 = 0,    ///< 2 16x8 blocks (vertical)
67
    VP8_SPLITMVMODE_8x16,        ///< 2 8x16 blocks (horizontal)
68
    VP8_SPLITMVMODE_8x8,         ///< 2x2 blocks of 8x8px each
69
    VP8_SPLITMVMODE_4x4,         ///< 4x4 blocks of 4x4px each
70
};
71

  
65 72
static const uint8_t vp8_pred4x4_mode[] =
66 73
{
67 74
    [DC_PRED8x8]    = DC_PRED,
......
130 137
};
131 138

  
132 139
static const int8_t vp8_mbsplit_tree[3][2] = {
133
    { -3,  1 },                             // '0' - 16 individual MVs
134
     { -2,  2 },                            // '10' - quarter-based MVs
135
      { -0, -1 }                            // '110' - top/bottom MVs,
136
                                            // '111' - left/right MVs
140
    { -VP8_SPLITMVMODE_4x4,  1 },           // '0' - 16 individual MVs
141
     { -VP8_SPLITMVMODE_8x8,  2 },          // '10' - quarter-based MVs
142
      { -VP8_SPLITMVMODE_16x8,              // '110' - top/bottom MVs
143
        -VP8_SPLITMVMODE_8x16 }             // '111' - left/right MVs
137 144
};
138 145
static const uint8_t vp8_mbsplit_count[4] = {   2,   2,   4,  16 };
139 146
static const uint8_t vp8_mbsplit_prob[3]  = { 110, 111, 150 };

Also available in: Unified diff