Fix unlikely race condition

oreo639 · Apr 6, 2021 · d8d4702 · d8d4702
1 parent 66635ca
commit d8d4702
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/source/main.c b/source/main.c
@@ -70,11 +70,20 @@ void videoDecode_thread(void* nul) {
 		scaleframe = getFrameScalef(vinfo->width, vinfo->height, SCREEN_WIDTH, SCREEN_HEIGHT);
 	}
 
+	isplaying = true;
+
 	while (isplaying)
 	{
 		if (THEORA_eos(&vidCtx))
 			break;
 
+		if (THEORA_HasVideo(&vidCtx)) {
+			th_ycbcr_buffer ybr;
+			if (THEORA_getvideo(&vidCtx, ybr)) {
+				frameWrite(&frame, vinfo, ybr);
+			}
+		}
+
 		if (THEORA_HasAudio(&vidCtx)) {
 			for (int cur_wvbuf = 0; cur_wvbuf < WAVEBUFCOUNT; cur_wvbuf++) {
 				ndspWaveBuf *buf = &waveBuf[cur_wvbuf];
@@ -93,13 +102,6 @@ void videoDecode_thread(void* nul) {
 				DSP_FlushDataCache(buf->data_pcm16, buffSize * sizeof(int16_t));
 			}
 		}
-
-		if (THEORA_HasVideo(&vidCtx)) {
-			th_ycbcr_buffer ybr;
-			if (THEORA_getvideo(&vidCtx, ybr)) {
-				frameWrite(&frame, vinfo, ybr);
-			}
-		}
 	}
 
 	printf("frames: %d dropped: %d\n", vidCtx.frames, vidCtx.dropped);
@@ -215,7 +217,6 @@ static void changeFile(const char* filepath) {
 	}
 
 	printf("Theora Create sucessful.\n");
-	isplaying = true;
 
 	s32 prio;
 	svcGetThreadPriority(&prio, CUR_THREAD_HANDLE);