From 27edf28be2772229a7974a007313ea30d92c3ffd Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- mpeglib/lib/mpegplay/decoderClass.cpp | 2 +- mpeglib/lib/mpegplay/macroBlock.cpp | 6 ++-- mpeglib/lib/mpegplay/mpegExtension.cpp | 6 ++-- mpeglib/lib/mpegplay/mpegExtension.h | 2 +- mpeglib/lib/mpegplay/mpegVideoBitWindow.h | 4 +-- mpeglib/lib/output/outputStream.cpp | 6 ++-- mpeglib/lib/output/outputStream.h | 6 ++-- mpeglib/lib/splay/mpegAudioHeader.cpp | 2 +- .../lib/util/render/dither/colorTableHighBit.cpp | 18 ++++++------ mpeglib/lib/util/render/dither/ditherer_mmx16.cpp | 32 +++++++++++----------- mpeglib/lib/util/render/x11/initDisplay.cpp | 6 ++-- 11 files changed, 45 insertions(+), 45 deletions(-) (limited to 'mpeglib/lib') 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))); diff --git a/mpeglib/lib/output/outputStream.cpp b/mpeglib/lib/output/outputStream.cpp index 560ab75f..ef209cbc 100644 --- a/mpeglib/lib/output/outputStream.cpp +++ b/mpeglib/lib/output/outputStream.cpp @@ -198,7 +198,7 @@ int OutputStream::getFrameusec() { -int OutputStream::waitStreamState(int method,int tqmask,int streamType) { +int OutputStream::waitStreamState(int method,int mask,int streamType) { int* waitState=NULL; switch(streamType) { @@ -216,9 +216,9 @@ int OutputStream::waitStreamState(int method,int tqmask,int streamType) { if (method == _OUTPUT_WAIT_METHOD_BLOCK) { abs_thread_mutex_lock(&stateChangeMut); - while ((*waitState &= tqmask)==0) { + while ((*waitState &= mask)==0) { cout << "waitStreamState:"< 2) { DEBUG_HEADER(cout << "frequency value out of range"<> (8 - number_of_bits_set(red_tqmask)); - r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_tqmask); - g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_tqmask)); - g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_tqmask); - b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_tqmask)); - b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_tqmask); + r_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(red_mask)); + r_2_pix_alloc[i + 256] <<= free_bits_at_bottom(red_mask); + g_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(green_mask)); + g_2_pix_alloc[i + 256] <<= free_bits_at_bottom(green_mask); + b_2_pix_alloc[i + 256] = i >> (8 - number_of_bits_set(blue_mask)); + b_2_pix_alloc[i + 256] <<= free_bits_at_bottom(blue_mask); /* * If we have 16-bit output depth, then we double the value * in the top word. This means that we can write out both diff --git a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp index 1de9cc17..757f0676 100644 --- a/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp +++ b/mpeglib/lib/util/render/dither/ditherer_mmx16.cpp @@ -26,8 +26,8 @@ static unsigned short MMX16_Vredcoeff[] = {0x66, 0x66, 0x66, 0x66}; static unsigned short MMX16_Ugrncoeff[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; static unsigned short MMX16_Vgrncoeff[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; static unsigned short MMX16_Ycoeff[] = {0x4a, 0x4a, 0x4a, 0x4a}; -static unsigned short MMX16_redtqmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; -static unsigned short MMX16_grntqmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; +static unsigned short MMX16_redmask[] = {0xf800, 0xf800, 0xf800, 0xf800}; +static unsigned short MMX16_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0}; void dummy_dithermmx16() { cout << "MMX16_0"<display; @@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) { cout << "visual is null"<colormap==0) { xswa.colormap = XCreateColormap(dpy, XRootWindow(dpy, screen), @@ -166,7 +166,7 @@ void CreateFullColorWindow (XWindow* xwindow) { /* xwindow->window = XCreateWindow(dpy, RootWindow(dpy, screen), x, y, w, h, (unsigned int) 1, depth, c_class, - visual, tqmask, &xswa); + visual, mask, &xswa); */ } -- cgit v1.2.1