Mercurial > libavcodec.hg
comparison mpegvideo.c @ 5029:dbaa06366c3c libavcodec
add a proper prefix to all mjpeg encoder exported functions
author | aurel |
---|---|
date | Fri, 18 May 2007 22:54:54 +0000 |
parents | 3d8a813666e4 |
children | 9ce0052d533a |
comparison
equal
deleted
inserted
replaced
5028:3d8a813666e4 | 5029:dbaa06366c3c |
---|---|
1202 s->mjpeg_vsample[1] = 2>>chroma_v_shift; | 1202 s->mjpeg_vsample[1] = 2>>chroma_v_shift; |
1203 s->mjpeg_vsample[2] = 2>>chroma_v_shift; | 1203 s->mjpeg_vsample[2] = 2>>chroma_v_shift; |
1204 s->mjpeg_hsample[0] = 2; | 1204 s->mjpeg_hsample[0] = 2; |
1205 s->mjpeg_hsample[1] = 2>>chroma_h_shift; | 1205 s->mjpeg_hsample[1] = 2>>chroma_h_shift; |
1206 s->mjpeg_hsample[2] = 2>>chroma_h_shift; | 1206 s->mjpeg_hsample[2] = 2>>chroma_h_shift; |
1207 if (!(ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) || mjpeg_init(s) < 0) | 1207 if (!(ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) |
1208 || ff_mjpeg_encode_init(s) < 0) | |
1208 return -1; | 1209 return -1; |
1209 avctx->delay=0; | 1210 avctx->delay=0; |
1210 s->low_delay=1; | 1211 s->low_delay=1; |
1211 break; | 1212 break; |
1212 case CODEC_ID_H261: | 1213 case CODEC_ID_H261: |
1396 | 1397 |
1397 ff_rate_control_uninit(s); | 1398 ff_rate_control_uninit(s); |
1398 | 1399 |
1399 MPV_common_end(s); | 1400 MPV_common_end(s); |
1400 if ((ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) && s->out_format == FMT_MJPEG) | 1401 if ((ENABLE_MJPEG_ENCODER || ENABLE_LJPEG_ENCODER) && s->out_format == FMT_MJPEG) |
1401 mjpeg_close(s); | 1402 ff_mjpeg_encode_close(s); |
1402 | 1403 |
1403 av_freep(&avctx->extradata); | 1404 av_freep(&avctx->extradata); |
1404 | 1405 |
1405 return 0; | 1406 return 0; |
1406 } | 1407 } |
2542 avctx->skip_count = s->skip_count; | 2543 avctx->skip_count = s->skip_count; |
2543 | 2544 |
2544 MPV_frame_end(s); | 2545 MPV_frame_end(s); |
2545 | 2546 |
2546 if (ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG) | 2547 if (ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG) |
2547 mjpeg_picture_trailer(s); | 2548 ff_mjpeg_encode_picture_trailer(s); |
2548 | 2549 |
2549 if(avctx->rc_buffer_size){ | 2550 if(avctx->rc_buffer_size){ |
2550 RateControlContext *rcc= &s->rc_context; | 2551 RateControlContext *rcc= &s->rc_context; |
2551 int max_size= rcc->buffer_index/3; | 2552 int max_size= rcc->buffer_index/3; |
2552 | 2553 |
4592 case CODEC_ID_RV10: | 4593 case CODEC_ID_RV10: |
4593 case CODEC_ID_RV20: | 4594 case CODEC_ID_RV20: |
4594 h263_encode_mb(s, s->block, motion_x, motion_y); break; | 4595 h263_encode_mb(s, s->block, motion_x, motion_y); break; |
4595 case CODEC_ID_MJPEG: | 4596 case CODEC_ID_MJPEG: |
4596 if (ENABLE_MJPEG_ENCODER) | 4597 if (ENABLE_MJPEG_ENCODER) |
4597 mjpeg_encode_mb(s, s->block); | 4598 ff_mjpeg_encode_mb(s, s->block); |
4598 break; | 4599 break; |
4599 default: | 4600 default: |
4600 assert(0); | 4601 assert(0); |
4601 } | 4602 } |
4602 } | 4603 } |
4894 ff_mpeg4_merge_partitions(s); | 4895 ff_mpeg4_merge_partitions(s); |
4895 } | 4896 } |
4896 | 4897 |
4897 ff_mpeg4_stuffing(&s->pb); | 4898 ff_mpeg4_stuffing(&s->pb); |
4898 }else if(ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG){ | 4899 }else if(ENABLE_MJPEG_ENCODER && s->out_format == FMT_MJPEG){ |
4899 ff_mjpeg_stuffing(&s->pb); | 4900 ff_mjpeg_encode_stuffing(&s->pb); |
4900 } | 4901 } |
4901 | 4902 |
4902 align_put_bits(&s->pb); | 4903 align_put_bits(&s->pb); |
4903 flush_put_bits(&s->pb); | 4904 flush_put_bits(&s->pb); |
4904 | 4905 |
5761 | 5762 |
5762 s->last_bits= put_bits_count(&s->pb); | 5763 s->last_bits= put_bits_count(&s->pb); |
5763 switch(s->out_format) { | 5764 switch(s->out_format) { |
5764 case FMT_MJPEG: | 5765 case FMT_MJPEG: |
5765 if (ENABLE_MJPEG_ENCODER) | 5766 if (ENABLE_MJPEG_ENCODER) |
5766 mjpeg_picture_header(s); | 5767 ff_mjpeg_encode_picture_header(s); |
5767 break; | 5768 break; |
5768 case FMT_H261: | 5769 case FMT_H261: |
5769 if (ENABLE_H261_ENCODER) | 5770 if (ENABLE_H261_ENCODER) |
5770 ff_h261_encode_picture_header(s, picture_number); | 5771 ff_h261_encode_picture_header(s, picture_number); |
5771 break; | 5772 break; |