Small HISI fixes

teamblue-e2 · Aug 12, 2023 · d70b0f3 · d70b0f3
1 parent 5b5fb8b
commit d70b0f3
Show file tree

Hide file tree

Showing 3 changed files with 703 additions and 18 deletions.
diff --git a/lib/dvb/decoder.cpp b/lib/dvb/decoder.cpp
@@ -1257,12 +1257,12 @@ RESULT eTSMPEGDecoder::showSinglePic(const char *filename)
 		{
 			struct stat s = {};
 			fstat(f, &s);
-			if (m_video_clip_fd == -1)
-				m_video_clip_fd = open("/dev/dvb/adapter0/video0", O_WRONLY);
 #if HAVE_HISILICON
 			if (m_video_clip_fd >= 0)
 				finishShowSinglePic();
 #endif
+			if (m_video_clip_fd == -1)
+				m_video_clip_fd = open("/dev/dvb/adapter0/video0", O_WRONLY);
 			if (m_video_clip_fd >= 0)
 			{
 				bool seq_end_avail = false;

diff --git a/lib/dvb/filepush.cpp b/lib/dvb/filepush.cpp
@@ -120,7 +120,7 @@ void eFilePushThread::thread()
 			if (d)
 				buf_end -= d;
 
-			if (buf_end == 0 || m_sof == 1)
+			if (buf_end == 0)
 			{
 				/* on EOF, try COMMITting once. */
 				if (m_send_pvr_commit)
@@ -130,18 +130,18 @@ void eFilePushThread::thread()
 					pfd.events = POLLIN;
 					switch (poll(&pfd, 1, 250)) // wait for 250ms
 					{
-						case 0:
-							eDebug("[eFilePushThread] wait for driver eof timeout");
-							continue;
-						case 1:
-							eDebug("[eFilePushThread] wait for driver eof ok");
+					case 0:
+						eDebug("[eFilePushThread] wait for driver eof timeout");
+						continue;
+					case 1:
+						eDebug("[eFilePushThread] wait for driver eof ok");
+						break;
+					default:
+						eDebug("[eFilePushThread] wait for driver eof aborted by signal");
+						/* Check m_stop after interrupted syscall. */
+						if (m_stop)
 							break;
-						default:
-							eDebug("[eFilePushThread] wait for driver eof aborted by signal");
-							/* Check m_stop after interrupted syscall. */
-							if (m_stop)
-								break;
-							continue;
+						continue;
 					}
 				}
 
@@ -151,10 +151,7 @@ void eFilePushThread::thread()
 				/* in stream_mode, we are sending EOF events
 				   over and over until somebody responds.
 				   in stream_mode, think of evtEOF as "buffer underrun occurred". */
-				if (m_sof == 0)
-					sendEvent(evtEOF);
-				else
-					sendEvent(evtUser); // start of file event
+				sendEvent(evtEOF);
 
 				if (m_stream_mode)
 				{
@@ -190,7 +187,12 @@ void eFilePushThread::thread()
 							break;
 						}
 						if (w < 0 && (errno == EINTR || errno == EAGAIN || errno == EBUSY))
+						{
+#if HAVE_HISILICON
+							usleep(100000);
+#endif
 							continue;
+						}
 						eDebug("[eFilePushThread] write: %m");
 						sendEvent(evtWriteError);
 						break;
@@ -583,6 +585,9 @@ void eFilePushThreadRecorder::thread()
 			if (errno == EINTR || errno == EBUSY)
 			{
 				eDebug("[eFilePushThreadRecorder] read got interrupted by signal, stop: %d", m_stop);
+#if HAVE_HISILICON
+				usleep(100000);
+#endif
 				continue;
 			}