Merge pull request pesintta#87 from j1rie/latest

tell VideoSoftStartSync, cosmetics
j1rie · Aug 1, 2024 · 96eb88a · 96eb88a
2 parents 45a4f30 + 4324351
commit 96eb88a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/audio.c b/audio.c
@@ -2455,6 +2455,7 @@ void AudioVideoReady(int64_t pts)
     int first = 1;
     int loop_max = 800; // 8s
 
+    Debug(3, "audio: VideoSoftStartSync: %d\n", VideoSoftStartSync);
     if (pts == (int64_t) INT64_C(0x8000000000000000)) {
 	Debug(3, "audio: a/v start, no valid video\n");
 	return;

diff --git a/video.c b/video.c
@@ -13287,7 +13287,7 @@ static void CuvidDestroySurfaces(CuvidDecoder * decoder)
     if (EglEnabled) {
         if(EglThreadContext){
             eglMakeCurrent(EglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EglThreadContext);
-            EglCheck();;
+            EglCheck();
         }
     }
 #endif
@@ -13946,7 +13946,7 @@ static uint8_t *CuvidGrabOutputSurfaceLocked(int *ret_size, int *ret_width, int
 	Debug(3, "video/cuvid: grab source rect %d,%d:%d,%d dest dim %dx%d\n",
 	source_rect.x0, source_rect.y0, source_rect.x1, source_rect.y1, width, height);
 
-	size = width * height * 4;;
+	size = width * height * 4;
 
 	base = malloc(size*sizeof(uint8_t));
 	if (!base) {
@@ -15724,7 +15724,7 @@ void NVdecCreateGlTexture(NVdecDecoder * decoder, unsigned int size_x, unsigned
 #ifdef USE_EGL
     if (EglEnabled) {
         eglMakeCurrent(EglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EglThreadContext);
-        EglCheck();;
+        EglCheck();
     }
 #endif
     // create texture planes
@@ -15861,7 +15861,7 @@ static void NVdecDestroySurfaces(NVdecDecoder * decoder)
     if (EglEnabled) {
         if(EglThreadContext){
             eglMakeCurrent(EglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EglThreadContext);
-            EglCheck();;
+            EglCheck();
         }
     }
 #endif
@@ -16612,7 +16612,7 @@ static uint8_t *NVdecGrabOutputSurfaceLocked(int *ret_size, int *ret_width, int
 	Debug(3, "video/nvdec: grab source rect %d,%d:%d,%d dest dim %dx%d\n",
 	source_rect.x0, source_rect.y0, source_rect.x1, source_rect.y1, width, height);
 
-	size = width * height * 4;;
+	size = width * height * 4;
 
 	base = malloc(size*sizeof(uint8_t));
 	if (!base) {
@@ -18394,7 +18394,7 @@ void CpuCreateGlTexture(CpuDecoder * decoder, unsigned int size_x, unsigned int
 #ifdef USE_EGL
     if (EglEnabled) {
         eglMakeCurrent(EglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EglThreadContext);
-        EglCheck();;
+        EglCheck();
     }
 #endif
     // create texture planes
@@ -19004,7 +19004,7 @@ static uint8_t *CpuGrabOutputSurfaceLocked(int *ret_size, int *ret_width, int *r
 	Debug(3, "video/cpu: grab source rect %d,%d:%d,%d dest dim %dx%d\n",
 	source_rect.x0, source_rect.y0, source_rect.x1, source_rect.y1, width, height);
 
-	size = width * height * 4;;
+	size = width * height * 4;
 
 	base = malloc(size*sizeof(uint8_t));
 	if (!base) {