Changeset 44973

Timestamp:

12/08/20 21:06:13 (3 years ago)

Author:

obi

Message:

fix

Location:

titan/libeplayer3/output/writer

Files:

• common/writer.c (modified) (2 diffs)
• mipsel/writer.c (modified) (3 diffs)

titan/libeplayer3/output/writer/common/writer.c

@@ -26 +26 @@
 #include <string.h>
 #include <errno.h>
-#include <pthread.h>
 
 #include "misc.h"
 #include "writer.h"
+#include "debug.h"
 #include "common.h"
-#include "debug.h"
 
 /* ***************************** */
 /* Makros/Constants              */
 /* ***************************** */
-#define getDVBMutex(pmtx) do { if (pmtx) pthread_mutex_lock(pmtx);} while(false);
-#define releaseDVBMutex(pmtx) do { if (pmtx) pthread_mutex_unlock(pmtx);} while(false);
 
 /* ***************************** */
 /* Types                         */
 /* ***************************** */
-typedef enum {
-    DVB_STS_UNKNOWN, 
-    DVB_STS_SEEK, 
-    DVB_STS_PAUSE, 
-    DVB_STS_EXIT
-} DVBState_t; 
 
 /* ***************************** */
 /* Varaibles                     */
 /* ***************************** */
-
-static Writer_t * AvailableWriter[] = {
-    &WriterAudioAAC,
-    &WriterAudioAACLATM,
-    &WriterAudioAACPLUS,
-    &WriterAudioAC3,
-    &WriterAudioEAC3,
-    &WriterAudioMP3,
-    &WriterAudioMPEGL3,
-    &WriterAudioPCM,
-    &WriterAudioIPCM,
-    &WriterAudioLPCM,
-    &WriterAudioDTS,
-    &WriterAudioWMA,
-    &WriterAudioWMAPRO,
-    &WriterAudioOPUS,
-    &WriterAudioVORBIS,
-
-    &WriterVideoH264,
-    &WriterVideoH265,
-    &WriterVideoH263,
-    &WriterVideoMPEG4,
-    &WriterVideoMPEG2,
-    &WriterVideoMPEG1,
-    &WriterVideoVC1,
-    &WriterVideoDIVX3,
-    &WriterVideoVP6,
-    &WriterVideoVP8,
-    &WriterVideoVP9,
-    &WriterVideoFLV,
-    &WriterVideoWMV,
-    &WriterVideoMJPEG,
-    &WriterVideoRV40,
-    &WriterVideoRV30,
-    &WriterVideoAVS2,
-    NULL
-};
 
 /* ***************************** */
@@ -97 +51 @@
 /*  Functions                    */
 /* ***************************** */
-ssize_t WriteWithRetry(Context_t *context, int pipefd, int fd, void *pDVBMtx, const void *buf, int size)
+void FlushPipe(int pipefd)
 {
-    fd_set rfds;
-    fd_set wfds;
-
-    ssize_t ret;
-    int retval = -1;
-    int maxFd = pipefd > fd ? pipefd : fd;
-    struct timeval tv;
-
-//    while(size > 0 && !context->playback->isSeeking)
-    while(size > 0 && 0 == PlaybackDieNow(0) && !context->playback->isSeeking)
-    {
-        FD_ZERO(&rfds);
-        FD_ZERO(&wfds);
-
-        FD_SET(pipefd, &rfds);
-        FD_SET(fd, &wfds);
-
-        /* When we PAUSE LINUX DVB outputs buffers, then audio/video buffers 
-         * will continue to be filled. Unfortunately, in such case after resume 
-         * select() will never return with fd set - bug in DVB drivers?
-         * There are to workarounds possible:
-         *   1. write to pipe at resume to return from select() immediately
-         *   2. make timeout select(), limit max time spend in the select()
-         *      to for example 0,1s 
-         *   (at now first workaround is used)
-         */
-        //tv.tv_sec = 0;
-        //tv.tv_usec = 100000; // 100ms
-        
-        retval = select(maxFd + 1, &rfds, &wfds, NULL, NULL); //&tv);
-        if (retval < 0)
-        {
-            break;
-        }
-        
-        //if (retval == 0)
-        //{
-        //    //printf("RETURN FROM SELECT DUE TO TIMEOUT\n");
-        //    continue;
-        //}
-        
-        if(FD_ISSET(pipefd, &rfds))
-        {
-            FlushPipe(pipefd);
-            //printf("RETURN FROM SELECT DUE TO pipefd SET\n");
-            continue;
-        }
-        
-        if(FD_ISSET(fd, &wfds))
-        {
-            ret = write(fd, buf, size);
-            if (ret < 0)
-            {
-                switch(errno)
-                {
-                    case EINTR:
-                    case EAGAIN:
-                        continue;
-                    default:
-                        retval = -3;
-                        break;
-                }
-                if (retval < 0)
-                {
-                    break;
-                }
-                
-                return ret;
-            }
-            else if (ret == 0)
-            {
-                // 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_usec = 10000; // 10ms
-                retval = select(pipefd + 1, &rfds, NULL, NULL, &tv);
-                if (retval)
-                    FlushPipe(pipefd);
-                continue;
-            }
-            
-            size -= ret;
-            buf += ret;
-        }
-    }
-    return 0;
+    char tmp;
+    while(1 == read(pipefd, &tmp, 1));
 }
 
-ssize_t write_with_retry(int fd, const void *buf, int size)
+ssize_t WriteExt(WriteV_t _call, int fd, void *data, size_t size)
 {
-    ssize_t ret;
-    int retval = 0;
-//    while(size > 0 && 0 == PlaybackDieNow(0))
-    while(size > 0)
-    {
-        ret = write(fd, buf, size);
-        if (ret < 0)
-        {
-            switch(errno)
-            {
-                case EINTR:
-                case EAGAIN:
-                    usleep(1000);
-                    continue;
-                default:
-                    retval = -3;
-                    break;
-            }
-            if (retval < 0)
-            {
-                break;
-            }
-        }
-            
-        if (ret < 0)
-        {
-            return ret;
-        }
-        
-        size -= ret;
-        buf += ret;
-        
-        if(size > 0)
-        {
-            if( usleep(1000) )
-            {
-                writer_err("usleep error \n");
-            }
-        }
-    }
-    return 0;
+    struct iovec iov[1];
+    iov[0].iov_base = data;
+    iov[0].iov_len = size;
+    return _call(fd, iov, 1);
 }
-
-ssize_t writev_with_retry(int fd, const struct iovec *iov, int ic) 
-{
-    ssize_t len = 0;
-    int i = 0;
-    for(i=0; i<ic; ++i)
-    {
-        write_with_retry(fd, iov[i].iov_base, iov[i].iov_len); 
-        len += iov[i].iov_len;
-        if(PlaybackDieNow(0))
-        {
-//            return -1;
-        }
-    }
-    return len;
-}
-
-Writer_t* getWriter(char* encoding)
-{
-    int i;
-
-    for (i = 0; AvailableWriter[i] != NULL; i++)
-    {
-        if (strcmp(AvailableWriter[i]->caps->textEncoding, encoding) == 0)
-        {
-            writer_printf(50, "%s: found writer \"%s\" for \"%s\"\n", __func__, AvailableWriter[i]->caps->name, encoding);
-            return AvailableWriter[i];
-        }
-    }
-
-    writer_printf(1, "%s: no writer found for \"%s\"\n", __func__, encoding);
-
-    return NULL;
-}
-
-Writer_t* getDefaultVideoWriter()
-{
-    int i;
-
-    for (i = 0; AvailableWriter[i] != NULL; i++)
-    {
-        if (strcmp(AvailableWriter[i]->caps->textEncoding, "V_MPEG2") == 0)
-        {
-            writer_printf(50, "%s: found writer \"%s\"\n", __func__, AvailableWriter[i]->caps->name);
-            return AvailableWriter[i];
-        }
-    }
-
-    writer_printf(1, "%s: no writer found\n", __func__);
-
-    return NULL;
-}
-
-Writer_t* getDefaultAudioWriter()
-{
-    int i;
-
-    for (i = 0; AvailableWriter[i] != NULL; i++)
-    {
-        if (strcmp(AvailableWriter[i]->caps->textEncoding, "A_MP3") == 0)
-        {
-            writer_printf(50, "%s: found writer \"%s\"\n", __func__, AvailableWriter[i]->caps->name);
-            return AvailableWriter[i];
-        }
-    }
-
-    writer_printf(1, "%s: no writer found\n", __func__);
-
-    return NULL;
-}
-

titan/libeplayer3/output/writer/mipsel/writer.c

@@ -107 +107 @@
     struct timeval tv;
 
+//    while(size > 0 && !context->playback->isSeeking)
     while(size > 0 && 0 == PlaybackDieNow(0) && !context->playback->isSeeking)
     {
@@ -190 +191 @@
     ssize_t ret;
     int retval = 0;
-    while(size > 0 && 0 == PlaybackDieNow(0))
+//    while(size > 0 && 0 == PlaybackDieNow(0))
+    while(size > 0)
     {
         ret = write(fd, buf, size);
@@ -240 +242 @@
         if(PlaybackDieNow(0))
         {
-            return -1;
+//            return -1;
         }
     }