Mercurial > libavcodec.hg

comparison mpeg12enc.c @ 6481:493dc59d469a libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add FF_ prefix to all (frame)_TYPE usage
author aurel
date Sun, 09 Mar 2008 23:31:02 +0000
parents 9af99d2cce0f
children 48759bfbd073
comparison
equal deleted inserted replaced
6480:6f01a499e785 6481:493dc59d469a
347 347
348 s->vbv_delay_ptr= s->pb.buf + put_bits_count(&s->pb)/8; 348 s->vbv_delay_ptr= s->pb.buf + put_bits_count(&s->pb)/8;
349 put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */ 349 put_bits(&s->pb, 16, 0xFFFF); /* vbv_delay */
350 350
351 // RAL: Forward f_code also needed for B frames 351 // RAL: Forward f_code also needed for B frames
352 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { 352 if (s->pict_type == FF_P_TYPE || s->pict_type == FF_B_TYPE) {
353 put_bits(&s->pb, 1, 0); /* half pel coordinates */ 353 put_bits(&s->pb, 1, 0); /* half pel coordinates */
354 if(s->codec_id == CODEC_ID_MPEG1VIDEO) 354 if(s->codec_id == CODEC_ID_MPEG1VIDEO)
355 put_bits(&s->pb, 3, s->f_code); /* forward_f_code */ 355 put_bits(&s->pb, 3, s->f_code); /* forward_f_code */
356 else 356 else
357 put_bits(&s->pb, 3, 7); /* forward_f_code */ 357 put_bits(&s->pb, 3, 7); /* forward_f_code */
358 } 358 }
359 359
360 // RAL: Backward f_code necessary for B frames 360 // RAL: Backward f_code necessary for B frames
361 if (s->pict_type == B_TYPE) { 361 if (s->pict_type == FF_B_TYPE) {
362 put_bits(&s->pb, 1, 0); /* half pel coordinates */ 362 put_bits(&s->pb, 1, 0); /* half pel coordinates */
363 if(s->codec_id == CODEC_ID_MPEG1VIDEO) 363 if(s->codec_id == CODEC_ID_MPEG1VIDEO)
364 put_bits(&s->pb, 3, s->b_code); /* backward_f_code */ 364 put_bits(&s->pb, 3, s->b_code); /* backward_f_code */
365 else 365 else
366 put_bits(&s->pb, 3, 7); /* backward_f_code */ 366 put_bits(&s->pb, 3, 7); /* backward_f_code */
370 370
371 s->frame_pred_frame_dct = 1; 371 s->frame_pred_frame_dct = 1;
372 if(s->codec_id == CODEC_ID_MPEG2VIDEO){ 372 if(s->codec_id == CODEC_ID_MPEG2VIDEO){
373 put_header(s, EXT_START_CODE); 373 put_header(s, EXT_START_CODE);
374 put_bits(&s->pb, 4, 8); //pic ext 374 put_bits(&s->pb, 4, 8); //pic ext
375 if (s->pict_type == P_TYPE || s->pict_type == B_TYPE) { 375 if (s->pict_type == FF_P_TYPE || s->pict_type == FF_B_TYPE) {
376 put_bits(&s->pb, 4, s->f_code); 376 put_bits(&s->pb, 4, s->f_code);
377 put_bits(&s->pb, 4, s->f_code); 377 put_bits(&s->pb, 4, s->f_code);
378 }else{ 378 }else{
379 put_bits(&s->pb, 8, 255); 379 put_bits(&s->pb, 8, 255);
380 } 380 }
381 if (s->pict_type == B_TYPE) { 381 if (s->pict_type == FF_B_TYPE) {
382 put_bits(&s->pb, 4, s->b_code); 382 put_bits(&s->pb, 4, s->b_code);
383 put_bits(&s->pb, 4, s->b_code); 383 put_bits(&s->pb, 4, s->b_code);
384 }else{ 384 }else{
385 put_bits(&s->pb, 8, 255); 385 put_bits(&s->pb, 8, 255);
386 } 386 }
449 cbp |= 1 << (mb_block_count - 1 - i); 449 cbp |= 1 << (mb_block_count - 1 - i);
450 } 450 }
451 451
452 if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 && 452 if (cbp == 0 && !first_mb && s->mv_type == MV_TYPE_16X16 &&
453 (mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == CODEC_ID_MPEG1VIDEO)) && 453 (mb_x != s->mb_width - 1 || (mb_y != s->mb_height - 1 && s->codec_id == CODEC_ID_MPEG1VIDEO)) &&
454 ((s->pict_type == P_TYPE && (motion_x | motion_y) == 0) || 454 ((s->pict_type == FF_P_TYPE && (motion_x | motion_y) == 0) ||
455 (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) | 455 (s->pict_type == FF_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) |
456 ((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))) { 456 ((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))) {
457 s->mb_skip_run++; 457 s->mb_skip_run++;
458 s->qscale -= s->dquant; 458 s->qscale -= s->dquant;
459 s->skip_count++; 459 s->skip_count++;
460 s->misc_bits++; 460 s->misc_bits++;
461 s->last_bits++; 461 s->last_bits++;
462 if(s->pict_type == P_TYPE){ 462 if(s->pict_type == FF_P_TYPE){
463 s->last_mv[0][1][0]= s->last_mv[0][0][0]= 463 s->last_mv[0][1][0]= s->last_mv[0][0][0]=
464 s->last_mv[0][1][1]= s->last_mv[0][0][1]= 0; 464 s->last_mv[0][1][1]= s->last_mv[0][0][1]= 0;
465 } 465 }
466 } else { 466 } else {
467 if(first_mb){ 467 if(first_mb){
469 encode_mb_skip_run(s, s->mb_x); 469 encode_mb_skip_run(s, s->mb_x);
470 }else{ 470 }else{
471 encode_mb_skip_run(s, s->mb_skip_run); 471 encode_mb_skip_run(s, s->mb_skip_run);
472 } 472 }
473 473
474 if (s->pict_type == I_TYPE) { 474 if (s->pict_type == FF_I_TYPE) {
475 if(s->dquant && cbp){ 475 if(s->dquant && cbp){
476 put_mb_modes(s, 2, 1, 0, 0); /* macroblock_type : macroblock_quant = 1 */ 476 put_mb_modes(s, 2, 1, 0, 0); /* macroblock_type : macroblock_quant = 1 */
477 put_qscale(s); 477 put_qscale(s);
478 }else{ 478 }else{
479 put_mb_modes(s, 1, 1, 0, 0); /* macroblock_type : macroblock_quant = 0 */ 479 put_mb_modes(s, 1, 1, 0, 0); /* macroblock_type : macroblock_quant = 0 */
490 s->qscale -= s->dquant; 490 s->qscale -= s->dquant;
491 } 491 }
492 s->misc_bits+= get_bits_diff(s); 492 s->misc_bits+= get_bits_diff(s);
493 s->i_count++; 493 s->i_count++;
494 memset(s->last_mv, 0, sizeof(s->last_mv)); 494 memset(s->last_mv, 0, sizeof(s->last_mv));
495 } else if (s->pict_type == P_TYPE) { 495 } else if (s->pict_type == FF_P_TYPE) {
496 if(s->mv_type == MV_TYPE_16X16){ 496 if(s->mv_type == MV_TYPE_16X16){
497 if (cbp != 0) { 497 if (cbp != 0) {
498 if ((motion_x|motion_y) == 0) { 498 if ((motion_x|motion_y) == 0) {
499 if(s->dquant){ 499 if(s->dquant){
500 put_mb_modes(s, 5, 1, 0, 0); /* macroblock_pattern & quant */ 500 put_mb_modes(s, 5, 1, 0, 0); /* macroblock_pattern & quant */