annotate wmv2.c @ 1273:a979fab41ed8 libavcodec

ASV1 codec with postprocessing support :)
author michaelni
date Mon, 19 May 2003 13:30:59 +0000
parents 9da267732f68
children 26c44d2433c1
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
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
62 static int encode_ext_header(Wmv2Context *w){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
63 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
64 PutBitContext pb;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
65 int code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
66
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
67 init_put_bits(&pb, s->avctx->extradata, s->avctx->extradata_size, NULL, NULL);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
68
1126
77ccf7fe3bd0 per context frame_rate_base, this should finally fix frame_rate related av sync issues
michaelni
parents: 1106
diff changeset
69 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
70 put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
71
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
72 put_bits(&pb, 1, w->mspel_bit=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
73 put_bits(&pb, 1, w->flag3=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
74 put_bits(&pb, 1, w->abt_flag=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
75 put_bits(&pb, 1, w->j_type_bit=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
76 put_bits(&pb, 1, w->top_left_mv_flag=0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
77 put_bits(&pb, 1, w->per_mb_rl_bit=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
78 put_bits(&pb, 3, code=1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
79
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
80 flush_put_bits(&pb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
81
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
82 s->slice_height = s->mb_height / code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
83
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
84 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
85 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
86
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
87 #ifdef CONFIG_ENCODERS
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
88 static int wmv2_encode_init(AVCodecContext *avctx){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
89 Wmv2Context * const w= avctx->priv_data;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
90
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
91 if(MPV_encode_init(avctx) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
92 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
93
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
94 wmv2_common_init(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
95
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
96 avctx->extradata_size= 4;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
97 avctx->extradata= av_mallocz(avctx->extradata_size + 10);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
98 encode_ext_header(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
99
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
100 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
101 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
102
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
103 static int wmv2_encode_end(AVCodecContext *avctx){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
104 Wmv2Context * const w= avctx->priv_data;
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
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
185 s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
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 */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
220 h263_pred_motion(s, 0, &pred_x, &pred_y);
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,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
247 table_mb_intra[coded_cbp][1], table_mb_intra[coded_cbp][0]);
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){
983
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 936
diff changeset
342 printf("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",
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);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
370 printf("I7:%X/\n", code);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
371 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
372 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){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
401 printf("qscale:%d rlc:%d rl:%d dc:%d mbrl:%d j_type:%d \n",
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
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
447 s->inter_intra_pred= (s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
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){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
451 printf("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",
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){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
475 printf("J-type picture isnt supported\n");
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
1057
bb5de8a59da8 * static,const,compiler warning cleanup
kabi
parents: 1043
diff changeset
482 static void ff_wmv2_decode_init(MpegEncContext *s){
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
483 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
484
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
485 static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
486 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
487 int ret;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
488
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
489 ret= msmpeg4_decode_motion(s, mx_ptr, my_ptr);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
490
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
491 if(ret<0) return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
492
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
493 if((((*mx_ptr)|(*my_ptr)) & 1) && s->mspel)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
494 w->hshift= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
495 else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
496 w->hshift= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
497
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
498 //printf("%d %d ", *mx_ptr, *my_ptr);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
499
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
500 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
501 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
502
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
503 static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
504 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
505 int xy, wrap, diff, type;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
506 int16_t *A, *B, *C, *mot_val;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
507
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
508 wrap = s->block_wrap[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
509 xy = s->block_index[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
510
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
511 mot_val = s->motion_val[xy];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
512
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
513 A = s->motion_val[xy - 1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
514 B = s->motion_val[xy - wrap];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
515 C = s->motion_val[xy + 2 - wrap];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
516
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
517 diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1]));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
518
1043
michaelni
parents: 1025
diff changeset
519 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
520 type= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
521 else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
522 type= 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
523
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
524 if(type == 0){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
525 *px= A[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
526 *py= A[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
527 }else if(type == 1){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
528 *px= B[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
529 *py= B[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
530 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
531 /* special case for first (slice) line */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
532 if (s->first_slice_line) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
533 *px = A[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
534 *py = A[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
535 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
536 *px = mid_pred(A[0], B[0], C[0]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
537 *py = mid_pred(A[1], B[1], C[1]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
538 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
539 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
540
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
541 return mot_val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
542 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
543
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
544 static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, int cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
545 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
546 static const int sub_cbp_table[3]= {2,3,1};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
547 int sub_cbp;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
548
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
549 if(!cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
550 s->block_last_index[n] = -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
551
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
552 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
553 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
554
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
555 if(w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
556 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
557 #if 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
558 if(w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
559 printf("B%d", w->abt_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
560 #endif
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
561 w->abt_type_table[n]= w->abt_type;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
562
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
563 if(w->abt_type){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
564 // const uint8_t *scantable= w->abt_scantable[w->abt_type-1].permutated;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
565 const uint8_t *scantable= w->abt_scantable[w->abt_type-1].scantable;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
566 // 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
567
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
568 sub_cbp= sub_cbp_table[ decode012(&s->gb) ];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
569 // printf("S%d", sub_cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
570
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
571 if(sub_cbp&1){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
572 if (msmpeg4_decode_block(s, block, n, 1, scantable) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
573 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
574 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
575
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
576 if(sub_cbp&2){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
577 if (msmpeg4_decode_block(s, w->abt_block2[n], n, 1, scantable) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
578 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
579 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
580 s->block_last_index[n] = 63;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
581
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
582 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
583 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
584 return msmpeg4_decode_block(s, block, n, 1, s->inter_scantable.permutated);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
585 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
586 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
587
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
588 static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
589 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
590 uint8_t temp[2][64];
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
591
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
592 switch(w->abt_type_table[n]){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
593 case 0:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
594 if (s->block_last_index[n] >= 0) {
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1070
diff changeset
595 s->dsp.idct_add (dst, stride, block1);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
596 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
597 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
598 case 1:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
599 simple_idct84_add(dst , stride, block1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
600 simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
601 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
602 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
603 case 2:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
604 simple_idct48_add(dst , stride, block1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
605 simple_idct48_add(dst + 4 , stride, w->abt_block2[n]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
606 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
607 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
608 default:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
609 fprintf(stderr, "internal error in WMV2 abt\n");
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
610 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
611 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
612
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
613 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
614 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
615
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
616 wmv2_add_block(w, block1[0], dest_y , s->linesize, 0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
617 wmv2_add_block(w, block1[1], dest_y + 8 , s->linesize, 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
618 wmv2_add_block(w, block1[2], dest_y + 8*s->linesize, s->linesize, 2);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
619 wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
620
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
621 if(s->flags&CODEC_FLAG_GRAY) return;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
622
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
623 wmv2_add_block(w, block1[4], dest_cb , s->uvlinesize, 4);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
624 wmv2_add_block(w, block1[5], dest_cr , s->uvlinesize, 5);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
625 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
626
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
627 void ff_mspel_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
628 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
629 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
630 int motion_x, int motion_y, int h)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
631 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
632 Wmv2Context * const w= (Wmv2Context*)s;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
633 uint8_t *ptr;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
634 int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
635 int emu=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
636
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
637 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
638 dxy = 2*dxy + w->hshift;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
639 src_x = s->mb_x * 16 + (motion_x >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
640 src_y = s->mb_y * 16 + (motion_y >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
641
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
642 /* WARNING: do no forget half pels */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
643 v_edge_pos = s->v_edge_pos;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
644 src_x = clip(src_x, -16, s->width);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
645 src_y = clip(src_y, -16, s->height);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
646 linesize = s->linesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
647 uvlinesize = s->uvlinesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
648 ptr = ref_picture[0] + (src_y * linesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
649
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
650 if(s->flags&CODEC_FLAG_EMU_EDGE){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
651 if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
652 || src_y + h+1 >= v_edge_pos){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
653 ff_emulated_edge_mc(s, ptr - 1 - s->linesize, s->linesize, 19, 19,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
654 src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
655 ptr= s->edge_emu_buffer + 1 + s->linesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
656 emu=1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
657 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
658 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
659
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
660 s->dsp.put_mspel_pixels_tab[dxy](dest_y , ptr , linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
661 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8 , ptr+8 , linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
662 s->dsp.put_mspel_pixels_tab[dxy](dest_y +8*linesize, ptr +8*linesize, linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
663 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8+8*linesize, ptr+8+8*linesize, linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
664
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
665 if(s->flags&CODEC_FLAG_GRAY) return;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
666
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
667 if (s->out_format == FMT_H263) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
668 dxy = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
669 if ((motion_x & 3) != 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
670 dxy |= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
671 if ((motion_y & 3) != 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
672 dxy |= 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
673 mx = motion_x >> 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
674 my = motion_y >> 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
675 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
676 mx = motion_x / 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
677 my = motion_y / 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
678 dxy = ((my & 1) << 1) | (mx & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
679 mx >>= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
680 my >>= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
681 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
682
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
683 src_x = s->mb_x * 8 + mx;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
684 src_y = s->mb_y * 8 + my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
685 src_x = clip(src_x, -8, s->width >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
686 if (src_x == (s->width >> 1))
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
687 dxy &= ~1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
688 src_y = clip(src_y, -8, s->height >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
689 if (src_y == (s->height >> 1))
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
690 dxy &= ~2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
691 offset = (src_y * uvlinesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
692 ptr = ref_picture[1] + offset;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
693 if(emu){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
694 ff_emulated_edge_mc(s, ptr, s->uvlinesize, 9, 9,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
695 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
696 ptr= s->edge_emu_buffer;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
697 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
698 pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
699
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
700 ptr = ref_picture[2] + offset;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
701 if(emu){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
702 ff_emulated_edge_mc(s, ptr, s->uvlinesize, 9, 9,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
703 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
704 ptr= s->edge_emu_buffer;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
705 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
706 pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
707 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
708
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
709
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
710 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
711 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
712 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
713 int cbp, code, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
714 uint8_t *coded_val;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
715
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
716 if(w->j_type) return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
717
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
718 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
719 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
720 /* skip mb */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
721 s->mb_intra = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
722 for(i=0;i<6;i++)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
723 s->block_last_index[i] = -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
724 s->mv_dir = MV_DIR_FORWARD;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
725 s->mv_type = MV_TYPE_16X16;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
726 s->mv[0][0][0] = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
727 s->mv[0][0][1] = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
728 s->mb_skiped = 1;
1185
michaelni
parents: 1183
diff changeset
729 w->hshift=0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
730 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
731 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
732
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
733 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
734 if (code < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
735 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
736 s->mb_intra = (~code & 0x40) >> 6;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
737
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
738 cbp = code & 0x3f;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
739 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
740 s->mb_intra = 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
741 code = get_vlc2(&s->gb, mb_intra_vlc.table, MB_INTRA_VLC_BITS, 2);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
742 if (code < 0){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
743 fprintf(stderr, "II-cbp illegal at %d %d\n", s->mb_x, s->mb_y);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
744 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
745 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
746 /* predict coded block pattern */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
747 cbp = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
748 for(i=0;i<6;i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
749 int val = ((code >> (5 - i)) & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
750 if (i < 4) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
751 int pred = coded_block_pred(s, i, &coded_val);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
752 val = val ^ pred;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
753 *coded_val = val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
754 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
755 cbp |= val << (5 - i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
756 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
757 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
758
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
759 if (!s->mb_intra) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
760 int mx, my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
761 //printf("P at %d %d\n", s->mb_x, s->mb_y);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
762 wmv2_pred_motion(w, &mx, &my);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
763
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
764 if(cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
765 if(s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
766 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
767 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
768 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
769
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
770 if(w->abt_flag && w->per_mb_abt){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
771 w->per_block_abt= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
772 if(!w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
773 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
774 }else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
775 w->per_block_abt=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
776 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
777
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
778 if (wmv2_decode_motion(w, &mx, &my) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
779 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
780
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
781 s->mv_dir = MV_DIR_FORWARD;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
782 s->mv_type = MV_TYPE_16X16;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
783 s->mv[0][0][0] = mx;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
784 s->mv[0][0][1] = my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
785
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
786 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
787 if (wmv2_decode_inter_block(w, block[i], i, (cbp >> (5 - i)) & 1) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
788 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
789 fprintf(stderr,"\nerror while decoding inter block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
790 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
791 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
792 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
793 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
794 //if(s->pict_type==P_TYPE)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
795 // printf("%d%d ", s->inter_intra_pred, cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
796 //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
797 s->ac_pred = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
798 if(s->inter_intra_pred){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
799 s->h263_aic_dir= get_vlc2(&s->gb, inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
800 // 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
801 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
802 if(s->per_mb_rl_table && cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
803 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
804 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
805 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
806
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
807 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
808 if (msmpeg4_decode_block(s, block[i], i, (cbp >> (5 - i)) & 1, NULL) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
809 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
810 fprintf(stderr,"\nerror while decoding intra block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
811 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
812 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
813 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
814 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
815
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
816 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
817 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
818
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
819 static int wmv2_decode_init(AVCodecContext *avctx){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
820 Wmv2Context * const w= avctx->priv_data;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
821
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
822 if(ff_h263_decode_init(avctx) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
823 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
824
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
825 wmv2_common_init(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
826
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
827 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
828 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
829
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
830 AVCodec wmv2_decoder = {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
831 "wmv2",
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
832 CODEC_TYPE_VIDEO,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
833 CODEC_ID_WMV2,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
834 sizeof(Wmv2Context),
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
835 wmv2_decode_init,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
836 NULL,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
837 ff_h263_decode_end,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
838 ff_h263_decode_frame,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
839 CODEC_CAP_DRAW_HORIZ_BAND | CODEC_CAP_DR1,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
840 };
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
841
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
842 #ifdef CONFIG_ENCODERS
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
843 AVCodec wmv2_encoder = {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
844 "wmv2",
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
845 CODEC_TYPE_VIDEO,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
846 CODEC_ID_WMV2,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
847 sizeof(Wmv2Context),
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
848 wmv2_encode_init,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
849 MPV_encode_picture,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
850 MPV_encode_end,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
851 };
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
852 #endif