summaryrefslogtreecommitdiffstats
path: root/mpeglib/lib
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-11 06:00:15 +0000
commitb1057f437bf65300831a0ccb45b920787c6b318d (patch)
treef8a73db06ca1180d0da0ba6dfbe786197b4f4bc3 /mpeglib/lib
parent4ddfca384ced9ad654213aef9dc2c3973720b980 (diff)
downloadtdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.tar.gz
tdemultimedia-b1057f437bf65300831a0ccb45b920787c6b318d.zip
TQt4 port kdemultimedia
This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'mpeglib/lib')
-rw-r--r--mpeglib/lib/Makefile.am2
-rw-r--r--mpeglib/lib/decoder/mpgPlugin.cpp2
-rw-r--r--mpeglib/lib/frame/IOFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/README4
-rw-r--r--mpeglib/lib/frame/audioFrameQueue.h4
-rw-r--r--mpeglib/lib/frame/frameQueue.h4
-rw-r--r--mpeglib/lib/frame/framer.cpp2
-rw-r--r--mpeglib/lib/mpegplay/decoderClass.cpp4
-rw-r--r--mpeglib/lib/mpegplay/jrevdct.h2
-rw-r--r--mpeglib/lib/mpegplay/macroBlock.cpp8
-rw-r--r--mpeglib/lib/mpegplay/mpegExtension.cpp6
-rw-r--r--mpeglib/lib/mpegplay/mpegExtension.h2
-rw-r--r--mpeglib/lib/mpegplay/mpegSystemStream.cpp2
-rw-r--r--mpeglib/lib/mpegplay/mpegVideoBitWindow.h4
-rw-r--r--mpeglib/lib/mpegplay/mpegVideoStream.cpp8
-rw-r--r--mpeglib/lib/mpegplay/pesSystemStream.cpp2
-rw-r--r--mpeglib/lib/mpegplay/picture.cpp2
-rw-r--r--mpeglib/lib/mpegplay/recon.cpp4
-rw-r--r--mpeglib/lib/mpegplay/slice.h2
-rw-r--r--mpeglib/lib/mpegplay/startCodes.h6
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.cpp14
-rw-r--r--mpeglib/lib/mpegplay/videoDecoder.h2
-rw-r--r--mpeglib/lib/output/outputStream.cpp6
-rw-r--r--mpeglib/lib/output/outputStream.h6
-rw-r--r--mpeglib/lib/splay/dxHead.h2
-rw-r--r--mpeglib/lib/splay/mpegAudioFrame.cpp2
-rw-r--r--mpeglib/lib/splay/mpegAudioHeader.cpp2
-rw-r--r--mpeglib/lib/util/abstract/threadQueue.cpp16
-rw-r--r--mpeglib/lib/util/abstract/threadQueue.h4
-rw-r--r--mpeglib/lib/util/dynBuffer.cpp2
-rw-r--r--mpeglib/lib/util/dynBuffer.h2
-rw-r--r--mpeglib/lib/util/mmx/mmx_asm.h2
-rw-r--r--mpeglib/lib/util/render/dither/colorTableHighBit.cpp20
-rw-r--r--mpeglib/lib/util/render/dither/ditherer_mmx16.cpp32
-rw-r--r--mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h4
-rw-r--r--mpeglib/lib/util/render/x11/initDisplay.cpp6
-rw-r--r--mpeglib/lib/util/render/x11/x11Surface.cpp2
37 files changed, 100 insertions, 98 deletions
diff --git a/mpeglib/lib/Makefile.am b/mpeglib/lib/Makefile.am
index 74a7d181..3c6d115e 100644
--- a/mpeglib/lib/Makefile.am
+++ b/mpeglib/lib/Makefile.am
@@ -1,3 +1,5 @@
+INCLUDES= $(all_includes)
+
# player - Makefile.am
SUBDIRS = frame util input output decoder \
diff --git a/mpeglib/lib/decoder/mpgPlugin.cpp b/mpeglib/lib/decoder/mpgPlugin.cpp
index fd7170c8..510accbd 100644
--- a/mpeglib/lib/decoder/mpgPlugin.cpp
+++ b/mpeglib/lib/decoder/mpgPlugin.cpp
@@ -95,7 +95,7 @@ void MpgPlugin::decoder_loop() {
//cout << "still initializing system stream"<<endl;
} else {
// if we have found a raw stream,
- // make sure we pass as first argument a SEQ_START_CODE
+ // make sure we pass as first argument a SETQ_START_CODE
if (mpegSystemHeader->getLayer() == _PACKET_SYSLAYER) {
lSysLayer=true;
mpegStreamPlayer->processSystemHeader(mpegSystemHeader);
diff --git a/mpeglib/lib/frame/IOFrameQueue.h b/mpeglib/lib/frame/IOFrameQueue.h
index d56f25aa..98780096 100644
--- a/mpeglib/lib/frame/IOFrameQueue.h
+++ b/mpeglib/lib/frame/IOFrameQueue.h
@@ -12,8 +12,8 @@
-#ifndef __IOFRAMEQUEUE_H
-#define __IOFRAMEQUEUE_H
+#ifndef __IOFRAMETQUEUE_H
+#define __IOFRAMETQUEUE_H
#include "frameQueue.h"
#include <kdemacros.h>
diff --git a/mpeglib/lib/frame/README b/mpeglib/lib/frame/README
index 9e21059f..e54bd918 100644
--- a/mpeglib/lib/frame/README
+++ b/mpeglib/lib/frame/README
@@ -27,7 +27,7 @@ IOFrameQueues
=============
IOFrameQueues deal with the problem, that you first start
-with an empty FrameQueue (this is a FrameQueue which contains
+with an empty FrameQueue (this is a FrameQueue which tqcontains
prealloceated data, but the data is empty (eg:all pcm samples zero)
Only after converting an "empty" Frame by a decoder (mp3decoder)
the frame if "full" (== Frame with data)
@@ -58,7 +58,7 @@ A IOFrameQueue, which allows converting "dataFrames back to continous
stream".
What is this?
Lets say an application wants only 20 byte from a dataFrame which
-contains 3KB of data?
+tqcontains 3KB of data?
There must be some mechanism to read less or more data from the
queue. And the data should be written to a continus memory
segment.
diff --git a/mpeglib/lib/frame/audioFrameQueue.h b/mpeglib/lib/frame/audioFrameQueue.h
index 7e7a01c0..0582af76 100644
--- a/mpeglib/lib/frame/audioFrameQueue.h
+++ b/mpeglib/lib/frame/audioFrameQueue.h
@@ -12,8 +12,8 @@
-#ifndef __AUDIOFRAMEQUE_H
-#define __AUDIOFRAMEQUE_H
+#ifndef __AUDIOFRAMETQUE_H
+#define __AUDIOFRAMETQUE_H
#include "IOFrameQueue.h"
#include "floatFrame.h"
diff --git a/mpeglib/lib/frame/frameQueue.h b/mpeglib/lib/frame/frameQueue.h
index 27747aa3..6e42c678 100644
--- a/mpeglib/lib/frame/frameQueue.h
+++ b/mpeglib/lib/frame/frameQueue.h
@@ -13,8 +13,8 @@
-#ifndef __FRAMEQUEUE_H
-#define __FRAMEQUEUE_H
+#ifndef __FRAMETQUEUE_H
+#define __FRAMETQUEUE_H
#include "frame.h"
diff --git a/mpeglib/lib/frame/framer.cpp b/mpeglib/lib/frame/framer.cpp
index d380b2ec..2882864d 100644
--- a/mpeglib/lib/frame/framer.cpp
+++ b/mpeglib/lib/frame/framer.cpp
@@ -223,7 +223,7 @@ int Framer::read_frame(RawDataBuffer* ,RawDataBuffer* ) {
void Framer::unsync(RawDataBuffer* ,int ) {
if (lConstruct == false) {
- // invalidate header in buffer
+ // tqinvalidate header in buffer
cout << "direct virtual call Framer::unsync"<<endl;
}
}
diff --git a/mpeglib/lib/mpegplay/decoderClass.cpp b/mpeglib/lib/mpegplay/decoderClass.cpp
index e259c8e6..0e46f752 100644
--- a/mpeglib/lib/mpegplay/decoderClass.cpp
+++ b/mpeglib/lib/mpegplay/decoderClass.cpp
@@ -54,7 +54,7 @@ static const int zigzag_direct_mmx[64] = {
-/* Bit masks used by bit i/o operations. */
+/* Bit tqmasks used by bit i/o operations. */
@@ -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 mask
+ * I've streamlined the code a lot, so that we don't have to tqmask
* out the low order bits and a few of the extra adds are removed.
* bsmith
*/
diff --git a/mpeglib/lib/mpegplay/jrevdct.h b/mpeglib/lib/mpegplay/jrevdct.h
index d280c2ce..24ab126f 100644
--- a/mpeglib/lib/mpegplay/jrevdct.h
+++ b/mpeglib/lib/mpegplay/jrevdct.h
@@ -24,7 +24,7 @@ extern "C" {
#ifndef XMD_H
typedef int INT32;
typedef short INT16;
-typedef char INT8;
+// typedef char INT8;
#endif
typedef unsigned int UINT32;
typedef unsigned short UINT16;
diff --git a/mpeglib/lib/mpegplay/macroBlock.cpp b/mpeglib/lib/mpegplay/macroBlock.cpp
index 2e35e551..730fdd62 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 mask, i;
+ int tqmask, 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 (mask = 32, i = 0; i < 6; mask >>= 1, i++) {
+ for (tqmask = 32, i = 0; i < 6; tqmask >>= 1, i++) {
/* If block exists... */
- if ((mb_intra) || (cbp & mask)) {
+ if ((mb_intra) || (cbp & tqmask)) {
zero_block_flag = 0;
//copyFunctions->endNOFloatSection();
decoderClass->ParseReconBlock(i,mb_intra,
@@ -1067,7 +1067,7 @@ void MacroBlock::ReconSkippedBlock(unsigned char* source,
if (width == 16) {
if ((!right_half) && (!down_half)) {
if (right & 0x1) {
- /* No alignment, use bye copy */
+ /* No tqalignment, use bye copy */
for (rr = 0; rr < 16; rr++) {
memcpy(dest,source,sizeof(char)*16);
diff --git a/mpeglib/lib/mpegplay/mpegExtension.cpp b/mpeglib/lib/mpegplay/mpegExtension.cpp
index 657fe683..3fc89215 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 mask,
+int MpegExtension::next_bits(int num,unsigned int tqmask,
MpegVideoStream* input) {
unsigned int data;
@@ -97,11 +97,11 @@ int MpegExtension::next_bits(int num,unsigned int mask,
data=input->showBits(num);
- /* Compare bit stream and mask. Set return value toTRUE if equal, FALSE if
+ /* Compare bit stream and tqmask. Set return value toTRUE if equal, FALSE if
differs.
*/
- if (mask == data) {
+ if (tqmask == data) {
return true;
}
return false;
diff --git a/mpeglib/lib/mpegplay/mpegExtension.h b/mpeglib/lib/mpegplay/mpegExtension.h
index 23b79c5b..3b0f1680 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 mask,MpegVideoStream* input);
+ int next_bits(int num,unsigned int tqmask,MpegVideoStream* input);
};
#endif
diff --git a/mpeglib/lib/mpegplay/mpegSystemStream.cpp b/mpeglib/lib/mpegplay/mpegSystemStream.cpp
index ca25d7e8..d4ec43a6 100644
--- a/mpeglib/lib/mpegplay/mpegSystemStream.cpp
+++ b/mpeglib/lib/mpegplay/mpegSystemStream.cpp
@@ -68,7 +68,7 @@ int MpegSystemStream::firstInitialize(MpegSystemHeader* mpegHeader) {
}
mpegHeader->setHeader(syncCode);
- // SEQ_START_CODE: 1b3
+ // SETQ_START_CODE: 1b3
if (mpegHeader->hasRAWHeader()) {
// If we found a seq_heade_start code we assume
// that we are a video only stream
diff --git a/mpeglib/lib/mpegplay/mpegVideoBitWindow.h b/mpeglib/lib/mpegplay/mpegVideoBitWindow.h
index 46abe44e..5c957e4d 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 mask=nBitMask[bits];
+ unsigned int tqmask=nBitMask[bits];
int shift=32-(bits);
int bO;
- shift=(curBits & mask)>>shift;
+ shift=(curBits & tqmask)>>shift;
bO = bit_offset + bits;
if (bO > 32) {
return (shift | (*(buffer+1)>>(64-bO)));
diff --git a/mpeglib/lib/mpegplay/mpegVideoStream.cpp b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
index 5e16b116..8ce1defd 100644
--- a/mpeglib/lib/mpegplay/mpegVideoStream.cpp
+++ b/mpeglib/lib/mpegplay/mpegVideoStream.cpp
@@ -48,7 +48,7 @@ int MpegVideoStream::firstInitialize(MpegVideoHeader* mpegHeader) {
fill_videoBuffer(mpegSystemHeader);
lHasStream=true;
}
- // now find SEQ_START_CODE
+ // now find SETQ_START_CODE
hasBytes(4);
mpegVideoBitWindow->flushByteOffset();
@@ -70,8 +70,8 @@ int MpegVideoStream::firstInitialize(MpegVideoHeader* mpegHeader) {
int MpegVideoStream::isStartCode(unsigned int data) {
switch(data) {
- case SEQ_END_CODE:
- case SEQ_START_CODE:
+ case SETQ_END_CODE:
+ case SETQ_START_CODE:
case GOP_START_CODE:
case PICTURE_START_CODE:
case SLICE_MIN_START_CODE:
@@ -125,7 +125,7 @@ int MpegVideoStream::nextPIC() {
unsigned int data=showBits(32);
if ( (data != PICTURE_START_CODE) &&
(data != GOP_START_CODE) &&
- (data != SEQ_START_CODE) ) {
+ (data != SETQ_START_CODE) ) {
flushBits(8);
return false;
}
diff --git a/mpeglib/lib/mpegplay/pesSystemStream.cpp b/mpeglib/lib/mpegplay/pesSystemStream.cpp
index 10787f21..b9915fc2 100644
--- a/mpeglib/lib/mpegplay/pesSystemStream.cpp
+++ b/mpeglib/lib/mpegplay/pesSystemStream.cpp
@@ -192,7 +192,7 @@ int PESSystemStream::processMPEG2PacketHeader(MpegSystemHeader* mpegHeader){
//LIVID
u_char original_or_copy : 1;
u_char copyright : 1;
- u_char data_alignment_indicator : 1;
+ u_char data_tqalignment_indicator : 1;
u_char pes_priority : 1;
u_char pes_scrambling_control : 2;
u_char start_code_prefix : 2; // 0x02
diff --git a/mpeglib/lib/mpegplay/picture.cpp b/mpeglib/lib/mpegplay/picture.cpp
index 6d8c1efe..b63f4989 100644
--- a/mpeglib/lib/mpegplay/picture.cpp
+++ b/mpeglib/lib/mpegplay/picture.cpp
@@ -63,7 +63,7 @@ int Picture::processPicture(MpegVideoStream* mpegVideoStream) {
stamp=mpegVideoStream->getCurrentTimeStamp();
stamp->copyTo(startOfPicStamp);
- // now invalidate the PTSFlag
+ // now tqinvalidate the PTSFlag
stamp->setPTSFlag(false);
diff --git a/mpeglib/lib/mpegplay/recon.cpp b/mpeglib/lib/mpegplay/recon.cpp
index 6116157a..81350345 100644
--- a/mpeglib/lib/mpegplay/recon.cpp
+++ b/mpeglib/lib/mpegplay/recon.cpp
@@ -298,7 +298,7 @@ int Recon::ReconPMBlock(int bnum,
} else {
if (right_for & 0x1) {
- /* No alignment, used byte copy */
+ /* No tqalignment, used byte copy */
copyFunctions->copy8_byte(rindex1,index,row_size);
@@ -498,7 +498,7 @@ int Recon::ReconBMBlock(int bnum,
copyFunctions->copy8_src2linear_crop(rindex1,dct_start,index,row_size);
} else {
if (right_back & 0x1) {
- /* No alignment, use byte copy */
+ /* No tqalignment, use byte copy */
copyFunctions->copy8_byte(rindex1,index,row_size);
diff --git a/mpeglib/lib/mpegplay/slice.h b/mpeglib/lib/mpegplay/slice.h
index 10689d34..13556155 100644
--- a/mpeglib/lib/mpegplay/slice.h
+++ b/mpeglib/lib/mpegplay/slice.h
@@ -38,7 +38,7 @@ class Slice {
/* Slice structure. */
- unsigned int vert_pos; /* Vertical position of slice. */
+ unsigned int vert_pos; /*Qt::Vertical position of slice. */
unsigned int quant_scale; /* Quantization scale. */
MpegExtension* mpegExtension; /* Extra bit slice info. */
diff --git a/mpeglib/lib/mpegplay/startCodes.h b/mpeglib/lib/mpegplay/startCodes.h
index c305a39f..94c2a56e 100644
--- a/mpeglib/lib/mpegplay/startCodes.h
+++ b/mpeglib/lib/mpegplay/startCodes.h
@@ -29,8 +29,8 @@
/* Start codes. */
-#define SEQ_END_CODE 0x000001b7
-#define SEQ_START_CODE 0x000001b3
+#define SETQ_END_CODE 0x000001b7
+#define SETQ_START_CODE 0x000001b3
#define GOP_START_CODE 0x000001b8
#define PICTURE_START_CODE 0x00000100
#define SLICE_MIN_START_CODE 0x00000101
@@ -42,7 +42,7 @@
//extension start code ids
#define SEQUENCE_EXTENSION_ID 1
#define SEQUENCE_DISPLAY_EXTENSION_ID 2
-#define QUANT_MATRIX_EXTENSION_ID 3
+#define TQUANT_MATRIX_EXTENSION_ID 3
#define COPYRIGHT_EXTENSION_ID 4
#define SEQUENCE_SCALABLE_EXTENSION_ID 5
#define PICTURE_DISPLAY_EXTENSION_ID 7
diff --git a/mpeglib/lib/mpegplay/videoDecoder.cpp b/mpeglib/lib/mpegplay/videoDecoder.cpp
index b1971795..b7144291 100644
--- a/mpeglib/lib/mpegplay/videoDecoder.cpp
+++ b/mpeglib/lib/mpegplay/videoDecoder.cpp
@@ -69,7 +69,7 @@ VideoDecoder::~VideoDecoder() {
*
* mpegVidRsrc --
*
- * Parses bit stream until MB_QUANTUM number of
+ * Parses bit stream until MB_TQUANTUM number of
* macroblocks have been decoded or current slice or
* picture ends, whichever comes first. If the start
* of a frame is encountered, the frame is time stamped
@@ -121,7 +121,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
mpegVideoStream->flushBits(32);
packet->read_sys(data,vid_stream->bufferReader);
*/
- case SEQ_END_CODE:
+ case SETQ_END_CODE:
case ISO_11172_END_CODE: /* handle ISO_11172_END_CODE too */
/* Display last frame. */
@@ -148,11 +148,11 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
mpegVideoStream->next_start_code();
break;
- case SEQ_START_CODE:
+ case SETQ_START_CODE:
/* Sequence start code. Parse sequence header. */
if (ParseSeqHead() == false) {
- printf("SEQ_START_CODE 1-error\n");
+ printf("SETQ_START_CODE 1-error\n");
goto error;
}
goto done;
@@ -204,8 +204,8 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
break;
}
- /* Parse next MB_QUANTUM macroblocks. */
- for (i = 0; i < MB_QUANTUM; i++) {
+ /* Parse next MB_TQUANTUM macroblocks. */
+ for (i = 0; i < MB_TQUANTUM; i++) {
/* Check to see if actually a startcode and not a macroblock. */
data=mpegVideoStream->showBits(23);
@@ -232,7 +232,7 @@ int VideoDecoder::mpegVidRsrc(PictureArray* pictureArray) {
}
}
data=mpegVideoStream->showBits(23);
- /* Check if we just finished a picture on the MB_QUANTUM macroblock */
+ /* Check if we just finished a picture on the MB_TQUANTUM macroblock */
if (data == 0x0) {
mpegVideoStream->next_start_code();
diff --git a/mpeglib/lib/mpegplay/videoDecoder.h b/mpeglib/lib/mpegplay/videoDecoder.h
index cba45a29..695b424d 100644
--- a/mpeglib/lib/mpegplay/videoDecoder.h
+++ b/mpeglib/lib/mpegplay/videoDecoder.h
@@ -53,7 +53,7 @@
/* Number of macroblocks to process in one call to mpegVidRsrc. */
-#define MB_QUANTUM 100
+#define MB_TQUANTUM 100
/* Video stream structure. */
diff --git a/mpeglib/lib/output/outputStream.cpp b/mpeglib/lib/output/outputStream.cpp
index ef209cbc..560ab75f 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 mask,int streamType) {
+int OutputStream::waitStreamState(int method,int tqmask,int streamType) {
int* waitState=NULL;
switch(streamType) {
@@ -216,9 +216,9 @@ int OutputStream::waitStreamState(int method,int mask,int streamType) {
if (method == _OUTPUT_WAIT_METHOD_BLOCK) {
abs_thread_mutex_lock(&stateChangeMut);
- while ((*waitState &= mask)==0) {
+ while ((*waitState &= tqmask)==0) {
cout << "waitStreamState:"<<waitState<<endl;
- cout << "mask:"<<mask<<endl;
+ cout << "tqmask:"<<tqmask<<endl;
abs_thread_cond_wait(&stateChangeCond,&stateChangeMut);
}
abs_thread_mutex_unlock(&stateChangeMut);
diff --git a/mpeglib/lib/output/outputStream.h b/mpeglib/lib/output/outputStream.h
index 9ef538fd..6dccd02e 100644
--- a/mpeglib/lib/output/outputStream.h
+++ b/mpeglib/lib/output/outputStream.h
@@ -105,10 +105,10 @@ class KDE_EXPORT OutputStream {
// stream State handling
- // we return the mask which triggerd (by "AND")
- // or the current polled mask when method is POLL
+ // we return the tqmask which triggerd (by "AND")
+ // or the current polled tqmask when method is POLL
// Note: you can only wait for "true" signals
- virtual int waitStreamState(int method,int mask,int streamType);
+ virtual int waitStreamState(int method,int tqmask,int streamType);
diff --git a/mpeglib/lib/splay/dxHead.h b/mpeglib/lib/splay/dxHead.h
index da0f2eff..0bfc0bac 100644
--- a/mpeglib/lib/splay/dxHead.h
+++ b/mpeglib/lib/splay/dxHead.h
@@ -10,7 +10,7 @@ Copyright 1998 Xing Technology Corp.
-----------------------------------------------------------*/
// A Xing header may be present in the ancillary
// data field of the first frame of an mp3 bitstream
-// The Xing header (optionally) contains
+// The Xing header (optionally) tqcontains
// frames total number of audio frames in the bitstream
// bytes total number of bytes in the bitstream
// toc table of contents
diff --git a/mpeglib/lib/splay/mpegAudioFrame.cpp b/mpeglib/lib/splay/mpegAudioFrame.cpp
index 807a23a6..d423a1fe 100644
--- a/mpeglib/lib/splay/mpegAudioFrame.cpp
+++ b/mpeglib/lib/splay/mpegAudioFrame.cpp
@@ -34,7 +34,7 @@ MpegAudioFrame::~MpegAudioFrame() {
void MpegAudioFrame::unsync(RawDataBuffer* store,int ) {
- // invalidate header in buffer
+ // tqinvalidate header in buffer
unsigned char* start=store->ptr();
start[0]=0x0;
start[1]=0x0;
diff --git a/mpeglib/lib/splay/mpegAudioHeader.cpp b/mpeglib/lib/splay/mpegAudioHeader.cpp
index 7e34b212..31e97563 100644
--- a/mpeglib/lib/splay/mpegAudioHeader.cpp
+++ b/mpeglib/lib/splay/mpegAudioHeader.cpp
@@ -116,7 +116,7 @@ int MpegAudioHeader::parseHeader(unsigned char* buf){
inputstereo= (mode==_MODE_SINGLE)?0:1;
//
- // frequency can be 0,1 or 2 but the mask above allows 3 as well
+ // frequency can be 0,1 or 2 but the tqmask above allows 3 as well
// check now.
if (frequency > 2) {
DEBUG_HEADER(cout << "frequency value out of range"<<endl;)
diff --git a/mpeglib/lib/util/abstract/threadQueue.cpp b/mpeglib/lib/util/abstract/threadQueue.cpp
index 1b130ba9..fd8a4a39 100644
--- a/mpeglib/lib/util/abstract/threadQueue.cpp
+++ b/mpeglib/lib/util/abstract/threadQueue.cpp
@@ -12,7 +12,7 @@
#include "threadQueue.h"
-#define _MAX_THREAD_IN_QUEUE 5
+#define _MAX_THREAD_IN_TQUEUE 5
#include <iostream>
@@ -37,9 +37,9 @@ WaitThreadEntry::~WaitThreadEntry() {
ThreadQueue::ThreadQueue() {
- waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_QUEUE];
+ waitThreadEntries=new WaitThreadEntry* [_MAX_THREAD_IN_TQUEUE];
int i;
- for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) {
+ for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) {
waitThreadEntries[i]=new WaitThreadEntry();
}
abs_thread_mutex_init(&queueMut);
@@ -56,7 +56,7 @@ ThreadQueue::~ThreadQueue() {
exit(0);
}
int i;
- for(i=0;i<_MAX_THREAD_IN_QUEUE;i++) {
+ for(i=0;i<_MAX_THREAD_IN_TQUEUE;i++) {
delete waitThreadEntries[i];
}
delete [] waitThreadEntries;
@@ -73,14 +73,14 @@ void ThreadQueue::waitForExclusiveAccess() {
}
// wait
size++;
- if (size == _MAX_THREAD_IN_QUEUE) {
- cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_QUEUE<<endl;
+ if (size == _MAX_THREAD_IN_TQUEUE) {
+ cout << "Aieee! ThreadQueue can only buffer:"<<_MAX_THREAD_IN_TQUEUE<<endl;
exit(0);
}
abs_thread_cond_t* waitCond=&(waitThreadEntries[insertPos]->waitCond);
insertPos++;
// wrap counter
- if (insertPos == _MAX_THREAD_IN_QUEUE) {
+ if (insertPos == _MAX_THREAD_IN_TQUEUE) {
insertPos=0;
}
abs_thread_cond_wait(waitCond,&queueMut);
@@ -98,7 +98,7 @@ void ThreadQueue::releaseExclusiveAccess() {
abs_thread_cond_t* waitCond=&(waitThreadEntries[removePos]->waitCond);
removePos++;
// wrap counter
- if (removePos == _MAX_THREAD_IN_QUEUE) {
+ if (removePos == _MAX_THREAD_IN_TQUEUE) {
removePos=0;
}
size--;
diff --git a/mpeglib/lib/util/abstract/threadQueue.h b/mpeglib/lib/util/abstract/threadQueue.h
index 4c650e21..765713b6 100644
--- a/mpeglib/lib/util/abstract/threadQueue.h
+++ b/mpeglib/lib/util/abstract/threadQueue.h
@@ -11,8 +11,8 @@
*/
-#ifndef __THREADQUEUE_H
-#define __THREADQUEUE_H
+#ifndef __THREADTQUEUE_H
+#define __THREADTQUEUE_H
#include "abs_thread.h"
diff --git a/mpeglib/lib/util/dynBuffer.cpp b/mpeglib/lib/util/dynBuffer.cpp
index c93d5381..c1eb2a9d 100644
--- a/mpeglib/lib/util/dynBuffer.cpp
+++ b/mpeglib/lib/util/dynBuffer.cpp
@@ -132,7 +132,7 @@ void DynBuffer::grow(int size) {
}
-int DynBuffer::find(char zeichen) {
+int DynBuffer::tqfind(char zeichen) {
int i;
int nlen=len();
for(i=0;i<nlen;i++) {
diff --git a/mpeglib/lib/util/dynBuffer.h b/mpeglib/lib/util/dynBuffer.h
index 7ba99d42..6d8b186b 100644
--- a/mpeglib/lib/util/dynBuffer.h
+++ b/mpeglib/lib/util/dynBuffer.h
@@ -39,7 +39,7 @@ class DynBuffer {
void append(char* buffer,int buflen);
- int find(char zeichen);
+ int tqfind(char zeichen);
int len();
void setData(char* msg);
diff --git a/mpeglib/lib/util/mmx/mmx_asm.h b/mpeglib/lib/util/mmx/mmx_asm.h
index 8717eff5..d1c2a0bd 100644
--- a/mpeglib/lib/util/mmx/mmx_asm.h
+++ b/mpeglib/lib/util/mmx/mmx_asm.h
@@ -208,7 +208,7 @@ typedef union {
: "X" (mem))
-#define maskmovq(regs,maskreg) mmx_r2ri (maskmovq, regs, maskreg)
+#define tqmaskmovq(regs,tqmaskreg) mmx_r2ri (tqmaskmovq, regs, tqmaskreg)
#define movntq_r2m(mmreg,var) mmx_r2m (movntq, mmreg, var)
diff --git a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
index 171f4e97..86b0b135 100644
--- a/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
+++ b/mpeglib/lib/util/render/dither/colorTableHighBit.cpp
@@ -21,7 +21,7 @@
* Erik Corry's multi-byte dither routines.
*
* The basic idea is that the Init generates all the necessary tables.
- * The tables incorporate the information about the layout of pixels
+ * The tables incorporate the information about the tqlayout of pixels
* in the XImage, so that it should be able to cope with 15-bit, 16-bit
* 24-bit (non-packed) and 32-bit (10-11 bits per color!) screens.
* At present it cannot cope with 24-bit packed mode, since this involves
@@ -131,9 +131,9 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask,
unsigned int greenMask,
unsigned int blueMask) {
- unsigned PIXVAL red_mask = redMask;
- unsigned PIXVAL green_mask =greenMask;
- unsigned PIXVAL blue_mask = blueMask;
+ unsigned PIXVAL red_tqmask = redMask;
+ unsigned PIXVAL green_tqmask =greenMask;
+ unsigned PIXVAL blue_tqmask = blueMask;
int CR, CB, i;
@@ -197,12 +197,12 @@ void ColorTableHighBit::initHighColor(int thirty2,unsigned int redMask,
* Set up entries 0-255 in rgb-to-pixel value tables.
*/
for (i = 0; i < 256; i++) {
- 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);
+ r_2_pix_alloc[i + 256] = i >> (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);
/*
* 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 757f0676..1de9cc17 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_redmask[] = {0xf800, 0xf800, 0xf800, 0xf800};
-static unsigned short MMX16_grnmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0};
+static unsigned short MMX16_redtqmask[] = {0xf800, 0xf800, 0xf800, 0xf800};
+static unsigned short MMX16_grntqmask[] = {0x7e0, 0x7e0, 0x7e0, 0x7e0};
void dummy_dithermmx16() {
cout << "MMX16_0"<<MMX16_0<<endl;
@@ -38,8 +38,8 @@ void dummy_dithermmx16() {
cout << "MMX16_Ugrncoeff:"<<MMX16_Ugrncoeff<<endl;
cout << "MMX16_Vgrncoeff:"<<MMX16_Vgrncoeff<<endl;
cout << "MMX16_Ycoeff:"<<MMX16_Ycoeff<<endl;
- cout << "MMX16_redmask:"<<MMX16_redmask<<endl;
- cout << "MMX16_grnmask:"<<MMX16_grnmask<<endl;
+ cout << "MMX16_redtqmask:"<<MMX16_redtqmask<<endl;
+ cout << "MMX16_grntqmask:"<<MMX16_grntqmask<<endl;
cout << "MMX16_00FFw:"<<MMX16_00FFw<<endl;
}
@@ -114,11 +114,11 @@ void ditherBlock(unsigned char *lum,
"punpcklbw %%mm4, %%mm4\n"
"punpcklbw %%mm5, %%mm5\n"
- "pand MMX16_redmask, %%mm4\n"
+ "pand MMX16_redtqmask, %%mm4\n"
"psllw $3, %%mm5\n" // GREEN 1
"punpcklbw %%mm6, %%mm6\n"
- "pand MMX16_grnmask, %%mm5\n"
- "pand MMX16_redmask, %%mm6\n"
+ "pand MMX16_grntqmask, %%mm5\n"
+ "pand MMX16_redtqmask, %%mm6\n"
"por %%mm5, %%mm4\n" //
"psrlw $11, %%mm6\n" // BLUE 1
"movq %%mm3, %%mm5\n" // lum2
@@ -145,10 +145,10 @@ void ditherBlock(unsigned char *lum,
"pmullw MMX16_Ycoeff, %%mm6\n" // lum3
"punpcklbw %%mm7, %%mm7\n"
"psllw $3, %%mm5\n" // GREEN 2
- "pand MMX16_redmask, %%mm7\n"
- "pand MMX16_redmask, %%mm3\n"
+ "pand MMX16_redtqmask, %%mm7\n"
+ "pand MMX16_redtqmask, %%mm3\n"
"psrlw $11, %%mm7\n" // BLUE 2
- "pand MMX16_grnmask, %%mm5\n"
+ "pand MMX16_grntqmask, %%mm5\n"
"por %%mm7, %%mm3\n"
"movq (%2), %%mm7\n" // L4 load lum2
@@ -186,11 +186,11 @@ void ditherBlock(unsigned char *lum,
"punpcklbw %%mm5, %%mm5\n"
"punpcklbw %%mm6, %%mm6\n"
"psllw $3, %%mm5\n" // GREEN 3
- "pand MMX16_redmask, %%mm4\n"
+ "pand MMX16_redtqmask, %%mm4\n"
"psraw $6, %%mm3\n" // psr 6
"psraw $6, %%mm0\n"
- "pand MMX16_redmask, %%mm6\n" // BLUE
- "pand MMX16_grnmask, %%mm5\n"
+ "pand MMX16_redtqmask, %%mm6\n" // BLUE
+ "pand MMX16_grntqmask, %%mm5\n"
"psrlw $11, %%mm6\n" // BLUE 3
"por %%mm5, %%mm4\n"
"psraw $6, %%mm7\n"
@@ -201,11 +201,11 @@ void ditherBlock(unsigned char *lum,
"punpcklbw %%mm3, %%mm3\n"
"punpcklbw %%mm0, %%mm0\n"
"punpcklbw %%mm7, %%mm7\n"
- "pand MMX16_redmask, %%mm3\n"
- "pand MMX16_redmask, %%mm7\n" // BLUE
+ "pand MMX16_redtqmask, %%mm3\n"
+ "pand MMX16_redtqmask, %%mm7\n" // BLUE
"psllw $3, %%mm0\n" // GREEN 4
"psrlw $11, %%mm7\n"
- "pand MMX16_grnmask, %%mm0\n"
+ "pand MMX16_grntqmask, %%mm0\n"
"por %%mm7, %%mm3\n"
"por %%mm0, %%mm3\n"
diff --git a/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h b/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
index 5c7ae574..6feeee6b 100644
--- a/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
+++ b/mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h
@@ -20,8 +20,8 @@
/* gcc 3.3.1 and later optimise the "not used" (only in asm code)
symbols away. So we need to mark them as used. */
-#if defined(__GNUC_PREREQ__) && !defined(__GNUC_PREREQ)
-#define __GNUC_PREREQ __GNUC_PREREQ__
+#if defined(__GNUC_PRERETQ__) && !defined(__GNUC_PREREQ)
+#define __GNUC_PREREQ __GNUC_PRERETQ__
#endif
#ifdef __GNUC_PREREQ
#if __GNUC_PREREQ (3,1)
diff --git a/mpeglib/lib/util/render/x11/initDisplay.cpp b/mpeglib/lib/util/render/x11/initDisplay.cpp
index d0029eb6..2a62e721 100644
--- a/mpeglib/lib/util/render/x11/initDisplay.cpp
+++ b/mpeglib/lib/util/render/x11/initDisplay.cpp
@@ -128,7 +128,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
int depth;
Visual *visual;
XSetWindowAttributes xswa;
- unsigned long mask;
+ unsigned long tqmask;
unsigned int c_class;
int screen;
Display *dpy=xwindow->display;
@@ -152,7 +152,7 @@ void CreateFullColorWindow (XWindow* xwindow) {
cout << "visual is null"<<endl;
return;
}
- mask = CWBackPixel | CWColormap | CWBorderPixel;
+ tqmask = CWBackPixel | CWColormap | CWBorderPixel;
if (xwindow->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, mask, &xswa);
+ visual, tqmask, &xswa);
*/
}
diff --git a/mpeglib/lib/util/render/x11/x11Surface.cpp b/mpeglib/lib/util/render/x11/x11Surface.cpp
index d7b8f052..0aaf7743 100644
--- a/mpeglib/lib/util/render/x11/x11Surface.cpp
+++ b/mpeglib/lib/util/render/x11/x11Surface.cpp
@@ -183,7 +183,7 @@ int X11Surface::open(int width, int height,const char *title, bool border) {
} else {
// depth is <= 8
// allocate memory for dithertables
- // gets the rgb masks
+ // gets the rgb tqmasks
initColorDisplay(xWindow);
// create 8 bit dithertables
// create private colormap