mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

driver/radiotext.cpp: rework CRadioText,

Browse Source 
thread now persistent, minimal delay for stop at zap,
for testing


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b086415d8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-25 (Thu, 25 Oct 2012)



------------------
This commit was generated by Migit
This commit is contained in:
[CST] Focus
2012-10-25 18:48:36 +04:00
parent c17e6ad4e3
commit 7d8997c9bc
2 changed files with 95 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

401
src/driver/radiotext.cpp
View File

@@ -2288,97 +2288,31 @@ eOSState cRTplusList::ProcessKey(eKeys Key)
//--------------- End ----------------------------------------------------------------- //--------------- End -----------------------------------------------------------------
#endif #endif
//static int pes_SyncBufferRead (cDemux *audioDemux, ringbuffer_t *buf, u_long *skipped_bytes);
static bool rtThreadRunning;
void *RadioTextThread(void *data)
{
CRadioText *rt = ((CRadioText::s_rt_thread*)data)->rt_object;
int fd = ((CRadioText::s_rt_thread*)data)->fd;
// struct dmx_pes_filter_params flt;
cDemux *audioDemux = rt->audioDemux;
printf("in RadioTextThread fd = %d\n", fd);
bool ret = false;
printf("\nRadioTextThread: ###################### Setting PID 0x%x ######################\n", rt->getPid());
audioDemux->Stop();
if (audioDemux->pesFilter(rt->getPid()))
{
/* start demux filter */
if (audioDemux->Start())
ret = true;
}
if (!ret) {
perror("RadiotextThread Audiodemuxer");
perror("DMX_SET_PES_FILTER");
audioDemux->Stop();
pthread_exit(NULL);
}
/*
-- read PES packet for pid
*/
#if 0
ringbuffer_t *buf_in = ringbuffer_create(0x1FFFF);
char *b; /* ptr to packet start */
long count = 0;
#endif
rtThreadRunning = true;
while(rtThreadRunning)
{
int n;
unsigned char buf[0x1FFFF];
#if 0
int offset;
size_t rd;
u_long skipped_bytes = 0;
#endif
//printf("."); fflush(stdout);
// -- Read PES packet (sync Read)
//n = pes_SyncBufferRead (audioDemux, buf_in, &skipped_bytes);
n = audioDemux->Read(buf, sizeof(buf), 500 /*5000*/);
// -- error or eof?
if (n <= 0) {
usleep(10000); /* save CPU if nothing read */
continue;
}
rt->PES_Receive(buf, n);
#if 0
rd = ringbuffer_get_readpointer(buf_in, &b, n);
/* this can not happen, because pes_SyncBufferRead() returns -1 if ringbuffer is empty
if (rd <= 0) {
continue;
}
*/
count ++;
// -- skipped Data to get sync byte?
offset = rt->PES_Receive(b, n);
ringbuffer_read_advance(buf_in, offset);
#endif
}
audioDemux->Stop();
#if 0
ringbuffer_free(buf_in);
fprintf(stderr, "RT %s: exit\n", __FUNCTION__);
#endif
printf("\nRadioTextThread: ###################### exit ######################\n");
pthread_exit(NULL);
}
CRadioText::CRadioText(void) CRadioText::CRadioText(void)
{ {
pid = 0; pid = 0;
dmxfd = -1; audioDemux = NULL;
init();
running = true;
start();
}
CRadioText::~CRadioText(void)
{
printf("CRadioText::~CRadioText\n");
running = false;
radiotext_stop();
cond.broadcast();
OpenThreads::Thread::join();
printf("CRadioText::~CRadioText done\n");
}
void CRadioText::init()
{
S_Verbose = 0; S_Verbose = 0;
S_RtFunc = 1; S_RtFunc = 1;
S_RtOsd = 1; S_RtOsd = 0;
S_RtOsdTitle = 1; S_RtOsdTitle = 1;
S_RtOsdTags = 2; S_RtOsdTags = 2;
S_RtOsdPos = 2; S_RtOsdPos = 2;
@@ -2391,7 +2325,6 @@ CRadioText::CRadioText(void)
S_RtFgCol = 1; S_RtFgCol = 1;
S_RtDispl = 1; S_RtDispl = 1;
S_RtMsgItems = 0; S_RtMsgItems = 0;
//int S_RtpMemNo = 25;
RT_Index = 0; RT_Index = 0;
RT_PTY = 0; RT_PTY = 0;
@@ -2401,265 +2334,87 @@ CRadioText::CRadioText(void)
RT_PlusShow = false; RT_PlusShow = false;
RT_Replay = false; RT_Replay = false;
RT_ReOpen = false; RT_ReOpen = false;
for (int i=0; i<5; i++) strcpy(RT_Text[i], ""); for (int i = 0; i < 5; i++)
strcpy(RDS_PTYN, ""); RT_Text[i][0] = 0;
RDS_PTYN[0] = 0;
#if ENABLE_RASS
// Rass ...
Rass_Show = -1; // -1=No, 0=Yes, 1=display
Rass_Archiv = -1; // -1=Off, 0=Index, 1000-9990=Slidenr.
#endif
RT_MsgShow = false; // clear entries from old channel
have_radiotext = false; have_radiotext = false;
audioDemux = NULL;
} }
void CRadioText::radiotext_stop(void) void CRadioText::radiotext_stop(void)
{ {
printf("\nCRadioText::radiotext_stop: ###################### pid 0x%x ######################\n", getPid()); printf("CRadioText::radiotext_stop: ###################### pid 0x%x ######################\n", getPid());
if (getPid() != 0) { if (getPid() != 0) {
// this stuff takes a while sometimes - look for a better syncronisation mutex.lock();
printf("Stopping RT Thread\n");
rtThreadRunning = false;
pthread_join(getThread(), NULL);
pid = 0; pid = 0;
have_radiotext = false; have_radiotext = false;
audioDemux->Stop();
S_RtOsd = 0; S_RtOsd = 0;
mutex.unlock();
} }
} }
CRadioText::~CRadioText(void)
{
radiotext_stop();
pid = 0;
// printf("Deleting RT object\n");
// close(dmxfd);
delete audioDemux;
audioDemux = NULL;
dmxfd = -1;
}
void CRadioText::setPid(uint inPid) void CRadioText::setPid(uint inPid)
{ {
uint oldPid = pid; printf("CRadioText::setPid: ###################### old pid 0x%x new pid 0x%x ######################\n", pid, inPid);
if (pid != inPid) {
printf("\nCRadioText::setPid: ###################### old pid 0x%x new pid 0x%x ######################\n", oldPid, inPid); mutex.lock();
if (pid != inPid)
{
int rc;
printf("CRadioText::setPid: setting pid 0x%x\n", inPid);
pid = inPid; pid = inPid;
init();
// open the device if first pid mutex.unlock();
if (0 == oldPid) cond.broadcast();
{
if (audioDemux == NULL) {
audioDemux = new cDemux(1);
//audioDemux->Open(DMX_TP_CHANNEL /*DMX_AUDIO_CHANNEL*/,0,128*1024);
audioDemux->Open(DMX_PES_CHANNEL,0,128*1024);
#if 0
bool ret = false;
if (audioDemux->pesFilter(pid))
{
/* start demux filter */
if (audioDemux->Start())
ret = true;
}
if (!ret) {
perror("Radiotext Audiodemuxer");
return;
}
#endif
// audioDemux->Stop()
#if 0
dmxfd = open(DMXDEV, O_RDWR|O_NONBLOCK);
if (dmxfd < 0) {
perror(DMXDEV);
pthread_exit(NULL);
}
#endif
}
rt.rt_object = this;
rt.fd = dmxfd;
}
// Setup-Params
// S_Activate = false;
// S_HMEntry = false;
S_RtFunc = 1;
S_RtOsd = 0;
S_RtOsdTitle = 1;
S_RtOsdTags = 2;
S_RtOsdPos = 2;
S_RtOsdRows = 3;
S_RtOsdLoop = 1;
S_RtOsdTO = 60;
S_RtSkinColor = false;
S_RtBgCol = 0;
S_RtBgTra = 0xA0;
S_RtFgCol = 1;
S_RtDispl = 1;
S_RtMsgItems = 0;
//int S_RtpMemNo = 25;
RT_Index = RT_PTY = 0;
// Radiotext
RTP_ItemToggle = 1;
RTP_TToggle = 0;
RT_PlusShow = false;
RT_Replay = false;
RT_ReOpen = false;
for (int i=0; i<5; i++) strcpy(RT_Text[i], "");
strcpy(RDS_PTYN, "");
#if ENABLE_RASS
// Rass ...
Rass_Show = -1; // -1=No, 0=Yes, 1=display
Rass_Archiv = -1; // -1=Off, 0=Index, 1000-9990=Slidenr.
#endif
RT_MsgShow = false; // clear entries from old channel
rc = pthread_create(&threadRT, 0, RadioTextThread, (void *) &rt);
if (rc) {
printf("failed to create RadioText Thread (rc=%d)\n", rc);
return;
}
} }
} }
void CRadioText::run()
// -----------------------------------------------------------
// following functions are ripped from dvbsnoop: http://dvbsnoop.sourceforge.net
/*
-- read PES packet (Synced)
-- buffer pre-read bytes for next execution
-- return: len // read()-return code
*/
#if 0
static int pes_SyncBufferRead(cDemux *audioDemux, ringbuffer_t *buf, /*u_long max_len,*/ u_long *skipped_bytes)
{ {
ringbuffer_data_t vec; uint current_pid = 0;
int rd;
char *ppes;
// -- simple PES sync... seek for 0x000001 (PES_SYNC_BYTE) printf("CRadioText::run: ###################### Starting thread ######################\n");
// ISO/IEC 13818-1: audioDemux = new cDemux(1);
// -- packet_start_code_prefix -- The packet_start_code_prefix is audioDemux->Open(DMX_PES_CHANNEL,0,128*1024);
// -- a 24-bit code. Together with the stream_id that follows it constitutes
// -- a packet start code that identifies the beginning of a packet.
// -- The packet_start_code_prefix is the bit stream
// -- '0000 0000 0000 0000 0000 0001' (0x000001).
*skipped_bytes = 0; while(running) {
ringbuffer_get_write_vector(buf, &vec); mutex.lock();
if (vec.len == 0) if (pid == 0) {
{ mutex.unlock();
fprintf(stderr, "RT %s: ringbuffer full\n", __FUNCTION__); audioDemux->Stop();
/* do not read anything from demux, but continue with sync */ pidmutex.lock();
} printf("CRadioText::run: ###################### waiting for pid.. ######################\n");
else cond.wait(&pidmutex);
{ pidmutex.unlock();
rd = audioDemux->Read((unsigned char*)vec.buf, vec.len, 5000); mutex.lock();
if (rd < 0)
{
if (errno != EAGAIN)
{
fprintf(stderr, "RT %s: read %d errno %d (%m)\n", __FUNCTION__, rd, errno);
return rd;
}
/* if EAGAIN, still process contents of ringbuffer */
rd = 0;
} }
if (pid && (current_pid != pid)) {
ringbuffer_write_advance(buf, rd); current_pid = pid;
} printf("CRadioText::run: ###################### Setting PID 0x%x ######################\n", getPid());
audioDemux->Stop();
rd = ringbuffer_get_readpointer(buf, &ppes, 6); if (!audioDemux->pesFilter(getPid()) || !audioDemux->Start()) {
if (rd < 6) pid = 0;
{ printf("CRadioText::run: ###################### failed to start PES filter ######################\n");
// fprintf(stderr, "RT %s: ringbuffer empty (%d < 6)\n", __FUNCTION__, rd);
return -1;
}
if ((ppes[0] != 0x00) || (ppes[1] != 0x00) || (ppes[2] != 0x01))
{
//INFO("async, not 000001: %02x%02x%02x ", ppes[0], ppes[1], ppes[2]);
int deleted = 0;
do {
ringbuffer_read_advance(buf, 1); // remove 1 Byte
rd = ringbuffer_get_readpointer(buf, &ppes, 6);
deleted++;
(*skipped_bytes)++;
//fprintf(stderr, "%d", rd);
if ((ppes[0] == 0x00) || (ppes[1] == 0x00) || (ppes[2] == 0x01))
{
deleted = 0;
break;
} }
} }
while (rd == 6); mutex.unlock();
//fprintf(stderr, "\n"); if (pid) {
if (deleted > 0) int n;
{ unsigned char buf[0x1FFFF];
// fprintf(stderr, "RT %s: No valid PES signature found. %d Bytes deleted.\n", __FUNCTION__, deleted);
return -1; n = audioDemux->Read(buf, sizeof(buf), 500 /*5000*/);
if (n > 0) {
//printf("."); fflush(stdout);
mutex.lock();
PES_Receive(buf, n);
mutex.unlock();
}
} }
} }
delete audioDemux;
// -- Sync found! audioDemux = NULL;
// -- evaluate packet_id and seek packet end (next sync) printf("CRadioText::run: ###################### exit ######################\n");
if (ppes[3] >= 0xBC) { // PES system packet with length
unsigned int l;
l = (ppes[4] << 8) + ppes[5]; // PES packet size...
if (l > 0) {
if (ringbuffer_read_space(buf) >= l + 6)
return (l + 6);
else
return 0;
} else
ringbuffer_read_advance(buf, 6);
} else {
// will resync automatically on next invocation. Enough?
ringbuffer_read_advance(buf, 4);
}
#if 0
// -- seek packet end (sync to next packet)
// -- ISO 13818-1 length=0 packets (unbound video streams)
// -- ISO 13818-2 packets
sync = 0xFFFFFFFF;
while (max_len > 0) {
u_char c;
int n;
// $$$ TODO: may be optimized
n = pes_rawBufferedRead (fd, buf,1);
if (n < 0) return n;
c = *buf++;
max_len -= n;
// -- EOF
if (n == 0) {
return (long) (buf - org_buf);
}
// -- next packet found? (sync detected)
sync = (sync << 8) | c;
if ( (sync & 0x00FFFFFF) == 0x000001 ) {
pes_rawBufferedPushByte (*(--buf)); // push back sync bytes
pes_rawBufferedPushByte (*(--buf));
pes_rawBufferedPushByte (*(--buf));
return (long) (buf - org_buf);
}
}
#endif
// fprintf(stderr, "RT %s: unsynced, ret = -1! (this never happens) ppes[3] = 0x%02x\n", __FUNCTION__, ppes[3]);
return -1; // buffer overflow
} }
#endif

32
src/driver/radiotext.h
View File

@@ -59,6 +59,8 @@
#endif #endif
#include <dmx.h> #include <dmx.h>
#include <OpenThreads/Thread>
#include <OpenThreads/Condition>
//#define ENABLE_RASS //#define ENABLE_RASS
@@ -88,13 +90,8 @@ public:
#define RT_MEL 65 #define RT_MEL 65
#define tr(a) a #define tr(a) a
class CRadioText { class CRadioText : public OpenThreads::Thread
{
public:
typedef struct {
CRadioText *rt_object;
int fd;
} s_rt_thread;
private: private:
bool enabled; bool enabled;
@@ -107,17 +104,26 @@ private:
int first_packets; int first_packets;
//Radiotext //Radiotext
#if 0
// cDevice *rdsdevice; // cDevice *rdsdevice;
void RadiotextCheckPES(const uchar *Data, int Length); void RadiotextCheckPES(const uchar *Data, int Length);
void RadioStatusMsg(void);
void AudioRecorderService(void); void AudioRecorderService(void);
#endif
void RadioStatusMsg(void);
void RassDecode(uchar *Data, int Length); void RassDecode(uchar *Data, int Length);
bool DividePes(unsigned char *data, int length, int *substart, int *subend); bool DividePes(unsigned char *data, int length, int *substart, int *subend);
uint pid; uint pid;
pthread_t threadRT; //pthread_t threadRT;
int dmxfd; //int dmxfd;
OpenThreads::Mutex mutex;
OpenThreads::Mutex pidmutex;
OpenThreads::Condition cond;
bool running;
void run();
void init();
public: public:
CRadioText(void); CRadioText(void);
~CRadioText(void); ~CRadioText(void);
@@ -133,15 +139,11 @@ public:
void setPid(uint inPid); void setPid(uint inPid);
uint getPid(){ return pid; } uint getPid(){ return pid; }
int run(void);
int getDMXfd(void) { return dmxfd; }
// s_rt_thread& getThreadParams(void) { return rt; }
pthread_t getThread(void) { return threadRT; }
void radiotext_stop(void); void radiotext_stop(void);
bool haveRadiotext(void) {return have_radiotext; } bool haveRadiotext(void) {return have_radiotext; }
cDemux *audioDemux; cDemux *audioDemux;
s_rt_thread rt;
//Setup-Params //Setup-Params
int S_RtFunc; int S_RtFunc;