Mercurial > libavcodec.hg

comparison mpegvideo_enc.c @ 5278:ef85411bb7e8 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cosmetics: indentation
author aurel
date Tue, 10 Jul 2007 20:27:50 +0000
parents 7b3fcb7c61ce
children e5b6e68deadc
comparison
equal deleted inserted replaced
5277:7b3fcb7c61ce 5278:ef85411bb7e8
1699 if (ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER) 1699 if (ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER)
1700 mpeg1_encode_mb(s, s->block, motion_x, motion_y); 1700 mpeg1_encode_mb(s, s->block, motion_x, motion_y);
1701 break; 1701 break;
1702 case CODEC_ID_MPEG4: 1702 case CODEC_ID_MPEG4:
1703 if (ENABLE_MPEG4_ENCODER) 1703 if (ENABLE_MPEG4_ENCODER)
1704 mpeg4_encode_mb(s, s->block, motion_x, motion_y); break; 1704 mpeg4_encode_mb(s, s->block, motion_x, motion_y);
1705 break;
1705 case CODEC_ID_MSMPEG4V2: 1706 case CODEC_ID_MSMPEG4V2:
1706 case CODEC_ID_MSMPEG4V3: 1707 case CODEC_ID_MSMPEG4V3:
1707 case CODEC_ID_WMV1: 1708 case CODEC_ID_WMV1:
1708 if (ENABLE_MSMPEG4_ENCODER) 1709 if (ENABLE_MSMPEG4_ENCODER)
1709 msmpeg4_encode_mb(s, s->block, motion_x, motion_y); 1710 msmpeg4_encode_mb(s, s->block, motion_x, motion_y);
1721 case CODEC_ID_FLV1: 1722 case CODEC_ID_FLV1:
1722 case CODEC_ID_RV10: 1723 case CODEC_ID_RV10:
1723 case CODEC_ID_RV20: 1724 case CODEC_ID_RV20:
1724 if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER || 1725 if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER ||
1725 ENABLE_FLV_ENCODER || ENABLE_RV10_ENCODER || ENABLE_RV20_ENCODER) 1726 ENABLE_FLV_ENCODER || ENABLE_RV10_ENCODER || ENABLE_RV20_ENCODER)
1726 h263_encode_mb(s, s->block, motion_x, motion_y); break; 1727 h263_encode_mb(s, s->block, motion_x, motion_y);
1728 break;
1727 case CODEC_ID_MJPEG: 1729 case CODEC_ID_MJPEG:
1728 if (ENABLE_MJPEG_ENCODER) 1730 if (ENABLE_MJPEG_ENCODER)
1729 ff_mjpeg_encode_mb(s, s->block); 1731 ff_mjpeg_encode_mb(s, s->block);
1730 break; 1732 break;
1731 default: 1733 default:
2029 switch(s->codec_id){ 2031 switch(s->codec_id){
2030 case CODEC_ID_H263: 2032 case CODEC_ID_H263:
2031 case CODEC_ID_H263P: 2033 case CODEC_ID_H263P:
2032 case CODEC_ID_FLV1: 2034 case CODEC_ID_FLV1:
2033 if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER || ENABLE_FLV_ENCODER) 2035 if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER || ENABLE_FLV_ENCODER)
2034 s->gob_index = ff_h263_get_gob_height(s); 2036 s->gob_index = ff_h263_get_gob_height(s);
2035 break; 2037 break;
2036 case CODEC_ID_MPEG4: 2038 case CODEC_ID_MPEG4:
2037 if(ENABLE_MPEG4_ENCODER && s->partitioned_frame) 2039 if(ENABLE_MPEG4_ENCODER && s->partitioned_frame)
2038 ff_mpeg4_init_partitions(s); 2040 ff_mpeg4_init_partitions(s);
2039 break; 2041 break;
2133 } 2135 }
2134 2136
2135 switch(s->codec_id){ 2137 switch(s->codec_id){
2136 case CODEC_ID_MPEG4: 2138 case CODEC_ID_MPEG4:
2137 if (ENABLE_MPEG4_ENCODER) { 2139 if (ENABLE_MPEG4_ENCODER) {
2138 ff_mpeg4_encode_video_packet_header(s); 2140 ff_mpeg4_encode_video_packet_header(s);
2139 ff_mpeg4_clean_buffers(s); 2141 ff_mpeg4_clean_buffers(s);
2140 } 2142 }
2141 break; 2143 break;
2142 case CODEC_ID_MPEG1VIDEO: 2144 case CODEC_ID_MPEG1VIDEO:
2143 case CODEC_ID_MPEG2VIDEO: 2145 case CODEC_ID_MPEG2VIDEO:
2144 if (ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER) { 2146 if (ENABLE_MPEG1VIDEO_ENCODER || ENABLE_MPEG2VIDEO_ENCODER) {
2147 } 2149 }
2148 break; 2150 break;
2149 case CODEC_ID_H263: 2151 case CODEC_ID_H263:
2150 case CODEC_ID_H263P: 2152 case CODEC_ID_H263P:
2151 if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER) 2153 if (ENABLE_H263_ENCODER || ENABLE_H263P_ENCODER)
2152 h263_encode_gob_header(s, mb_y); 2154 h263_encode_gob_header(s, mb_y);
2153 break; 2155 break;
2154 } 2156 }
2155 2157
2156 if(s->flags&CODEC_FLAG_PASS1){ 2158 if(s->flags&CODEC_FLAG_PASS1){
2157 int bits= put_bits_count(&s->pb); 2159 int bits= put_bits_count(&s->pb);
2480 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1]; 2482 s->mv[0][i][1] = s->current_picture.motion_val[0][s->block_index[i]][1];
2481 } 2483 }
2482 break; 2484 break;
2483 case CANDIDATE_MB_TYPE_DIRECT: 2485 case CANDIDATE_MB_TYPE_DIRECT:
2484 if (ENABLE_MPEG4_ENCODER) { 2486 if (ENABLE_MPEG4_ENCODER) {
2485 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; 2487 s->mv_dir = MV_DIR_FORWARD|MV_DIR_BACKWARD|MV_DIRECT;
2486 s->mb_intra= 0; 2488 s->mb_intra= 0;
2487 motion_x=s->b_direct_mv_table[xy][0]; 2489 motion_x=s->b_direct_mv_table[xy][0];
2488 motion_y=s->b_direct_mv_table[xy][1]; 2490 motion_y=s->b_direct_mv_table[xy][1];
2489 ff_mpeg4_set_direct_mv(s, motion_x, motion_y); 2491 ff_mpeg4_set_direct_mv(s, motion_x, motion_y);
2490 } 2492 }
2491 break; 2493 break;
2492 case CANDIDATE_MB_TYPE_DIRECT0: 2494 case CANDIDATE_MB_TYPE_DIRECT0:
2493 if (ENABLE_MPEG4_ENCODER) { 2495 if (ENABLE_MPEG4_ENCODER) {
2494 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD | MV_DIRECT; 2496 s->mv_dir = MV_DIR_FORWARD|MV_DIR_BACKWARD|MV_DIRECT;
2495 s->mb_intra= 0; 2497 s->mb_intra= 0;
2496 ff_mpeg4_set_direct_mv(s, 0, 0); 2498 ff_mpeg4_set_direct_mv(s, 0, 0);
2497 } 2499 }
2498 break; 2500 break;
2499 case CANDIDATE_MB_TYPE_BIDIR: 2501 case CANDIDATE_MB_TYPE_BIDIR:
2500 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD; 2502 s->mv_dir = MV_DIR_FORWARD | MV_DIR_BACKWARD;
2501 s->mb_intra= 0; 2503 s->mb_intra= 0;
2667 2669
2668 if(s->adaptive_quant){ 2670 if(s->adaptive_quant){
2669 switch(s->codec_id){ 2671 switch(s->codec_id){
2670 case CODEC_ID_MPEG4: 2672 case CODEC_ID_MPEG4:
2671 if (ENABLE_MPEG4_ENCODER) 2673 if (ENABLE_MPEG4_ENCODER)
2672 ff_clean_mpeg4_qscales(s); 2674 ff_clean_mpeg4_qscales(s);
2673 break; 2675 break;
2674 case CODEC_ID_H263: 2676 case CODEC_ID_H263:
2675 case CODEC_ID_H263P: 2677 case CODEC_ID_H263P:
2676 case CODEC_ID_FLV1: 2678 case CODEC_ID_FLV1:
2677 if (ENABLE_H263_ENCODER||ENABLE_H263P_ENCODER||ENABLE_FLV_ENCODER) 2679 if (ENABLE_H263_ENCODER||ENABLE_H263P_ENCODER||ENABLE_FLV_ENCODER)
2678 ff_clean_h263_qscales(s); 2680 ff_clean_h263_qscales(s);
2679 break; 2681 break;
2680 } 2682 }
2681 2683
2682 s->lambda= s->lambda_table[0]; 2684 s->lambda= s->lambda_table[0];
2683 //FIXME broken 2685 //FIXME broken