diff options
| author |  Elvio Basello | 2010-12-29 20:54:06 +0000 |
|---|---|---|
| committer | Elvio Basello | 2010-12-29 20:54:06 +0000 |
| commit | 239ecac79eac162e0fe8433bd8278f00c68d4bab (patch) | |
| tree | 21f707f5ff1c3bd70f2205dd80d7d80e569901c2 /src | |
| parent | yet more splitting (diff) | |
| download | KVIrc-239ecac79eac162e0fe8433bd8278f00c68d4bab.tar.gz KVIrc-239ecac79eac162e0fe8433bd8278f00c68d4bab.tar.bz2 KVIrc-239ecac79eac162e0fe8433bd8278f00c68d4bab.zip | |
quick fix
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5263 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src')
| -rw-r--r-- | src/kvilib/ext/KviOggTheoraDecoder.cpp | 12 | ||||
| -rw-r--r-- | src/kvilib/ext/KviOggTheoraDecoder.h | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/kvilib/ext/KviOggTheoraDecoder.cpp b/src/kvilib/ext/KviOggTheoraDecoder.cpp index 8262c7abb..ab7244cfd 100644 --- a/src/kvilib/ext/KviOggTheoraDecoder.cpp +++ b/src/kvilib/ext/KviOggTheoraDecoder.cpp @@ -1,6 +1,6 @@ //============================================================================= // -// File : KviTheoraDecoder.cpp +// File : KviOggTheoraDecoder.cpp // Creation date : Sat Nov 21 2009 22:53:21 CEST by Fabio Bas // // This file is part of the KVIrc irc client distribution @@ -55,7 +55,7 @@ using namespace KviOggIrcText; //------------------------------------------------------------------------------ #define OC_CLAMP255(_x) ((unsigned char)((((_x)<0)-1)&((_x)|-((_x)>255)))) -KviTheoraDecoder::KviTheoraDecoder(KviDataBuffer * videoSignal,KviDataBuffer * textSignal) +KviOggTheoraDecoder::KviOggTheoraDecoder(KviDataBuffer * videoSignal,KviDataBuffer * textSignal) { m_pVideoSignal=videoSignal; m_pTextSignal=textSignal; @@ -89,7 +89,7 @@ KviTheoraDecoder::KviTheoraDecoder(KviDataBuffer * videoSignal,KviDataBuffer * t } } -KviTheoraDecoder::~KviTheoraDecoder() +KviOggTheoraDecoder::~KviOggTheoraDecoder() { if(theora_p){ ogg_stream_clear(&to); @@ -107,7 +107,7 @@ KviTheoraDecoder::~KviTheoraDecoder() ogg_sync_clear(&oy); } -void KviTheoraDecoder::addData(KviDataBuffer * stream) +void KviOggTheoraDecoder::addData(KviDataBuffer * stream) { // qDebug("adddata signal %p stream size %d",m_pVideoSignal, stream->size() ); if(stream->size()==0)return; @@ -293,14 +293,14 @@ void KviTheoraDecoder::addData(KviDataBuffer * stream) /* helper: push a page into the appropriate steam */ /* this can be done blindly; a stream won't accept a page that doesn't belong to it */ -int KviTheoraDecoder::queue_page(ogg_page *page) +int KviOggTheoraDecoder::queue_page(ogg_page *page) { if(theora_p)ogg_stream_pagein(&to,page); if(irct_p)ogg_stream_pagein(&zo,page); return 0; } -void KviTheoraDecoder::video_write(void) +void KviOggTheoraDecoder::video_write(void) { th_ycbcr_buffer yuv; int y_offset; diff --git a/src/kvilib/ext/KviOggTheoraDecoder.h b/src/kvilib/ext/KviOggTheoraDecoder.h index 1e5016c72..585cc7da1 100644 --- a/src/kvilib/ext/KviOggTheoraDecoder.h +++ b/src/kvilib/ext/KviOggTheoraDecoder.h @@ -46,24 +46,24 @@ class KviDataBuffer; /** -* \class KviTheoraDecoder +* \class KviOggTheoraDecoder * \brief An ogg/theora+irct decoder class; accepts a proper ogg stream, outputs argb32 images and binary text */ -class KVILIB_API KviTheoraDecoder +class KVILIB_API KviOggTheoraDecoder { public: /** - * \brief Constructs the KviTheoraDecoder object + * \brief Constructs the KviOggTheoraDecoder object * \param videoSignal the output video stream object * \param textSignal the output text stream object - * \return KviTheoraDecoder + * \return KviOggTheoraDecoder */ - KviTheoraDecoder(KviDataBuffer * videoSignal,KviDataBuffer * textSignal); + KviOggTheoraDecoder(KviDataBuffer * videoSignal,KviDataBuffer * textSignal); /** * \brief Destroys the KviTheoraEncoder object */ - virtual ~KviTheoraDecoder(); + virtual ~KviOggTheoraDecoder(); /** * \brief Feeds the decoded with some received data to decode |