From 70eedd95052239aac269f2c2383eaeaf078a9207 Mon Sep 17 00:00:00 2001
From: ekeeke31 <ekeeke31@fcb46045-4337-0410-a722-cd382f7ce8f6>
Date: Fri, 6 Mar 2009 15:57:31 +0000
Subject: [PATCH] minor fixes to audio/video engines

---
 source/ngc/ogc_audio.c | 16 +++++++++-------
 source/ngc/ogc_video.c | 33 +++++++++++++++++----------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/source/ngc/ogc_audio.c b/source/ngc/ogc_audio.c
index 604b77e..21afe0c 100644
--- a/source/ngc/ogc_audio.c
+++ b/source/ngc/ogc_audio.c
@@ -55,7 +55,7 @@ static u8 audioStarted;
      In 60Hz modes, VSYNC period is longer than default DMA period so it requires different sync.
  ***/
 
-static void AudioDmaCallback()
+static void AudioDmaCallback(void)
 {
   frameticker++;
 }
@@ -81,7 +81,7 @@ void ogc_audio__init(void)
      This function retrieves samples for the frame then set the next DMA parameters 
      Parameters will be taken in account only when current DMA operation is over
  ***/
-void ogc_audio__update()
+void ogc_audio__update(void)
 {
   u32 size = dma_len;
   
@@ -124,15 +124,19 @@ void ogc_audio__update()
 void ogc_audio__start(void)
 {
   /* initialize default DMA length */
-  /* PAL (50Hz): 20000 us period --> 960 samples/frame  at 48kHz */
-  /* NTSC (60Hz): 16667 us period --> 800 samples/frame at 48kHz */
+  /* PAL (50Hz): 20000 us period --> 960 samples/frame  @48kHz */
+  /* NTSC (60Hz): 16667 us period --> 800 samples/frame @48kHz */
   dma_len   = vdp_pal ? 960 : 800;
   dma_sync  = 0;
   mixbuffer = 0;
   delta     = 0;
 
+  /* reset sound buffers */
+  memset(soundbuffer, 0, 2 * 3840);
+
   /* default case: we use DMA interrupt to synchronize frame emulation */
-  if (vdp_pal | gc_pal) AUDIO_RegisterDMACallback (AudioDmaCallback);
+  AUDIO_RegisterDMACallback(NULL);
+  if (vdp_pal | gc_pal) AUDIO_RegisterDMACallback(AudioDmaCallback);
 
   /* 60hz video mode requires synchronization with Video interrupt      */
   /* VSYNC period is 16715 us which is approx. 802.32 samples           */
@@ -150,8 +154,6 @@ void ogc_audio__start(void)
  ***/
 void ogc_audio__stop(void)
 {
-  AUDIO_RegisterDMACallback(NULL);
   AUDIO_StopDMA ();
-  memset(soundbuffer, 0, 2 * 3840);
   audioStarted = 0;
 }
diff --git a/source/ngc/ogc_video.c b/source/ngc/ogc_video.c
index c3a2516..9bb8d52 100644
--- a/source/ngc/ogc_video.c
+++ b/source/ngc/ogc_video.c
@@ -402,6 +402,7 @@ static void gxResetView(GXRModeObj *tvmode)
   GX_SetFieldMode(tvmode->field_rendering, ((tvmode->viHeight == 2 * tvmode->xfbHeight) ? GX_ENABLE : GX_DISABLE));
   guOrtho(p, tvmode->efbHeight/2, -(tvmode->efbHeight/2), -(tvmode->fbWidth/2), tvmode->fbWidth/2, 100, 1000);
   GX_LoadProjectionMtx(p, GX_ORTHOGRAPHIC);
+  GX_Flush();
 }
 
 /* Reset GX/VI scaler */
@@ -532,7 +533,7 @@ void ogc_video__stop(void)
 }
 
 /* Update Video settings */
-void ogc_video__start()
+void ogc_video__start(void)
 {
   /* 50Hz/60Hz mode */
   if ((config.tv_mode == 1) || ((config.tv_mode == 2) && vdp_pal)) gc_pal = 1;
@@ -591,7 +592,7 @@ void ogc_video__start()
 }
 
 /* GX render update */
-void ogc_video__update()
+void ogc_video__update(void)
 {
   /* check if display has changed */
   if (bitmap.viewport.changed)
@@ -603,12 +604,12 @@ void ogc_video__update()
     u32 vheight = bitmap.viewport.h + 2 * bitmap.viewport.y;
 
     /* special cases */
-    if (config.render && interlaced) vheight *= 2;
+    if (config.render && interlaced) vheight = vheight << 1;
     if (config.ntsc) vwidth = (reg[12]&1) ? MD_NTSC_OUT_WIDTH(vwidth) : SMS_NTSC_OUT_WIDTH(vwidth);
 
     /* texels size must be multiple of 4 */
-    vwidth  = (vwidth  / 4) * 4;
-    vheight = (vheight / 4) * 4;
+    vwidth  = (vwidth  >> 2) << 2;
+    vheight = (vheight >> 2) << 2;
 
     /* initialize texture object */
     GXTexObj texobj;
@@ -623,29 +624,28 @@ void ogc_video__update()
     /* load texture object */
     GX_LoadTexObj(&texobj, GX_TEXMAP0);
 
-    /* select TV mode */
+    /* reset TV mode */
     if (config.render) rmode = tvmodes[gc_pal*3 + 2];
     else rmode = tvmodes[gc_pal*3 + interlaced];
 
     /* reset aspect ratio */
     gxResetScale(vwidth,vheight);
 
-    /* reset GX */
-    gxResetView(rmode);
-
-    /* configure VI */
+    /* reconfigure VI */
     VIDEO_Configure(rmode);
     VIDEO_Flush();
     VIDEO_WaitVSync();
     if (rmode->viTVMode & VI_NON_INTERLACE) VIDEO_WaitVSync();
     else while (VIDEO_GetNextField() != odd_frame) VIDEO_WaitVSync();
-
     if (frameticker > 1) frameticker = 1;
+
+    /* reset GX */
+    gxResetView(rmode);
   }
 
   /* texture is now directly mapped by the line renderer */
 
-  /* update texture cache */
+  /* force texture cache update */
   DCFlushRange(texturemem, TEX_SIZE);
   GX_InvalidateTexAll();
 
@@ -653,14 +653,15 @@ void ogc_video__update()
   draw_square();
   GX_DrawDone();
 
-  /* swap XFB */
+  /* swap XFB then copy EFB to XFB */
   whichfb ^= 1;
+  GX_CopyDisp(xfb[whichfb], GX_TRUE);
+  GX_Flush();
+
+  /* set next XFB */
   VIDEO_SetNextFramebuffer(xfb[whichfb]);
   VIDEO_Flush();
 
-  /* copy EFB to XFB */
-  GX_CopyDisp(xfb[whichfb], GX_TRUE);
-  GX_Flush();
 }
 
 /* Initialize VIDEO subsystem */