libavcodec.hg: mpeg12.c comparison

comparison mpeg12.c @ 1421:340c90faa1dc libavcodec

mpeg2 encoding

author	michaelni
date	Mon, 25 Aug 2003 22:47:32 +0000
parents	c2e63cb94d06
children	2e590fee59bd

comparison

equal deleted inserted replaced

-:ff0220970711
+:340c90faa1dc
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 /**
 * @file mpeg12.c
-* MPEG1 codec / MPEG2 decoder.
+* MPEG1/2 codec
 */
 //#define DEBUG
 #include "avcodec.h"
 #include "dsputil.h"
 }
 put_bits(&s->pb, 4, s->aspect_ratio_info);
 put_bits(&s->pb, 4, s->frame_rate_index);
 v = (s->bit_rate + 399) / 400;
-if (v > 0x3ffff)
+if (v > 0x3ffff && s->codec_id == CODEC_ID_MPEG1VIDEO)
 v = 0x3ffff;
-put_bits(&s->pb, 18, v);
+put_bits(&s->pb, 18, v & 0x3FFFF);
 put_bits(&s->pb, 1, 1); /* marker */
 if(s->avctx->rc_buffer_size)
 vbv_buffer_size = s->avctx->rc_buffer_size;
 else
 /* VBV calculation: Scaled so that a VCD has the proper VBV size of 40 kilobytes */
 vbv_buffer_size = (( 20 * s->bit_rate) / (1151929 / 2)) * 8 * 1024;
-put_bits(&s->pb, 10, (vbv_buffer_size + 16383) / 16384);
+put_bits(&s->pb, 10, ((vbv_buffer_size + 16383) / 16384) & 0x3FF);
 put_bits(&s->pb, 1, 1); /* constrained parameter flag */
 ff_write_quant_matrix(&s->pb, s->avctx->intra_matrix);
 ff_write_quant_matrix(&s->pb, s->avctx->inter_matrix);
+if(s->codec_id == CODEC_ID_MPEG2VIDEO){
+put_header(s, EXT_START_CODE);
+put_bits(&s->pb, 4, 1); //seq ext
+put_bits(&s->pb, 1, 0); //esc
+put_bits(&s->pb, 3, 4); //profile
+put_bits(&s->pb, 4, 8); //level
+put_bits(&s->pb, 1, s->progressive_sequence=1);
+put_bits(&s->pb, 2, 1); //chroma format 4:2:0
+put_bits(&s->pb, 2, 0); //horizontal size ext
+put_bits(&s->pb, 2, 0); //vertical size ext
+put_bits(&s->pb, 12, v>>18); //bitrate ext
+put_bits(&s->pb, 1, 1); //marker
+put_bits(&s->pb, 8, vbv_buffer_size >>10); //vbv buffer ext
+put_bits(&s->pb, 1, s->low_delay);
+put_bits(&s->pb, 2, 0); // frame_rate_ext_n
+put_bits(&s->pb, 5, 0); // frame_rate_ext_d
+}
 put_header(s, GOP_START_CODE);
 put_bits(&s->pb, 1, 0); /* do drop frame */
 /* time code : we must convert from the real frame rate to a
 fake mpeg frame rate in case of low frame rate */
 fps = frame_rate_tab[s->frame_rate_index];
 }
 /* insert a fake P picture */
 static void mpeg1_skip_picture(MpegEncContext *s, int pict_num)
 {
+assert(s->codec_id == CODEC_ID_MPEG1VIDEO); // mpeg2 can do these repeat things
 /* mpeg1 picture header */
 put_header(s, PICTURE_START_CODE);
 /* temporal reference */
 put_bits(&s->pb, 10, pict_num & 0x3ff);
 // RAL: Backward f_code necessary for B frames
 if (s->pict_type == B_TYPE) {
 put_bits(&s->pb, 1, 0); /* half pel coordinates */
 put_bits(&s->pb, 3, s->b_code); /* backward_f_code */
 }
 put_bits(&s->pb, 1, 0); /* extra bit picture */
+if(s->codec_id == CODEC_ID_MPEG2VIDEO){
+put_header(s, EXT_START_CODE);
+put_bits(&s->pb, 4, 8); //pic ext
+put_bits(&s->pb, 4, s->f_code);
+put_bits(&s->pb, 4, s->f_code);
+put_bits(&s->pb, 4, s->b_code);
+put_bits(&s->pb, 4, s->b_code);
+put_bits(&s->pb, 2, s->intra_dc_precision);
+put_bits(&s->pb, 2, s->picture_structure= PICT_FRAME);
+put_bits(&s->pb, 1, s->top_field_first);
+put_bits(&s->pb, 1, s->frame_pred_frame_dct= 1);
+put_bits(&s->pb, 1, s->concealment_motion_vectors);
+put_bits(&s->pb, 1, s->q_scale_type);
+put_bits(&s->pb, 1, s->intra_vlc_format);
+put_bits(&s->pb, 1, s->alternate_scan);
+put_bits(&s->pb, 1, s->repeat_first_field);
+put_bits(&s->pb, 1, s->chroma_420_type=1);
+put_bits(&s->pb, 1, s->progressive_frame=1);
+put_bits(&s->pb, 1, 0); //composite_display_flag
+}
 s->mb_y=0;
 ff_mpeg1_encode_slice_header(s);
 }
 for(i=0;i<6;i++) {
 if (s->block_last_index[i] >= 0)
 cbp |= 1 << (5 - i);
 }
-if (cbp == 0 && !first_mb && (mb_x != s->mb_width - 1 || mb_y != s->mb_height - 1) &&
+if (cbp == 0 && !first_mb && (mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == CODEC_ID_MPEG1VIDEO)) &&
 ((s->pict_type == P_TYPE && (motion_x | motion_y) == 0) ||
 (s->pict_type == B_TYPE && s->mv_dir == s->last_mv_dir && (((s->mv_dir & MV_DIR_FORWARD) ? ((s->mv[0][0][0] - s->last_mv[0][0][0])|(s->mv[0][0][1] - s->last_mv[0][0][1])) : 0) |
 ((s->mv_dir & MV_DIR_BACKWARD) ? ((s->mv[1][0][0] - s->last_mv[1][0][0])|(s->mv[1][0][1] - s->last_mv[1][0][1])) : 0)) == 0))) {
 s->mb_skip_run++;
 s->qscale -= s->dquant;
 }
 }
 }
 s->me.mv_penalty= mv_penalty;
 s->fcode_tab= fcode_tab;
-s->min_qcoeff=-255;
+if(s->codec_id == CODEC_ID_MPEG1VIDEO){
-s->max_qcoeff= 255;
+s->min_qcoeff=-255;
+s->max_qcoeff= 255;
+}else{
+s->min_qcoeff=-2047;
+s->max_qcoeff= 2047;
+}
 s->intra_ac_vlc_length=
 s->inter_ac_vlc_length= uni_mpeg1_ac_vlc_len;
 }
 static inline void encode_dc(MpegEncContext *s, int diff, int component)
 dc = block[0]; /* overflow is impossible */
 diff = dc - s->last_dc[component];
 encode_dc(s, diff, component);
 s->last_dc[component] = dc;
 i = 1;
+/*
+if (s->intra_vlc_format)
+rl = &rl_mpeg2;
+else
+rl = &rl_mpeg1;
+*/
 } else {
 /* encode the first coefficient : needs to be done here because
 it is handled slightly differently */
 level = block[0];
 if (abs(level) == 1) {
 } else {
 		/* escape seems to be pretty rare <5% so i dont optimize it */
 put_bits(&s->pb, mpeg1_vlc[111/*rl->n*/][1], mpeg1_vlc[111/*rl->n*/][0]);
 /* escape: only clip in this case */
 put_bits(&s->pb, 6, run);
-if (alevel < 128) {
+if(s->codec_id == CODEC_ID_MPEG1VIDEO){
-put_bits(&s->pb, 8, level & 0xff);
+if (alevel < 128) {
-} else {
+put_bits(&s->pb, 8, level & 0xff);
-if (level < 0) {
-put_bits(&s->pb, 16, 0x8001 + level + 255);
 } else {
-put_bits(&s->pb, 16, level & 0xffff);
+if (level < 0) {
+put_bits(&s->pb, 16, 0x8001 + level + 255);
+} else {
+put_bits(&s->pb, 16, level & 0xffff);
+}
 }
+}else{
+put_bits(&s->pb, 12, level & 0xfff);
 }
 }
 last_non_zero = i;
 }
 }
 }
 static inline int get_qscale(MpegEncContext *s)
 {
 int qscale = get_bits(&s->gb, 5);
-if (s->mpeg2) {
+if (s->codec_id == CODEC_ID_MPEG2VIDEO) {
 if (s->q_scale_type) {
 return non_linear_qscale[qscale];
 } else {
 return qscale << 1;
 }
 skip_bits1(&s->gb); /* marker */
 }else
 memset(s->last_mv, 0, sizeof(s->last_mv)); /* reset mv prediction */
 s->mb_intra = 1;
-if (s->mpeg2) {
+if (s->codec_id == CODEC_ID_MPEG2VIDEO) {
 for(i=0;i<6;i++) {
 if (mpeg2_decode_block_intra(s, block[i], i) < 0)
 return -1;
 }
 } else {
 fprintf(stderr, "invalid cbp at %d %d\n", s->mb_x, s->mb_y);
 return -1;
 }
 cbp++;
-if (s->mpeg2) {
+if (s->codec_id == CODEC_ID_MPEG2VIDEO) {
 for(i=0;i<6;i++) {
 if (cbp & 32) {
 if (mpeg2_decode_block_non_intra(s, block[i], i) < 0)
 return -1;
 } else {
 static void mpeg_decode_sequence_extension(MpegEncContext *s)
 {
 int horiz_size_ext, vert_size_ext;
 int bit_rate_ext, vbv_buf_ext;
 int frame_rate_ext_n, frame_rate_ext_d;
+int level, profile;
 float aspect;
-skip_bits(&s->gb, 8); /* profil and level */
+skip_bits(&s->gb, 1); /* profil and level esc*/
+profile= get_bits(&s->gb, 3);
+level= get_bits(&s->gb, 4);
 s->progressive_sequence = get_bits1(&s->gb); /* progressive_sequence */
 skip_bits(&s->gb, 2); /* chroma_format */
 horiz_size_ext = get_bits(&s->gb, 2);
 vert_size_ext = get_bits(&s->gb, 2);
 s->width |= (horiz_size_ext << 12);
 frame_rate_tab[s->frame_rate_index] * (frame_rate_ext_n+1),
 MPEG1_FRAME_RATE_BASE * (frame_rate_ext_d+1),
 1<<30);
 dprintf("sequence extension\n");
-s->mpeg2 = 1;
+s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
 s->avctx->sub_id = 2; /* indicates mpeg2 found */
 aspect= mpeg2_aspect[s->aspect_ratio_info];
 if(aspect>0.0)      s->avctx->aspect_ratio= s->width/(aspect*s->height);
 else if(aspect<0.0) s->avctx->aspect_ratio= -1.0/aspect;
+if(s->avctx->debug & FF_DEBUG_PICT_INFO)
+printf("profile: %d, level: %d \n", profile, level);
 }
 static void mpeg_decode_quant_matrix_extension(MpegEncContext *s)
 {
 int i, v, j;
 #endif
 /* end of slice reached */
 if (/*s->mb_y<<field_pic == s->mb_height &&*/ !s->first_field) {
 /* end of image */
-if(s->mpeg2){
+if(s->codec_id == CODEC_ID_MPEG2VIDEO){
 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG2;
 }else
 s->current_picture_ptr->qscale_type= FF_QSCALE_TYPE_MPEG1;
 ff_er_frame_end(s);
 init_get_bits(&s->gb, buf, buf_size*8);
 width = get_bits(&s->gb, 12);
 height = get_bits(&s->gb, 12);
 s->aspect_ratio_info= get_bits(&s->gb, 4);
-if(!s->mpeg2){
+if(s->codec_id == CODEC_ID_MPEG1VIDEO){
 aspect= mpeg1_aspect[s->aspect_ratio_info];
 if(aspect!=0.0) avctx->aspect_ratio= width/(aspect*height);
 }
 s->frame_rate_index = get_bits(&s->gb, 4);
 /* we set mpeg2 parameters so that it emulates mpeg1 */
 s->progressive_sequence = 1;
 s->progressive_frame = 1;
 s->picture_structure = PICT_FRAME;
 s->frame_pred_frame_dct = 1;
-s->mpeg2 = 0;
+s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG1VIDEO;
 avctx->sub_id = 1; /* indicates mpeg1 */
 return 0;
 }
 static int vcr2_init_sequence(AVCodecContext *avctx)
 s->progressive_sequence = 1;
 s->progressive_frame = 1;
 s->picture_structure = PICT_FRAME;
 s->frame_pred_frame_dct = 1;
-s->mpeg2 = 1;
+s->codec_id= s->avctx->codec_id= CODEC_ID_MPEG2VIDEO;
 avctx->sub_id = 2; /* indicates mpeg2 */
 return 0;
 }

Mercurial > libavcodec.hg

comparison mpeg12.c @ 1421:340c90faa1dc libavcodec