annotate h263dec.c @ 333:8aa87f1dfc52 libavcodec

divx 5.01 support
author michaelni
date Mon, 22 Apr 2002 12:45:22 +0000
parents ac677a84d5df
children c56b45669214
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
1 /*
986e461dc072 Initial revision
glantau
parents:
diff changeset
2 * H263 decoder
986e461dc072 Initial revision
glantau
parents:
diff changeset
3 * Copyright (c) 2001 Gerard Lantau.
986e461dc072 Initial revision
glantau
parents:
diff changeset
4 *
986e461dc072 Initial revision
glantau
parents:
diff changeset
5 * This program is free software; you can redistribute it and/or modify
986e461dc072 Initial revision
glantau
parents:
diff changeset
6 * it under the terms of the GNU General Public License as published by
986e461dc072 Initial revision
glantau
parents:
diff changeset
7 * the Free Software Foundation; either version 2 of the License, or
986e461dc072 Initial revision
glantau
parents:
diff changeset
8 * (at your option) any later version.
986e461dc072 Initial revision
glantau
parents:
diff changeset
9 *
986e461dc072 Initial revision
glantau
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful,
986e461dc072 Initial revision
glantau
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
986e461dc072 Initial revision
glantau
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
986e461dc072 Initial revision
glantau
parents:
diff changeset
13 * GNU General Public License for more details.
986e461dc072 Initial revision
glantau
parents:
diff changeset
14 *
986e461dc072 Initial revision
glantau
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License
986e461dc072 Initial revision
glantau
parents:
diff changeset
16 * along with this program; if not, write to the Free Software
986e461dc072 Initial revision
glantau
parents:
diff changeset
17 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
986e461dc072 Initial revision
glantau
parents:
diff changeset
18 */
986e461dc072 Initial revision
glantau
parents:
diff changeset
19 #include <stdlib.h>
986e461dc072 Initial revision
glantau
parents:
diff changeset
20 #include <stdio.h>
986e461dc072 Initial revision
glantau
parents:
diff changeset
21 #include <string.h>
986e461dc072 Initial revision
glantau
parents:
diff changeset
22 #include "dsputil.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
23 #include "avcodec.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
24 #include "mpegvideo.h"
986e461dc072 Initial revision
glantau
parents:
diff changeset
25
986e461dc072 Initial revision
glantau
parents:
diff changeset
26 //#define DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
27
986e461dc072 Initial revision
glantau
parents:
diff changeset
28 static int h263_decode_init(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
29 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
30 MpegEncContext *s = avctx->priv_data;
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
31 int i;
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
32
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
33 s->avctx = avctx;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
34 s->out_format = FMT_H263;
986e461dc072 Initial revision
glantau
parents:
diff changeset
35
986e461dc072 Initial revision
glantau
parents:
diff changeset
36 s->width = avctx->width;
986e461dc072 Initial revision
glantau
parents:
diff changeset
37 s->height = avctx->height;
986e461dc072 Initial revision
glantau
parents:
diff changeset
38
986e461dc072 Initial revision
glantau
parents:
diff changeset
39 /* select sub codec */
986e461dc072 Initial revision
glantau
parents:
diff changeset
40 switch(avctx->codec->id) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
41 case CODEC_ID_H263:
154
f914f710b8d0 - Fixed a bug on H.263 MV prediction for MB on GOBs limits.
pulento
parents: 144
diff changeset
42 s->gob_number = 0;
f914f710b8d0 - Fixed a bug on H.263 MV prediction for MB on GOBs limits.
pulento
parents: 144
diff changeset
43 s->first_gob_line = 0;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
44 break;
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
45 case CODEC_ID_MPEG4:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
46 s->time_increment_bits = 4; /* default value for broken headers */
986e461dc072 Initial revision
glantau
parents:
diff changeset
47 s->h263_pred = 1;
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
48 s->has_b_frames = 1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
49 break;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
50 case CODEC_ID_MSMPEG4V1:
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
52 s->h263_pred = 1;
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
53 s->msmpeg4_version=1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
54 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
55 case CODEC_ID_MSMPEG4V2:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
56 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
57 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
58 s->msmpeg4_version=2;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
59 break;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
60 case CODEC_ID_MSMPEG4V3:
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
61 s->h263_msmpeg4 = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
62 s->h263_pred = 1;
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
63 s->msmpeg4_version=3;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
64 break;
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
65 case CODEC_ID_WMV1:
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
66 s->h263_msmpeg4 = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
67 s->h263_pred = 1;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
68 s->msmpeg4_version=4;
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
69 break;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
70 case CODEC_ID_H263I:
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 s->h263_intel = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
75 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
76
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 /* for h263, we allocate the images after having read the header */
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
78 if (avctx->codec->id != CODEC_ID_H263 && avctx->codec->id != CODEC_ID_MPEG4)
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
79 if (MPV_common_init(s) < 0)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
80 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
81
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
82 /* XXX: suppress this matrix init, only needed because using mpeg1
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
83 dequantize in mmx case */
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
84 for(i=0;i<64;i++)
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
85 s->non_intra_matrix[i] = default_non_intra_matrix[i];
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
86
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 if (s->h263_msmpeg4)
986e461dc072 Initial revision
glantau
parents:
diff changeset
88 msmpeg4_decode_init_vlc(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 h263_decode_init_vlc(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
91
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
94
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 static int h263_decode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
98
986e461dc072 Initial revision
glantau
parents:
diff changeset
99 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
102
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 static int h263_decode_frame(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 void *data, int *data_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
105 UINT8 *buf, int buf_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
107 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 AVPicture *pict = data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
110
986e461dc072 Initial revision
glantau
parents:
diff changeset
111 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
112 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
114 #endif
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
115
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
116 /* no supplementary picture */
986e461dc072 Initial revision
glantau
parents:
diff changeset
117 if (buf_size == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
118 *data_size = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
119 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
120 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
121
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
122 if(s->bitstream_buffer_size) //divx 5.01+ frame reorder
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
123 init_get_bits(&s->gb, s->bitstream_buffer, s->bitstream_buffer_size);
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
124 else
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
125 init_get_bits(&s->gb, buf, buf_size);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
126
986e461dc072 Initial revision
glantau
parents:
diff changeset
127 /* let's go :-) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
128 if (s->h263_msmpeg4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
129 ret = msmpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
130 } else if (s->h263_pred) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
131 ret = mpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
132 } else if (s->h263_intel) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
133 ret = intel_h263_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
134 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
135 ret = h263_decode_picture_header(s);
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
136 }
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
137 if(ret==FRAME_SKIPED) return 0;
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
138
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
139 /* After H263 & mpeg4 header decode we have the height, width,*/
160
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
140 /* and other parameters. So then we could init the picture */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
141 /* FIXME: By the way H263 decoder is evolving it should have */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
142 /* an H263EncContext */
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
143 if (!s->context_initialized) {
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
144 avctx->width = s->width;
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
145 avctx->height = s->height;
281
1fc96b02142e mpeg4 aspect_ratio_info in AVCodecContext (requested by alex)
michaelni
parents: 274
diff changeset
146 avctx->aspect_ratio_info= s->aspect_ratio_info;
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
147 if (MPV_common_init(s) < 0)
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
148 return -1;
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
149 } else if (s->width != avctx->width || s->height != avctx->height) {
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
150 /* H.263 could change picture size any time */
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
151 MPV_common_end(s);
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
152 if (MPV_common_init(s) < 0)
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
153 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
154 }
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
155
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
156 if (ret < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
157 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
158
986e461dc072 Initial revision
glantau
parents:
diff changeset
159 MPV_frame_start(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
160
986e461dc072 Initial revision
glantau
parents:
diff changeset
161 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
162 printf("qscale=%d\n", s->qscale);
986e461dc072 Initial revision
glantau
parents:
diff changeset
163 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
164
986e461dc072 Initial revision
glantau
parents:
diff changeset
165 /* decode each macroblock */
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
166 s->block_wrap[0]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
167 s->block_wrap[1]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
168 s->block_wrap[2]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
169 s->block_wrap[3]= s->mb_width*2 + 2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
170 s->block_wrap[4]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
171 s->block_wrap[5]= s->mb_width + 2;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 for(s->mb_y=0; s->mb_y < s->mb_height; s->mb_y++) {
162
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
173 /* Check for GOB headers on H.263 */
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
174 /* FIXME: In the future H.263+ will have intra prediction */
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
175 /* and we are gonna need another way to detect MPEG4 */
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
176 if (s->mb_y && !s->h263_pred) {
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
177 s->first_gob_line = h263_decode_gob_header(s);
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
178 }
296
c1a8a1b4a24b sizeof(s->block) isnt 64*6*2 anymore bugfix
michaelni
parents: 281
diff changeset
179
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
180 s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1;
252444e5259b optimization
michaelni
parents: 262
diff changeset
181 s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1);
252444e5259b optimization
michaelni
parents: 262
diff changeset
182 s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1;
252444e5259b optimization
michaelni
parents: 262
diff changeset
183 s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2);
252444e5259b optimization
michaelni
parents: 262
diff changeset
184 s->block_index[4]= s->block_wrap[4]*(s->mb_y + 1) + s->block_wrap[0]*(s->mb_height*2 + 2);
252444e5259b optimization
michaelni
parents: 262
diff changeset
185 s->block_index[5]= s->block_wrap[4]*(s->mb_y + 1 + s->mb_height + 2) + s->block_wrap[0]*(s->mb_height*2 + 2);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
186 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) {
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
187 s->block_index[0]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
188 s->block_index[1]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
189 s->block_index[2]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
190 s->block_index[3]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
191 s->block_index[4]++;
252444e5259b optimization
michaelni
parents: 262
diff changeset
192 s->block_index[5]++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
193 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
194 printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y);
986e461dc072 Initial revision
glantau
parents:
diff changeset
195 #endif
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
196 //fprintf(stderr,"\nFrame: %d\tMB: %d",avctx->frame_number, (s->mb_y * s->mb_width) + s->mb_x);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
197 /* DCT & quantize */
986e461dc072 Initial revision
glantau
parents:
diff changeset
198 if (s->h263_msmpeg4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
199 msmpeg4_dc_scale(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
200 } else if (s->h263_pred) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
201 h263_dc_scale(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
202 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
203 /* default quantization values */
986e461dc072 Initial revision
glantau
parents:
diff changeset
204 s->y_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
205 s->c_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
206 }
296
c1a8a1b4a24b sizeof(s->block) isnt 64*6*2 anymore bugfix
michaelni
parents: 281
diff changeset
207 clear_blocks(s->block[0]);
c1a8a1b4a24b sizeof(s->block) isnt 64*6*2 anymore bugfix
michaelni
parents: 281
diff changeset
208
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
210 s->mv_type = MV_TYPE_16X16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
211 if (s->h263_msmpeg4) {
242
d1a9663b973b * continue after error in msmpeg4_decode_mb - helps for some movie samples
kabi
parents: 231
diff changeset
212 if (msmpeg4_decode_mb(s, s->block) < 0) {
d1a9663b973b * continue after error in msmpeg4_decode_mb - helps for some movie samples
kabi
parents: 231
diff changeset
213 fprintf(stderr,"\nError at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 return -1;
242
d1a9663b973b * continue after error in msmpeg4_decode_mb - helps for some movie samples
kabi
parents: 231
diff changeset
215 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
216 } else {
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 160
diff changeset
217 if (h263_decode_mb(s, s->block) < 0) {
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 160
diff changeset
218 fprintf(stderr,"\nError at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 return -1;
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 160
diff changeset
220 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 }
12
4d50c7d89e0f use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents: 0
diff changeset
222 MPV_decode_mb(s, s->block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
223 }
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
224 if (avctx->draw_horiz_band) {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
225 UINT8 *src_ptr[3];
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
226 int y, h, offset;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
227 y = s->mb_y * 16;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
228 h = s->height - y;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
229 if (h > 16)
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
230 h = 16;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
231 offset = y * s->linesize;
308
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
232 if(s->pict_type==B_TYPE || (!s->has_b_frames)){
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
233 src_ptr[0] = s->current_picture[0] + offset;
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
234 src_ptr[1] = s->current_picture[1] + (offset >> 2);
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
235 src_ptr[2] = s->current_picture[2] + (offset >> 2);
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
236 } else {
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
237 src_ptr[0] = s->last_picture[0] + offset;
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
238 src_ptr[1] = s->last_picture[1] + (offset >> 2);
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
239 src_ptr[2] = s->last_picture[2] + (offset >> 2);
072c4ff05e62 b frames & slices bugfix
michaelni
parents: 307
diff changeset
240 }
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
241 avctx->draw_horiz_band(avctx, src_ptr, s->linesize,
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
242 y, s->width, h);
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
243 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
244 }
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 203
diff changeset
245
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
246 if (s->h263_msmpeg4 && s->msmpeg4_version<4 && s->pict_type==I_TYPE)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 203
diff changeset
247 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1;
333
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
248
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
249 /* divx 5.01+ bistream reorder stuff */
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
250 if(s->h263_pred && s->bitstream_buffer_size==0){
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
251 int current_pos= get_bits_count(&s->gb)/8;
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
252 if( buf_size - current_pos > 5
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
253 && buf_size - current_pos < BITSTREAM_BUFFER_SIZE){
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
254 memcpy(s->bitstream_buffer, buf + current_pos, buf_size - current_pos);
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
255 s->bitstream_buffer_size= buf_size - current_pos;
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
256 }
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
257 }else
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
258 s->bitstream_buffer_size=0;
8aa87f1dfc52 divx 5.01 support
michaelni
parents: 311
diff changeset
259
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
260 MPV_frame_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
261
273
34f40a0fc840 msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents: 266
diff changeset
262 if(s->pict_type==B_TYPE || (!s->has_b_frames)){
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
263 pict->data[0] = s->current_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
264 pict->data[1] = s->current_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
265 pict->data[2] = s->current_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
266 } else {
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
267 pict->data[0] = s->last_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
268 pict->data[1] = s->last_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
269 pict->data[2] = s->last_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
270 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
271 pict->linesize[0] = s->linesize;
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 pict->linesize[1] = s->linesize / 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 pict->linesize[2] = s->linesize / 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
274
986e461dc072 Initial revision
glantau
parents:
diff changeset
275 avctx->quality = s->qscale;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
276
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
277 /* Return the Picture timestamp as the frame number */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
278 /* we substract 1 because it is added on utils.c */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
279 avctx->frame_number = s->picture_number - 1;
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
280
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 *data_size = sizeof(AVPicture);
986e461dc072 Initial revision
glantau
parents:
diff changeset
282 return buf_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
284
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
285 AVCodec mpeg4_decoder = {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
286 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
287 CODEC_TYPE_VIDEO,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
288 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
289 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
290 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
291 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
292 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
293 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
294 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
295 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
296
986e461dc072 Initial revision
glantau
parents:
diff changeset
297 AVCodec h263_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
298 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
299 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
300 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
301 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
302 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
303 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
304 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
306 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
308
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
309 AVCodec msmpeg4v1_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
310 "msmpeg4v1",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
311 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
312 CODEC_ID_MSMPEG4V1,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
313 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
314 h263_decode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
315 NULL,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
316 h263_decode_end,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
317 h263_decode_frame,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
318 CODEC_CAP_DRAW_HORIZ_BAND,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
319 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
320
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
321 AVCodec msmpeg4v2_decoder = {
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
322 "msmpeg4v2",
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
323 CODEC_TYPE_VIDEO,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
324 CODEC_ID_MSMPEG4V2,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
325 sizeof(MpegEncContext),
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
326 h263_decode_init,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
327 NULL,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
328 h263_decode_end,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
329 h263_decode_frame,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
330 CODEC_CAP_DRAW_HORIZ_BAND,
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
331 };
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
332
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
333 AVCodec msmpeg4v3_decoder = {
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
334 "msmpeg4",
986e461dc072 Initial revision
glantau
parents:
diff changeset
335 CODEC_TYPE_VIDEO,
307
764aeec1320e msmpeg4v2 decoding (no encoding yet)
michaelni
parents: 296
diff changeset
336 CODEC_ID_MSMPEG4V3,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
337 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
338 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
339 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
340 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
341 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
342 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
343 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
344
311
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
345 AVCodec wmv1_decoder = {
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
346 "wmv1",
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
347 CODEC_TYPE_VIDEO,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
348 CODEC_ID_WMV1,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
349 sizeof(MpegEncContext),
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
350 h263_decode_init,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
351 NULL,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
352 h263_decode_end,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
353 h263_decode_frame,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
354 CODEC_CAP_DRAW_HORIZ_BAND,
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
355 };
ac677a84d5df wmv1 header parser (unfinished)
michaelni
parents: 308
diff changeset
356
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
357 AVCodec h263i_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
358 "h263i",
986e461dc072 Initial revision
glantau
parents:
diff changeset
359 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
360 CODEC_ID_H263I,
986e461dc072 Initial revision
glantau
parents:
diff changeset
361 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
362 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
363 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
364 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
365 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
366 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
367 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
368