From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001 From: tpearson Date: Sat, 11 Jun 2011 06:00:15 +0000 Subject: 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 --- mpeglib/COPYING | 4 +-- mpeglib/README | 2 +- mpeglib/example/cddaplay/Makefile.am | 2 +- mpeglib/example/mpgplay/Makefile.am | 2 +- mpeglib/example/splay/Makefile.am | 4 +-- mpeglib/example/splay/mp3framing.cpp | 20 +++++++------- mpeglib/example/tplay/Makefile.am | 2 +- mpeglib/example/yaf/yafcdda/Makefile.am | 2 +- mpeglib/example/yaf/yafcore/buffer.cpp | 2 +- mpeglib/example/yaf/yafcore/buffer.h | 2 +- mpeglib/example/yaf/yafcore/inputDecoder.cpp | 4 +-- mpeglib/example/yaf/yafcore/inputDecoder.h | 4 +-- mpeglib/example/yaf/yafcore/lineStack.cpp | 4 +-- mpeglib/example/yaf/yafcore/parser.cpp | 2 +- mpeglib/example/yaf/yafcore/yaf_control.cpp | 2 +- mpeglib/example/yaf/yafmpgplay/Makefile.am | 2 +- mpeglib/example/yaf/yafsplay/Makefile.am | 2 +- mpeglib/example/yaf/yaftplay/Makefile.am | 2 +- mpeglib/example/yaf/yafvorbis/Makefile.am | 2 +- .../example/yaf/yafxplayer/inputDecoderXPlayer.cpp | 6 ++-- mpeglib/example/yaf/yafyuv/Makefile.am | 2 +- mpeglib/lib/Makefile.am | 2 ++ mpeglib/lib/decoder/mpgPlugin.cpp | 2 +- mpeglib/lib/frame/IOFrameQueue.h | 4 +-- mpeglib/lib/frame/README | 4 +-- mpeglib/lib/frame/audioFrameQueue.h | 4 +-- mpeglib/lib/frame/frameQueue.h | 4 +-- mpeglib/lib/frame/framer.cpp | 2 +- mpeglib/lib/mpegplay/decoderClass.cpp | 4 +-- mpeglib/lib/mpegplay/jrevdct.h | 2 +- mpeglib/lib/mpegplay/macroBlock.cpp | 8 +++--- mpeglib/lib/mpegplay/mpegExtension.cpp | 6 ++-- mpeglib/lib/mpegplay/mpegExtension.h | 2 +- mpeglib/lib/mpegplay/mpegSystemStream.cpp | 2 +- mpeglib/lib/mpegplay/mpegVideoBitWindow.h | 4 +-- mpeglib/lib/mpegplay/mpegVideoStream.cpp | 8 +++--- mpeglib/lib/mpegplay/pesSystemStream.cpp | 2 +- mpeglib/lib/mpegplay/picture.cpp | 2 +- mpeglib/lib/mpegplay/recon.cpp | 4 +-- mpeglib/lib/mpegplay/slice.h | 2 +- mpeglib/lib/mpegplay/startCodes.h | 6 ++-- mpeglib/lib/mpegplay/videoDecoder.cpp | 14 +++++----- mpeglib/lib/mpegplay/videoDecoder.h | 2 +- mpeglib/lib/output/outputStream.cpp | 6 ++-- mpeglib/lib/output/outputStream.h | 6 ++-- mpeglib/lib/splay/dxHead.h | 2 +- mpeglib/lib/splay/mpegAudioFrame.cpp | 2 +- mpeglib/lib/splay/mpegAudioHeader.cpp | 2 +- mpeglib/lib/util/abstract/threadQueue.cpp | 16 +++++------ mpeglib/lib/util/abstract/threadQueue.h | 4 +-- mpeglib/lib/util/dynBuffer.cpp | 2 +- mpeglib/lib/util/dynBuffer.h | 2 +- mpeglib/lib/util/mmx/mmx_asm.h | 2 +- .../lib/util/render/dither/colorTableHighBit.cpp | 20 +++++++------- mpeglib/lib/util/render/dither/ditherer_mmx16.cpp | 32 +++++++++++----------- mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h | 4 +-- mpeglib/lib/util/render/x11/initDisplay.cpp | 6 ++-- mpeglib/lib/util/render/x11/x11Surface.cpp | 2 +- 58 files changed, 137 insertions(+), 135 deletions(-) (limited to 'mpeglib') diff --git a/mpeglib/COPYING b/mpeglib/COPYING index b7047e29..d80c8b62 100644 --- a/mpeglib/COPYING +++ b/mpeglib/COPYING @@ -122,7 +122,7 @@ included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated +all the source code for all modules it tqcontains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. @@ -244,7 +244,7 @@ linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline +structure tqlayouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the diff --git a/mpeglib/README b/mpeglib/README index 6e72c9b8..a2e7893a 100644 --- a/mpeglib/README +++ b/mpeglib/README @@ -8,7 +8,7 @@ PORTS MPEG I library. =============== -This library contains: +This library tqcontains: * mpeg I audio player (layer I,II,III (mp3)) * mpeg I video player diff --git a/mpeglib/example/cddaplay/Makefile.am b/mpeglib/example/cddaplay/Makefile.am index 49f42a2a..a7a5286c 100644 --- a/mpeglib/example/cddaplay/Makefile.am +++ b/mpeglib/example/cddaplay/Makefile.am @@ -10,7 +10,7 @@ cddaplay_SOURCES = cddaplay.cpp noinst_HEADERS = -cddaplay_LDFLAGS = $(all_libraries) +cddaplay_LDFLAGS = $(all_libraries) $(LIB_QT) cddaplay_LDADD = ../../lib/libmpeg.la \ diff --git a/mpeglib/example/mpgplay/Makefile.am b/mpeglib/example/mpgplay/Makefile.am index c76bd4d1..303823d3 100644 --- a/mpeglib/example/mpgplay/Makefile.am +++ b/mpeglib/example/mpgplay/Makefile.am @@ -10,7 +10,7 @@ mpgplay_SOURCES = mpgplay.cpp noinst_HEADERS = -mpgplay_LDFLAGS = $(all_libraries) +mpgplay_LDFLAGS = $(all_libraries) $(LIB_QT) mpgplay_LDADD = ../../lib/libmpeg.la \ $(THIS_LIB_LIBS) diff --git a/mpeglib/example/splay/Makefile.am b/mpeglib/example/splay/Makefile.am index 76e04cff..9da0145c 100644 --- a/mpeglib/example/splay/Makefile.am +++ b/mpeglib/example/splay/Makefile.am @@ -12,12 +12,12 @@ mp3framing_SOURCES = mp3framing.cpp noinst_HEADERS = -splay_LDFLAGS = $(all_libraries) +splay_LDFLAGS = $(all_libraries) $(LIB_QT) splay_LDADD = ../../lib/libmpeg.la \ $(THIS_LIB_LIBS) -mp3framing_LDFLAGS = $(all_libraries) +mp3framing_LDFLAGS = $(all_libraries) $(LIB_QT) mp3framing_LDADD = ../../lib/libmpeg.la \ $(THIS_LIB_LIBS) diff --git a/mpeglib/example/splay/mp3framing.cpp b/mpeglib/example/splay/mp3framing.cpp index 586899a3..ad17657c 100644 --- a/mpeglib/example/splay/mp3framing.cpp +++ b/mpeglib/example/splay/mp3framing.cpp @@ -30,8 +30,8 @@ using namespace std; #include #define INPUT_SIZE 8192 -#define _QUEUE_FLOAT 1 -#define _QUEUE_INT 2 +#define _TQUEUE_FLOAT 1 +#define _TQUEUE_INT 2 void usage() { @@ -52,7 +52,7 @@ void initDSP(DSPWrapper* dsp) { int main(int argc, char** argv) { - int queueType=_QUEUE_INT; + int queueType=_TQUEUE_INT; int samples=8192; PCMFrame* outFrame; @@ -67,7 +67,7 @@ int main(int argc, char** argv) { break; } case 'f': { - queueType=_QUEUE_FLOAT; + queueType=_TQUEUE_FLOAT; break; } case 'c': { @@ -101,10 +101,10 @@ int main(int argc, char** argv) { // so we need a _FRAME_AUDIO_PCM type and we need // for splay at least MP3FRAMESIZE AudioFrameQueue* frameQueue; - if (queueType == _QUEUE_INT) { + if (queueType == _TQUEUE_INT) { frameQueue=new AudioFrameQueue(500,MP3FRAMESIZE,_FRAME_AUDIO_PCM); } - if (queueType == _QUEUE_FLOAT) { + if (queueType == _TQUEUE_FLOAT) { frameQueue=new AudioFrameQueue(100,MP3FRAMESIZE,_FRAME_AUDIO_FLOAT); } @@ -188,12 +188,12 @@ int main(int argc, char** argv) { // // we need to setup the dsp manually, when we do not play pcmFrames directly // - if (queueType == _QUEUE_INT) { + if (queueType == _TQUEUE_INT) { AudioFrame* audioFrame=frameQueue->getCurrent(); dsp->audioSetup(audioFrame); } - if (queueType == _QUEUE_FLOAT) { + if (queueType == _TQUEUE_FLOAT) { AudioFrame* audioFrame=frameQueue->getCurrent(); dsp->audioSetup(audioFrame->getStereo(),16, audioFrame->getSigned(), @@ -220,7 +220,7 @@ int main(int argc, char** argv) { - if (queueType == _QUEUE_INT) { + if (queueType == _TQUEUE_INT) { cout << "reading :"<copy(outFrame->getData(),samples); dsp->audioPlay((char*)outFrame->getData(),hasRead*sizeof(short int)); @@ -228,7 +228,7 @@ int main(int argc, char** argv) { } - if (queueType == _QUEUE_FLOAT) { + if (queueType == _TQUEUE_FLOAT) { int n; hasRead=frameQueue->copy(left,right,samples); diff --git a/mpeglib/example/tplay/Makefile.am b/mpeglib/example/tplay/Makefile.am index c79a2805..2f298a80 100644 --- a/mpeglib/example/tplay/Makefile.am +++ b/mpeglib/example/tplay/Makefile.am @@ -10,7 +10,7 @@ tplay_SOURCES = tplay.cpp noinst_HEADERS = -tplay_LDFLAGS = $(all_libraries) +tplay_LDFLAGS = $(all_libraries) $(LIB_QT) tplay_LDADD = ../../lib/libmpeg.la \ diff --git a/mpeglib/example/yaf/yafcdda/Makefile.am b/mpeglib/example/yaf/yafcdda/Makefile.am index 2930f348..287fc8ea 100644 --- a/mpeglib/example/yaf/yafcdda/Makefile.am +++ b/mpeglib/example/yaf/yafcdda/Makefile.am @@ -10,7 +10,7 @@ yaf_cdda_SOURCES = cdda_control.cpp noinst_HEADERS = -yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_cdda_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_cdda_LDADD = ../yafxplayer/libyafxplayer.la \ diff --git a/mpeglib/example/yaf/yafcore/buffer.cpp b/mpeglib/example/yaf/yafcore/buffer.cpp index 3c58f0ee..3f3d6158 100644 --- a/mpeglib/example/yaf/yafcore/buffer.cpp +++ b/mpeglib/example/yaf/yafcore/buffer.cpp @@ -122,7 +122,7 @@ void Buffer::grow(int size) { } -int Buffer::find(char zeichen) { +int Buffer::tqfind(char zeichen) { int i; int nlen=len(); for(i=0;ifind('\n'); + nPos=stack->tqfind('\n'); if (nPos == -1) return false; return true; @@ -45,7 +45,7 @@ void LineStack::nextLine(Buffer* nextLine) { char* data=stack->getData(); int nSize=stack->getSize(); - nPos=stack->find('\n'); + nPos=stack->tqfind('\n'); if (nPos == -1) { nextLine->clear(); return; diff --git a/mpeglib/example/yaf/yafcore/parser.cpp b/mpeglib/example/yaf/yafcore/parser.cpp index 21b27c6b..f9e8fdaa 100644 --- a/mpeglib/example/yaf/yafcore/parser.cpp +++ b/mpeglib/example/yaf/yafcore/parser.cpp @@ -101,7 +101,7 @@ void Parser::parse(char* strStart,int* nCommand){ int Parser::isOK(){ - // a Commandline ist valid when it contains : + // a Commandline ist valid when it tqcontains : // * 2 * (identifer/value) // * first identifier ist "Command" diff --git a/mpeglib/example/yaf/yafcore/yaf_control.cpp b/mpeglib/example/yaf/yafcore/yaf_control.cpp index 6e789588..6192f36b 100644 --- a/mpeglib/example/yaf/yafcore/yaf_control.cpp +++ b/mpeglib/example/yaf/yafcore/yaf_control.cpp @@ -37,7 +37,7 @@ void yaf_control(InputInterface* input, while(1) { - status=decoder->getDecoderStatus(); + status=decoder->getDecodertqStatus(); if (status == _DECODER_STATUS_EXIT) { break; diff --git a/mpeglib/example/yaf/yafmpgplay/Makefile.am b/mpeglib/example/yaf/yafmpgplay/Makefile.am index c9fd9b55..811e3d9a 100644 --- a/mpeglib/example/yaf/yafmpgplay/Makefile.am +++ b/mpeglib/example/yaf/yafmpgplay/Makefile.am @@ -11,7 +11,7 @@ yaf_mpgplay_SOURCES = mpg_control.cpp noinst_HEADERS = -yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_mpgplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_mpgplay_LDADD = ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafsplay/Makefile.am b/mpeglib/example/yaf/yafsplay/Makefile.am index 463ec7db..40c8196d 100644 --- a/mpeglib/example/yaf/yafsplay/Makefile.am +++ b/mpeglib/example/yaf/yafsplay/Makefile.am @@ -11,7 +11,7 @@ yaf_splay_SOURCES = splay_control.cpp noinst_HEADERS = -yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_splay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_splay_LDADD = ../yafxplayer/libyafxplayer.la \ diff --git a/mpeglib/example/yaf/yaftplay/Makefile.am b/mpeglib/example/yaf/yaftplay/Makefile.am index 2d82700d..96b596ba 100644 --- a/mpeglib/example/yaf/yaftplay/Makefile.am +++ b/mpeglib/example/yaf/yaftplay/Makefile.am @@ -9,7 +9,7 @@ yaf_tplay_SOURCES = tplay_control.cpp noinst_HEADERS = -yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_tplay_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_tplay_LDADD = ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafvorbis/Makefile.am b/mpeglib/example/yaf/yafvorbis/Makefile.am index f0a01965..d07fdbdf 100644 --- a/mpeglib/example/yaf/yafvorbis/Makefile.am +++ b/mpeglib/example/yaf/yafvorbis/Makefile.am @@ -10,7 +10,7 @@ yaf_vorbis_SOURCES = vorbis_control.cpp noinst_HEADERS = -yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) +yaf_vorbis_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) yaf_vorbis_LDADD = \ ../yafcore/libyafcore.la \ diff --git a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp index 4b3bf3b3..00e9a213 100644 --- a/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp +++ b/mpeglib/example/yaf/yafxplayer/inputDecoderXPlayer.cpp @@ -29,7 +29,7 @@ InputDecoderXPlayer::InputDecoderXPlayer(YafOutputStream* yafOutput) : this->yafOutput=yafOutput; ct=new CommandTableXPlayer(); - setDecoderStatus(_DECODER_STATUS_IDLE); + setDecodertqStatus(_DECODER_STATUS_IDLE); appendCommandTable(ct); majorMode=_PLAYER_MAJOR_MODE_OFF; setRuntimeInfo(false); @@ -161,7 +161,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ } if (command == _PLAYER_PLAY) { - setDecoderStatus(_DECODER_STATUS_WORKING); + setDecodertqStatus(_DECODER_STATUS_WORKING); setMajorMode(_PLAYER_MAJOR_MODE_PLAYING); return""; } @@ -186,7 +186,7 @@ const char* InputDecoderXPlayer::processCommand(int command,const char* args){ return "already output file selected"; } yafOutput->setStreamFile(args); - // now we have set the fifo. But we must say the parent + // now we have set the fifo. But we must say the tqparent // process that we start with waiting cout << "Command:0 Msg:fileopen before"<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 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"< 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:"<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"< @@ -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<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> (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"<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, 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 -- cgit v1.2.1