Bump rvid version to 5, and add a "for GBA" flag

Author: RocketRobz

common/rvidHeader.cpp

@@ -34,7 +34,10 @@ bool rvidNativeRefreshRate = false;
 int rvidHRes = 0;
 int rvidVRes = 0;
 bool rvidInterlaced = false;
+#ifndef __GBA__
 bool rvidDualScreen = false;
+bool rvidForGba = false;
+#endif
 int rvidOver256Colors = 0;
 bool rvidHasSound = false;
 u16 rvidSampleRate = 0;
@@ -66,6 +69,8 @@ void readRvidHeader(
 		return;
 	}
 	#else
+	rvidForGba = false;
+
 	u32
 	#endif
 
@@ -116,8 +121,9 @@ void readRvidHeader(
 			rvidHRes = width16;
 			break;
 		case 3:
+		case 4:
 		#endif
-		case 4: {
+		case 5: {
 			rvidHeaderInfo4 rvidHeader4;
 			#ifdef __GBA__
 			tonccpy(&rvidHeader4, rvid, sizeof(rvidHeader4));
@@ -140,7 +146,13 @@ void readRvidHeader(
 			}
 			rvidVRes = rvidHeader4.vRes;
 			rvidInterlaced = rvidHeader4.interlaced;
-			rvidDualScreen = rvidHeader4.dualScreen;
+			#ifndef __GBA__
+			if (rvidHeaderCheck.ver > 4 && rvidHeader4.dualScreen == 2) {
+				rvidForGba = true;
+			} else {
+				rvidDualScreen = (rvidHeader4.dualScreen == 1);
+			}
+			#endif
 			rvidSampleRate = rvidHeader4.sampleRate;
 			#ifndef __GBA__
 			rvidAudioIs16bit = rvidHeader4.audioBitMode;

common/rvidHeader.h

@@ -1,7 +1,7 @@
 #ifndef RVIDHEADER_H
 #define RVIDHEADER_H
 
-#define latestRvidVer 4
+#define latestRvidVer 5
 
 typedef struct rvidHeaderCheckInfo {
 	u32 formatString;	// "RVID" string
@@ -40,7 +40,7 @@ typedef struct rvidHeaderInfo4 {
 	u8 fps;					// Frames per second
 	u8 vRes;				// Vertical resolution
 	u8 interlaced;			// Is interlaced
-	u8 dualScreen;			// Is dual screen video
+	u8 dualScreen;			// Is dual screen video, 2 = Video is for GBA
 	u16 sampleRate;			// Audio sample rate
 	u8 audioBitMode;		// 0 = 8-bit, 1 = 16-bit
 	u8 bmpMode;				// 0 = 8 BPP (RGB565), 1 = 16 BPP (RGB555), 2 = 16 BPP (RGB565)
@@ -66,7 +66,10 @@ extern bool rvidNativeRefreshRate;
 extern int rvidHRes;
 extern int rvidVRes;
 extern bool rvidInterlaced;
+#ifndef __GBA__
 extern bool rvidDualScreen;
+extern bool rvidForGba;
+#endif
 extern int rvidOver256Colors;
 extern bool rvidHasSound;
 extern u16 rvidSampleRate;

gba/source/main.iwram.cpp

@@ -333,7 +333,7 @@ int main(void)
 
 	readRvidHeader((const void*)0x08002000);
 
-	if (rvidHeaderCheck.formatString != 0x44495652 || rvidHeaderCheck.ver < 4 || rvidDualScreen) { // Old versions and dual-screen videos are not supported
+	if (rvidHeaderCheck.formatString != 0x44495652 || rvidHeaderCheck.ver < 5) { // Old versions are not supported
 		SetMode( MODE_4 | BG2_ON );
 
 		*(vu16*)BG_PALETTE = 0x001F; // Red screen

nds/arm9/source/main.cpp

@@ -827,7 +827,9 @@ int playRvid(const char* filename) {
 
 	readRvidHeader(rvid[0]);
 
-	if (isGbMacro && rvidDualScreen) {
+	if (rvidForGba) {
+		return 7;
+	} else if (isGbMacro && rvidDualScreen) {
 		return 6;
 	} else if (rvidFps > 60 && is3DS) {
 		return 5;
@@ -1597,7 +1599,10 @@ int main(int argc, char **argv) {
 						}
 						consoleClear();
 					}
-					if (err == 6) {
+					if (err == 7) {
+						printf("Videos made for GBA are\n"
+								"not compatible.\n");
+					} else if (err == 6) {
 						printf("Cannot play dual-screen\n"
 								"videos on a single screen.\n");
 					} else if (err == 5) {