mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-27 07:23:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

libspark: port a prior version of martii's cRecord

Browse Source 
This imports most of the changes of martii's cRecord
https://gitorious.org/neutrino-hd/martiis-libstb-hal,
commmit 23bea61473
This commit is contained in:
Stefan Seyfried
2015-02-22 22:21:33 +01:00
parent efb860f20d
commit 1df6cfc16d
1 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
libspark/record.cpp
View File

@@ -109,7 +109,7 @@ bool cRecord::Start(int fd, unsigned short vpid, unsigned short *apids, int nump
if (!pd->dmx) if (!pd->dmx)
pd->dmx = new cDemux(pd->dmx_num); pd->dmx = new cDemux(pd->dmx_num);
pd->dmx->Open(DMX_TP_CHANNEL, NULL, 512*1024); pd->dmx->Open(DMX_TP_CHANNEL, NULL, 2*1024*1024);
pd->dmx->pesFilter(vpid); pd->dmx->pesFilter(vpid);
for (i = 0; i < numpids; i++) for (i = 0; i < numpids; i++)
@@ -221,14 +221,17 @@ bool cRecord::AddPid(unsigned short pid)
void RecData::RecordThread() void RecData::RecordThread()
{ {
lt_info("%s: begin\n", __func__); lt_info("%s: begin\n", __func__);
#define BUFSIZE (1 << 20) /* 1MB */ hal_set_threadname("hal:record");
#define BUFSIZE (2 << 20) /* 2MB */
#define READSIZE (BUFSIZE / 16) #define READSIZE (BUFSIZE / 16)
const int bufsize = BUFSIZE;
const int readsize = READSIZE;
int buf_pos = 0; int buf_pos = 0;
int queued = 0; int queued = 0;
uint8_t *buf; uint8_t *buf;
struct aiocb a; struct aiocb a;
buf = (uint8_t *)malloc(BUFSIZE); buf = (uint8_t *)malloc(bufsize);
if (!buf) if (!buf)
{ {
exit_flag = RECORD_FAILED_MEMORY; exit_flag = RECORD_FAILED_MEMORY;
@@ -244,18 +247,23 @@ void RecData::RecordThread()
a.aio_sigevent.sigev_notify = SIGEV_NONE; a.aio_sigevent.sigev_notify = SIGEV_NONE;
dmx->Start(); dmx->Start();
int overflow_count = 0;
bool overflow = false; bool overflow = false;
int r = 0; int r = 0;
while (exit_flag == RECORD_RUNNING) while (exit_flag == RECORD_RUNNING)
{ {
if (buf_pos < BUFSIZE) if (buf_pos < bufsize)
{ {
int toread = BUFSIZE - buf_pos; if (overflow_count) {
if (toread > READSIZE) lt_info("%s: Overflow cleared after %d iterations\n", __func__, overflow_count);
toread = READSIZE; overflow_count = 0;
}
int toread = bufsize - buf_pos;
if (toread > readsize)
toread = readsize;
ssize_t s = dmx->Read(buf + buf_pos, toread, 50); ssize_t s = dmx->Read(buf + buf_pos, toread, 50);
lt_debug("%s: buf_pos %6d s %6d / %6d\n", __func__, lt_debug("%s: buf_pos %6d s %6d / %6d\n", __func__,
buf_pos, (int)s, BUFSIZE - buf_pos); buf_pos, (int)s, bufsize - buf_pos);
if (s < 0) if (s < 0)
{ {
if (errno != EAGAIN && (errno != EOVERFLOW || !overflow)) if (errno != EAGAIN && (errno != EOVERFLOW || !overflow))
@@ -264,7 +272,6 @@ void RecData::RecordThread()
exit_flag = RECORD_FAILED_READ; exit_flag = RECORD_FAILED_READ;
break; break;
} }
lt_info("%s: %s\n", __func__, errno == EOVERFLOW ? "EOVERFLOW" : "EAGAIN");
} }
else else
{ {
@@ -274,24 +281,28 @@ void RecData::RecordThread()
} }
else else
{ {
if (!overflow)
overflow_count = 0;
overflow = true; overflow = true;
lt_info("%s: buffer full! Overflow?\n", __func__); if (!(overflow_count % 10))
lt_info("%s: buffer full! Overflow? (%d)\n", __func__, ++overflow_count);
} }
r = aio_error(&a); r = aio_error(&a);
if (r == EINPROGRESS) if (r == EINPROGRESS)
{ {
lt_debug("%s: aio in progress...\n", __func__); lt_debug("%s: aio in progress, free: %d\n", __func__, bufsize - buf_pos);
if (overflow) /* rate-limit the message */
usleep(100000);
continue; continue;
} }
if (r) // not calling aio_return causes a memory leak --martii
r = aio_return(&a);
if (r < 0)
{ {
exit_flag = RECORD_FAILED_FILE; exit_flag = RECORD_FAILED_FILE;
lt_info("%s: aio_error != EINPROGRESS: %d (%m)\n", __func__, r); lt_debug("%s: aio_return = %d (%m)\n", __func__, r);
break; break;
} }
lt_debug("%s: buf_pos %6d w %6d\n", __func__, buf_pos, (int)queued); else
lt_debug("%s: aio_return = %d, free: %d\n", __func__, r, bufsize - buf_pos);
if (posix_fadvise(file_fd, 0, 0, POSIX_FADV_DONTNEED)) if (posix_fadvise(file_fd, 0, 0, POSIX_FADV_DONTNEED))
perror("posix_fadvise"); perror("posix_fadvise");
if (queued) if (queued)
@@ -320,10 +331,11 @@ void RecData::RecordThread()
usleep(50000); usleep(50000);
continue; continue;
} }
if (r) r = aio_return(&a);
if (r < 0)
{ {
exit_flag = RECORD_FAILED_FILE; exit_flag = RECORD_FAILED_FILE;
lt_info("%s: aio_error != EINPROGRESS: %d (%m)\n", __func__, r); lt_info("%s: aio_result: %d (%m)\n", __func__, r);
break; break;
} }
if (!queued) if (!queued)