annotate vp6.c @ 12530:63edd10ad4bc libavcodec tip

Try to fix crashes introduced by r25218 r25218 made assumptions about the existence of past reference frames that weren't necessarily true.
author darkshikari
date Tue, 28 Sep 2010 09:06:22 +0000
parents 9f06475db098
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
1 /**
11644
7dd2a45249a9 Remove explicit filename from Doxygen @file commands.
diego
parents: 11560
diff changeset
2 * @file
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
3 * VP6 compatible video decoder
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
4 *
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
5 * Copyright (C) 2006 Aurelien Jacobs <aurel@gnuage.org>
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
6 *
5214
470601203f44 Group all copyright and author notices together.
diego
parents: 4925
diff changeset
7 * The VP6F decoder accepts an optional 1 byte extradata. It is composed of:
470601203f44 Group all copyright and author notices together.
diego
parents: 4925
diff changeset
8 * - upper 4bits: difference between encoded width and visible width
470601203f44 Group all copyright and author notices together.
diego
parents: 4925
diff changeset
9 * - lower 4bits: difference between encoded height and visible height
470601203f44 Group all copyright and author notices together.
diego
parents: 4925
diff changeset
10 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3697
diff changeset
11 * This file is part of FFmpeg.
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3697
diff changeset
12 *
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3697
diff changeset
13 * FFmpeg is free software; you can redistribute it and/or
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
14 * modify it under the terms of the GNU Lesser General Public
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
15 * License as published by the Free Software Foundation; either
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
16 * version 2.1 of the License, or (at your option) any later version.
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
17 *
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3697
diff changeset
18 * FFmpeg is distributed in the hope that it will be useful,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
19 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
20 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
21 * Lesser General Public License for more details.
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
22 *
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
23 * You should have received a copy of the GNU Lesser General Public
3947
c8c591fe26f8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
diego
parents: 3697
diff changeset
24 * License along with FFmpeg; if not, write to the Free Software
5214
470601203f44 Group all copyright and author notices together.
diego
parents: 4925
diff changeset
25 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
26 */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
27
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
28 #include <stdlib.h>
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
29
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
30 #include "avcodec.h"
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
31 #include "dsputil.h"
9428
0dce4fe6e6f3 Rename bitstream.h to get_bits.h.
stefano
parents: 8785
diff changeset
32 #include "get_bits.h"
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
33 #include "huffman.h"
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
34
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
35 #include "vp56.h"
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
36 #include "vp56data.h"
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
37 #include "vp6data.h"
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
38
11943
3f5b35e5f4de vp6: convert VLA to fixed size
mru
parents: 11665
diff changeset
39 #define VP6_MAX_HUFF_SIZE 12
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
40
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
41 static void vp6_parse_coeff(VP56Context *s);
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
42 static void vp6_parse_coeff_huffman(VP56Context *s);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
43
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
44 static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
45 int *golden_frame)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
46 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
47 VP56RangeCoder *c = &s->c;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
48 int parse_filter_info = 0;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
49 int coeff_offset = 0;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
50 int vrt_shift = 0;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
51 int sub_version;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
52 int rows, cols;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
53 int res = 1;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
54 int separated_coeff = buf[0] & 1;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
55
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
56 s->framep[VP56_FRAME_CURRENT]->key_frame = !(buf[0] & 0x80);
12292
d8364962cc4a ff_prefix non static vp56 functions.
alexc
parents: 11943
diff changeset
57 ff_vp56_init_dequant(s, (buf[0] >> 1) & 0x3F);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
58
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
59 if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
60 sub_version = buf[1] >> 3;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
61 if (sub_version > 8)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
62 return 0;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
63 s->filter_header = buf[1] & 0x06;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
64 if (buf[1] & 1) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
65 av_log(s->avctx, AV_LOG_ERROR, "interlacing not supported\n");
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
66 return 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
67 }
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
68 if (separated_coeff || !s->filter_header) {
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4349
diff changeset
69 coeff_offset = AV_RB16(buf+2) - 2;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
70 buf += 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
71 buf_size -= 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
72 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
73
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
74 rows = buf[2]; /* number of stored macroblock rows */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
75 cols = buf[3]; /* number of stored macroblock cols */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
76 /* buf[4] is number of displayed macroblock rows */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
77 /* buf[5] is number of displayed macroblock cols */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
78
8329
8b6bcfa22aa8 vp56: don't reset dimensions to 0 in codec init
aurel
parents: 8304
diff changeset
79 if (!s->macroblocks || /* first frame */
8b6bcfa22aa8 vp56: don't reset dimensions to 0 in codec init
aurel
parents: 8304
diff changeset
80 16*cols != s->avctx->coded_width ||
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
81 16*rows != s->avctx->coded_height) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
82 avcodec_set_dimensions(s->avctx, 16*cols, 16*rows);
4062
683d458a251f use the adjustment value present in FLV to crop VP6 video
aurel
parents: 4001
diff changeset
83 if (s->avctx->extradata_size == 1) {
683d458a251f use the adjustment value present in FLV to crop VP6 video
aurel
parents: 4001
diff changeset
84 s->avctx->width -= s->avctx->extradata[0] >> 4;
683d458a251f use the adjustment value present in FLV to crop VP6 video
aurel
parents: 4001
diff changeset
85 s->avctx->height -= s->avctx->extradata[0] & 0x0F;
683d458a251f use the adjustment value present in FLV to crop VP6 video
aurel
parents: 4001
diff changeset
86 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
87 res = 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
88 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
89
12365
7c54834209f6 VP5/6/8: eliminate CABAC dependency
darkshikari
parents: 12293
diff changeset
90 ff_vp56_init_range_decoder(c, buf+6, buf_size-6);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
91 vp56_rac_gets(c, 2);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
92
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
93 parse_filter_info = s->filter_header;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
94 if (sub_version < 8)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
95 vrt_shift = 5;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
96 s->sub_version = sub_version;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
97 } else {
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
98 if (!s->sub_version)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
99 return 0;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
100
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
101 if (separated_coeff || !s->filter_header) {
4364
05e932ddaaa9 rename BE/LE_8/16/32 to AV_RL/B_8/16/32
alex
parents: 4349
diff changeset
102 coeff_offset = AV_RB16(buf+1) - 2;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
103 buf += 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
104 buf_size -= 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
105 }
12365
7c54834209f6 VP5/6/8: eliminate CABAC dependency
darkshikari
parents: 12293
diff changeset
106 ff_vp56_init_range_decoder(c, buf+1, buf_size-1);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
107
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
108 *golden_frame = vp56_rac_get(c);
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
109 if (s->filter_header) {
4349
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
110 s->deblock_filtering = vp56_rac_get(c);
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
111 if (s->deblock_filtering)
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
112 vp56_rac_get(c);
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
113 if (s->sub_version > 7)
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
114 parse_filter_info = vp56_rac_get(c);
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
115 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
116 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
117
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
118 if (parse_filter_info) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
119 if (vp56_rac_get(c)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
120 s->filter_mode = 2;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
121 s->sample_variance_threshold = vp56_rac_gets(c, 5) << vrt_shift;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
122 s->max_vector_length = 2 << vp56_rac_gets(c, 3);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
123 } else if (vp56_rac_get(c)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
124 s->filter_mode = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
125 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
126 s->filter_mode = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
127 }
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
128 if (s->sub_version > 7)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
129 s->filter_selection = vp56_rac_gets(c, 4);
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
130 else
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
131 s->filter_selection = 16;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
132 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
133
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
134 s->use_huffman = vp56_rac_get(c);
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
135
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
136 s->parse_coeff = vp6_parse_coeff;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
137 if (coeff_offset) {
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
138 buf += coeff_offset;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
139 buf_size -= coeff_offset;
8022
21c3e313709e vp6dec: ensure we don't try to use a buffer with negative size
aurel
parents: 7093
diff changeset
140 if (buf_size < 0)
21c3e313709e vp6dec: ensure we don't try to use a buffer with negative size
aurel
parents: 7093
diff changeset
141 return 0;
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
142 if (s->use_huffman) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
143 s->parse_coeff = vp6_parse_coeff_huffman;
5945
3413fce9e26a 10l: init_get_bits want size in bits, not bytes
aurel
parents: 5821
diff changeset
144 init_get_bits(&s->gb, buf, buf_size<<3);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
145 } else {
12365
7c54834209f6 VP5/6/8: eliminate CABAC dependency
darkshikari
parents: 12293
diff changeset
146 ff_vp56_init_range_decoder(&s->cc, buf, buf_size);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
147 s->ccp = &s->cc;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
148 }
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
149 } else {
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
150 s->ccp = &s->c;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
151 }
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
152
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
153 return res;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
154 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
155
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
156 static void vp6_coeff_order_table_init(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
157 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
158 int i, pos, idx = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
159
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
160 s->modelp->coeff_index_to_pos[0] = 0;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
161 for (i=0; i<16; i++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
162 for (pos=1; pos<64; pos++)
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
163 if (s->modelp->coeff_reorder[pos] == i)
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
164 s->modelp->coeff_index_to_pos[idx++] = pos;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
165 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
166
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
167 static void vp6_default_models_init(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
168 {
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
169 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
170
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
171 model->vector_dct[0] = 0xA2;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
172 model->vector_dct[1] = 0xA4;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
173 model->vector_sig[0] = 0x80;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
174 model->vector_sig[1] = 0x80;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
175
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
176 memcpy(model->mb_types_stats, vp56_def_mb_types_stats, sizeof(model->mb_types_stats));
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
177 memcpy(model->vector_fdv, vp6_def_fdv_vector_model, sizeof(model->vector_fdv));
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
178 memcpy(model->vector_pdv, vp6_def_pdv_vector_model, sizeof(model->vector_pdv));
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
179 memcpy(model->coeff_runv, vp6_def_runv_coeff_model, sizeof(model->coeff_runv));
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
180 memcpy(model->coeff_reorder, vp6_def_coeff_reorder, sizeof(model->coeff_reorder));
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
181
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
182 vp6_coeff_order_table_init(s);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
183 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
184
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
185 static void vp6_parse_vector_models(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
186 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
187 VP56RangeCoder *c = &s->c;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
188 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
189 int comp, node;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
190
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
191 for (comp=0; comp<2; comp++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
192 if (vp56_rac_get_prob(c, vp6_sig_dct_pct[comp][0]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
193 model->vector_dct[comp] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
194 if (vp56_rac_get_prob(c, vp6_sig_dct_pct[comp][1]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
195 model->vector_sig[comp] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
196 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
197
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
198 for (comp=0; comp<2; comp++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
199 for (node=0; node<7; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
200 if (vp56_rac_get_prob(c, vp6_pdv_pct[comp][node]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
201 model->vector_pdv[comp][node] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
202
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
203 for (comp=0; comp<2; comp++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
204 for (node=0; node<8; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
205 if (vp56_rac_get_prob(c, vp6_fdv_pct[comp][node]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
206 model->vector_fdv[comp][node] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
207 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
208
7093
544da38cb2c9 vp6: ensure that huffman decoding table is sorted with descending symbol order
aurel
parents: 7040
diff changeset
209 /* nodes must ascend by count, but with descending symbol order */
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
210 static int vp6_huff_cmp(const void *va, const void *vb)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
211 {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
212 const Node *a = va, *b = vb;
7093
544da38cb2c9 vp6: ensure that huffman decoding table is sorted with descending symbol order
aurel
parents: 7040
diff changeset
213 return (a->count - b->count)*16 + (b->sym - a->sym);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
214 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
215
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
216 static void vp6_build_huff_tree(VP56Context *s, uint8_t coeff_model[],
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
217 const uint8_t *map, unsigned size, VLC *vlc)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
218 {
11943
3f5b35e5f4de vp6: convert VLA to fixed size
mru
parents: 11665
diff changeset
219 Node nodes[2*VP6_MAX_HUFF_SIZE], *tmp = &nodes[size];
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
220 int a, b, i;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
221
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
222 /* first compute probabilities from model */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
223 tmp[0].count = 256;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
224 for (i=0; i<size-1; i++) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
225 a = tmp[i].count * coeff_model[i] >> 8;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
226 b = tmp[i].count * (255 - coeff_model[i]) >> 8;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
227 nodes[map[2*i ]].count = a + !a;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
228 nodes[map[2*i+1]].count = b + !b;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
229 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
230
11342
8d23ea397dda Plug some memory leaks in the VP6 decoder
vitor
parents: 9920
diff changeset
231 free_vlc(vlc);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
232 /* then build the huffman tree accodring to probabilities */
6472
e39e03d99d24 huffman: pass hnode_first as a flag instead of as an argument on its own
aurel
parents: 6448
diff changeset
233 ff_huff_build_tree(s->avctx, vlc, size, nodes, vp6_huff_cmp,
e39e03d99d24 huffman: pass hnode_first as a flag instead of as an argument on its own
aurel
parents: 6448
diff changeset
234 FF_HUFFMAN_FLAG_HNODE_FIRST);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
235 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
236
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
237 static void vp6_parse_coeff_models(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
238 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
239 VP56RangeCoder *c = &s->c;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
240 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
241 int def_prob[11];
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
242 int node, cg, ctx, pos;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
243 int ct; /* code type */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
244 int pt; /* plane type (0 for Y, 1 for U or V) */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
245
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
246 memset(def_prob, 0x80, sizeof(def_prob));
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
247
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
248 for (pt=0; pt<2; pt++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
249 for (node=0; node<11; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
250 if (vp56_rac_get_prob(c, vp6_dccv_pct[pt][node])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
251 def_prob[node] = vp56_rac_gets_nn(c, 7);
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
252 model->coeff_dccv[pt][node] = def_prob[node];
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
253 } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
254 model->coeff_dccv[pt][node] = def_prob[node];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
255 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
256
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
257 if (vp56_rac_get(c)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
258 for (pos=1; pos<64; pos++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
259 if (vp56_rac_get_prob(c, vp6_coeff_reorder_pct[pos]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
260 model->coeff_reorder[pos] = vp56_rac_gets(c, 4);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
261 vp6_coeff_order_table_init(s);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
262 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
263
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
264 for (cg=0; cg<2; cg++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
265 for (node=0; node<14; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
266 if (vp56_rac_get_prob(c, vp6_runv_pct[cg][node]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
267 model->coeff_runv[cg][node] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
268
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
269 for (ct=0; ct<3; ct++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
270 for (pt=0; pt<2; pt++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
271 for (cg=0; cg<6; cg++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
272 for (node=0; node<11; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
273 if (vp56_rac_get_prob(c, vp6_ract_pct[ct][pt][cg][node])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
274 def_prob[node] = vp56_rac_gets_nn(c, 7);
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
275 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
276 } else if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
277 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
278 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
279
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
280 if (s->use_huffman) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
281 for (pt=0; pt<2; pt++) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
282 vp6_build_huff_tree(s, model->coeff_dccv[pt],
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
283 vp6_huff_coeff_map, 12, &s->dccv_vlc[pt]);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
284 vp6_build_huff_tree(s, model->coeff_runv[pt],
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
285 vp6_huff_run_map, 9, &s->runv_vlc[pt]);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
286 for (ct=0; ct<3; ct++)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
287 for (cg = 0; cg < 6; cg++)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
288 vp6_build_huff_tree(s, model->coeff_ract[pt][ct][cg],
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
289 vp6_huff_coeff_map, 12,
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
290 &s->ract_vlc[pt][ct][cg]);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
291 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
292 memset(s->nb_null, 0, sizeof(s->nb_null));
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
293 } else {
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
294 /* coeff_dcct is a linear combination of coeff_dccv */
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
295 for (pt=0; pt<2; pt++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
296 for (ctx=0; ctx<3; ctx++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
297 for (node=0; node<5; node++)
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
298 model->coeff_dcct[pt][ctx][node] = av_clip(((model->coeff_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
299 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
300 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
301
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
302 static void vp6_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
303 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
304 VP56RangeCoder *c = &s->c;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
305 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
306 int comp;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
307
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
308 *vect = (VP56mv) {0,0};
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
309 if (s->vector_candidate_pos < 2)
3697
596e62da8f29 rename vector to vect to avoid clash with Apple gcc
aurel
parents: 3695
diff changeset
310 *vect = s->vector_candidate[0];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
311
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
312 for (comp=0; comp<2; comp++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
313 int i, delta = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
314
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
315 if (vp56_rac_get_prob(c, model->vector_dct[comp])) {
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
316 static const uint8_t prob_order[] = {0, 1, 2, 7, 6, 5, 4};
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
317 for (i=0; i<sizeof(prob_order); i++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
318 int j = prob_order[i];
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
319 delta |= vp56_rac_get_prob(c, model->vector_fdv[comp][j])<<j;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
320 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
321 if (delta & 0xF0)
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
322 delta |= vp56_rac_get_prob(c, model->vector_fdv[comp][3])<<3;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
323 else
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
324 delta |= 8;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
325 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
326 delta = vp56_rac_get_tree(c, vp56_pva_tree,
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
327 model->vector_pdv[comp]);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
328 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
329
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
330 if (delta && vp56_rac_get_prob(c, model->vector_sig[comp]))
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
331 delta = -delta;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
332
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
333 if (!comp)
3697
596e62da8f29 rename vector to vect to avoid clash with Apple gcc
aurel
parents: 3695
diff changeset
334 vect->x += delta;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
335 else
3697
596e62da8f29 rename vector to vect to avoid clash with Apple gcc
aurel
parents: 3695
diff changeset
336 vect->y += delta;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
337 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
338 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
339
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
340 /**
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
341 * Read number of consecutive blocks with null DC or AC.
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
342 * This value is < 74.
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
343 */
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
344 static unsigned vp6_get_nb_null(VP56Context *s)
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
345 {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
346 unsigned val = get_bits(&s->gb, 2);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
347 if (val == 2)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
348 val += get_bits(&s->gb, 2);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
349 else if (val == 3) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
350 val = get_bits1(&s->gb) << 2;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
351 val = 6+val + get_bits(&s->gb, 2+val);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
352 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
353 return val;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
354 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
355
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
356 static void vp6_parse_coeff_huffman(VP56Context *s)
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
357 {
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
358 VP56Model *model = s->modelp;
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
359 uint8_t *permute = s->scantable.permutated;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
360 VLC *vlc_coeff;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
361 int coeff, sign, coeff_idx;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
362 int b, cg, idx;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
363 int pt = 0; /* plane type (0 for Y, 1 for U or V) */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
364
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
365 for (b=0; b<6; b++) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
366 int ct = 0; /* code type */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
367 if (b > 3) pt = 1;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
368 vlc_coeff = &s->dccv_vlc[pt];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
369
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
370 for (coeff_idx=0; coeff_idx<64; ) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
371 int run = 1;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
372 if (coeff_idx<2 && s->nb_null[coeff_idx][pt]) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
373 s->nb_null[coeff_idx][pt]--;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
374 if (coeff_idx)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
375 break;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
376 } else {
9920
8332746a9db9 Add a check to vp6_parse_coeff_huffman to ensure it does not overread the input buffer.
reimar
parents: 9428
diff changeset
377 if (get_bits_count(&s->gb) >= s->gb.size_in_bits)
8332746a9db9 Add a check to vp6_parse_coeff_huffman to ensure it does not overread the input buffer.
reimar
parents: 9428
diff changeset
378 return;
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
379 coeff = get_vlc2(&s->gb, vlc_coeff->table, 9, 3);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
380 if (coeff == 0) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
381 if (coeff_idx) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
382 int pt = (coeff_idx >= 6);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
383 run += get_vlc2(&s->gb, s->runv_vlc[pt].table, 9, 3);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
384 if (run >= 9)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
385 run += get_bits(&s->gb, 6);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
386 } else
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
387 s->nb_null[0][pt] = vp6_get_nb_null(s);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
388 ct = 0;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
389 } else if (coeff == 11) { /* end of block */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
390 if (coeff_idx == 1) /* first AC coeff ? */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
391 s->nb_null[1][pt] = vp6_get_nb_null(s);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
392 break;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
393 } else {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
394 int coeff2 = vp56_coeff_bias[coeff];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
395 if (coeff > 4)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
396 coeff2 += get_bits(&s->gb, coeff <= 9 ? coeff - 4 : 11);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
397 ct = 1 + (coeff2 > 1);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
398 sign = get_bits1(&s->gb);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
399 coeff2 = (coeff2 ^ -sign) + sign;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
400 if (coeff_idx)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
401 coeff2 *= s->dequant_ac;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
402 idx = model->coeff_index_to_pos[coeff_idx];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
403 s->block_coeff[b][permute[idx]] = coeff2;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
404 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
405 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
406 coeff_idx+=run;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
407 cg = FFMIN(vp6_coeff_groups[coeff_idx], 3);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
408 vlc_coeff = &s->ract_vlc[pt][ct][cg];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
409 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
410 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
411 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
412
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
413 static void vp6_parse_coeff(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
414 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
415 VP56RangeCoder *c = s->ccp;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
416 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
417 uint8_t *permute = s->scantable.permutated;
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
418 uint8_t *model1, *model2, *model3;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
419 int coeff, sign, coeff_idx;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
420 int b, i, cg, idx, ctx;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
421 int pt = 0; /* plane type (0 for Y, 1 for U or V) */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
422
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
423 for (b=0; b<6; b++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
424 int ct = 1; /* code type */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
425 int run = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
426
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
427 if (b > 3) pt = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
428
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
429 ctx = s->left_block[vp56_b6to4[b]].not_null_dc
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
430 + s->above_blocks[s->above_block_idx[b]].not_null_dc;
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
431 model1 = model->coeff_dccv[pt];
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
432 model2 = model->coeff_dcct[pt][ctx];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
433
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
434 for (coeff_idx=0; coeff_idx<64; ) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
435 if ((coeff_idx>1 && ct==0) || vp56_rac_get_prob(c, model2[0])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
436 /* parse a coeff */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
437 if (vp56_rac_get_prob(c, model2[2])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
438 if (vp56_rac_get_prob(c, model2[3])) {
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
439 idx = vp56_rac_get_tree(c, vp56_pc_tree, model1);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
440 coeff = vp56_coeff_bias[idx+5];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
441 for (i=vp56_coeff_bit_length[idx]; i>=0; i--)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
442 coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
443 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
444 if (vp56_rac_get_prob(c, model2[4]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
445 coeff = 3 + vp56_rac_get_prob(c, model1[5]);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
446 else
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
447 coeff = 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
448 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
449 ct = 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
450 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
451 ct = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
452 coeff = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
453 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
454 sign = vp56_rac_get(c);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
455 coeff = (coeff ^ -sign) + sign;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
456 if (coeff_idx)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
457 coeff *= s->dequant_ac;
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
458 idx = model->coeff_index_to_pos[coeff_idx];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
459 s->block_coeff[b][permute[idx]] = coeff;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
460 run = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
461 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
462 /* parse a run */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
463 ct = 0;
4925
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
464 if (coeff_idx > 0) {
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
465 if (!vp56_rac_get_prob(c, model2[1]))
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
466 break;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
467
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
468 model3 = model->coeff_runv[coeff_idx >= 6];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
469 run = vp56_rac_get_tree(c, vp6_pcr_tree, model3);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
470 if (!run)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
471 for (run=9, i=0; i<6; i++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
472 run += vp56_rac_get_prob(c, model3[i+8]) << i;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
473 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
474 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
475
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
476 cg = vp6_coeff_groups[coeff_idx+=run];
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
477 model1 = model2 = model->coeff_ract[pt][ct][cg];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
478 }
4925
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
479
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
480 s->left_block[vp56_b6to4[b]].not_null_dc =
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
481 s->above_blocks[s->above_block_idx[b]].not_null_dc = !!s->block_coeff[b][0];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
482 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
483 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
484
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
485 static int vp6_block_variance(uint8_t *src, int stride)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
486 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
487 int sum = 0, square_sum = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
488 int y, x;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
489
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
490 for (y=0; y<8; y+=2) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
491 for (x=0; x<8; x+=2) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
492 sum += src[x];
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
493 square_sum += src[x]*src[x];
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
494 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
495 src += 2*stride;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
496 }
4306
331961478469 small optimization
aurel
parents: 4078
diff changeset
497 return (16*square_sum - sum*sum) >> 8;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
498 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
499
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
500 static void vp6_filter_hv4(uint8_t *dst, uint8_t *src, int stride,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
501 int delta, const int16_t *weights)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
502 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
503 int x, y;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
504
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
505 for (y=0; y<8; y++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
506 for (x=0; x<8; x++) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4364
diff changeset
507 dst[x] = av_clip_uint8(( src[x-delta ] * weights[0]
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
508 + src[x ] * weights[1]
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
509 + src[x+delta ] * weights[2]
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
510 + src[x+2*delta] * weights[3] + 64) >> 7);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
511 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
512 src += stride;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
513 dst += stride;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
514 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
515 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
516
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
517 static void vp6_filter_diag2(VP56Context *s, uint8_t *dst, uint8_t *src,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
518 int stride, int h_weight, int v_weight)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
519 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
520 uint8_t *tmp = s->edge_emu_buffer+16;
4921
9a2c08b939ee faster and simpler vp6 bilinear mc
lorenm
parents: 4910
diff changeset
521 s->dsp.put_h264_chroma_pixels_tab[0](tmp, src, stride, 9, h_weight, 0);
9a2c08b939ee faster and simpler vp6 bilinear mc
lorenm
parents: 4910
diff changeset
522 s->dsp.put_h264_chroma_pixels_tab[0](dst, tmp, stride, 8, 0, v_weight);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
523 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
524
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
525 static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
526 int offset1, int offset2, int stride,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
527 VP56mv mv, int mask, int select, int luma)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
528 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
529 int filter4 = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
530 int x8 = mv.x & mask;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
531 int y8 = mv.y & mask;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
532
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
533 if (luma) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
534 x8 *= 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
535 y8 *= 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
536 filter4 = s->filter_mode;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
537 if (filter4 == 2) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
538 if (s->max_vector_length &&
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
539 (FFABS(mv.x) > s->max_vector_length ||
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
540 FFABS(mv.y) > s->max_vector_length)) {
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
541 filter4 = 0;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
542 } else if (s->sample_variance_threshold
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
543 && (vp6_block_variance(src+offset1, stride)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
544 < s->sample_variance_threshold)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
545 filter4 = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
546 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
547 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
548 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
549
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
550 if ((y8 && (offset2-offset1)*s->flip<0) || (!y8 && offset1 > offset2)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
551 offset1 = offset2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
552 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
553
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
554 if (filter4) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
555 if (!y8) { /* left or right combine */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
556 vp6_filter_hv4(dst, src+offset1, stride, 1,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
557 vp6_block_copy_filter[select][x8]);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
558 } else if (!x8) { /* above or below combine */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
559 vp6_filter_hv4(dst, src+offset1, stride, stride,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
560 vp6_block_copy_filter[select][y8]);
4922
58f751086434 simplify
lorenm
parents: 4921
diff changeset
561 } else {
12417
9f06475db098 Move vp6_filter_diag4() from DSPContext to VP56DSPContext.
rbultje
parents: 12365
diff changeset
562 s->vp56dsp.vp6_filter_diag4(dst, src+offset1+((mv.x^mv.y)>>31), stride,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
563 vp6_block_copy_filter[select][x8],
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
564 vp6_block_copy_filter[select][y8]);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
565 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
566 } else {
4921
9a2c08b939ee faster and simpler vp6 bilinear mc
lorenm
parents: 4910
diff changeset
567 if (!x8 || !y8) {
9a2c08b939ee faster and simpler vp6 bilinear mc
lorenm
parents: 4910
diff changeset
568 s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8);
4922
58f751086434 simplify
lorenm
parents: 4921
diff changeset
569 } else {
58f751086434 simplify
lorenm
parents: 4921
diff changeset
570 vp6_filter_diag2(s, dst, src+offset1 + ((mv.x^mv.y)>>31), stride, x8, y8);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
571 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
572 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
573 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
574
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6472
diff changeset
575 static av_cold int vp6_decode_init(AVCodecContext *avctx)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
576 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
577 VP56Context *s = avctx->priv_data;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
578
12292
d8364962cc4a ff_prefix non static vp56 functions.
alexc
parents: 11943
diff changeset
579 ff_vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6,
12293
83400282990a Reindent after last commit.
alexc
parents: 12292
diff changeset
580 avctx->codec->id == CODEC_ID_VP6A);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
581 s->vp56_coord_div = vp6_coord_div;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
582 s->parse_vector_adjustment = vp6_parse_vector_adjustment;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
583 s->filter = vp6_filter;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
584 s->default_models_init = vp6_default_models_init;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
585 s->parse_vector_models = vp6_parse_vector_models;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
586 s->parse_coeff_models = vp6_parse_coeff_models;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
587 s->parse_header = vp6_parse_header;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
588
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
589 return 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
590 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
591
11350
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
592 static av_cold int vp6_decode_free(AVCodecContext *avctx)
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
593 {
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
594 VP56Context *s = avctx->priv_data;
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
595 int pt, ct, cg;
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
596
12292
d8364962cc4a ff_prefix non static vp56 functions.
alexc
parents: 11943
diff changeset
597 ff_vp56_free(avctx);
11350
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
598
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
599 for (pt=0; pt<2; pt++) {
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
600 free_vlc(&s->dccv_vlc[pt]);
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
601 free_vlc(&s->runv_vlc[pt]);
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
602 for (ct=0; ct<3; ct++)
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
603 for (cg=0; cg<6; cg++)
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
604 free_vlc(&s->ract_vlc[pt][ct][cg]);
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
605 }
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
606 return 0;
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
607 }
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
608
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
609 AVCodec vp6_decoder = {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
610 "vp6",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11350
diff changeset
611 AVMEDIA_TYPE_VIDEO,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
612 CODEC_ID_VP6,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
613 sizeof(VP56Context),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
614 vp6_decode_init,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
615 NULL,
11350
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
616 vp6_decode_free,
12292
d8364962cc4a ff_prefix non static vp56 functions.
alexc
parents: 11943
diff changeset
617 ff_vp56_decode_frame,
4910
143b89ab8187 set CODEC_CAP_DR1 for vp5 and vp6 decoders
aurel
parents: 4595
diff changeset
618 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
619 .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
620 };
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
621
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
622 /* flash version, not flipped upside-down */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
623 AVCodec vp6f_decoder = {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
624 "vp6f",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11350
diff changeset
625 AVMEDIA_TYPE_VIDEO,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
626 CODEC_ID_VP6F,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
627 sizeof(VP56Context),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
628 vp6_decode_init,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
629 NULL,
11350
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
630 vp6_decode_free,
12292
d8364962cc4a ff_prefix non static vp56 functions.
alexc
parents: 11943
diff changeset
631 ff_vp56_decode_frame,
4910
143b89ab8187 set CODEC_CAP_DR1 for vp5 and vp6 decoders
aurel
parents: 4595
diff changeset
632 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
633 .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
634 };
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
635
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
636 /* flash version, not flipped upside-down, with alpha channel */
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
637 AVCodec vp6a_decoder = {
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
638 "vp6a",
11560
8a4984c5cacc Define AVMediaType enum, and use it instead of enum CodecType, which
stefano
parents: 11350
diff changeset
639 AVMEDIA_TYPE_VIDEO,
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
640 CODEC_ID_VP6A,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
641 sizeof(VP56Context),
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
642 vp6_decode_init,
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
643 NULL,
11350
7d9a1a807e91 move vp6 huffman table freeing code, out of common vp56 code
aurel
parents: 11342
diff changeset
644 vp6_decode_free,
12292
d8364962cc4a ff_prefix non static vp56 functions.
alexc
parents: 11943
diff changeset
645 ff_vp56_decode_frame,
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
646 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
647 .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version, with alpha channel)"),
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
648 };