diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | dxr3nextpts.c | 32 | ||||
| -rw-r--r-- | dxr3nextpts.h | 85 | ||||
| -rw-r--r-- | dxr3syncbuffer.c | 5 |
4 files changed, 1 insertions, 123 deletions
@@ -68,7 +68,7 @@ DEFINES += -DUSE_XINE_SCALER ### The object files (add further files here): OBJS = $(PLUGIN).o dxr3multichannelaudio.o dxr3sysclock.o dxr3colormanager.o \ - dxr3syncbuffer.o dxr3audiodecoder.o dxr3blackframe.o dxr3nextpts.o \ + dxr3syncbuffer.o dxr3audiodecoder.o dxr3blackframe.o \ dxr3pesframe.o dxr3demuxdevice.o dxr3configdata.o dxr3ffmpeg.o \ dxr3interface_spu_encoder.o dxr3interface.o dxr3device.o \ dxr3output.o dxr3output-video.o dxr3output-audio.o dxr3osd.o dxr3spudecoder.o diff --git a/dxr3nextpts.c b/dxr3nextpts.c deleted file mode 100644 index 7f775e6..0000000 --- a/dxr3nextpts.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * dxr3nextpts.c - * - * Copyright (C) 2002-2004 Kai Möller - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#include "dxr3nextpts.h" - -// ================================== -cMutex* cDxr3NextPts::m_pMutex = new cMutex; - -// Local variables: -// mode: c++ -// c-file-style: "stroustrup" -// c-file-offsets: ((inline-open . 0)) -// indent-tabs-mode: t -// End: diff --git a/dxr3nextpts.h b/dxr3nextpts.h deleted file mode 100644 index 6dc3ed3..0000000 --- a/dxr3nextpts.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * dxr3nextpts.h - * - * Copyright (C) 2002-2004 Kai Möller - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public License - * as published by the Free Software Foundation; either version 2.1 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - */ - -#ifndef _DXR3NEXTPTS_H_ -#define _DXR3NEXTPTS_H_ - -#include <unistd.h> -#include <stdint.h> -#include <vdr/thread.h> -#include "dxr3singleton.h" - -// ================================== -// pts program time stamp -// damit wird ermittelt welches audio frame zu welchem bild gehört -class cDxr3NextPts : public Singleton<cDxr3NextPts> -{ -public: - cDxr3NextPts() {} - ~cDxr3NextPts() {} - - void SetNextPts(uint32_t pts) - { - Lock(); - if (pts) - m_nextPts = pts; - Unlock(); - } - uint32_t GetNextPts() - { - Lock(); - uint32_t tmpPts = m_nextPts; - Unlock(); - return tmpPts; - } - - void Clear() - { - Lock(); - m_nextPts = 0; - Unlock(); - } - -protected: - static cMutex* m_pMutex; - uint32_t m_nextPts; - - static void Lock() - { - cDxr3NextPts::m_pMutex->Lock(); - } - static void Unlock() - { - cDxr3NextPts::m_pMutex->Unlock(); - } - -private: - cDxr3NextPts(cDxr3NextPts&); // no copy constructor -}; - -#endif /*_DXR3NEXTPTS_H_*/ - -// Local variables: -// mode: c++ -// c-file-style: "stroustrup" -// c-file-offsets: ((inline-open . 0)) -// indent-tabs-mode: t -// End: diff --git a/dxr3syncbuffer.c b/dxr3syncbuffer.c index ce9c741..95a9bd8 100644 --- a/dxr3syncbuffer.c +++ b/dxr3syncbuffer.c @@ -299,10 +299,6 @@ void cDxr3SyncBuffer::Pop(void) if (tmpBuffer) tmpBuffer = --tmpBuffer ? tmpBuffer : (Size() - 1); nextPts = m_pBuffer[tmpBuffer].GetPts(); } - if (nextPts != 30) - { - cDxr3NextPts::Instance().SetNextPts(nextPts); - } m_next++; m_count--; @@ -358,7 +354,6 @@ void cDxr3SyncBuffer::Clear(void) m_bPutBlock = false; } cFixedLengthFrame::Clear(); - cDxr3NextPts::Instance().Clear(); } // ================================== |