From 7ed1aeef0249551624f9cc1977402f154acd7352 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 02:09:49 -0500 Subject: Fix inadvertent "TQ" changes. --- k9vamps/getvlc.h | 16 ++++++++-------- k9vamps/k9requant.cpp | 18 +++++++++--------- k9vamps/k9requant.h | 4 ++-- k9vamps/k9requant2.h | 4 ++-- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'k9vamps') diff --git a/k9vamps/getvlc.h b/k9vamps/getvlc.h index b35a5a3..bcf82c0 100644 --- a/k9vamps/getvlc.h +++ b/k9vamps/getvlc.h @@ -4,7 +4,7 @@ #define MACROBLOCK_PATTERN 2 #define MACROBLOCK_MOTION_BACKWARD 4 #define MACROBLOCK_MOTION_FORWARD 8 -#define MACROBLOCK_TQUANT 16 +#define MACROBLOCK_QUANT 16 #define DCT_TYPE_INTERLACED 32 /* motion_type */ @@ -68,17 +68,17 @@ typedef struct { #define INTRA MACROBLOCK_INTRA -#define TQUANT MACROBLOCK_TQUANT +#define QUANT MACROBLOCK_QUANT static const MBtab MB_I [] = { - {INTRA|TQUANT, 2}, {INTRA, 1} + {INTRA|QUANT, 2}, {INTRA, 1} }; #define MC MACROBLOCK_MOTION_FORWARD #define CODED MACROBLOCK_PATTERN static const MBtab MB_P [] = { - {INTRA|TQUANT, 6}, {CODED|TQUANT, 5}, {MC|CODED|TQUANT, 5}, {INTRA, 5}, + {INTRA|QUANT, 6}, {CODED|QUANT, 5}, {MC|CODED|QUANT, 5}, {INTRA, 5}, {MC, 3}, {MC, 3}, {MC, 3}, {MC, 3}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, {CODED, 2}, @@ -93,9 +93,9 @@ static const MBtab MB_P [] = { #define INTER MACROBLOCK_MOTION_FORWARD|MACROBLOCK_MOTION_BACKWARD static const MBtab MB_B [] = { - {0, 0}, {INTRA|TQUANT, 6}, - {BWD|CODED|TQUANT, 6}, {FWD|CODED|TQUANT, 6}, - {INTER|CODED|TQUANT, 5}, {INTER|CODED|TQUANT, 5}, + {0, 0}, {INTRA|QUANT, 6}, + {BWD|CODED|QUANT, 6}, {FWD|CODED|QUANT, 6}, + {INTER|CODED|QUANT, 5}, {INTER|CODED|QUANT, 5}, {INTRA, 5}, {INTRA, 5}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, {FWD|CODED, 4}, @@ -114,7 +114,7 @@ static const MBtab MB_B [] = { }; #undef INTRA -#undef TQUANT +#undef QUANT #undef MC #undef CODED #undef FWD 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); diff --git a/k9vamps/k9requant.h b/k9vamps/k9requant.h index 7cdc711..54d8d80 100644 --- a/k9vamps/k9requant.h +++ b/k9vamps/k9requant.h @@ -9,8 +9,8 @@ // Copyright: See COPYING file that comes with this distribution // // -#ifndef K9RETQUANT_H -#define K9RETQUANT_H +#ifndef K9REQUANT_H +#define K9REQUANT_H #include "k9common.h" diff --git a/k9vamps/k9requant2.h b/k9vamps/k9requant2.h index f85c8bd..e568087 100755 --- a/k9vamps/k9requant2.h +++ b/k9vamps/k9requant2.h @@ -1,8 +1,8 @@ #include #include "k9fifo.h" -#ifndef K9RETQUANT2_H -#define K9RETQUANT2_H +#ifndef K9REQUANT2_H +#define K9REQUANT2_H class k9Requant2 -- cgit v1.2.1