X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/c31bef10af2174fc72b9e5658edc81681da4e47e..7265acc377e49beaed3f3c43f36267c9fced53e7:/lib/driver/avswitch.cpp

diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp
index 40db19ae..199a7855 100644
--- a/lib/driver/avswitch.cpp
+++ b/lib/driver/avswitch.cpp
@@ -6,7 +6,6 @@
 
 #include <lib/base/init.h>
 #include <lib/base/init_num.h>
-#include <lib/base/econfig.h>
 #include <lib/base/eerror.h>
 
 eAVSwitch *eAVSwitch::instance = 0;
@@ -15,6 +14,7 @@ eAVSwitch::eAVSwitch()
 {
 	ASSERT(!instance);
 	instance = this;
+	m_video_mode = 0;
 }
 
 eAVSwitch::~eAVSwitch()
@@ -46,15 +46,21 @@ void eAVSwitch::setInput(int val)
 	write(fd, input[val], strlen(input[val]));
 	close(fd);
 	
+	if (val == 1)
+		setFastBlank(2);
+}
+
+void eAVSwitch::setFastBlank(int val)
+{
+	int fd;
 	char *fb[] = {"low", "high", "vcr"};
 
-	
 	if((fd = open("/proc/stb/avs/0/fb", O_WRONLY)) < 0) {
 		printf("cannot open /proc/stb/avs/0/fb\n");
 		return;
 	}
 
-	write(fd, input[val], strlen(fb[0]));
+	write(fd, fb[val], strlen(fb[0]));
 	close(fd);
 }
 
@@ -68,6 +74,7 @@ void eAVSwitch::setColorFormat(int format)
 	char *cvbs="cvbs";
 	char *rgb="rgb";
 	char *svideo="svideo";
+	char *yuv="yuv";
 	int fd;
 	
 	if((fd = open("/proc/stb/avs/0/colorformat", O_WRONLY)) < 0) {
@@ -84,6 +91,9 @@ void eAVSwitch::setColorFormat(int format)
 		case 2:
 			write(fd, svideo, strlen(svideo));
 			break;
+		case 3:
+			write(fd, yuv, strlen(yuv));
+			break;
 	}	
 	close(fd);
 }
@@ -94,17 +104,20 @@ void eAVSwitch::setAspectRatio(int ratio)
 	0-4:3 Letterbox
 	1-4:3 PanScan
 	2-16:9
-	3-16:9 forced
+	3-16:9 forced ("panscan")
+	4-16:10 Letterbox
+	5-16:10 PanScan
+	6-16:9 forced ("letterbox")
 	*/
-	
-	char *aspect[] = {"4:3", "4:3", "any", "16:9"};
-	char *policy[] = {"letterbox", "panscan", "bestfit", "panscan"};
+	char *aspect[] = {"4:3", "4:3", "any", "16:9", "16:10", "16:10", "16:9", "16:9"};
+	char *policy[] = {"letterbox", "panscan", "bestfit", "panscan", "letterbox", "panscan", "letterbox"};
 
 	int fd;
 	if((fd = open("/proc/stb/video/aspect", O_WRONLY)) < 0) {
 		printf("cannot open /proc/stb/video/aspect\n");
 		return;
 	}
+//	eDebug("set aspect to %s", aspect[ratio]);
 	write(fd, aspect[ratio], strlen(aspect[ratio]));
 	close(fd);
 
@@ -112,6 +125,7 @@ void eAVSwitch::setAspectRatio(int ratio)
 		printf("cannot open /proc/stb/video/policy\n");
 		return;
 	}
+//	eDebug("set ratio to %s", policy[ratio]);
 	write(fd, policy[ratio], strlen(policy[ratio]));
 	close(fd);
 
@@ -121,10 +135,12 @@ void eAVSwitch::setVideomode(int mode)
 {
 	char *pal="pal";
 	char *ntsc="ntsc";
-	int fd;
 	
-	return;
-	//FIXME: bug in driver (cannot set PAL)
+	if (mode == m_video_mode)
+		return;
+	
+	int fd;
+
 	if((fd = open("/proc/stb/video/videomode", O_WRONLY)) < 0) {
 		printf("cannot open /proc/stb/video/videomode\n");
 		return;
@@ -136,7 +152,39 @@ void eAVSwitch::setVideomode(int mode)
 		case 1:
 			write(fd, ntsc, strlen(ntsc));
 			break;
-	}	
+	}
+	close(fd);
+
+	m_video_mode = mode;
+}
+
+void eAVSwitch::setWSS(int val) // 0 = auto, 1 = auto(4:3_off)
+{
+	int fd;
+	if((fd = open("/proc/stb/denc/0/wss", O_WRONLY)) < 0) {
+		printf("cannot open /proc/stb/denc/0/wss\n");
+		return;
+	}
+	char *wss[] = {
+		"off", "auto", "auto(4:3_off)", "4:3_full_format", "16:9_full_format",
+		"14:9_letterbox_center", "14:9_letterbox_top", "16:9_letterbox_center",
+		"16:9_letterbox_top", ">16:9_letterbox_center", "14:9_full_format"
+	};
+	write(fd, wss[val], strlen(wss[val]));
+//	eDebug("set wss to %s", wss[val]);
+	close(fd);
+}
+
+void eAVSwitch::setSlowblank(int val)
+{
+	int fd;
+	if((fd = open("/proc/stb/avs/0/sb", O_WRONLY)) < 0) {
+		printf("cannot open /proc/stb/avs/0/sb\n");
+		return;
+	}
+	char *sb[] = {"0", "6", "12", "vcr", "auto"};
+	write(fd, sb[val], strlen(sb[val]));
+//	eDebug("set slow blanking to %s", sb[val]);
 	close(fd);
 }