@@ -160,80 +160,80 @@ static const uint8_t mv_len[16] =
static const uint8_t mv_bits[2][16][10] =
{
{
- { 2, 3, 3, 5, 5, 4, 4, 5, 5, 2 },
- { 2, 3, 4, 4, 3, 4, 4, 2 },
- { 3, 4, 4, 2, 4, 4, 3, 2 },
- { 1, 3, 4, 5, 5, 3, 3 },
- { 2, 4, 4, 3, 3, 4, 4, 2 },
- { 2, 3, 4, 4, 4, 4, 3, 2 },
- { 2, 3, 4, 4, 4, 4, 3, 2 },
- { 2, 2, 3, 4, 5, 5, 2 },
- { 2, 3, 4, 4, 3, 4, 4, 2 },
- { 2, 4, 4, 3, 4, 4, 3, 2 },
- { 2, 3, 3, 5, 5, 4, 3, 2 },
- { 2, 3, 4, 4, 3, 3, 2 },
- { 1, 4, 4, 3, 3, 4, 4 },
- { 2, 3, 4, 4, 3, 3, 2 },
- { 2, 3, 4, 4, 3, 3, 2 },
- { 3, 3, 2, 2, 3, 3 },
+ { 2, 3, 3, 5, 5, 4, 4, 5, 5, 2 },
+ { 2, 3, 4, 4, 3, 4, 4, 2 },
+ { 3, 4, 4, 2, 4, 4, 3, 2 },
+ { 1, 3, 4, 5, 5, 3, 3 },
+ { 2, 4, 4, 3, 3, 4, 4, 2 },
+ { 2, 3, 4, 4, 4, 4, 3, 2 },
+ { 2, 3, 4, 4, 4, 4, 3, 2 },
+ { 2, 2, 3, 4, 5, 5, 2 },
+ { 2, 3, 4, 4, 3, 4, 4, 2 },
+ { 2, 4, 4, 3, 4, 4, 3, 2 },
+ { 2, 3, 3, 5, 5, 4, 3, 2 },
+ { 2, 3, 4, 4, 3, 3, 2 },
+ { 1, 4, 4, 3, 3, 4, 4 },
+ { 2, 3, 4, 4, 3, 3, 2 },
+ { 2, 3, 4, 4, 3, 3, 2 },
+ { 3, 3, 2, 2, 3, 3 },
},
{
- { 3, 4, 5, 5, 3, 5, 6, 6, 4, 1 },
- { 2, 3, 4, 5, 5, 2, 3, 3 },
- { 2, 4, 4, 3, 3, 4, 4, 2 },
- { 1, 4, 4, 3, 4, 4, 3 },
- { 3, 3, 2, 4, 5, 5, 3, 2 },
- { 3, 4, 4, 3, 3, 3, 3, 2 },
- { 1, 3, 3, 4, 4, 4, 5, 5 },
- { 1, 4, 4, 3, 3, 4, 4 },
- { 2, 4, 4, 3, 3, 4, 4, 2 },
- { 1, 3, 3, 4, 4, 4, 5, 5 },
- { 2, 3, 4, 4, 4, 4, 3, 2 },
- { 2, 3, 3, 4, 4, 3, 2 },
- { 1, 4, 4, 3, 3, 4, 4 },
- { 1, 4, 4, 3, 3, 4, 4 },
- { 2, 3, 3, 4, 4, 3, 2 },
- { 2, 3, 3, 3, 3, 2 },
+ { 3, 4, 5, 5, 3, 5, 6, 6, 4, 1 },
+ { 2, 3, 4, 5, 5, 2, 3, 3 },
+ { 2, 4, 4, 3, 3, 4, 4, 2 },
+ { 1, 4, 4, 3, 4, 4, 3 },
+ { 3, 3, 2, 4, 5, 5, 3, 2 },
+ { 3, 4, 4, 3, 3, 3, 3, 2 },
+ { 1, 3, 3, 4, 4, 4, 5, 5 },
+ { 1, 4, 4, 3, 3, 4, 4 },
+ { 2, 4, 4, 3, 3, 4, 4, 2 },
+ { 1, 3, 3, 4, 4, 4, 5, 5 },
+ { 2, 3, 4, 4, 4, 4, 3, 2 },
+ { 2, 3, 3, 4, 4, 3, 2 },
+ { 1, 4, 4, 3, 3, 4, 4 },
+ { 1, 4, 4, 3, 3, 4, 4 },
+ { 2, 3, 3, 4, 4, 3, 2 },
+ { 2, 3, 3, 3, 3, 2 },
}
};
static const uint8_t mv_syms[2][16][10] =
{
{
- { 1, 8, 9, 4, 3, 2, 7, 5, 6, 0 },
- { 0, 9, 5, 4, 2, 3, 8, 1 },
- { 3, 9, 5, 0, 4, 8, 2, 1 },
- { 1, 3, 4, 8, 5, 2, 0 },
- { 0, 5, 4, 8, 2, 3, 9, 1 },
- { 0, 3, 5, 9, 4, 8, 2, 1 },
- { 0, 3, 9, 5, 8, 4, 2, 1 },
- { 0, 2, 3, 4, 8, 5, 1 },
- { 0, 3, 8, 4, 2, 5, 9, 1 },
- { 2, 8, 9, 3, 5, 4, 0, 1 },
- { 0, 4, 3, 8, 9, 5, 2, 1 },
- { 0, 4, 8, 5, 3, 2, 1 },
- { 1, 9, 4, 2, 0, 5, 3 },
- { 2, 4, 9, 5, 3, 0, 1 },
- { 0, 4, 9, 5, 3, 2, 1 },
- { 5, 4, 1, 0, 3, 2 },
+ { 1, 8, 9, 4, 3, 2, 7, 5, 6, 0 },
+ { 0, 9, 5, 4, 2, 3, 8, 1 },
+ { 3, 9, 5, 0, 4, 8, 2, 1 },
+ { 1, 3, 4, 8, 5, 2, 0 },
+ { 0, 5, 4, 8, 2, 3, 9, 1 },
+ { 0, 3, 5, 9, 4, 8, 2, 1 },
+ { 0, 3, 9, 5, 8, 4, 2, 1 },
+ { 0, 2, 3, 4, 8, 5, 1 },
+ { 0, 3, 8, 4, 2, 5, 9, 1 },
+ { 2, 8, 9, 3, 5, 4, 0, 1 },
+ { 0, 4, 3, 8, 9, 5, 2, 1 },
+ { 0, 4, 8, 5, 3, 2, 1 },
+ { 1, 9, 4, 2, 0, 5, 3 },
+ { 2, 4, 9, 5, 3, 0, 1 },
+ { 0, 4, 9, 5, 3, 2, 1 },
+ { 5, 4, 1, 0, 3, 2 },
},
{
- { 8, 2, 3, 6, 1, 7, 5, 4, 9, 0 },
- { 9, 2, 3, 5, 4, 1, 8, 0 },
- { 0, 5, 4, 2, 9, 3, 8, 1 },
- { 1, 5, 4, 2, 8, 3, 0 },
- { 2, 9, 8, 3, 5, 4, 0, 1 },
- { 3, 5, 4, 2, 9, 8, 0, 1 },
- { 1, 2, 0, 9, 8, 3, 5, 4 },
- { 1, 8, 5, 2, 0, 4, 3 },
- { 0, 5, 4, 2, 8, 3, 9, 1 },
- { 1, 2, 0, 9, 8, 3, 5, 4 },
- { 0, 3, 9, 8, 5, 4, 2, 1 },
- { 0, 4, 3, 8, 5, 2, 1 },
- { 1, 5, 4, 2, 0, 9, 3 },
- { 1, 9, 5, 2, 0, 4, 3 },
- { 0, 5, 3, 9, 4, 2, 1 },
- { 0, 4, 5, 3, 2, 1 },
+ { 8, 2, 3, 6, 1, 7, 5, 4, 9, 0 },
+ { 9, 2, 3, 5, 4, 1, 8, 0 },
+ { 0, 5, 4, 2, 9, 3, 8, 1 },
+ { 1, 5, 4, 2, 8, 3, 0 },
+ { 2, 9, 8, 3, 5, 4, 0, 1 },
+ { 3, 5, 4, 2, 9, 8, 0, 1 },
+ { 1, 2, 0, 9, 8, 3, 5, 4 },
+ { 1, 8, 5, 2, 0, 4, 3 },
+ { 0, 5, 4, 2, 8, 3, 9, 1 },
+ { 1, 2, 0, 9, 8, 3, 5, 4 },
+ { 0, 3, 9, 8, 5, 4, 2, 1 },
+ { 0, 4, 3, 8, 5, 2, 1 },
+ { 1, 5, 4, 2, 0, 9, 3 },
+ { 1, 9, 5, 2, 0, 4, 3 },
+ { 0, 5, 3, 9, 4, 2, 1 },
+ { 0, 4, 5, 3, 2, 1 },
}
};
@@ -300,11 +300,11 @@ static av_cold int mobiclip_init(AVCodecContext *avctx)
INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[0], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0),
- syms0, sizeof(*syms0), sizeof(*syms0),
+ syms0, sizeof(*syms0), sizeof(*syms0),
0, 0, 1 << MOBI_RL_VLC_BITS);
INIT_VLC_STATIC_FROM_LENGTHS(&rl_vlc[1], MOBI_RL_VLC_BITS, 104,
bits0, sizeof(*bits0),
- syms1, sizeof(*syms1), sizeof(*syms1),
+ syms1, sizeof(*syms1), sizeof(*syms1),
0, 0, 1 << MOBI_RL_VLC_BITS);
for (int i = 0; i < 2; i++) {
static VLC_TYPE vlc_buf[2 * 16 << MOBI_MV_VLC_BITS][2];
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com> --- libavcodec/mobiclip.c | 132 +++++++++++++++++++++--------------------- 1 file changed, 66 insertions(+), 66 deletions(-)