diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-05-27 23:37:00 +0000 |
| commit | b0e912c8b3d02a518fedda28c3180eb4794a7520 (patch) | |
| tree | 07d344862562fab58cbe2df39d13d16f2e4d2bea /k9vamps/k9requant.cpp | |
| parent | 4d695ec81fe4d4335ee82c7a9346ad9c9e144ecc (diff) | |
| download | k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.tar.gz k9copy-b0e912c8b3d02a518fedda28c3180eb4794a7520.zip | |
TQt4 convert k9copy
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/k9copy@1233843 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'k9vamps/k9requant.cpp')
| -rw-r--r-- | k9vamps/k9requant.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/k9vamps/k9requant.cpp b/k9vamps/k9requant.cpp index 009f76c..cf2f381 100644 --- a/k9vamps/k9requant.cpp +++ b/k9vamps/k9requant.cpp @@ -1709,7 +1709,7 @@ void k9requant::mpeg2_slice ( const int code ) const MBAtab * mba; macroblock_modes = get_macroblock_modes (); - if (macroblock_modes & MACROBLOCK_QUANT) quantizer_scale = get_quantizer_scale (); + if (macroblock_modes & MACROBLOCK_TQUANT) quantizer_scale = get_quantizer_scale (); if (macroblock_modes & MACROBLOCK_INTRA) { @@ -1719,12 +1719,12 @@ void k9requant::mpeg2_slice ( const int code ) #endif new_quantizer_scale = getNewQuant(quantizer_scale, 1); - if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_QUANT - else macroblock_modes |= MACROBLOCK_QUANT; //add MACROBLOCK_QUANT + if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_TQUANT + else macroblock_modes |= MACROBLOCK_TQUANT; //add MACROBLOCK_TQUANT putaddrinc(mb_add + mb_skip); mb_skip = 0; putmbdata(macroblock_modes); - if (macroblock_modes & MACROBLOCK_QUANT) put_quantiser(new_quantizer_scale); + if (macroblock_modes & MACROBLOCK_TQUANT) put_quantiser(new_quantizer_scale); if (concealment_motion_vectors) { @@ -1825,7 +1825,7 @@ void k9requant::mpeg2_slice ( const int code ) #endif if (!new_coded_block_pattern) { - macroblock_modes &= 0xFFFFFFED; // remove MACROBLOCK_PATTERN and MACROBLOCK_QUANT flag + macroblock_modes &= 0xFFFFFFED; // remove MACROBLOCK_PATTERN and MACROBLOCK_TQUANT flag if ( (picture_coding_type == P_TYPE) && !(macroblock_modes & MACROBLOCK_MOTION_FORWARD)) { @@ -1855,13 +1855,13 @@ void k9requant::mpeg2_slice ( const int code ) } } - if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_QUANT - else if (macroblock_modes & MACROBLOCK_PATTERN) macroblock_modes |= MACROBLOCK_QUANT; //add MACROBLOCK_QUANT - assert( (macroblock_modes & MACROBLOCK_PATTERN) || !(macroblock_modes & MACROBLOCK_QUANT) ); + if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_TQUANT + else if (macroblock_modes & MACROBLOCK_PATTERN) macroblock_modes |= MACROBLOCK_TQUANT; //add MACROBLOCK_TQUANT + assert( (macroblock_modes & MACROBLOCK_PATTERN) || !(macroblock_modes & MACROBLOCK_TQUANT) ); putaddrinc(mb_add + mb_skip); mb_skip = 0; putmbdata(macroblock_modes); - if (macroblock_modes & MACROBLOCK_QUANT) put_quantiser(new_quantizer_scale); + if (macroblock_modes & MACROBLOCK_TQUANT) put_quantiser(new_quantizer_scale); // put saved motion data... for (batb = 0; batb < (n_wbuf - n_owbuf); batb++) putbits(n_owbuf[batb], 8); @@ -2440,14 +2440,14 @@ bool k9requant::lock( int64 x) { { if (likely (wbuf)) { - QMutexLocker locker( &mutw ); + TQMutexLocker locker( &mutw ); //mutw.lock(); rqt_wcnt = wbuf - owbuf; condw.wakeAll(); //mutw.unlock(); } //mutr.lock(); - QMutexLocker locker( &mutr ); + TQMutexLocker locker( &mutr ); while (!rqt_rcnt) { condr.wait( &mutr); |