annotate wmv2.c @ 2497:69adfbbdcdeb libavcodec

- samples from mplayer ftp in the "adv" profile seem to have profile=2, which isn't the advanced one; and indeed, using adv. profile parser fails. Using normal parser works, and that's what is done - attempt at taking care of stride for NORM2 bitplane decoding - duplication of much code from msmpeg4.c; this code isn't yet used, but goes down as far as the block layer (mainly Transform Type stuff, the remains are wild editing without checking). Unusable yet, and lacks the AC decoding (but a step further in bitstream parsing) patch by anonymous
author michael
date Fri, 04 Feb 2005 02:20:38 +0000
parents 81a9f883a17a
children e25782262d7d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
1 /*
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
2 * Copyright (c) 2002 The FFmpeg Project.
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
3 *
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
4 * This library is free software; you can redistribute it and/or
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
5 * modify it under the terms of the GNU Lesser General Public
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
6 * License as published by the Free Software Foundation; either
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
7 * version 2 of the License, or (at your option) any later version.
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
8 *
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
9 * This library is distributed in the hope that it will be useful,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
12 * Lesser General Public License for more details.
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
13 *
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
14 * You should have received a copy of the GNU Lesser General Public
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
15 * License along with this library; if not, write to the Free Software
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
16 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
17 *
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
18 */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
19
1106
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
20 /**
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
21 * @file wmv2.c
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
22 * wmv2 codec.
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
23 */
1e39f273ecd6 per file doxy
michaelni
parents: 1092
diff changeset
24
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
25 #include "simple_idct.h"
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
26
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
27 #define SKIP_TYPE_NONE 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
28 #define SKIP_TYPE_MPEG 1
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
29 #define SKIP_TYPE_ROW 2
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
30 #define SKIP_TYPE_COL 3
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
31
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
32
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
33 typedef struct Wmv2Context{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
34 MpegEncContext s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
35 int j_type_bit;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
36 int j_type;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
37 int flag3;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
38 int flag63;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
39 int abt_flag;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
40 int abt_type;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
41 int abt_type_table[6];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
42 int per_mb_abt;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
43 int per_block_abt;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
44 int mspel_bit;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
45 int cbp_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
46 int top_left_mv_flag;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
47 int per_mb_rl_bit;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
48 int skip_type;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
49 int hshift;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
50
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
51 ScanTable abt_scantable[2];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
52 DCTELEM abt_block2[6][64] __align8;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
53 }Wmv2Context;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
54
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
55 static void wmv2_common_init(Wmv2Context * w){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
56 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
57
1273
a979fab41ed8 ASV1 codec
michaelni
parents: 1185
diff changeset
58 ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], wmv2_scantableA);
a979fab41ed8 ASV1 codec
michaelni
parents: 1185
diff changeset
59 ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], wmv2_scantableB);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
60 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
61
2024
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 1943
diff changeset
62 #ifdef CONFIG_ENCODERS
f65d87bfdd5a some of the warning fixes by (Michael Roitzsch <mroi at users dot sourceforge dot net>)
michael
parents: 1943
diff changeset
63
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
64 static int encode_ext_header(Wmv2Context *w){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
65 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
66 PutBitContext pb;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
67 int code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
68
1524
alex
parents: 1418
diff changeset
69 init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
70
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
71 put_bits(&pb, 5, s->avctx->frame_rate / s->avctx->frame_rate_base); //yes 29.97 -> 29
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
72 put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
73
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
74 put_bits(&pb, 1, w->mspel_bit=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
75 put_bits(&pb, 1, w->flag3=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
76 put_bits(&pb, 1, w->abt_flag=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
77 put_bits(&pb, 1, w->j_type_bit=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
78 put_bits(&pb, 1, w->top_left_mv_flag=0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
79 put_bits(&pb, 1, w->per_mb_rl_bit=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
80 put_bits(&pb, 3, code=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
81
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
82 flush_put_bits(&pb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
83
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
84 s->slice_height = s->mb_height / code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
85
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
86 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
87 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
88
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
89 static int wmv2_encode_init(AVCodecContext *avctx){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
90 Wmv2Context * const w= avctx->priv_data;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
91
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
92 if(MPV_encode_init(avctx) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
93 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
94
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
95 wmv2_common_init(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
96
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
97 avctx->extradata_size= 4;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
98 avctx->extradata= av_mallocz(avctx->extradata_size + 10);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
99 encode_ext_header(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
100
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
101 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
102 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
103
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
104 static int wmv2_encode_end(AVCodecContext *avctx){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
105
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
106 if(MPV_encode_end(avctx) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
107 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
108
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
109 avctx->extradata_size= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
110 av_freep(&avctx->extradata);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
111
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
112 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
113 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
114
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
115 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
116 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
117 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
118
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
119 put_bits(&s->pb, 1, s->pict_type - 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
120 if(s->pict_type == I_TYPE){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
121 put_bits(&s->pb, 7, 0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
122 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
123 put_bits(&s->pb, 5, s->qscale);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
124
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
125 s->dc_table_index = 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
126 s->mv_table_index = 1; /* only if P frame */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
127 // s->use_skip_mb_code = 1; /* only if P frame */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
128 s->per_mb_rl_table = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
129 s->mspel= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
130 w->per_mb_abt=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
131 w->abt_type=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
132 w->j_type=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
133
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
134 assert(s->flipflop_rounding);
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
135
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
136 if (s->pict_type == I_TYPE) {
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
137 assert(s->no_rounding==1);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
138 if(w->j_type_bit) put_bits(&s->pb, 1, w->j_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
139
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
140 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
141
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
142 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
143 code012(&s->pb, s->rl_chroma_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
144 code012(&s->pb, s->rl_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
145 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
146
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
147 put_bits(&s->pb, 1, s->dc_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
148
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
149 s->inter_intra_pred= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
150 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
151 int cbp_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
152
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
153 put_bits(&s->pb, 2, SKIP_TYPE_NONE);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
154
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
155 code012(&s->pb, cbp_index=0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
156 if(s->qscale <= 10){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
157 int map[3]= {0,2,1};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
158 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
159 }else if(s->qscale <= 20){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
160 int map[3]= {1,0,2};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
161 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
162 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
163 int map[3]= {2,1,0};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
164 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
165 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
166
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
167 if(w->mspel_bit) put_bits(&s->pb, 1, s->mspel);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
168
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
169 if(w->abt_flag){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
170 put_bits(&s->pb, 1, w->per_mb_abt^1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
171 if(!w->per_mb_abt){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
172 code012(&s->pb, w->abt_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
173 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
174 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
175
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
176 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
177
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
178 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
179 code012(&s->pb, s->rl_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
180 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
181 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
182 put_bits(&s->pb, 1, s->dc_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
183 put_bits(&s->pb, 1, s->mv_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
184
1943
62beeb1a8676 seems wmv8 doesnt use intra-inter prediction
michael
parents: 1938
diff changeset
185 s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
186 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
187 s->esc3_level_length= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
188 s->esc3_run_length= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
189
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
190 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
191 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
192
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
193 // nearly idential to wmv1 but thats just because we dont use the useless M$ crap features
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
194 // its duplicated here in case someone wants to add support for these carp features
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
195 void ff_wmv2_encode_mb(MpegEncContext * s,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
196 DCTELEM block[6][64],
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
197 int motion_x, int motion_y)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
198 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
199 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
200 int cbp, coded_cbp, i;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
201 int pred_x, pred_y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
202 uint8_t *coded_block;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
203
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
204 handle_slices(s);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
205
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
206 if (!s->mb_intra) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
207 /* compute cbp */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
208 set_stat(ST_INTER_MB);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
209 cbp = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
210 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
211 if (s->block_last_index[i] >= 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
212 cbp |= 1 << (5 - i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
213 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
214
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
215 put_bits(&s->pb,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
216 wmv2_inter_table[w->cbp_table_index][cbp + 64][1],
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
217 wmv2_inter_table[w->cbp_table_index][cbp + 64][0]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
218
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
219 /* motion vector */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1668
diff changeset
220 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
221 msmpeg4_encode_motion(s, motion_x - pred_x,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
222 motion_y - pred_y);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
223 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
224 /* compute cbp */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
225 cbp = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
226 coded_cbp = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
227 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
228 int val, pred;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
229 val = (s->block_last_index[i] >= 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
230 cbp |= val << (5 - i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
231 if (i < 4) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
232 /* predict value for close blocks only for luma */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
233 pred = coded_block_pred(s, i, &coded_block);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
234 *coded_block = val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
235 val = val ^ pred;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
236 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
237 coded_cbp |= val << (5 - i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
238 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
239 #if 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
240 if (coded_cbp)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
241 printf("cbp=%x %x\n", cbp, coded_cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
242 #endif
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
243
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
244 if (s->pict_type == I_TYPE) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
245 set_stat(ST_INTRA_MB);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
246 put_bits(&s->pb,
2474
81a9f883a17a In that patch:
michael
parents: 2031
diff changeset
247 ff_msmp4_mb_i_table[coded_cbp][1], ff_msmp4_mb_i_table[coded_cbp][0]);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
248 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
249 put_bits(&s->pb,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
250 wmv2_inter_table[w->cbp_table_index][cbp][1],
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
251 wmv2_inter_table[w->cbp_table_index][cbp][0]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
252 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
253 set_stat(ST_INTRA_MB);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
254 put_bits(&s->pb, 1, 0); /* no AC prediction yet */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
255 if(s->inter_intra_pred){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
256 s->h263_aic_dir=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
257 put_bits(&s->pb, table_inter_intra[s->h263_aic_dir][1], table_inter_intra[s->h263_aic_dir][0]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
258 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
259 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
260
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
261 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
262 msmpeg4_encode_block(s, block[i], i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
263 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
264 }
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
265 #endif //CONFIG_ENCODERS
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
266
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
267 static void parse_mb_skip(Wmv2Context * w){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
268 int mb_x, mb_y;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
269 MpegEncContext * const s= &w->s;
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
270 uint32_t * const mb_type= s->current_picture_ptr->mb_type;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
271
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
272 w->skip_type= get_bits(&s->gb, 2);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
273 switch(w->skip_type){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
274 case SKIP_TYPE_NONE:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
275 for(mb_y=0; mb_y<s->mb_height; mb_y++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
276 for(mb_x=0; mb_x<s->mb_width; mb_x++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
277 mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_16x16 | MB_TYPE_L0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
278 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
279 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
280 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
281 case SKIP_TYPE_MPEG:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
282 for(mb_y=0; mb_y<s->mb_height; mb_y++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
283 for(mb_x=0; mb_x<s->mb_width; mb_x++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
284 mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
285 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
286 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
287 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
288 case SKIP_TYPE_ROW:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
289 for(mb_y=0; mb_y<s->mb_height; mb_y++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
290 if(get_bits1(&s->gb)){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
291 for(mb_x=0; mb_x<s->mb_width; mb_x++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
292 mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
293 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
294 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
295 for(mb_x=0; mb_x<s->mb_width; mb_x++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
296 mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
297 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
298 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
299 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
300 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
301 case SKIP_TYPE_COL:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
302 for(mb_x=0; mb_x<s->mb_width; mb_x++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
303 if(get_bits1(&s->gb)){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
304 for(mb_y=0; mb_y<s->mb_height; mb_y++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
305 mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_SKIP | MB_TYPE_16x16 | MB_TYPE_L0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
306 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
307 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
308 for(mb_y=0; mb_y<s->mb_height; mb_y++){
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
309 mb_type[mb_y*s->mb_stride + mb_x]= (get_bits1(&s->gb) ? MB_TYPE_SKIP : 0) | MB_TYPE_16x16 | MB_TYPE_L0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
310 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
311 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
312 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
313 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
314 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
315 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
316
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
317 static int decode_ext_header(Wmv2Context *w){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
318 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
319 GetBitContext gb;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
320 int fps;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
321 int code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
322
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
323 if(s->avctx->extradata_size<4) return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
324
1025
1f9afd8b9131 GetBitContext.size is allways multiplied by 8 -> use size_in_bits to avoid useless *8 in a few inner loops
michaelni
parents: 983
diff changeset
325 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
326
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
327 fps = get_bits(&gb, 5);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
328 s->bit_rate = get_bits(&gb, 11)*1024;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
329 w->mspel_bit = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
330 w->flag3 = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
331 w->abt_flag = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
332 w->j_type_bit = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
333 w->top_left_mv_flag= get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
334 w->per_mb_rl_bit = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
335 code = get_bits(&gb, 3);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
336
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
337 if(code==0) return -1;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1070
diff changeset
338
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
339 s->slice_height = s->mb_height / code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
340
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
341 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
342 av_log(s->avctx, AV_LOG_DEBUG, "fps:%d, br:%d, qpbit:%d, abt_flag:%d, j_type_bit:%d, tl_mv_flag:%d, mbrl_bit:%d, code:%d, flag3:%d, slices:%d\n",
983
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 936
diff changeset
343 fps, s->bit_rate, w->mspel_bit, w->abt_flag, w->j_type_bit, w->top_left_mv_flag, w->per_mb_rl_bit, code, w->flag3,
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 936
diff changeset
344 code);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
345 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
346 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
347 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
348
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
349 int ff_wmv2_decode_picture_header(MpegEncContext * s)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
350 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
351 Wmv2Context * const w= (Wmv2Context*)s;
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
352 int code;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
353
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
354 #if 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
355 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
356 int i;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
357 for(i=0; i<s->gb.size*8; i++)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
358 printf("%d", get_bits1(&s->gb));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
359 // get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
360 printf("END\n");
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
361 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
362 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
363 #endif
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
364 if(s->picture_number==0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
365 decode_ext_header(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
366
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
367 s->pict_type = get_bits(&s->gb, 1) + 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
368 if(s->pict_type == I_TYPE){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
369 code = get_bits(&s->gb, 7);
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
370 av_log(s->avctx, AV_LOG_ERROR, "I7:%X/\n", code);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
371 }
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1598
diff changeset
372 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
373 if(s->qscale < 0)
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
374 return -1;
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
375
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
376 return 0;
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
377 }
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
378
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
379 int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
380 {
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
381 Wmv2Context * const w= (Wmv2Context*)s;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
382
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
383 if (s->pict_type == I_TYPE) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
384 if(w->j_type_bit) w->j_type= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
385 else w->j_type= 0; //FIXME check
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
386
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
387 if(!w->j_type){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
388 if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
389 else s->per_mb_rl_table= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
390
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
391 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
392 s->rl_chroma_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
393 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
394 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
395
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
396 s->dc_table_index = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
397 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
398 s->inter_intra_pred= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
399 s->no_rounding = 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
400 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
401 av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d j_type:%d \n",
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
402 s->qscale,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
403 s->rl_chroma_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
404 s->rl_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
405 s->dc_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
406 s->per_mb_rl_table,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
407 w->j_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
408 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
409 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
410 int cbp_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
411 w->j_type=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
412
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
413 parse_mb_skip(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
414 cbp_index= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
415 if(s->qscale <= 10){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
416 int map[3]= {0,2,1};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
417 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
418 }else if(s->qscale <= 20){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
419 int map[3]= {1,0,2};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
420 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
421 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
422 int map[3]= {2,1,0};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
423 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
424 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
425
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
426 if(w->mspel_bit) s->mspel= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
427 else s->mspel= 0; //FIXME check
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
428
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
429 if(w->abt_flag){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
430 w->per_mb_abt= get_bits1(&s->gb)^1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
431 if(!w->per_mb_abt){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
432 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
433 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
434 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
435
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
436 if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
437 else s->per_mb_rl_table= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
438
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
439 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
440 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
441 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
442 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
443
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
444 s->dc_table_index = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
445 s->mv_table_index = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
446
1943
62beeb1a8676 seems wmv8 doesnt use intra-inter prediction
michael
parents: 1938
diff changeset
447 s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
448 s->no_rounding ^= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
449
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
450 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
451 av_log(s->avctx, AV_LOG_DEBUG, "rl:%d rlc:%d dc:%d mv:%d mbrl:%d qp:%d mspel:%d per_mb_abt:%d abt_type:%d cbp:%d ii:%d\n",
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
452 s->rl_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
453 s->rl_chroma_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
454 s->dc_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
455 s->mv_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
456 s->per_mb_rl_table,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
457 s->qscale,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
458 s->mspel,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
459 w->per_mb_abt,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
460 w->abt_type,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
461 w->cbp_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
462 s->inter_intra_pred);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
463 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
464 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
465 s->esc3_level_length= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
466 s->esc3_run_length= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
467
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
468 s->picture_number++; //FIXME ?
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
469
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
470
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
471 // if(w->j_type)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
472 // return wmv2_decode_j_picture(w); //FIXME
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
473
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
474 if(w->j_type){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
475 av_log(s->avctx, AV_LOG_ERROR, "J-type picture isnt supported\n");
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
476 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
477 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
478
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
479 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
480 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
481
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
482 static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
483 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
484 int ret;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
485
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
486 ret= msmpeg4_decode_motion(s, mx_ptr, my_ptr);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
487
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
488 if(ret<0) return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
489
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
490 if((((*mx_ptr)|(*my_ptr)) & 1) && s->mspel)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
491 w->hshift= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
492 else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
493 w->hshift= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
494
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
495 //printf("%d %d ", *mx_ptr, *my_ptr);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
496
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
497 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
498 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
499
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
500 static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
501 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
502 int xy, wrap, diff, type;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
503 int16_t *A, *B, *C, *mot_val;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
504
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1668
diff changeset
505 wrap = s->b8_stride;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
506 xy = s->block_index[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
507
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1651
diff changeset
508 mot_val = s->current_picture.motion_val[0][xy];
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
509
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1651
diff changeset
510 A = s->current_picture.motion_val[0][xy - 1];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1651
diff changeset
511 B = s->current_picture.motion_val[0][xy - wrap];
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1651
diff changeset
512 C = s->current_picture.motion_val[0][xy + 2 - wrap];
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
513
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
514 diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1]));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
515
1043
michaelni
parents: 1025
diff changeset
516 if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag && diff >= 8)
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
517 type= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
518 else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
519 type= 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
520
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
521 if(type == 0){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
522 *px= A[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
523 *py= A[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
524 }else if(type == 1){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
525 *px= B[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
526 *py= B[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
527 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
528 /* special case for first (slice) line */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
529 if (s->first_slice_line) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
530 *px = A[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
531 *py = A[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
532 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
533 *px = mid_pred(A[0], B[0], C[0]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
534 *py = mid_pred(A[1], B[1], C[1]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
535 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
536 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
537
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
538 return mot_val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
539 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
540
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
541 static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, int cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
542 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
543 static const int sub_cbp_table[3]= {2,3,1};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
544 int sub_cbp;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
545
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
546 if(!cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
547 s->block_last_index[n] = -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
548
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
549 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
550 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
551
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
552 if(w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
553 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
554 #if 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
555 if(w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
556 printf("B%d", w->abt_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
557 #endif
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
558 w->abt_type_table[n]= w->abt_type;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
559
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
560 if(w->abt_type){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
561 // const uint8_t *scantable= w->abt_scantable[w->abt_type-1].permutated;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
562 const uint8_t *scantable= w->abt_scantable[w->abt_type-1].scantable;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
563 // const uint8_t *scantable= w->abt_type-1 ? w->abt_scantable[1].permutated : w->abt_scantable[0].scantable;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
564
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
565 sub_cbp= sub_cbp_table[ decode012(&s->gb) ];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
566 // printf("S%d", sub_cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
567
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
568 if(sub_cbp&1){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
569 if (msmpeg4_decode_block(s, block, n, 1, scantable) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
570 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
571 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
572
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
573 if(sub_cbp&2){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
574 if (msmpeg4_decode_block(s, w->abt_block2[n], n, 1, scantable) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
575 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
576 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
577 s->block_last_index[n] = 63;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
578
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
579 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
580 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
581 return msmpeg4_decode_block(s, block, n, 1, s->inter_scantable.permutated);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
582 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
583 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
584
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
585 static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
586 MpegEncContext * const s= &w->s;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
587
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
588 switch(w->abt_type_table[n]){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
589 case 0:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
590 if (s->block_last_index[n] >= 0) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1070
diff changeset
591 s->dsp.idct_add (dst, stride, block1);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
592 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
593 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
594 case 1:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
595 simple_idct84_add(dst , stride, block1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
596 simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
597 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
598 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
599 case 2:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
600 simple_idct48_add(dst , stride, block1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
601 simple_idct48_add(dst + 4 , stride, w->abt_block2[n]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
602 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
603 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
604 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
605 av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n");
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
606 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
607 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
608
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
609 void ff_wmv2_add_mb(MpegEncContext *s, DCTELEM block1[6][64], uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
610 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
611
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
612 wmv2_add_block(w, block1[0], dest_y , s->linesize, 0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
613 wmv2_add_block(w, block1[1], dest_y + 8 , s->linesize, 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
614 wmv2_add_block(w, block1[2], dest_y + 8*s->linesize, s->linesize, 2);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
615 wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
616
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
617 if(s->flags&CODEC_FLAG_GRAY) return;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
618
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
619 wmv2_add_block(w, block1[4], dest_cb , s->uvlinesize, 4);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
620 wmv2_add_block(w, block1[5], dest_cr , s->uvlinesize, 5);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
621 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
622
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
623 void ff_mspel_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
624 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
625 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
626 int motion_x, int motion_y, int h)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
627 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
628 Wmv2Context * const w= (Wmv2Context*)s;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
629 uint8_t *ptr;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
630 int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
631 int emu=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
632
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
633 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
634 dxy = 2*dxy + w->hshift;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
635 src_x = s->mb_x * 16 + (motion_x >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
636 src_y = s->mb_y * 16 + (motion_y >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
637
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
638 /* WARNING: do no forget half pels */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
639 v_edge_pos = s->v_edge_pos;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
640 src_x = clip(src_x, -16, s->width);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
641 src_y = clip(src_y, -16, s->height);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
642 linesize = s->linesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
643 uvlinesize = s->uvlinesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
644 ptr = ref_picture[0] + (src_y * linesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
645
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
646 if(s->flags&CODEC_FLAG_EMU_EDGE){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
647 if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
648 || src_y + h+1 >= v_edge_pos){
1318
209abbb4c4f7 fix identifier to fix compilation
tmmm
parents: 1317
diff changeset
649 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
650 src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
651 ptr= s->edge_emu_buffer + 1 + s->linesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
652 emu=1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
653 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
654 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
655
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
656 s->dsp.put_mspel_pixels_tab[dxy](dest_y , ptr , linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
657 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8 , ptr+8 , linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
658 s->dsp.put_mspel_pixels_tab[dxy](dest_y +8*linesize, ptr +8*linesize, linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
659 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8+8*linesize, ptr+8+8*linesize, linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
660
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
661 if(s->flags&CODEC_FLAG_GRAY) return;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
662
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
663 if (s->out_format == FMT_H263) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
664 dxy = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
665 if ((motion_x & 3) != 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
666 dxy |= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
667 if ((motion_y & 3) != 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
668 dxy |= 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
669 mx = motion_x >> 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
670 my = motion_y >> 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
671 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
672 mx = motion_x / 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
673 my = motion_y / 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
674 dxy = ((my & 1) << 1) | (mx & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
675 mx >>= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
676 my >>= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
677 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
678
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
679 src_x = s->mb_x * 8 + mx;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
680 src_y = s->mb_y * 8 + my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
681 src_x = clip(src_x, -8, s->width >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
682 if (src_x == (s->width >> 1))
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
683 dxy &= ~1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
684 src_y = clip(src_y, -8, s->height >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
685 if (src_y == (s->height >> 1))
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
686 dxy &= ~2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
687 offset = (src_y * uvlinesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
688 ptr = ref_picture[1] + offset;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
689 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1273
diff changeset
690 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
691 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
692 ptr= s->edge_emu_buffer;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
693 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
694 pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
695
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
696 ptr = ref_picture[2] + offset;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
697 if(emu){
1317
26c44d2433c1 make ff_emulated_edge_mc() independant of MpegEncContext
michaelni
parents: 1273
diff changeset
698 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
699 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
700 ptr= s->edge_emu_buffer;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
701 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
702 pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
703 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
704
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
705
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
706 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
707 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
708 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
709 int cbp, code, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
710 uint8_t *coded_val;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
711
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
712 if(w->j_type) return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
713
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
714 if (s->pict_type == P_TYPE) {
1177
fea03d2c4946 simplified adressing of most mb based arrays (mb_x + mb_y*s->mb_stride) now instead of mb_x + mb_y*mb_width and 1+mb_x + (1+mb_y)*(mb_width+2) and ... mixture
michaelni
parents: 1163
diff changeset
715 if(IS_SKIP(s->current_picture.mb_type[s->mb_y * s->mb_stride + s->mb_x])){
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
716 /* skip mb */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
717 s->mb_intra = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
718 for(i=0;i<6;i++)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
719 s->block_last_index[i] = -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
720 s->mv_dir = MV_DIR_FORWARD;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
721 s->mv_type = MV_TYPE_16X16;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
722 s->mv[0][0][0] = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
723 s->mv[0][0][1] = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
724 s->mb_skiped = 1;
1185
michaelni
parents: 1183
diff changeset
725 w->hshift=0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
726 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
727 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
728
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
729 code = get_vlc2(&s->gb, mb_non_intra_vlc[w->cbp_table_index].table, MB_NON_INTRA_VLC_BITS, 3);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
730 if (code < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
731 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
732 s->mb_intra = (~code & 0x40) >> 6;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
733
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
734 cbp = code & 0x3f;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
735 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
736 s->mb_intra = 1;
2474
81a9f883a17a In that patch:
michael
parents: 2031
diff changeset
737 code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
738 if (code < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
739 av_log(s->avctx, AV_LOG_ERROR, "II-cbp illegal at %d %d\n", s->mb_x, s->mb_y);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
740 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
741 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
742 /* predict coded block pattern */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
743 cbp = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
744 for(i=0;i<6;i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
745 int val = ((code >> (5 - i)) & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
746 if (i < 4) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
747 int pred = coded_block_pred(s, i, &coded_val);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
748 val = val ^ pred;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
749 *coded_val = val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
750 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
751 cbp |= val << (5 - i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
752 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
753 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
754
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
755 if (!s->mb_intra) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
756 int mx, my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
757 //printf("P at %d %d\n", s->mb_x, s->mb_y);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
758 wmv2_pred_motion(w, &mx, &my);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
759
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
760 if(cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
761 if(s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
762 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
763 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
764 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
765
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
766 if(w->abt_flag && w->per_mb_abt){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
767 w->per_block_abt= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
768 if(!w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
769 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
770 }else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
771 w->per_block_abt=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
772 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
773
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
774 if (wmv2_decode_motion(w, &mx, &my) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
775 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
776
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
777 s->mv_dir = MV_DIR_FORWARD;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
778 s->mv_type = MV_TYPE_16X16;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
779 s->mv[0][0][0] = mx;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
780 s->mv[0][0][1] = my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
781
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
782 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
783 if (wmv2_decode_inter_block(w, block[i], i, (cbp >> (5 - i)) & 1) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
784 {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
785 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding inter block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
786 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
787 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
788 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
789 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
790 //if(s->pict_type==P_TYPE)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
791 // printf("%d%d ", s->inter_intra_pred, cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
792 //printf("I at %d %d %d %06X\n", s->mb_x, s->mb_y, ((cbp&3)? 1 : 0) +((cbp&0x3C)? 2 : 0), show_bits(&s->gb, 24));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
793 s->ac_pred = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
794 if(s->inter_intra_pred){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
795 s->h263_aic_dir= get_vlc2(&s->gb, inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
796 // printf("%d%d %d %d/", s->ac_pred, s->h263_aic_dir, s->mb_x, s->mb_y);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
797 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
798 if(s->per_mb_rl_table && cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
799 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
800 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
801 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
802
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
803 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
804 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
805 {
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
806 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding intra block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
807 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
808 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
809 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
810 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
811
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
812 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
813 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
814
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
815 static int wmv2_decode_init(AVCodecContext *avctx){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
816 Wmv2Context * const w= avctx->priv_data;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
817
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
818 if(ff_h263_decode_init(avctx) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
819 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
820
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
821 wmv2_common_init(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
822
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
823 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
824 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
825
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
826 AVCodec wmv2_decoder = {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
827 "wmv2",
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
828 CODEC_TYPE_VIDEO,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
829 CODEC_ID_WMV2,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
830 sizeof(Wmv2Context),
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
831 wmv2_decode_init,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
832 NULL,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
833 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
834 ff_h263_decode_frame,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
835 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
836 };
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
837
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
838 #ifdef CONFIG_ENCODERS
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
839 AVCodec wmv2_encoder = {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
840 "wmv2",
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
841 CODEC_TYPE_VIDEO,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
842 CODEC_ID_WMV2,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
843 sizeof(Wmv2Context),
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
844 wmv2_encode_init,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
845 MPV_encode_picture,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
846 MPV_encode_end,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
847 };
1070
6da5ae9ee199 more #ifdef CONFIG_ENCODERS patch by (Wolfgang Hesseler <qv at multimediaware dot com>) with modifications by me (s/WOLFGANG/CONFIG_ENCODERS/ and some other fixes)
michaelni
parents: 1064
diff changeset
848 #endif