diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-13 02:09:49 -0500 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-04-13 02:09:49 -0500 |
| commit | 7ed1aeef0249551624f9cc1977402f154acd7352 (patch) | |
| tree | f13df285804a1c6aad394b9d1a8d66e16143b5ec /k9vamps/k9requant.cpp | |
| parent | 01a7e739162d6b0d90d3912b5926d8a6b17decdc (diff) | |
| download | k9copy-7ed1aeef0249551624f9cc1977402f154acd7352.tar.gz k9copy-7ed1aeef0249551624f9cc1977402f154acd7352.zip | |
Fix inadvertent "TQ" changes.
Diffstat (limited to 'k9vamps/k9requant.cpp')
| -rw-r--r-- | k9vamps/k9requant.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/k9vamps/k9requant.cpp b/k9vamps/k9requant.cpp index cf2f381..1648344 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_TQUANT) quantizer_scale = get_quantizer_scale (); + if (macroblock_modes & MACROBLOCK_QUANT) 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_TQUANT - else macroblock_modes |= MACROBLOCK_TQUANT; //add MACROBLOCK_TQUANT + if (last_coded_scale == new_quantizer_scale) macroblock_modes &= 0xFFFFFFEF; // remove MACROBLOCK_QUANT + else macroblock_modes |= MACROBLOCK_QUANT; //add MACROBLOCK_QUANT putaddrinc(mb_add + mb_skip); mb_skip = 0; putmbdata(macroblock_modes); - if (macroblock_modes & MACROBLOCK_TQUANT) put_quantiser(new_quantizer_scale); + if (macroblock_modes & MACROBLOCK_QUANT) 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_TQUANT flag + macroblock_modes &= 0xFFFFFFED; // remove MACROBLOCK_PATTERN and MACROBLOCK_QUANT 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_TQUANT - else if (macroblock_modes & MACROBLOCK_PATTERN) macroblock_modes |= MACROBLOCK_TQUANT; //add MACROBLOCK_TQUANT - assert( (macroblock_modes & MACROBLOCK_PATTERN) || !(macroblock_modes & MACROBLOCK_TQUANT) ); + 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) ); putaddrinc(mb_add + mb_skip); mb_skip = 0; putmbdata(macroblock_modes); - if (macroblock_modes & MACROBLOCK_TQUANT) put_quantiser(new_quantizer_scale); + if (macroblock_modes & MACROBLOCK_QUANT) put_quantiser(new_quantizer_scale); // put saved motion data... for (batb = 0; batb < (n_wbuf - n_owbuf); batb++) putbits(n_owbuf[batb], 8); |