mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 07:22:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix typo

Browse Source 
Signed-off-by: max_10 <max_10@gmx.de>


Origin commit data
------------------
Branch: master
Commit: 3c7718425e
Author: samsamsam <samsamsam@o2.pl>
Date: 2018-04-15 (Sun, 15 Apr 2018)



------------------
This commit was generated by Migit
This commit is contained in:
samsamsam
2018-04-15 16:03:16 +02:00
committed by max_10
parent 28c7fcb2e9
commit 4c38f644f6
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libeplayer3-arm/include/writer.h
View File

@@ -92,5 +92,5 @@ ssize_t write_with_retry(int fd, const void *buf, int size);
ssize_t writev_with_retry(int fd, const struct iovec *iov, int ic); ssize_t writev_with_retry(int fd, const struct iovec *iov, int ic);
ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, const void *buf, int size); ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, const void *buf, int size);
void FlusPipe(int pipefd); void FlushPipe(int pipefd);
#endif #endif

2
libeplayer3-arm/output/writer/common/writer.c
View File

@@ -67,7 +67,7 @@ if (debug_level >= level) printf(x); } while (0)
/* ***************************** */ /* ***************************** */
/* Functions */ /* Functions */
/* ***************************** */ /* ***************************** */
void FlusPipe(int pipefd) void FlushPipe(int pipefd)
{ {
char tmp; char tmp;
while(1 == read(pipefd, &tmp, 1)); while(1 == read(pipefd, &tmp, 1));

22
libeplayer3-arm/output/writer/mipsel/writer.c
View File

@@ -119,13 +119,14 @@ ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, const void *buf,
FD_SET(pipefd, &rfds); FD_SET(pipefd, &rfds);
FD_SET(fd, &wfds); FD_SET(fd, &wfds);
/* When we PAUSE LINUX DVB outputs buffers then audio/video buffers /* When we PAUSE LINUX DVB outputs buffers, then audio/video buffers
* will be filled to full unfortunately, in such case after resume * will continue to be filled. Unfortunately, in such case after resume
* select never return with fd set - bug in DVB drivers? * select() will never return with fd set - bug in DVB drivers?
* So, there will be to workarounds: * There are to workarounds possible:
* 1. write to pipe pipe at resume to exit select immediately * 1. write to pipe at resume to return from select() immediately
* 2. even if fd is not set exit from select after 0,1s * 2. make timeout select(), limit max time spend in the select()
* (it seems that second workaround is not needed) * to for example 0,1s
* (at now first workaround is used)
*/ */
//tv.tv_sec = 0; //tv.tv_sec = 0;
//tv.tv_usec = 100000; // 100ms //tv.tv_usec = 100000; // 100ms
@@ -138,13 +139,13 @@ ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, const void *buf,
//if (retval == 0) //if (retval == 0)
//{ //{
// //printf("RETURN FROM SELECT DUE TO TIMEOUT TIMEOUT\n"); // //printf("RETURN FROM SELECT DUE TO TIMEOUT\n");
// continue; // continue;
//} //}
if(FD_ISSET(pipefd, &rfds)) if(FD_ISSET(pipefd, &rfds))
{ {
FlusPipe(pipefd); FlushPipe(pipefd);
//printf("RETURN FROM SELECT DUE TO pipefd SET\n"); //printf("RETURN FROM SELECT DUE TO pipefd SET\n");
continue; continue;
} }
@@ -173,11 +174,12 @@ ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, const void *buf,
else if (ret == 0) else if (ret == 0)
{ {
// printf("This should not happen. Select return fd ready to write, but write return 0, errno [%d]\n", errno); // printf("This should not happen. Select return fd ready to write, but write return 0, errno [%d]\n", errno);
// wait 10ms before next try
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 10000; // 10ms tv.tv_usec = 10000; // 10ms
retval = select(pipefd + 1, &rfds, NULL, NULL, &tv); retval = select(pipefd + 1, &rfds, NULL, NULL, &tv);
if (retval) if (retval)
FlusPipe(pipefd); FlushPipe(pipefd);
continue; continue;
} }