annotate vp6.c @ 11034:fd5921186064 libavcodec

Make the fast loop filter path work with unavailable left MBs. This prevents the issue with having to switch between slow and fast code paths in each row. 0.5% faster loopfilter for cathedral
author michael
date Thu, 28 Jan 2010 02:15:25 +0000
parents 8332746a9db9
children 8d23ea397dda
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 /**
8718
e9d9d946f213 Use full internal pathname in doxygen @file directives.
diego
parents: 8329
diff changeset
2 * @file libavcodec/vp6.c
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
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
39
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
40 static void vp6_parse_coeff(VP56Context *s);
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
41 static void vp6_parse_coeff_huffman(VP56Context *s);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
42
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
43 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
44 int *golden_frame)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
45 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
46 VP56RangeCoder *c = &s->c;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
47 int parse_filter_info = 0;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
48 int coeff_offset = 0;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
49 int vrt_shift = 0;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
50 int sub_version;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
51 int rows, cols;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
52 int res = 1;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
53 int separated_coeff = buf[0] & 1;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
54
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
55 s->framep[VP56_FRAME_CURRENT]->key_frame = !(buf[0] & 0x80);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
56 vp56_init_dequant(s, (buf[0] >> 1) & 0x3F);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
57
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
58 if (s->framep[VP56_FRAME_CURRENT]->key_frame) {
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
59 sub_version = buf[1] >> 3;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
60 if (sub_version > 8)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
61 return 0;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
62 s->filter_header = buf[1] & 0x06;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
63 if (buf[1] & 1) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
64 av_log(s->avctx, AV_LOG_ERROR, "interlacing not supported\n");
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
65 return 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
66 }
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
67 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
68 coeff_offset = AV_RB16(buf+2) - 2;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
69 buf += 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
70 buf_size -= 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
71 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
72
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
73 rows = buf[2]; /* number of stored macroblock rows */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
74 cols = buf[3]; /* number of stored macroblock cols */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
75 /* buf[4] is number of displayed macroblock rows */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
76 /* buf[5] is number of displayed macroblock cols */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
77
8329
8b6bcfa22aa8 vp56: don't reset dimensions to 0 in codec init
aurel
parents: 8304
diff changeset
78 if (!s->macroblocks || /* first frame */
8b6bcfa22aa8 vp56: don't reset dimensions to 0 in codec init
aurel
parents: 8304
diff changeset
79 16*cols != s->avctx->coded_width ||
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
80 16*rows != s->avctx->coded_height) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
81 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
82 if (s->avctx->extradata_size == 1) {
683d458a251f use the adjustment value present in FLV to crop VP6 video
aurel
parents: 4001
diff changeset
83 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
84 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
85 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
86 res = 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
87 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
88
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
89 vp56_init_range_decoder(c, buf+6, buf_size-6);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
90 vp56_rac_gets(c, 2);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
91
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
92 parse_filter_info = s->filter_header;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
93 if (sub_version < 8)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
94 vrt_shift = 5;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
95 s->sub_version = sub_version;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
96 } else {
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
97 if (!s->sub_version)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
98 return 0;
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
99
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
100 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
101 coeff_offset = AV_RB16(buf+1) - 2;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
102 buf += 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
103 buf_size -= 2;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
104 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
105 vp56_init_range_decoder(c, buf+1, buf_size-1);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
106
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
107 *golden_frame = vp56_rac_get(c);
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
108 if (s->filter_header) {
4349
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
109 s->deblock_filtering = vp56_rac_get(c);
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
110 if (s->deblock_filtering)
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
111 vp56_rac_get(c);
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
112 if (s->sub_version > 7)
541b65620b5f cosmetics: reindent
aurel
parents: 4348
diff changeset
113 parse_filter_info = vp56_rac_get(c);
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
114 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
115 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
116
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
117 if (parse_filter_info) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
118 if (vp56_rac_get(c)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
119 s->filter_mode = 2;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
120 s->sample_variance_threshold = vp56_rac_gets(c, 5) << vrt_shift;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
121 s->max_vector_length = 2 << vp56_rac_gets(c, 3);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
122 } else if (vp56_rac_get(c)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
123 s->filter_mode = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
124 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
125 s->filter_mode = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
126 }
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
127 if (s->sub_version > 7)
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
128 s->filter_selection = vp56_rac_gets(c, 4);
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
129 else
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
130 s->filter_selection = 16;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
131 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
132
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
133 s->use_huffman = vp56_rac_get(c);
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
134
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
135 s->parse_coeff = vp6_parse_coeff;
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
136 if (coeff_offset) {
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
137 buf += coeff_offset;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
138 buf_size -= coeff_offset;
8022
21c3e313709e vp6dec: ensure we don't try to use a buffer with negative size
aurel
parents: 7093
diff changeset
139 if (buf_size < 0)
21c3e313709e vp6dec: ensure we don't try to use a buffer with negative size
aurel
parents: 7093
diff changeset
140 return 0;
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
141 if (s->use_huffman) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
142 s->parse_coeff = vp6_parse_coeff_huffman;
5945
3413fce9e26a 10l: init_get_bits want size in bits, not bytes
aurel
parents: 5821
diff changeset
143 init_get_bits(&s->gb, buf, buf_size<<3);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
144 } else {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
145 vp56_init_range_decoder(&s->cc, buf, buf_size);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
146 s->ccp = &s->cc;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
147 }
4348
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
148 } else {
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
149 s->ccp = &s->c;
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
150 }
d3dcf62d52c5 add support for another variant of vp6
aurel
parents: 4308
diff changeset
151
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
152 return res;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
153 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
154
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
155 static void vp6_coeff_order_table_init(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
156 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
157 int i, pos, idx = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
158
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
159 s->modelp->coeff_index_to_pos[0] = 0;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
160 for (i=0; i<16; i++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
161 for (pos=1; pos<64; pos++)
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
162 if (s->modelp->coeff_reorder[pos] == i)
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
163 s->modelp->coeff_index_to_pos[idx++] = pos;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
164 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
165
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
166 static void vp6_default_models_init(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
167 {
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
168 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
169
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
170 model->vector_dct[0] = 0xA2;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
171 model->vector_dct[1] = 0xA4;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
172 model->vector_sig[0] = 0x80;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
173 model->vector_sig[1] = 0x80;
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
174
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
175 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
176 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
177 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
178 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
179 memcpy(model->coeff_reorder, vp6_def_coeff_reorder, sizeof(model->coeff_reorder));
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
180
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
181 vp6_coeff_order_table_init(s);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
182 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
183
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
184 static void vp6_parse_vector_models(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
185 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
186 VP56RangeCoder *c = &s->c;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
187 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
188 int comp, node;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
189
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
190 for (comp=0; comp<2; comp++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
191 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
192 model->vector_dct[comp] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
193 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
194 model->vector_sig[comp] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
195 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
196
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
197 for (comp=0; comp<2; comp++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
198 for (node=0; node<7; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
199 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
200 model->vector_pdv[comp][node] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
201
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
202 for (comp=0; comp<2; comp++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
203 for (node=0; node<8; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
204 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
205 model->vector_fdv[comp][node] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
206 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
207
7093
544da38cb2c9 vp6: ensure that huffman decoding table is sorted with descending symbol order
aurel
parents: 7040
diff changeset
208 /* 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
209 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
210 {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
211 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
212 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
213 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
214
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
215 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
216 const uint8_t *map, unsigned size, VLC *vlc)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
217 {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
218 Node nodes[2*size], *tmp = &nodes[size];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
219 int a, b, i;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
220
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
221 /* first compute probabilities from model */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
222 tmp[0].count = 256;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
223 for (i=0; i<size-1; i++) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
224 a = tmp[i].count * coeff_model[i] >> 8;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
225 b = tmp[i].count * (255 - coeff_model[i]) >> 8;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
226 nodes[map[2*i ]].count = a + !a;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
227 nodes[map[2*i+1]].count = b + !b;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
228 }
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 /* 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
231 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
232 FF_HUFFMAN_FLAG_HNODE_FIRST);
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
233 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
234
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
235 static void vp6_parse_coeff_models(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
236 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
237 VP56RangeCoder *c = &s->c;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
238 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
239 int def_prob[11];
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
240 int node, cg, ctx, pos;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
241 int ct; /* code type */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
242 int pt; /* plane type (0 for Y, 1 for U or V) */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
243
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
244 memset(def_prob, 0x80, sizeof(def_prob));
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
245
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
246 for (pt=0; pt<2; pt++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
247 for (node=0; node<11; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
248 if (vp56_rac_get_prob(c, vp6_dccv_pct[pt][node])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
249 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
250 model->coeff_dccv[pt][node] = def_prob[node];
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
251 } 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
252 model->coeff_dccv[pt][node] = def_prob[node];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
253 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
254
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
255 if (vp56_rac_get(c)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
256 for (pos=1; pos<64; pos++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
257 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
258 model->coeff_reorder[pos] = vp56_rac_gets(c, 4);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
259 vp6_coeff_order_table_init(s);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
260 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
261
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
262 for (cg=0; cg<2; cg++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
263 for (node=0; node<14; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
264 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
265 model->coeff_runv[cg][node] = vp56_rac_gets_nn(c, 7);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
266
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
267 for (ct=0; ct<3; ct++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
268 for (pt=0; pt<2; pt++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
269 for (cg=0; cg<6; cg++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
270 for (node=0; node<11; node++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
271 if (vp56_rac_get_prob(c, vp6_ract_pct[ct][pt][cg][node])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
272 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
273 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
4595
340c876320eb Use pointers to avoid copying AVFrame.
aurel
parents: 4594
diff changeset
274 } 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
275 model->coeff_ract[pt][ct][cg][node] = def_prob[node];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
276 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
277
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
278 if (s->use_huffman) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
279 for (pt=0; pt<2; pt++) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
280 vp6_build_huff_tree(s, model->coeff_dccv[pt],
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
281 vp6_huff_coeff_map, 12, &s->dccv_vlc[pt]);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
282 vp6_build_huff_tree(s, model->coeff_runv[pt],
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
283 vp6_huff_run_map, 9, &s->runv_vlc[pt]);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
284 for (ct=0; ct<3; ct++)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
285 for (cg = 0; cg < 6; cg++)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
286 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
287 vp6_huff_coeff_map, 12,
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
288 &s->ract_vlc[pt][ct][cg]);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
289 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
290 memset(s->nb_null, 0, sizeof(s->nb_null));
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
291 } else {
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
292 /* coeff_dcct is a linear combination of coeff_dccv */
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
293 for (pt=0; pt<2; pt++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
294 for (ctx=0; ctx<3; ctx++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
295 for (node=0; node<5; node++)
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
296 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
297 }
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
298 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
299
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
300 static void vp6_parse_vector_adjustment(VP56Context *s, VP56mv *vect)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
301 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
302 VP56RangeCoder *c = &s->c;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
303 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
304 int comp;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
305
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
306 *vect = (VP56mv) {0,0};
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
307 if (s->vector_candidate_pos < 2)
3697
596e62da8f29 rename vector to vect to avoid clash with Apple gcc
aurel
parents: 3695
diff changeset
308 *vect = s->vector_candidate[0];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
309
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
310 for (comp=0; comp<2; comp++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
311 int i, delta = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
312
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
313 if (vp56_rac_get_prob(c, model->vector_dct[comp])) {
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
314 static const uint8_t prob_order[] = {0, 1, 2, 7, 6, 5, 4};
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
315 for (i=0; i<sizeof(prob_order); i++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
316 int j = prob_order[i];
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
317 delta |= vp56_rac_get_prob(c, model->vector_fdv[comp][j])<<j;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
318 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
319 if (delta & 0xF0)
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
320 delta |= vp56_rac_get_prob(c, model->vector_fdv[comp][3])<<3;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
321 else
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
322 delta |= 8;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
323 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
324 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
325 model->vector_pdv[comp]);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
326 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
327
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
328 if (delta && vp56_rac_get_prob(c, model->vector_sig[comp]))
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
329 delta = -delta;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
330
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
331 if (!comp)
3697
596e62da8f29 rename vector to vect to avoid clash with Apple gcc
aurel
parents: 3695
diff changeset
332 vect->x += delta;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
333 else
3697
596e62da8f29 rename vector to vect to avoid clash with Apple gcc
aurel
parents: 3695
diff changeset
334 vect->y += delta;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
335 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
336 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
337
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
338 /**
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
339 * Read number of consecutive blocks with null DC or AC.
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
340 * This value is < 74.
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
341 */
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
342 static unsigned vp6_get_nb_null(VP56Context *s)
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
343 {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
344 unsigned val = get_bits(&s->gb, 2);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
345 if (val == 2)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
346 val += get_bits(&s->gb, 2);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
347 else if (val == 3) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
348 val = get_bits1(&s->gb) << 2;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
349 val = 6+val + get_bits(&s->gb, 2+val);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
350 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
351 return 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
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
354 static void vp6_parse_coeff_huffman(VP56Context *s)
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
355 {
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
356 VP56Model *model = s->modelp;
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
357 uint8_t *permute = s->scantable.permutated;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
358 VLC *vlc_coeff;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
359 int coeff, sign, coeff_idx;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
360 int b, cg, idx;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
361 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
362
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
363 for (b=0; b<6; b++) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
364 int ct = 0; /* code type */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
365 if (b > 3) pt = 1;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
366 vlc_coeff = &s->dccv_vlc[pt];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
367
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
368 for (coeff_idx=0; coeff_idx<64; ) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
369 int run = 1;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
370 if (coeff_idx<2 && s->nb_null[coeff_idx][pt]) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
371 s->nb_null[coeff_idx][pt]--;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
372 if (coeff_idx)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
373 break;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
374 } 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
375 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
376 return;
5821
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
377 coeff = get_vlc2(&s->gb, vlc_coeff->table, 9, 3);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
378 if (coeff == 0) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
379 if (coeff_idx) {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
380 int pt = (coeff_idx >= 6);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
381 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
382 if (run >= 9)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
383 run += get_bits(&s->gb, 6);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
384 } else
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
385 s->nb_null[0][pt] = vp6_get_nb_null(s);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
386 ct = 0;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
387 } else if (coeff == 11) { /* end of block */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
388 if (coeff_idx == 1) /* first AC coeff ? */
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
389 s->nb_null[1][pt] = vp6_get_nb_null(s);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
390 break;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
391 } else {
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
392 int coeff2 = vp56_coeff_bias[coeff];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
393 if (coeff > 4)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
394 coeff2 += get_bits(&s->gb, coeff <= 9 ? coeff - 4 : 11);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
395 ct = 1 + (coeff2 > 1);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
396 sign = get_bits1(&s->gb);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
397 coeff2 = (coeff2 ^ -sign) + sign;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
398 if (coeff_idx)
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
399 coeff2 *= s->dequant_ac;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
400 idx = model->coeff_index_to_pos[coeff_idx];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
401 s->block_coeff[b][permute[idx]] = coeff2;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
402 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
403 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
404 coeff_idx+=run;
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
405 cg = FFMIN(vp6_coeff_groups[coeff_idx], 3);
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
406 vlc_coeff = &s->ract_vlc[pt][ct][cg];
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
407 }
51918cb97f6f add support for VP6 with huffman encoded blocks
aurel
parents: 5714
diff changeset
408 }
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
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
411 static void vp6_parse_coeff(VP56Context *s)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
412 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
413 VP56RangeCoder *c = s->ccp;
8304
3cddc18caeca rename Vp56Model to VP56Model for consistency
aurel
parents: 8299
diff changeset
414 VP56Model *model = s->modelp;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
415 uint8_t *permute = s->scantable.permutated;
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
416 uint8_t *model1, *model2, *model3;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
417 int coeff, sign, coeff_idx;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
418 int b, i, cg, idx, ctx;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
419 int pt = 0; /* plane type (0 for Y, 1 for U or V) */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
420
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
421 for (b=0; b<6; b++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
422 int ct = 1; /* code type */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
423 int run = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
424
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
425 if (b > 3) pt = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
426
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
427 ctx = s->left_block[vp56_b6to4[b]].not_null_dc
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
428 + 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
429 model1 = model->coeff_dccv[pt];
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
430 model2 = model->coeff_dcct[pt][ctx];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
431
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
432 for (coeff_idx=0; coeff_idx<64; ) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
433 if ((coeff_idx>1 && ct==0) || vp56_rac_get_prob(c, model2[0])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
434 /* parse a coeff */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
435 if (vp56_rac_get_prob(c, model2[2])) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
436 if (vp56_rac_get_prob(c, model2[3])) {
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
437 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
438 coeff = vp56_coeff_bias[idx+5];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
439 for (i=vp56_coeff_bit_length[idx]; i>=0; i--)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
440 coeff += vp56_rac_get_prob(c, vp56_coeff_parse_table[idx][i]) << i;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
441 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
442 if (vp56_rac_get_prob(c, model2[4]))
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
443 coeff = 3 + vp56_rac_get_prob(c, model1[5]);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
444 else
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
445 coeff = 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
446 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
447 ct = 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
448 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
449 ct = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
450 coeff = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
451 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
452 sign = vp56_rac_get(c);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
453 coeff = (coeff ^ -sign) + sign;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
454 if (coeff_idx)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
455 coeff *= s->dequant_ac;
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
456 idx = model->coeff_index_to_pos[coeff_idx];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
457 s->block_coeff[b][permute[idx]] = coeff;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
458 run = 1;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
459 } else {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
460 /* parse a run */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
461 ct = 0;
4925
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
462 if (coeff_idx > 0) {
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
463 if (!vp56_rac_get_prob(c, model2[1]))
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
464 break;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
465
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
466 model3 = model->coeff_runv[coeff_idx >= 6];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
467 run = vp56_rac_get_tree(c, vp6_pcr_tree, model3);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
468 if (!run)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
469 for (run=9, i=0; i<6; i++)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
470 run += vp56_rac_get_prob(c, model3[i+8]) << i;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
471 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
472 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
473
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
474 cg = vp6_coeff_groups[coeff_idx+=run];
5711
dae0f80edbb3 move all model related tables into their own struct
aurel
parents: 5708
diff changeset
475 model1 = model2 = model->coeff_ract[pt][ct][cg];
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
476 }
4925
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
477
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
478 s->left_block[vp56_b6to4[b]].not_null_dc =
ff4cd98bc90c simplify
lorenm
parents: 4922
diff changeset
479 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
480 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
481 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
482
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
483 static int vp6_adjust(int v, int t)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
484 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
485 int V = v, s = v >> 31;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
486 V ^= s;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
487 V -= s;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
488 if (V-t-1 >= (unsigned)(t-1))
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
489 return v;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
490 V = 2*t - V;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
491 V += s;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
492 V ^= s;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
493 return V;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
494 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
495
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
496 static int vp6_block_variance(uint8_t *src, int stride)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
497 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
498 int sum = 0, square_sum = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
499 int y, x;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
500
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
501 for (y=0; y<8; y+=2) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
502 for (x=0; x<8; x+=2) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
503 sum += src[x];
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
504 square_sum += src[x]*src[x];
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
505 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
506 src += 2*stride;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
507 }
4306
331961478469 small optimization
aurel
parents: 4078
diff changeset
508 return (16*square_sum - sum*sum) >> 8;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
509 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
510
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
511 static void vp6_filter_hv4(uint8_t *dst, uint8_t *src, int stride,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
512 int delta, const int16_t *weights)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
513 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
514 int x, y;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
515
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
516 for (y=0; y<8; y++) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
517 for (x=0; x<8; x++) {
4594
a96d905dcbaa Add av_ prefix to clip functions
reimar
parents: 4364
diff changeset
518 dst[x] = av_clip_uint8(( src[x-delta ] * weights[0]
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
519 + src[x ] * weights[1]
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
520 + src[x+delta ] * weights[2]
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
521 + src[x+2*delta] * weights[3] + 64) >> 7);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
522 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
523 src += stride;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
524 dst += stride;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
525 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
526 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
527
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
528 static void vp6_filter_diag2(VP56Context *s, uint8_t *dst, uint8_t *src,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
529 int stride, int h_weight, int v_weight)
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
530 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
531 uint8_t *tmp = s->edge_emu_buffer+16;
4921
9a2c08b939ee faster and simpler vp6 bilinear mc
lorenm
parents: 4910
diff changeset
532 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
533 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
534 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
535
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
536 static void vp6_filter(VP56Context *s, uint8_t *dst, uint8_t *src,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
537 int offset1, int offset2, int stride,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
538 VP56mv mv, int mask, int select, int luma)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
539 {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
540 int filter4 = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
541 int x8 = mv.x & mask;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
542 int y8 = mv.y & mask;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
543
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
544 if (luma) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
545 x8 *= 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
546 y8 *= 2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
547 filter4 = s->filter_mode;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
548 if (filter4 == 2) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
549 if (s->max_vector_length &&
4001
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
550 (FFABS(mv.x) > s->max_vector_length ||
34fdffe98bd0 Rename ABS macro to FFABS.
diego
parents: 3947
diff changeset
551 FFABS(mv.y) > s->max_vector_length)) {
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
552 filter4 = 0;
4308
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
553 } else if (s->sample_variance_threshold
74b476185cd1 Add support for VP60 and VP61.
aurel
parents: 4306
diff changeset
554 && (vp6_block_variance(src+offset1, stride)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
555 < s->sample_variance_threshold)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
556 filter4 = 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
557 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
558 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
559 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
560
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
561 if ((y8 && (offset2-offset1)*s->flip<0) || (!y8 && offset1 > offset2)) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
562 offset1 = offset2;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
563 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
564
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
565 if (filter4) {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
566 if (!y8) { /* left or right combine */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
567 vp6_filter_hv4(dst, src+offset1, stride, 1,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
568 vp6_block_copy_filter[select][x8]);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
569 } else if (!x8) { /* above or below combine */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
570 vp6_filter_hv4(dst, src+offset1, stride, stride,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
571 vp6_block_copy_filter[select][y8]);
4922
58f751086434 simplify
lorenm
parents: 4921
diff changeset
572 } else {
8785
bee83b3f9a6b move vp6_filter_diag4() to a new vp6dsp.c file and use it throught dsputil
aurel
parents: 8718
diff changeset
573 s->dsp.vp6_filter_diag4(dst, src+offset1+((mv.x^mv.y)>>31), stride,
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
574 vp6_block_copy_filter[select][x8],
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
575 vp6_block_copy_filter[select][y8]);
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
576 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
577 } else {
4921
9a2c08b939ee faster and simpler vp6 bilinear mc
lorenm
parents: 4910
diff changeset
578 if (!x8 || !y8) {
9a2c08b939ee faster and simpler vp6 bilinear mc
lorenm
parents: 4910
diff changeset
579 s->dsp.put_h264_chroma_pixels_tab[0](dst, src+offset1, stride, 8, x8, y8);
4922
58f751086434 simplify
lorenm
parents: 4921
diff changeset
580 } else {
58f751086434 simplify
lorenm
parents: 4921
diff changeset
581 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
582 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
583 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
584 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
585
6517
48759bfbd073 Apply 'cold' attribute to init/uninit functions in libavcodec
zuxy
parents: 6472
diff changeset
586 static av_cold int vp6_decode_init(AVCodecContext *avctx)
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
587 {
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
588 VP56Context *s = avctx->priv_data;
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
589
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
590 vp56_init(avctx, avctx->codec->id == CODEC_ID_VP6,
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
591 avctx->codec->id == CODEC_ID_VP6A);
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
592 s->vp56_coord_div = vp6_coord_div;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
593 s->parse_vector_adjustment = vp6_parse_vector_adjustment;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
594 s->adjust = vp6_adjust;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
595 s->filter = vp6_filter;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
596 s->default_models_init = vp6_default_models_init;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
597 s->parse_vector_models = vp6_parse_vector_models;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
598 s->parse_coeff_models = vp6_parse_coeff_models;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
599 s->parse_header = vp6_parse_header;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
600
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
601 return 0;
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
602 }
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
603
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
604 AVCodec vp6_decoder = {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
605 "vp6",
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
606 CODEC_TYPE_VIDEO,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
607 CODEC_ID_VP6,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
608 sizeof(VP56Context),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
609 vp6_decode_init,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
610 NULL,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
611 vp56_free,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
612 vp56_decode_frame,
4910
143b89ab8187 set CODEC_CAP_DR1 for vp5 and vp6 decoders
aurel
parents: 4595
diff changeset
613 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
614 .long_name = NULL_IF_CONFIG_SMALL("On2 VP6"),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
615 };
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
616
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
617 /* flash version, not flipped upside-down */
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
618 AVCodec vp6f_decoder = {
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
619 "vp6f",
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
620 CODEC_TYPE_VIDEO,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
621 CODEC_ID_VP6F,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
622 sizeof(VP56Context),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
623 vp6_decode_init,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
624 NULL,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
625 vp56_free,
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
626 vp56_decode_frame,
4910
143b89ab8187 set CODEC_CAP_DR1 for vp5 and vp6 decoders
aurel
parents: 4595
diff changeset
627 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
628 .long_name = NULL_IF_CONFIG_SMALL("On2 VP6 (Flash version)"),
3695
6795c9e5f983 VP5 and VP6 video decoder
aurel
parents:
diff changeset
629 };
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
630
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
631 /* 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
632 AVCodec vp6a_decoder = {
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
633 "vp6a",
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
634 CODEC_TYPE_VIDEO,
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
635 CODEC_ID_VP6A,
8299
524cb7f5ad2b avoid POSIX reserved _t suffix
aurel
parents: 8022
diff changeset
636 sizeof(VP56Context),
5714
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
637 vp6_decode_init,
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
638 NULL,
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
639 vp56_free,
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
640 vp56_decode_frame,
314be1cfdcb0 add a new vp6a codec (add alpha plan support to vp6)
aurel
parents: 5711
diff changeset
641 CODEC_CAP_DR1,
7040
e943e1409077 Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
stefano
parents: 6712
diff changeset
642 .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
643 };