Mercurial > libavcodec.hg
comparison mpegvideo.c @ 60:35c1141e23d9 libavcodec
moved matrix init away from MPV_common_init()
| author | glantau |
|---|---|
| date | Sun, 12 Aug 2001 00:52:37 +0000 |
| parents | 4efb718f4dc6 |
| children | 5aa6292a1660 |
comparison
equal
deleted
inserted
replaced
| 59:efd3c19f6d62 | 60:35c1141e23d9 |
|---|---|
| 181 goto fail; | 181 goto fail; |
| 182 } | 182 } |
| 183 /* default structure is frame */ | 183 /* default structure is frame */ |
| 184 s->picture_structure = PICT_FRAME; | 184 s->picture_structure = PICT_FRAME; |
| 185 | 185 |
| 186 /* init default q matrix (only for mpeg and mjpeg) */ | |
| 187 for(i=0;i<64;i++) { | |
| 188 s->intra_matrix[i] = default_intra_matrix[i]; | |
| 189 s->chroma_intra_matrix[i] = default_intra_matrix[i]; | |
| 190 s->non_intra_matrix[i] = default_non_intra_matrix[i]; | |
| 191 s->chroma_non_intra_matrix[i] = default_non_intra_matrix[i]; | |
| 192 } | |
| 193 /* init macroblock skip table */ | 186 /* init macroblock skip table */ |
| 194 if (!s->encoding) { | 187 if (!s->encoding) { |
| 195 s->mbskip_table = av_mallocz(s->mb_width * s->mb_height); | 188 s->mbskip_table = av_mallocz(s->mb_width * s->mb_height); |
| 196 if (!s->mbskip_table) | 189 if (!s->mbskip_table) |
| 197 goto fail; | 190 goto fail; |
| 246 | 239 |
| 247 /* init video encoder */ | 240 /* init video encoder */ |
| 248 int MPV_encode_init(AVCodecContext *avctx) | 241 int MPV_encode_init(AVCodecContext *avctx) |
| 249 { | 242 { |
| 250 MpegEncContext *s = avctx->priv_data; | 243 MpegEncContext *s = avctx->priv_data; |
| 244 int i; | |
| 251 | 245 |
| 252 s->bit_rate = avctx->bit_rate; | 246 s->bit_rate = avctx->bit_rate; |
| 253 s->frame_rate = avctx->frame_rate; | 247 s->frame_rate = avctx->frame_rate; |
| 254 s->width = avctx->width; | 248 s->width = avctx->width; |
| 255 s->height = avctx->height; | 249 s->height = avctx->height; |
| 310 | 304 |
| 311 /* init */ | 305 /* init */ |
| 312 if (MPV_common_init(s) < 0) | 306 if (MPV_common_init(s) < 0) |
| 313 return -1; | 307 return -1; |
| 314 | 308 |
| 309 /* init default q matrix */ | |
| 310 for(i=0;i<64;i++) { | |
| 311 s->intra_matrix[i] = default_intra_matrix[i]; | |
| 312 s->non_intra_matrix[i] = default_non_intra_matrix[i]; | |
| 313 } | |
| 314 | |
| 315 /* rate control init */ | 315 /* rate control init */ |
| 316 rate_control_init(s); | 316 rate_control_init(s); |
| 317 | 317 |
| 318 s->picture_number = 0; | 318 s->picture_number = 0; |
| 319 s->fake_picture_number = 0; | 319 s->fake_picture_number = 0; |