annotate h263dec.c @ 274:d0c186bcf075 libavcodec

use the width & height from the mpeg4 header ... in the case that its complete
author michaelni
date Tue, 19 Mar 2002 03:51:36 +0000
parents 34f40a0fc840
children 1fc96b02142e
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;
986e461dc072 Initial revision
glantau
parents:
diff changeset
50 case CODEC_ID_MSMPEG4:
986e461dc072 Initial revision
glantau
parents:
diff changeset
51 s->h263_msmpeg4 = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
52 s->h263_pred = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
53 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
54 case CODEC_ID_H263I:
986e461dc072 Initial revision
glantau
parents:
diff changeset
55 s->h263_intel = 1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
56 break;
986e461dc072 Initial revision
glantau
parents:
diff changeset
57 default:
986e461dc072 Initial revision
glantau
parents:
diff changeset
58 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
59 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
60
986e461dc072 Initial revision
glantau
parents:
diff changeset
61 /* 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
62 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
63 if (MPV_common_init(s) < 0)
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
64 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
65
60
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
66 /* XXX: suppress this matrix init, only needed because using mpeg1
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
67 dequantize in mmx case */
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
68 for(i=0;i<64;i++)
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
69 s->non_intra_matrix[i] = default_non_intra_matrix[i];
35c1141e23d9 moved matrix init away from MPV_common_init()
glantau
parents: 56
diff changeset
70
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
71 if (s->h263_msmpeg4)
986e461dc072 Initial revision
glantau
parents:
diff changeset
72 msmpeg4_decode_init_vlc(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
73 else
986e461dc072 Initial revision
glantau
parents:
diff changeset
74 h263_decode_init_vlc(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
75
986e461dc072 Initial revision
glantau
parents:
diff changeset
76 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
77 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
78
986e461dc072 Initial revision
glantau
parents:
diff changeset
79 static int h263_decode_end(AVCodecContext *avctx)
986e461dc072 Initial revision
glantau
parents:
diff changeset
80 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
81 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
82
986e461dc072 Initial revision
glantau
parents:
diff changeset
83 MPV_common_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
84 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
85 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
86
986e461dc072 Initial revision
glantau
parents:
diff changeset
87 static int h263_decode_frame(AVCodecContext *avctx,
986e461dc072 Initial revision
glantau
parents:
diff changeset
88 void *data, int *data_size,
986e461dc072 Initial revision
glantau
parents:
diff changeset
89 UINT8 *buf, int buf_size)
986e461dc072 Initial revision
glantau
parents:
diff changeset
90 {
986e461dc072 Initial revision
glantau
parents:
diff changeset
91 MpegEncContext *s = avctx->priv_data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
92 int ret;
986e461dc072 Initial revision
glantau
parents:
diff changeset
93 AVPicture *pict = data;
986e461dc072 Initial revision
glantau
parents:
diff changeset
94
986e461dc072 Initial revision
glantau
parents:
diff changeset
95 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
96 printf("*****frame %d size=%d\n", avctx->frame_number, buf_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
97 printf("bytes=%x %x %x %x\n", buf[0], buf[1], buf[2], buf[3]);
986e461dc072 Initial revision
glantau
parents:
diff changeset
98 #endif
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
99
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
100 /* no supplementary picture */
986e461dc072 Initial revision
glantau
parents:
diff changeset
101 if (buf_size == 0) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
102 *data_size = 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
103 return 0;
986e461dc072 Initial revision
glantau
parents:
diff changeset
104 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
105
986e461dc072 Initial revision
glantau
parents:
diff changeset
106 init_get_bits(&s->gb, buf, buf_size);
986e461dc072 Initial revision
glantau
parents:
diff changeset
107
986e461dc072 Initial revision
glantau
parents:
diff changeset
108 /* let's go :-) */
986e461dc072 Initial revision
glantau
parents:
diff changeset
109 if (s->h263_msmpeg4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
110 ret = msmpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
111 } else if (s->h263_pred) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
112 ret = mpeg4_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
113 } else if (s->h263_intel) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
114 ret = intel_h263_decode_picture_header(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
115 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
116 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
117 }
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
118
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
119 /* After H263 & mpeg4 header decode we have the height, width,*/
160
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
120 /* and other parameters. So then we could init the picture */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
121 /* FIXME: By the way H263 decoder is evolving it should have */
1bf8c111691d - Bug fixed on H.263 decoder initialization.
pulento
parents: 154
diff changeset
122 /* an H263EncContext */
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
123 if (!s->context_initialized) {
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
124 avctx->width = s->width;
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
125 avctx->height = s->height;
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
126 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
127 return -1;
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
128 } 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
129 /* 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
130 MPV_common_end(s);
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
131 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
132 return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
133 }
274
d0c186bcf075 use the width & height from the mpeg4 header ... in the case that its complete
michaelni
parents: 273
diff changeset
134
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
135 if (ret < 0)
986e461dc072 Initial revision
glantau
parents:
diff changeset
136 return -1;
986e461dc072 Initial revision
glantau
parents:
diff changeset
137
986e461dc072 Initial revision
glantau
parents:
diff changeset
138 MPV_frame_start(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
139
986e461dc072 Initial revision
glantau
parents:
diff changeset
140 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
141 printf("qscale=%d\n", s->qscale);
986e461dc072 Initial revision
glantau
parents:
diff changeset
142 #endif
986e461dc072 Initial revision
glantau
parents:
diff changeset
143
986e461dc072 Initial revision
glantau
parents:
diff changeset
144 /* decode each macroblock */
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
145 s->block_wrap[0]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
146 s->block_wrap[1]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
147 s->block_wrap[2]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
148 s->block_wrap[3]= s->mb_width*2 + 2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
149 s->block_wrap[4]=
252444e5259b optimization
michaelni
parents: 262
diff changeset
150 s->block_wrap[5]= s->mb_width + 2;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
151 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
152 /* Check for GOB headers on H.263 */
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
153 /* FIXME: In the future H.263+ will have intra prediction */
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
154 /* and we are gonna need another way to detect MPEG4 */
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
155 if (s->mb_y && !s->h263_pred) {
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
156 s->first_gob_line = h263_decode_gob_header(s);
de80712db90b - Preliminary RTP friendly mode for H.263.
pulento
parents: 161
diff changeset
157 }
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
158 s->block_index[0]= s->block_wrap[0]*(s->mb_y*2 + 1) - 1;
252444e5259b optimization
michaelni
parents: 262
diff changeset
159 s->block_index[1]= s->block_wrap[0]*(s->mb_y*2 + 1);
252444e5259b optimization
michaelni
parents: 262
diff changeset
160 s->block_index[2]= s->block_wrap[0]*(s->mb_y*2 + 2) - 1;
252444e5259b optimization
michaelni
parents: 262
diff changeset
161 s->block_index[3]= s->block_wrap[0]*(s->mb_y*2 + 2);
252444e5259b optimization
michaelni
parents: 262
diff changeset
162 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
163 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
164 for(s->mb_x=0; s->mb_x < s->mb_width; s->mb_x++) {
266
252444e5259b optimization
michaelni
parents: 262
diff changeset
165 s->block_index[0]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
166 s->block_index[1]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
167 s->block_index[2]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
168 s->block_index[3]+=2;
252444e5259b optimization
michaelni
parents: 262
diff changeset
169 s->block_index[4]++;
252444e5259b optimization
michaelni
parents: 262
diff changeset
170 s->block_index[5]++;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
171 #ifdef DEBUG
986e461dc072 Initial revision
glantau
parents:
diff changeset
172 printf("**mb x=%d y=%d\n", s->mb_x, s->mb_y);
986e461dc072 Initial revision
glantau
parents:
diff changeset
173 #endif
144
cb5dabd00ba2 - Bug fix on inter MCBPC table for inter+q.
pulento
parents: 67
diff changeset
174 //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
175 /* DCT & quantize */
986e461dc072 Initial revision
glantau
parents:
diff changeset
176 if (s->h263_msmpeg4) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
177 msmpeg4_dc_scale(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
178 } else if (s->h263_pred) {
986e461dc072 Initial revision
glantau
parents:
diff changeset
179 h263_dc_scale(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
180 } else {
986e461dc072 Initial revision
glantau
parents:
diff changeset
181 /* default quantization values */
986e461dc072 Initial revision
glantau
parents:
diff changeset
182 s->y_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
183 s->c_dc_scale = 8;
986e461dc072 Initial revision
glantau
parents:
diff changeset
184 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
185
203
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
186 #ifdef HAVE_MMX
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
187 if (mm_flags & MM_MMX) {
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
188 asm volatile(
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
189 "pxor %%mm7, %%mm7 \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
190 "movl $-128*6, %%eax \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
191 "1: \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
192 "movq %%mm7, (%0, %%eax) \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
193 "movq %%mm7, 8(%0, %%eax) \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
194 "movq %%mm7, 16(%0, %%eax) \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
195 "movq %%mm7, 24(%0, %%eax) \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
196 "addl $32, %%eax \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
197 " js 1b \n\t"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
198 : : "r" (((int)s->block)+128*6)
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
199 : "%eax"
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
200 );
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
201 }else{
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
202 memset(s->block, 0, sizeof(s->block));
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
203 }
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
204 #else
12
4d50c7d89e0f use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents: 0
diff changeset
205 memset(s->block, 0, sizeof(s->block));
203
9bfd3abd85eb (commit by michael)
arpi_esp
parents: 162
diff changeset
206 #endif
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
207 s->mv_dir = MV_DIR_FORWARD;
986e461dc072 Initial revision
glantau
parents:
diff changeset
208 s->mv_type = MV_TYPE_16X16;
986e461dc072 Initial revision
glantau
parents:
diff changeset
209 if (s->h263_msmpeg4) {
242
d1a9663b973b * continue after error in msmpeg4_decode_mb - helps for some movie samples
kabi
parents: 231
diff changeset
210 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
211 fprintf(stderr,"\nError at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
212 return -1;
242
d1a9663b973b * continue after error in msmpeg4_decode_mb - helps for some movie samples
kabi
parents: 231
diff changeset
213 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
214 } else {
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 160
diff changeset
215 if (h263_decode_mb(s, s->block) < 0) {
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 160
diff changeset
216 fprintf(stderr,"\nError at MB: %d\n", (s->mb_y * s->mb_width) + s->mb_x);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
217 return -1;
161
7ce36cf13055 - Added support to Inter4V+Q MBs to H.263 decoder.
pulento
parents: 160
diff changeset
218 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
219 }
12
4d50c7d89e0f use block[] in structure to have it aligned on 8 bytes for mmx optimizations
glantau
parents: 0
diff changeset
220 MPV_decode_mb(s, s->block);
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
221 }
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
222 if (avctx->draw_horiz_band) {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
223 UINT8 *src_ptr[3];
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
224 int y, h, offset;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
225 y = s->mb_y * 16;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
226 h = s->height - y;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
227 if (h > 16)
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
228 h = 16;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
229 offset = y * s->linesize;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
230 src_ptr[0] = s->current_picture[0] + offset;
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
231 src_ptr[1] = s->current_picture[1] + (offset >> 2);
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
232 src_ptr[2] = s->current_picture[2] + (offset >> 2);
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
233 avctx->draw_horiz_band(avctx, src_ptr, s->linesize,
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
234 y, s->width, h);
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
235 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
236 }
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 203
diff changeset
237
251
75091bfc577b fixing msmpeg4 decoding if fps < 16 (i thought it was a indicator for the ext header, its the fps indeed)
michaelni
parents: 249
diff changeset
238 if (s->h263_msmpeg4 && s->pict_type==I_TYPE)
208
2eb04d6be309 (commit by michael)
arpi_esp
parents: 203
diff changeset
239 if(msmpeg4_decode_ext_header(s, buf_size) < 0) return -1;
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
240
986e461dc072 Initial revision
glantau
parents:
diff changeset
241 MPV_frame_end(s);
986e461dc072 Initial revision
glantau
parents:
diff changeset
242
273
34f40a0fc840 msmpeg4 bugfix (wrong frame displayed if some frames are skipped)
michaelni
parents: 266
diff changeset
243 if(s->pict_type==B_TYPE || (!s->has_b_frames)){
262
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
244 pict->data[0] = s->current_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
245 pict->data[1] = s->current_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
246 pict->data[2] = s->current_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
247 } else {
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
248 pict->data[0] = s->last_picture[0];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
249 pict->data[1] = s->last_picture[1];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
250 pict->data[2] = s->last_picture[2];
7d941b8c4e84 mpeg4 b-frames :)
michaelni
parents: 251
diff changeset
251 }
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
252 pict->linesize[0] = s->linesize;
986e461dc072 Initial revision
glantau
parents:
diff changeset
253 pict->linesize[1] = s->linesize / 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
254 pict->linesize[2] = s->linesize / 2;
986e461dc072 Initial revision
glantau
parents:
diff changeset
255
986e461dc072 Initial revision
glantau
parents:
diff changeset
256 avctx->quality = s->qscale;
231
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
257
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
258 /* Return the Picture timestamp as the frame number */
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
259 /* 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
260 avctx->frame_number = s->picture_number - 1;
840cd25bf259 - Fixes on RTP and GOB headers for H.263.
pulento
parents: 208
diff changeset
261
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
262 *data_size = sizeof(AVPicture);
986e461dc072 Initial revision
glantau
parents:
diff changeset
263 return buf_size;
986e461dc072 Initial revision
glantau
parents:
diff changeset
264 }
986e461dc072 Initial revision
glantau
parents:
diff changeset
265
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
266 AVCodec mpeg4_decoder = {
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
267 "mpeg4",
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
268 CODEC_TYPE_VIDEO,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
269 CODEC_ID_MPEG4,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
270 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
271 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
272 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
273 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
274 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
275 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
276 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
277
986e461dc072 Initial revision
glantau
parents:
diff changeset
278 AVCodec h263_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
279 "h263",
986e461dc072 Initial revision
glantau
parents:
diff changeset
280 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
281 CODEC_ID_H263,
986e461dc072 Initial revision
glantau
parents:
diff changeset
282 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
283 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
284 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
285 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
286 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
287 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
288 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
289
986e461dc072 Initial revision
glantau
parents:
diff changeset
290 AVCodec msmpeg4_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
291 "msmpeg4",
986e461dc072 Initial revision
glantau
parents:
diff changeset
292 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
293 CODEC_ID_MSMPEG4,
986e461dc072 Initial revision
glantau
parents:
diff changeset
294 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
295 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
296 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
297 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
298 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
299 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
300 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
301
986e461dc072 Initial revision
glantau
parents:
diff changeset
302 AVCodec h263i_decoder = {
986e461dc072 Initial revision
glantau
parents:
diff changeset
303 "h263i",
986e461dc072 Initial revision
glantau
parents:
diff changeset
304 CODEC_TYPE_VIDEO,
986e461dc072 Initial revision
glantau
parents:
diff changeset
305 CODEC_ID_H263I,
986e461dc072 Initial revision
glantau
parents:
diff changeset
306 sizeof(MpegEncContext),
986e461dc072 Initial revision
glantau
parents:
diff changeset
307 h263_decode_init,
986e461dc072 Initial revision
glantau
parents:
diff changeset
308 NULL,
986e461dc072 Initial revision
glantau
parents:
diff changeset
309 h263_decode_end,
986e461dc072 Initial revision
glantau
parents:
diff changeset
310 h263_decode_frame,
67
cdd89f96cbe1 added draw_horiz_band test
glantau
parents: 60
diff changeset
311 CODEC_CAP_DRAW_HORIZ_BAND,
0
986e461dc072 Initial revision
glantau
parents:
diff changeset
312 };
986e461dc072 Initial revision
glantau
parents:
diff changeset
313