summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dxr3osd.c3
-rw-r--r--dxr3osd.h2
-rw-r--r--dxr3outputthread.c14
-rw-r--r--dxr3tools.h9
-rw-r--r--dxr3unixserversocket.c1
5 files changed, 19 insertions, 10 deletions
diff --git a/dxr3osd.c b/dxr3osd.c
index 2d18f0a..e81c061 100644
--- a/dxr3osd.c
+++ b/dxr3osd.c
@@ -26,7 +26,10 @@
#include <sys/unistd.h>
#include "dxr3vdrincludes.h"
+#include "dxr3interface.h"
+
#include "dxr3osd.h"
+#include "dxr3interface_spu_encoder.h"
#if VDRVERSNUM >= 10307
diff --git a/dxr3osd.h b/dxr3osd.h
index c16695e..37901b4 100644
--- a/dxr3osd.h
+++ b/dxr3osd.h
@@ -2,7 +2,7 @@
#define _DXR3_OSD_H_
#include "dxr3vdrincludes.h"
-#include "dxr3spuencoder.h"
+#include "dxr3interface_spu_encoder.h"
#if VDRVERSNUM >= 10307
diff --git a/dxr3outputthread.c b/dxr3outputthread.c
index d74689f..685d10e 100644
--- a/dxr3outputthread.c
+++ b/dxr3outputthread.c
@@ -32,14 +32,14 @@ const int AUDIO_OFFSET = 4500;
// ==================================
// ==================================
-// constr.
+//! constructor
cDxr3OutputThread::cDxr3OutputThread(cDxr3Interface& dxr3Device, cDxr3SyncBuffer& buffer) :
cThread(), m_dxr3Device(dxr3Device), m_buffer(buffer), m_bStopThread(false), m_bNeedResync(false)
{
}
// ==================================
-// send stop signal
+//! send stop signal
void cDxr3OutputThread::SetStopSignal()
{
Lock();
@@ -48,7 +48,7 @@ void cDxr3OutputThread::SetStopSignal()
}
// ==================================
-// was stop signal send?
+//! was stop signal send?
bool cDxr3OutputThread::GetStopSignal()
{
bool ret = false;
@@ -60,7 +60,7 @@ bool cDxr3OutputThread::GetStopSignal()
}
// ==================================
-// constr.
+//! constr.
cDxr3AudioOutThread::cDxr3AudioOutThread(cDxr3Interface& dxr3Device, cDxr3SyncBuffer& buffer) :
cDxr3OutputThread(dxr3Device, buffer)
{
@@ -70,7 +70,7 @@ cDxr3OutputThread(dxr3Device, buffer)
}
// ==================================
-// thread action
+//! thread action
void cDxr3AudioOutThread::Action()
{
bool resync = false;
@@ -175,7 +175,7 @@ void cDxr3AudioOutThread::Action()
}
// ==================================
-// constr.
+//! constr.
cDxr3VideoOutThread::cDxr3VideoOutThread(cDxr3Interface& dxr3Device, cDxr3SyncBuffer& buffer) :
cDxr3OutputThread(dxr3Device, buffer)
{
@@ -185,7 +185,7 @@ cDxr3OutputThread(dxr3Device, buffer)
}
// ==================================
-// thread action
+//! thread action
void cDxr3VideoOutThread::Action()
{
uint32_t pts = 0;
diff --git a/dxr3tools.h b/dxr3tools.h
index 5a8c890..dd96ebb 100644
--- a/dxr3tools.h
+++ b/dxr3tools.h
@@ -62,7 +62,12 @@ namespace Tools
Ey = (Y - 16);
Epb = (Cb - 128);
Epr = (Cr - 128);
-
+ /* ITU-R 709
+ Eg = (298*Ey - 55*Epb - 137*Epr)/256;
+ Eb = (298*Ey + 543*Epb)/256;
+ Er = (298*Ey + 460*Epr)/256;
+ */
+ /* FCC ~= mediaLib */
Eg = (298 * Ey - 100 * Epb - 208 * Epr) / 256;
Eb = (298 * Ey + 516 * Epb) / 256;
Er = (298 * Ey + 408 * Epr) / 256;
@@ -87,7 +92,7 @@ namespace Tools
// ==================================
//! write a string via vdr to OSD
- inline void WriteInfoToOsd(std::string x)
+ inline void WriteInfoToOsd(string x)
{
#if VDRVERSNUM <= 10306
Interface->Info(x.c_str());
diff --git a/dxr3unixserversocket.c b/dxr3unixserversocket.c
index 4af5d64..f7b7cee 100644
--- a/dxr3unixserversocket.c
+++ b/dxr3unixserversocket.c
@@ -39,6 +39,7 @@ using namespace std;
#endif
// ==================================
+//! constructor
cDxr3UnixServerSocket::cDxr3UnixServerSocket(const char* pFileName, int backlog)
{
m_bConnected = false;