summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib/mpegplay
diff options
context:
space:
mode:
Diffstat (limited to 'mpeglib/lib/mpegplay')
-rw-r--r--mpeglib/lib/mpegplay/decoderClass.cpp2
-rw-r--r--mpeglib/lib/mpegplay/macroBlock.cpp6
-rw-r--r--mpeglib/lib/mpegplay/mpegExtension.cpp6
-rw-r--r--mpeglib/lib/mpegplay/mpegExtension.h2
-rw-r--r--mpeglib/lib/mpegplay/mpegVideoBitWindow.h4
5 files changed, 10 insertions, 10 deletions
diff --git a/mpeglib/lib/mpegplay/decoderClass.cpp b/mpeglib/lib/mpegplay/decoderClass.cpp
index 1e7df93c..e259c8e6 100644
--- a/mpeglib/lib/mpegplay/decoderClass.cpp
+++ b/mpeglib/lib/mpegplay/decoderClass.cpp
@@ -647,7 +647,7 @@ void DecoderClass::ParseReconBlock(int& n,int& mb_intra,
* flush_bitsX <--> flushed += X;
* next16bits &= bitMask[flushed];
*
- * I've streamlined the code a lot, so that we don't have to tqmask
+ * I've streamlined the code a lot, so that we don't have to mask
* out the low order bits and a few of the extra adds are removed.
* bsmith
*/
diff --git a/mpeglib/lib/mpegplay/macroBlock.cpp b/mpeglib/lib/mpegplay/macroBlock.cpp
index 730fdd62..5436dbd7 100644
--- a/mpeglib/lib/mpegplay/macroBlock.cpp
+++ b/mpeglib/lib/mpegplay/macroBlock.cpp
@@ -329,7 +329,7 @@ int MacroBlock::reconstruct(int& recon_right_for,
int& mb_motion_forw,
int& mb_motion_back,
PictureArray* pictureArray) {
- int tqmask, i;
+ int mask, i;
int zero_block_flag;
int mb_row;
int mb_col;
@@ -364,11 +364,11 @@ int MacroBlock::reconstruct(int& recon_right_for,
copyFunctions->startNOFloatSection();
- for (tqmask = 32, i = 0; i < 6; tqmask >>= 1, i++) {
+ for (mask = 32, i = 0; i < 6; mask >>= 1, i++) {
/* If block exists... */
- if ((mb_intra) || (cbp & tqmask)) {
+ if ((mb_intra) || (cbp & mask)) {
zero_block_flag = 0;
//copyFunctions->endNOFloatSection();
decoderClass->ParseReconBlock(i,mb_intra,
diff --git a/mpeglib/lib/mpegplay/mpegExtension.cpp b/mpeglib/lib/mpegplay/mpegExtension.cpp
index 3fc89215..657fe683 100644
--- a/mpeglib/lib/mpegplay/mpegExtension.cpp
+++ b/mpeglib/lib/mpegplay/mpegExtension.cpp
@@ -89,7 +89,7 @@ int MpegExtension::processExtra_bit_info(MpegVideoStream* mpegVideoStream) {
-int MpegExtension::next_bits(int num,unsigned int tqmask,
+int MpegExtension::next_bits(int num,unsigned int mask,
MpegVideoStream* input) {
unsigned int data;
@@ -97,11 +97,11 @@ int MpegExtension::next_bits(int num,unsigned int tqmask,
data=input->showBits(num);
- /* Compare bit stream and tqmask. Set return value toTRUE if equal, FALSE if
+ /* Compare bit stream and mask. Set return value toTRUE if equal, FALSE if
differs.
*/
- if (tqmask == data) {
+ if (mask == data) {
return true;
}
return false;
diff --git a/mpeglib/lib/mpegplay/mpegExtension.h b/mpeglib/lib/mpegplay/mpegExtension.h
index 3b0f1680..23b79c5b 100644
--- a/mpeglib/lib/mpegplay/mpegExtension.h
+++ b/mpeglib/lib/mpegplay/mpegExtension.h
@@ -43,7 +43,7 @@ class MpegExtension {
private:
char* get_extra_bit_info(MpegVideoStream* mpegVideoStream);
- int next_bits(int num,unsigned int tqmask,MpegVideoStream* input);
+ int next_bits(int num,unsigned int mask,MpegVideoStream* input);
};
#endif
diff --git a/mpeglib/lib/mpegplay/mpegVideoBitWindow.h b/mpeglib/lib/mpegplay/mpegVideoBitWindow.h
index 5c957e4d..46abe44e 100644
--- a/mpeglib/lib/mpegplay/mpegVideoBitWindow.h
+++ b/mpeglib/lib/mpegplay/mpegVideoBitWindow.h
@@ -53,10 +53,10 @@ class MpegVideoBitWindow {
inline unsigned int showBits(int bits) {
- unsigned int tqmask=nBitMask[bits];
+ unsigned int mask=nBitMask[bits];
int shift=32-(bits);
int bO;
- shift=(curBits & tqmask)>>shift;
+ shift=(curBits & mask)>>shift;
bO = bit_offset + bits;
if (bO > 32) {
return (shift | (*(buffer+1)>>(64-bO)));