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

- libeplayer3: sync with max_10

Browse Source
This commit is contained in:
vanhofen
2023-01-24 21:00:47 +01:00
committed by Thilo Graf
parent 02994964e7
commit c0034ff0b7
65 changed files with 1100 additions and 959 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libeplayer3/output/linuxdvb_buffering.c
View File

@@ -54,6 +54,7 @@ typedef struct BufferingNode_s
{
uint32_t dataSize;
OutputType_t dataType;
void *stamp;
struct BufferingNode_s *next;
} BufferingNode_t;
@@ -71,6 +72,7 @@ static pthread_t bufferingThread;
static pthread_mutex_t bufferingMtx;
static pthread_cond_t bufferingExitCond;
static pthread_cond_t bufferingDataConsumedCond;
static pthread_cond_t bufferingWriteFinishedCond;
static pthread_cond_t bufferingdDataAddedCond;
static bool hasBufferingThreadStarted = false;
static BufferingNode_t *bufferingQueueHead = NULL;
@@ -85,6 +87,11 @@ static int g_pfd[2] = {-1, -1};
static pthread_mutex_t *g_pDVBMtx = NULL;
static bool g_bDuringWrite = false;
static bool g_bSignalWriteFinish = false;
static void *g_pWriteStamp = NULL;
/* ***************************** */
/* Prototypes */
/* ***************************** */
@@ -147,6 +154,12 @@ static void LinuxDvbBuffThread(Context_t *context)
while (0 == PlaybackDieNow(0))
{
pthread_mutex_lock(&bufferingMtx);
g_bDuringWrite = false;
if (g_bSignalWriteFinish)
{
pthread_cond_signal(&bufferingWriteFinishedCond);
g_bSignalWriteFinish = false;
}
if (nodePtr)
{
free(nodePtr);
@@ -183,23 +196,28 @@ static void LinuxDvbBuffThread(Context_t *context)
bufferingDataSize = 0;
}
}
pthread_mutex_unlock(&bufferingMtx);
/* We will write data without mutex
* this have some disadvantage because we can
* write some portion of data after LinuxDvbBuffFlush,
* for example after seek, this will be fixed later
* for example after seek.
*/
if (nodePtr && !context->playback->isSeeking)
if (nodePtr && !context->playback->isSeeking && context->playback->stamp == nodePtr->stamp)
{
/* Write data to valid output */
uint8_t *dataPtr = (uint8_t *)nodePtr + sizeof(BufferingNode_t);
int fd = nodePtr->dataType == OUTPUT_VIDEO ? videofd : audiofd;
g_bDuringWrite = true;
pthread_mutex_unlock(&bufferingMtx);
if (0 != WriteWithRetry(context, g_pfd[0], fd, g_pDVBMtx, dataPtr, nodePtr->dataSize))
{
buff_err("Something is WRONG\n");
}
}
else
{
pthread_mutex_unlock(&bufferingMtx);
}
}
pthread_mutex_lock(&bufferingMtx);
@@ -258,6 +276,7 @@ int32_t LinuxDvbBuffOpen(Context_t *context, char *type, int outfd, void *mtx)
pthread_cond_init(&bufferingExitCond, NULL);
pthread_cond_init(&bufferingDataConsumedCond, NULL);
pthread_cond_init(&bufferingWriteFinishedCond, NULL);
pthread_cond_init(&bufferingdDataAddedCond, NULL);
}
}
@@ -321,6 +340,7 @@ int32_t LinuxDvbBuffClose(Context_t *context __attribute__((unused)))
/*
pthread_mutex_destroy(&bufferingMtx);
pthread_cond_destroy(&bufferingDataConsumedCond);
pthread_cond_destroy(&bufferingWriteFinishedCond);
pthread_cond_destroy(&bufferingdDataAddedCond);
*/
}
@@ -356,6 +376,12 @@ int32_t LinuxDvbBuffFlush(Context_t *context __attribute__((unused)))
/* signal that queue is empty */
pthread_cond_signal(&bufferingDataConsumedCond);
while (g_bDuringWrite && !PlaybackDieNow(0))
{
g_bSignalWriteFinish = true;
pthread_cond_wait(&bufferingWriteFinishedCond, &bufferingMtx);
}
pthread_mutex_unlock(&bufferingMtx);
buff_printf(40, "EXIT\n");
@@ -372,6 +398,11 @@ int32_t LinuxDvbBuffResume(Context_t *context __attribute__((unused)))
return 0;
}
void LinuxDvbBuffSetStamp(void *stamp)
{
g_pWriteStamp = stamp;
}
ssize_t BufferingWriteV(int fd, const struct iovec *iov, int ic)
{
OutputType_t dataType = OUTPUT_UNK;
@@ -445,6 +476,7 @@ ssize_t BufferingWriteV(int fd, const struct iovec *iov, int ic)
chunkSize -= sizeof(BufferingNode_t);
nodePtr->dataSize = chunkSize;
nodePtr->dataType = dataType;
nodePtr->stamp = g_pWriteStamp;
nodePtr->next = NULL;
/* signal that we added some data to queue */