Mercurial > libavcodec.hg

comparison mpegvideo.c @ 8596:68e959302527 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replace all occurrence of ENABLE_ by the corresponding CONFIG_, HAVE_ or ARCH_ and remove all ENABLE_ definitions.
author aurel
date Wed, 14 Jan 2009 17:19:17 +0000
parents 7a463923ecd1
children 04423b2f6e0b
comparison
equal deleted inserted replaced
8595:2f476018b4ac 8596:68e959302527
1446 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s 1446 if( (unsigned)src_x > h_edge_pos - (!!sx) - 2*block_s
1447 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){ 1447 || (unsigned)src_y >(v_edge_pos >> field_based) - (!!sy) - h){
1448 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based, 1448 ff_emulated_edge_mc(s->edge_emu_buffer, ptr_y, s->linesize, 17, 17+field_based,
1449 src_x, src_y<<field_based, h_edge_pos, v_edge_pos); 1449 src_x, src_y<<field_based, h_edge_pos, v_edge_pos);
1450 ptr_y = s->edge_emu_buffer; 1450 ptr_y = s->edge_emu_buffer;
1451 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ 1451 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1452 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize; 1452 uint8_t *uvbuf= s->edge_emu_buffer+18*s->linesize;
1453 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based, 1453 ff_emulated_edge_mc(uvbuf , ptr_cb, s->uvlinesize, 9, 9+field_based,
1454 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); 1454 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
1455 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based, 1455 ff_emulated_edge_mc(uvbuf+16, ptr_cr, s->uvlinesize, 9, 9+field_based,
1456 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1); 1456 uvsrc_x, uvsrc_y<<field_based, h_edge_pos>>1, v_edge_pos>>1);
1473 1473
1474 sx <<= 2 - lowres; 1474 sx <<= 2 - lowres;
1475 sy <<= 2 - lowres; 1475 sy <<= 2 - lowres;
1476 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy); 1476 pix_op[lowres-1](dest_y, ptr_y, linesize, h, sx, sy);
1477 1477
1478 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ 1478 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1479 uvsx <<= 2 - lowres; 1479 uvsx <<= 2 - lowres;
1480 uvsy <<= 2 - lowres; 1480 uvsy <<= 2 - lowres;
1481 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); 1481 pix_op[lowres](dest_cb, ptr_cb, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
1482 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy); 1482 pix_op[lowres](dest_cr, ptr_cr, uvlinesize, h >> s->chroma_y_shift, uvsx, uvsy);
1483 } 1483 }
1579 1579
1580 mx += s->mv[dir][i][0]; 1580 mx += s->mv[dir][i][0];
1581 my += s->mv[dir][i][1]; 1581 my += s->mv[dir][i][1];
1582 } 1582 }
1583 1583
1584 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)) 1584 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY))
1585 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my); 1585 chroma_4mv_motion_lowres(s, dest_cb, dest_cr, ref_picture, pix_op, mx, my);
1586 break; 1586 break;
1587 case MV_TYPE_FIELD: 1587 case MV_TYPE_FIELD:
1588 if (s->picture_structure == PICT_FRAME) { 1588 if (s->picture_structure == PICT_FRAME) {
1589 /* top field */ 1589 /* top field */
1868 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); 1868 add_dequant_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
1869 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); 1869 add_dequant_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
1870 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); 1870 add_dequant_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);
1871 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); 1871 add_dequant_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
1872 1872
1873 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ 1873 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1874 if (s->chroma_y_shift){ 1874 if (s->chroma_y_shift){
1875 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); 1875 add_dequant_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
1876 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); 1876 add_dequant_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
1877 }else{ 1877 }else{
1878 dct_linesize >>= 1; 1878 dct_linesize >>= 1;
1887 add_dct(s, block[0], 0, dest_y , dct_linesize); 1887 add_dct(s, block[0], 0, dest_y , dct_linesize);
1888 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize); 1888 add_dct(s, block[1], 1, dest_y + block_size, dct_linesize);
1889 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize); 1889 add_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize);
1890 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize); 1890 add_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize);
1891 1891
1892 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ 1892 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1893 if(s->chroma_y_shift){//Chroma420 1893 if(s->chroma_y_shift){//Chroma420
1894 add_dct(s, block[4], 4, dest_cb, uvlinesize); 1894 add_dct(s, block[4], 4, dest_cb, uvlinesize);
1895 add_dct(s, block[5], 5, dest_cr, uvlinesize); 1895 add_dct(s, block[5], 5, dest_cr, uvlinesize);
1896 }else{ 1896 }else{
1897 //chroma422 1897 //chroma422
1909 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize); 1909 add_dct(s, block[11], 11, dest_cr+8+dct_offset, dct_linesize);
1910 } 1910 }
1911 } 1911 }
1912 }//fi gray 1912 }//fi gray
1913 } 1913 }
1914 else if (ENABLE_WMV2) { 1914 else if (CONFIG_WMV2) {
1915 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr); 1915 ff_wmv2_add_mb(s, block, dest_y, dest_cb, dest_cr);
1916 } 1916 }
1917 } else { 1917 } else {
1918 /* dct only in intra block */ 1918 /* dct only in intra block */
1919 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){ 1919 if(s->encoding || !(s->codec_id==CODEC_ID_MPEG1VIDEO || s->codec_id==CODEC_ID_MPEG2VIDEO)){
1920 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale); 1920 put_dct(s, block[0], 0, dest_y , dct_linesize, s->qscale);
1921 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale); 1921 put_dct(s, block[1], 1, dest_y + block_size, dct_linesize, s->qscale);
1922 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale); 1922 put_dct(s, block[2], 2, dest_y + dct_offset , dct_linesize, s->qscale);
1923 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale); 1923 put_dct(s, block[3], 3, dest_y + dct_offset + block_size, dct_linesize, s->qscale);
1924 1924
1925 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ 1925 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1926 if(s->chroma_y_shift){ 1926 if(s->chroma_y_shift){
1927 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale); 1927 put_dct(s, block[4], 4, dest_cb, uvlinesize, s->chroma_qscale);
1928 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale); 1928 put_dct(s, block[5], 5, dest_cr, uvlinesize, s->chroma_qscale);
1929 }else{ 1929 }else{
1930 dct_offset >>=1; 1930 dct_offset >>=1;
1939 s->dsp.idct_put(dest_y , dct_linesize, block[0]); 1939 s->dsp.idct_put(dest_y , dct_linesize, block[0]);
1940 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]); 1940 s->dsp.idct_put(dest_y + block_size, dct_linesize, block[1]);
1941 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]); 1941 s->dsp.idct_put(dest_y + dct_offset , dct_linesize, block[2]);
1942 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]); 1942 s->dsp.idct_put(dest_y + dct_offset + block_size, dct_linesize, block[3]);
1943 1943
1944 if(!ENABLE_GRAY || !(s->flags&CODEC_FLAG_GRAY)){ 1944 if(!CONFIG_GRAY || !(s->flags&CODEC_FLAG_GRAY)){
1945 if(s->chroma_y_shift){ 1945 if(s->chroma_y_shift){
1946 s->dsp.idct_put(dest_cb, uvlinesize, block[4]); 1946 s->dsp.idct_put(dest_cb, uvlinesize, block[4]);
1947 s->dsp.idct_put(dest_cr, uvlinesize, block[5]); 1947 s->dsp.idct_put(dest_cr, uvlinesize, block[5]);
1948 }else{ 1948 }else{
1949 1949