annotate wmv2.c @ 3454:de0ed6497a13 libavcodec

remove STATS code (probably hasnt been used for years ..., and its not completely clear what it was good for anyway)
author michael
date Sun, 09 Jul 2006 10:33:49 +0000
parents 072dbc669253
children 0082fb8c77b6
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
3036
0b546eab515d Update licensing information: The FSF changed postal address.
diego
parents: 2979
diff changeset
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
936
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 */
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
24
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
25 #include "simple_idct.h"
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
26
936
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
50
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
51 ScanTable abt_scantable[2];
3089
072dbc669253 MSVC-compatible __align8/__align16 declaration
diego
parents: 3036
diff changeset
52 DECLARE_ALIGNED_8(DCTELEM, abt_block2[6][64]);
936
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
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
2637
ef44d24680d1 switch to native time bases
michael
parents: 2632
diff changeset
71 put_bits(&pb, 5, s->avctx->time_base.den / s->avctx->time_base.num); //yes 29.97 -> 29
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
72 put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
73
936
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);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
81
936
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
85
936
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
91
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
92 if(MPV_encode_init(avctx) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
93 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
94
936
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);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
100
936
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
2522
e25782262d7d kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2474
diff changeset
104 #if 0 /* unused, remove? */
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
105 static int wmv2_encode_end(AVCodecContext *avctx){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
106
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
107 if(MPV_encode_end(avctx) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
108 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
109
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
110 avctx->extradata_size= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
111 av_freep(&avctx->extradata);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
112
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
113 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
114 }
2522
e25782262d7d kill warnings patch by (Mns Rullgrd <mru inprovide com>)
michael
parents: 2474
diff changeset
115 #endif
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
116
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
117 int ff_wmv2_encode_picture_header(MpegEncContext * s, int picture_number)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
118 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
119 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
120
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
121 put_bits(&s->pb, 1, s->pict_type - 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
122 if(s->pict_type == I_TYPE){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
123 put_bits(&s->pb, 7, 0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
124 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
125 put_bits(&s->pb, 5, s->qscale);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
126
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
127 s->dc_table_index = 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
128 s->mv_table_index = 1; /* only if P frame */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
129 // s->use_skip_mb_code = 1; /* only if P frame */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
130 s->per_mb_rl_table = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
131 s->mspel= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
132 w->per_mb_abt=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
133 w->abt_type=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
134 w->j_type=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
135
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
136 assert(s->flipflop_rounding);
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
137
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
138 if (s->pict_type == I_TYPE) {
1163
0951691c4225 fixing msmpeg4v2 encoding
michaelni
parents: 1144
diff changeset
139 assert(s->no_rounding==1);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
140 if(w->j_type_bit) put_bits(&s->pb, 1, w->j_type);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
141
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
142 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
143
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
144 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
145 code012(&s->pb, s->rl_chroma_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
146 code012(&s->pb, s->rl_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
147 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
148
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
149 put_bits(&s->pb, 1, s->dc_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
150
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
151 s->inter_intra_pred= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
152 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
153 int cbp_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
154
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
155 put_bits(&s->pb, 2, SKIP_TYPE_NONE);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
156
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
157 code012(&s->pb, cbp_index=0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
158 if(s->qscale <= 10){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
159 int map[3]= {0,2,1};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
160 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
161 }else if(s->qscale <= 20){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
162 int map[3]= {1,0,2};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
163 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
164 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
165 int map[3]= {2,1,0};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
166 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
167 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
168
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
169 if(w->mspel_bit) put_bits(&s->pb, 1, s->mspel);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
170
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
171 if(w->abt_flag){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
172 put_bits(&s->pb, 1, w->per_mb_abt^1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
173 if(!w->per_mb_abt){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
174 code012(&s->pb, w->abt_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
175 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
176 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
177
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
178 if(w->per_mb_rl_bit) put_bits(&s->pb, 1, s->per_mb_rl_table);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
179
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
180 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
181 code012(&s->pb, s->rl_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
182 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
183 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
184 put_bits(&s->pb, 1, s->dc_table_index);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
185 put_bits(&s->pb, 1, s->mv_table_index);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
186
1943
62beeb1a8676 seems wmv8 doesnt use intra-inter prediction
michael
parents: 1938
diff changeset
187 s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
188 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
189 s->esc3_level_length= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
190 s->esc3_run_length= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
191
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
192 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
193 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
194
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
195 // nearly idential to wmv1 but thats just because we dont use the useless M$ crap features
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
196 // its duplicated here in case someone wants to add support for these carp features
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
197 void ff_wmv2_encode_mb(MpegEncContext * s,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
198 DCTELEM block[6][64],
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
199 int motion_x, int motion_y)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
200 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
201 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
202 int cbp, coded_cbp, i;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
203 int pred_x, pred_y;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
204 uint8_t *coded_block;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
205
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
206 handle_slices(s);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
207
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
208 if (!s->mb_intra) {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
209 /* compute cbp */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
210 cbp = 0;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
211 for (i = 0; i < 6; i++) {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
212 if (s->block_last_index[i] >= 0)
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
213 cbp |= 1 << (5 - i);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
214 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
215
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
216 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
217 wmv2_inter_table[w->cbp_table_index][cbp + 64][1],
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
218 wmv2_inter_table[w->cbp_table_index][cbp + 64][0]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
219
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
220 /* motion vector */
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1668
diff changeset
221 h263_pred_motion(s, 0, 0, &pred_x, &pred_y);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
222 msmpeg4_encode_motion(s, motion_x - pred_x,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
223 motion_y - pred_y);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
224 } else {
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
225 /* compute cbp */
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
226 cbp = 0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
227 coded_cbp = 0;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
228 for (i = 0; i < 6; i++) {
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
229 int val, pred;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
230 val = (s->block_last_index[i] >= 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
231 cbp |= val << (5 - i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
232 if (i < 4) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
233 /* predict value for close blocks only for luma */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
234 pred = coded_block_pred(s, i, &coded_block);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
235 *coded_block = val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
236 val = val ^ pred;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
237 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
238 coded_cbp |= val << (5 - i);
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
239 }
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
240 #if 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
241 if (coded_cbp)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
242 printf("cbp=%x %x\n", cbp, coded_cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
243 #endif
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
244
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
245 if (s->pict_type == I_TYPE) {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
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 {
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
249 put_bits(&s->pb,
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
250 wmv2_inter_table[w->cbp_table_index][cbp][1],
936
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 }
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
253 put_bits(&s->pb, 1, 0); /* no AC prediction yet */
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
254 if(s->inter_intra_pred){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
255 s->h263_aic_dir=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
256 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
257 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
258 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
259
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
260 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
261 msmpeg4_encode_block(s, block[i], i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
262 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
263 }
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
264 #endif //CONFIG_ENCODERS
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
265
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
266 static void parse_mb_skip(Wmv2Context * w){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
267 int mb_x, mb_y;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
268 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
269 uint32_t * const mb_type= s->current_picture_ptr->mb_type;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
270
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
271 w->skip_type= get_bits(&s->gb, 2);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
272 switch(w->skip_type){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
273 case SKIP_TYPE_NONE:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
274 for(mb_y=0; mb_y<s->mb_height; mb_y++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
275 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
276 mb_type[mb_y*s->mb_stride + mb_x]= MB_TYPE_16x16 | MB_TYPE_L0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
277 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
278 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
279 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
280 case SKIP_TYPE_MPEG:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
281 for(mb_y=0; mb_y<s->mb_height; mb_y++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
282 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
283 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
284 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
285 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
286 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
287 case SKIP_TYPE_ROW:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
288 for(mb_y=0; mb_y<s->mb_height; mb_y++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
289 if(get_bits1(&s->gb)){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
290 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
291 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
292 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
293 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
294 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
295 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
296 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
297 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
298 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
299 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
300 case SKIP_TYPE_COL:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
301 for(mb_x=0; mb_x<s->mb_width; mb_x++){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
302 if(get_bits1(&s->gb)){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
303 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
304 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
305 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
306 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
307 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
308 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
309 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
310 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
311 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
312 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
313 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
314 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
315
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
316 static int decode_ext_header(Wmv2Context *w){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
317 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
318 GetBitContext gb;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
319 int fps;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
320 int code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
321
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
322 if(s->avctx->extradata_size<4) return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
323
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
324 init_get_bits(&gb, s->avctx->extradata, s->avctx->extradata_size*8);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
325
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
326 fps = get_bits(&gb, 5);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
327 s->bit_rate = get_bits(&gb, 11)*1024;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
328 w->mspel_bit = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
329 w->flag3 = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
330 w->abt_flag = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
331 w->j_type_bit = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
332 w->top_left_mv_flag= get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
333 w->per_mb_rl_bit = get_bits1(&gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
334 code = get_bits(&gb, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
335
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
336 if(code==0) return -1;
1092
f59c3f66363b MpegEncContext.(i)dct_* -> DspContext.(i)dct_*
michaelni
parents: 1070
diff changeset
337
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
338 s->slice_height = s->mb_height / code;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
339
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
340 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
341 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",
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
342 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,
983
ca2a303ea039 fixed wmv2 slices
michaelni
parents: 936
diff changeset
343 code);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
344 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
345 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
346 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
347
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
348 int ff_wmv2_decode_picture_header(MpegEncContext * s)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
349 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
350 Wmv2Context * const w= (Wmv2Context*)s;
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
351 int code;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
352
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
353 #if 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
354 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
355 int i;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
356 for(i=0; i<s->gb.size*8; i++)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
357 printf("%d", get_bits1(&s->gb));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
358 // get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
359 printf("END\n");
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
360 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
361 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
362 #endif
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
363 if(s->picture_number==0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
364 decode_ext_header(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
365
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
366 s->pict_type = get_bits(&s->gb, 1) + 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
367 if(s->pict_type == I_TYPE){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
368 code = get_bits(&s->gb, 7);
2810
b866af0c02d6 Reduce verbosity.
diego
parents: 2655
diff changeset
369 av_log(s->avctx, AV_LOG_DEBUG, "I7:%X/\n", code);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
370 }
1651
ccf7c96a630f h263 modified quantization fix
michael
parents: 1598
diff changeset
371 s->chroma_qscale= s->qscale = get_bits(&s->gb, 5);
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
372 if(s->qscale < 0)
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
373 return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
374
1183
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
375 return 0;
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
376 }
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
377
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
378 int ff_wmv2_decode_secondary_picture_header(MpegEncContext * s)
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
379 {
03b97d87dcdd 10l (use before malloc)
michaelni
parents: 1177
diff changeset
380 Wmv2Context * const w= (Wmv2Context*)s;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
381
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
382 if (s->pict_type == I_TYPE) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
383 if(w->j_type_bit) w->j_type= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
384 else w->j_type= 0; //FIXME check
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
385
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
386 if(!w->j_type){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
387 if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
388 else s->per_mb_rl_table= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
389
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
390 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
391 s->rl_chroma_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
392 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
393 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
394
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
395 s->dc_table_index = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
396 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
397 s->inter_intra_pred= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
398 s->no_rounding = 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
399 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
400 av_log(s->avctx, AV_LOG_DEBUG, "qscale:%d rlc:%d rl:%d dc:%d mbrl:%d j_type:%d \n",
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
401 s->qscale,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
402 s->rl_chroma_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
403 s->rl_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
404 s->dc_table_index,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
405 s->per_mb_rl_table,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
406 w->j_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
407 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
408 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
409 int cbp_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
410 w->j_type=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
411
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
412 parse_mb_skip(w);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
413 cbp_index= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
414 if(s->qscale <= 10){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
415 int map[3]= {0,2,1};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
416 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
417 }else if(s->qscale <= 20){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
418 int map[3]= {1,0,2};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
419 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
420 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
421 int map[3]= {2,1,0};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
422 w->cbp_table_index= map[cbp_index];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
423 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
424
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
425 if(w->mspel_bit) s->mspel= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
426 else s->mspel= 0; //FIXME check
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
427
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
428 if(w->abt_flag){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
429 w->per_mb_abt= get_bits1(&s->gb)^1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
430 if(!w->per_mb_abt){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
431 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
432 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
433 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
434
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
435 if(w->per_mb_rl_bit) s->per_mb_rl_table= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
436 else s->per_mb_rl_table= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
437
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
438 if(!s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
439 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
440 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
441 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
442
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
443 s->dc_table_index = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
444 s->mv_table_index = get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
445
1943
62beeb1a8676 seems wmv8 doesnt use intra-inter prediction
michael
parents: 1938
diff changeset
446 s->inter_intra_pred= 0;//(s->width*s->height < 320*240 && s->bit_rate<=II_BITRATE);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
447 s->no_rounding ^= 1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
448
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
449 if(s->avctx->debug&FF_DEBUG_PICT_INFO){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
450 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",
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
451 s->rl_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
452 s->rl_chroma_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
453 s->dc_table_index,
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
454 s->mv_table_index,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
455 s->per_mb_rl_table,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
456 s->qscale,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
457 s->mspel,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
458 w->per_mb_abt,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
459 w->abt_type,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
460 w->cbp_table_index,
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
461 s->inter_intra_pred);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
462 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
463 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
464 s->esc3_level_length= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
465 s->esc3_run_length= 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
466
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
467 s->picture_number++; //FIXME ?
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
468
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
469
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
470 // if(w->j_type)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
471 // return wmv2_decode_j_picture(w); //FIXME
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
472
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
473 if(w->j_type){
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2522
diff changeset
474 av_log(s->avctx, AV_LOG_ERROR, "J-type picture is not supported\n");
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
475 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
476 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
477
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
478 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
479 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
480
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
481 static inline int wmv2_decode_motion(Wmv2Context *w, int *mx_ptr, int *my_ptr){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
482 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
483 int ret;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
484
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
485 ret= msmpeg4_decode_motion(s, mx_ptr, my_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
486
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
487 if(ret<0) return -1;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
488
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
489 if((((*mx_ptr)|(*my_ptr)) & 1) && s->mspel)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
490 w->hshift= get_bits1(&s->gb);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
491 else
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
492 w->hshift= 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
493
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
494 //printf("%d %d ", *mx_ptr, *my_ptr);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
495
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
496 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
497 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
498
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
499 static int16_t *wmv2_pred_motion(Wmv2Context *w, int *px, int *py){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
500 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
501 int xy, wrap, diff, type;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
502 int16_t *A, *B, *C, *mot_val;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
503
1938
e2501e6e7ff7 unify table indexing (motion_val,dc_val,ac_val,coded_block changed)
michael
parents: 1668
diff changeset
504 wrap = s->b8_stride;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
505 xy = s->block_index[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
506
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1651
diff changeset
507 mot_val = s->current_picture.motion_val[0][xy];
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
508
1668
30746f429df6 move motion_val & mb_type to AVFrame patch by (Wolfgang Hesseler <qv at multimediaware dot com>)
michael
parents: 1651
diff changeset
509 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
510 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
511 C = s->current_picture.motion_val[0][xy + 2 - wrap];
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
512
2818
cdc7a2341165 segfault fix
michael
parents: 2810
diff changeset
513 if(s->mb_x && !s->first_slice_line && !s->mspel && w->top_left_mv_flag)
cdc7a2341165 segfault fix
michael
parents: 2810
diff changeset
514 diff= FFMAX(ABS(A[0] - B[0]), ABS(A[1] - B[1]));
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
515 else
2818
cdc7a2341165 segfault fix
michael
parents: 2810
diff changeset
516 diff=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
517
2818
cdc7a2341165 segfault fix
michael
parents: 2810
diff changeset
518 if(diff >= 8)
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
519 type= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
520 else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
521 type= 2;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
522
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
523 if(type == 0){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
524 *px= A[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
525 *py= A[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
526 }else if(type == 1){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
527 *px= B[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
528 *py= B[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
529 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
530 /* special case for first (slice) line */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
531 if (s->first_slice_line) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
532 *px = A[0];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
533 *py = A[1];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
534 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
535 *px = mid_pred(A[0], B[0], C[0]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
536 *py = mid_pred(A[1], B[1], C[1]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
537 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
538 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
539
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
540 return mot_val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
541 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
542
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
543 static inline int wmv2_decode_inter_block(Wmv2Context *w, DCTELEM *block, int n, int cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
544 MpegEncContext * const s= &w->s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
545 static const int sub_cbp_table[3]= {2,3,1};
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
546 int sub_cbp;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
547
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
548 if(!cbp){
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
549 s->block_last_index[n] = -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
550
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
551 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
552 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
553
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
554 if(w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
555 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
556 #if 0
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
557 if(w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
558 printf("B%d", w->abt_type);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
559 #endif
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
560 w->abt_type_table[n]= w->abt_type;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
561
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
562 if(w->abt_type){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
563 // const uint8_t *scantable= w->abt_scantable[w->abt_type-1].permutated;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
564 const uint8_t *scantable= w->abt_scantable[w->abt_type-1].scantable;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
565 // 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
566
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
567 sub_cbp= sub_cbp_table[ decode012(&s->gb) ];
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
568 // printf("S%d", sub_cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
569
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
570 if(sub_cbp&1){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
571 if (msmpeg4_decode_block(s, block, n, 1, scantable) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
572 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
573 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
574
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
575 if(sub_cbp&2){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
576 if (msmpeg4_decode_block(s, w->abt_block2[n], n, 1, scantable) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
577 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
578 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
579 s->block_last_index[n] = 63;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
580
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
581 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
582 }else{
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
583 return msmpeg4_decode_block(s, block, n, 1, s->inter_scantable.permutated);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
584 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
585 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
586
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
587 static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
588 MpegEncContext * const s= &w->s;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
589
2655
ab7bd4722cef fix block corruption caused by clear_blocks() optimization
michael
parents: 2637
diff changeset
590 if (s->block_last_index[n] >= 0) {
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
591 switch(w->abt_type_table[n]){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
592 case 0:
2655
ab7bd4722cef fix block corruption caused by clear_blocks() optimization
michael
parents: 2637
diff changeset
593 s->dsp.idct_add (dst, stride, block1);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
594 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
595 case 1:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
596 simple_idct84_add(dst , stride, block1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
597 simple_idct84_add(dst + 4*stride, stride, w->abt_block2[n]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
598 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
599 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
600 case 2:
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
601 simple_idct48_add(dst , stride, block1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
602 simple_idct48_add(dst + 4 , stride, w->abt_block2[n]);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
603 memset(w->abt_block2[n], 0, 64*sizeof(DCTELEM));
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
604 break;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
605 default:
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
606 av_log(s->avctx, AV_LOG_ERROR, "internal error in WMV2 abt\n");
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
607 }
2655
ab7bd4722cef fix block corruption caused by clear_blocks() optimization
michael
parents: 2637
diff changeset
608 }
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
609 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
610
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
611 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
612 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
613
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
614 wmv2_add_block(w, block1[0], dest_y , s->linesize, 0);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
615 wmv2_add_block(w, block1[1], dest_y + 8 , s->linesize, 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
616 wmv2_add_block(w, block1[2], dest_y + 8*s->linesize, s->linesize, 2);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
617 wmv2_add_block(w, block1[3], dest_y + 8 + 8*s->linesize, s->linesize, 3);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
618
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
619 if(s->flags&CODEC_FLAG_GRAY) return;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
620
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
621 wmv2_add_block(w, block1[4], dest_cb , s->uvlinesize, 4);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
622 wmv2_add_block(w, block1[5], dest_cr , s->uvlinesize, 5);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
623 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
624
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
625 void ff_mspel_motion(MpegEncContext *s,
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
626 uint8_t *dest_y, uint8_t *dest_cb, uint8_t *dest_cr,
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
627 uint8_t **ref_picture, op_pixels_func (*pix_op)[4],
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
628 int motion_x, int motion_y, int h)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
629 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
630 Wmv2Context * const w= (Wmv2Context*)s;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
631 uint8_t *ptr;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
632 int dxy, offset, mx, my, src_x, src_y, v_edge_pos, linesize, uvlinesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
633 int emu=0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
634
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
635 dxy = ((motion_y & 1) << 1) | (motion_x & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
636 dxy = 2*dxy + w->hshift;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
637 src_x = s->mb_x * 16 + (motion_x >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
638 src_y = s->mb_y * 16 + (motion_y >> 1);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
639
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
640 /* WARNING: do no forget half pels */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
641 v_edge_pos = s->v_edge_pos;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
642 src_x = clip(src_x, -16, s->width);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
643 src_y = clip(src_y, -16, s->height);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
644 linesize = s->linesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
645 uvlinesize = s->uvlinesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
646 ptr = ref_picture[0] + (src_y * linesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
647
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
648 if(s->flags&CODEC_FLAG_EMU_EDGE){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
649 if(src_x<1 || src_y<1 || src_x + 17 >= s->h_edge_pos
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
650 || src_y + h+1 >= v_edge_pos){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
651 ff_emulated_edge_mc(s->edge_emu_buffer, ptr - 1 - s->linesize, s->linesize, 19, 19,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
652 src_x-1, src_y-1, s->h_edge_pos, s->v_edge_pos);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
653 ptr= s->edge_emu_buffer + 1 + s->linesize;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
654 emu=1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
655 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
656 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
657
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
658 s->dsp.put_mspel_pixels_tab[dxy](dest_y , ptr , linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
659 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8 , ptr+8 , linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
660 s->dsp.put_mspel_pixels_tab[dxy](dest_y +8*linesize, ptr +8*linesize, linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
661 s->dsp.put_mspel_pixels_tab[dxy](dest_y+8+8*linesize, ptr+8+8*linesize, linesize);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
662
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
663 if(s->flags&CODEC_FLAG_GRAY) return;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
664
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
665 if (s->out_format == FMT_H263) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
666 dxy = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
667 if ((motion_x & 3) != 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
668 dxy |= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
669 if ((motion_y & 3) != 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
670 dxy |= 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
671 mx = motion_x >> 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
672 my = motion_y >> 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
673 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
674 mx = motion_x / 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
675 my = motion_y / 2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
676 dxy = ((my & 1) << 1) | (mx & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
677 mx >>= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
678 my >>= 1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
679 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
680
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
681 src_x = s->mb_x * 8 + mx;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
682 src_y = s->mb_y * 8 + my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
683 src_x = clip(src_x, -8, s->width >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
684 if (src_x == (s->width >> 1))
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
685 dxy &= ~1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
686 src_y = clip(src_y, -8, s->height >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
687 if (src_y == (s->height >> 1))
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
688 dxy &= ~2;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
689 offset = (src_y * uvlinesize) + src_x;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
690 ptr = ref_picture[1] + offset;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
691 if(emu){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
692 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
693 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
694 ptr= s->edge_emu_buffer;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
695 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
696 pix_op[1][dxy](dest_cb, ptr, uvlinesize, h >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
697
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
698 ptr = ref_picture[2] + offset;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
699 if(emu){
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
700 ff_emulated_edge_mc(s->edge_emu_buffer, ptr, s->uvlinesize, 9, 9,
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
701 src_x, src_y, s->h_edge_pos>>1, s->v_edge_pos>>1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
702 ptr= s->edge_emu_buffer;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
703 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
704 pix_op[1][dxy](dest_cr, ptr, uvlinesize, h >> 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
705 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
706
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
707
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
708 static int wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64])
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
709 {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
710 Wmv2Context * const w= (Wmv2Context*)s;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
711 int cbp, code, i;
1064
b32afefe7d33 * UINTX -> uintx_t INTX -> intx_t
kabi
parents: 1057
diff changeset
712 uint8_t *coded_val;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
713
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
714 if(w->j_type) return 0;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
715
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
716 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
717 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
718 /* skip mb */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
719 s->mb_intra = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
720 for(i=0;i<6;i++)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
721 s->block_last_index[i] = -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
722 s->mv_dir = MV_DIR_FORWARD;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
723 s->mv_type = MV_TYPE_16X16;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
724 s->mv[0][0][0] = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
725 s->mv[0][0][1] = 0;
2628
511e3afc43e1 Ministry of English Composition, reporting for duty (and the word is "skipped", not "skiped"; "skiped" would rhyme with "hyped")
melanson
parents: 2522
diff changeset
726 s->mb_skipped = 1;
1185
michaelni
parents: 1183
diff changeset
727 w->hshift=0;
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
728 return 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
729 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
730
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
731 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
732 if (code < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
733 return -1;
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
734 s->mb_intra = (~code & 0x40) >> 6;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
735
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
736 cbp = code & 0x3f;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
737 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
738 s->mb_intra = 1;
2474
81a9f883a17a In that patch:
michael
parents: 2031
diff changeset
739 code = get_vlc2(&s->gb, ff_msmp4_mb_i_vlc.table, MB_INTRA_VLC_BITS, 2);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
740 if (code < 0){
1598
932d306bf1dc av_log() patch by (Michel Bardiaux <mbardiaux at peaktime dot be>)
michael
parents: 1524
diff changeset
741 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
742 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
743 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
744 /* predict coded block pattern */
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
745 cbp = 0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
746 for(i=0;i<6;i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
747 int val = ((code >> (5 - i)) & 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
748 if (i < 4) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
749 int pred = coded_block_pred(s, i, &coded_val);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
750 val = val ^ pred;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
751 *coded_val = val;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
752 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
753 cbp |= val << (5 - i);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
754 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
755 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
756
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
757 if (!s->mb_intra) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
758 int mx, my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
759 //printf("P at %d %d\n", s->mb_x, s->mb_y);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
760 wmv2_pred_motion(w, &mx, &my);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
761
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
762 if(cbp){
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
763 s->dsp.clear_blocks(s->block[0]);
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
764 if(s->per_mb_rl_table){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
765 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
766 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
767 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
768
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
769 if(w->abt_flag && w->per_mb_abt){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
770 w->per_block_abt= get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
771 if(!w->per_block_abt)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
772 w->abt_type= decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
773 }else
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
774 w->per_block_abt=0;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
775 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
776
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
777 if (wmv2_decode_motion(w, &mx, &my) < 0)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
778 return -1;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
779
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
780 s->mv_dir = MV_DIR_FORWARD;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
781 s->mv_type = MV_TYPE_16X16;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
782 s->mv[0][0][0] = mx;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
783 s->mv[0][0][1] = my;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
784
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
785 for (i = 0; i < 6; i++) {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
786 if (wmv2_decode_inter_block(w, block[i], i, (cbp >> (5 - i)) & 1) < 0)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
787 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
788 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding inter block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
789 return -1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
790 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
791 }
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
792 } else {
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
793 //if(s->pict_type==P_TYPE)
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
794 // printf("%d%d ", s->inter_intra_pred, cbp);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
795 //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
796 s->ac_pred = get_bits1(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
797 if(s->inter_intra_pred){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
798 s->h263_aic_dir= get_vlc2(&s->gb, inter_intra_vlc.table, INTER_INTRA_VLC_BITS, 1);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
799 // 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
800 }
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
801 if(s->per_mb_rl_table && cbp){
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
802 s->rl_table_index = decode012(&s->gb);
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
803 s->rl_chroma_table_index = s->rl_table_index;
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
804 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
805
2632
67171616ead6 avoid unneeded clear_blocks()
michael
parents: 2628
diff changeset
806 s->dsp.clear_blocks(s->block[0]);
936
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)
2979
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
809 {
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
810 av_log(s->avctx, AV_LOG_ERROR, "\nerror while decoding intra block: %d x %d (%d)\n", s->mb_x, s->mb_y, i);
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
811 return -1;
bfabfdf9ce55 COSMETICS: tabs --> spaces, some prettyprinting
diego
parents: 2967
diff changeset
812 }
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
813 }
936
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
821
936
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;
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
824
936
caa77cd960c0 qpel encoding
michaelni
parents:
diff changeset
825 wmv2_common_init(w);
2967
ef2149182f1c COSMETICS: Remove all trailing whitespace.
diego
parents: 2818
diff changeset
826
936
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