Changeset 26547

Timestamp:

02/28/14 15:04:07 (9 years ago)

Author:

obi

Message:

mipsel add minitv support

Location:

titan/titan

Files:

• global.h (modified) (1 diff)
• mipselport.h (modified) (1 diff)
• sh4port.h (modified) (1 diff)

titan/titan/global.h

@@ -3200 +3200 @@
 }
 
-int setvmpeg(struct dvbdev* node, int posx, int posy, int width, int height)
-{
-        if(status.tvpic == 1 && (posx != 0 || posy != 0 || width != 0 || height != 0))
-                return 0;
-
-        if(getconfigint("minitv", NULL) == 1) 
-                return 0;
-        
-        char* vmpegdev = NULL, *tmpstr = NULL, *buf = NULL;
-        int ret = 0;
-
-        if(node == NULL) return 1;
-        vmpegdev = getconfig("vmpegalldev", NULL);
-
-        if(vmpegdev != NULL)
-        {
-                buf = malloc(MINMALLOC);
-                if(buf == NULL)
-                {
-                        err("no mem");
-                        return 1;
-                }
-                
-                tmpstr = malloc(MINMALLOC);
-                if(tmpstr == NULL)
-                {
-                        err("no mem");
-                        free(buf);
-                        return 1;
-                }
-                
-                snprintf(buf, MINMALLOC, vmpegdev, node->devnr);
-                snprintf(tmpstr, MINMALLOC, "%x %x %x %x", posx, posy, width, height);
-                debug(100, "set %s to %s", buf, tmpstr);
-
-                status.tvpic = 1;
-                ret = writesys(buf, tmpstr, 1);
-
-                //reset
-                if(posx == 0 && posy == 0 && width == 0 && height == 0)
-                        status.tvpic = 0;
-                
-                free(tmpstr);
-                free(buf);
-                return ret;
-        }
-
-        return 0;
-}
-
-//flag 0: wh = width
-//flag 1: wh = height
-int setvmpegrect(struct dvbdev* node, int posx, int posy, int wh, int flag)
-{
-        int ret = 0;
-        int leftoffset = status.leftoffset;
-        int rightoffset = status.rightoffset;
-        int topoffset = status.topoffset;
-        int bottomoffset = status.bottomoffset;
-
-        float rx = (float)fb->width / 720;
-        float ry = (float)fb->height / 576;
-
-        leftoffset = (float)leftoffset / rx;
-        rightoffset = (float)rightoffset / rx;
-        topoffset = (float)topoffset / ry;
-        bottomoffset = (float)bottomoffset / ry;
-
-        rx = (float)720 / (float)(720 - leftoffset - rightoffset);
-        ry = (float)576 / (float)(576 - topoffset - bottomoffset);
-
-        posx = (float)posx / rx;
-        posx += leftoffset;
-
-        posy = (float)posy / ry;
-        posy += topoffset;
-
-        if(flag == 0)
-        {
-                wh = ((float)wh / rx);
-                ret = setvmpeg(node, posx, posy, wh, (int)((float)wh / 1.2));
-        }
-
-        if(flag == 1)
-        {
-                wh = ((float)wh / ry);
-                ret = setvmpeg(node, posx, posy, (int)((float)wh * 1.2), wh);
-        }
-
-        return ret;
-}
-
-int resettvpic()
-{
-        int ret = 0;
-
-        if(status.tvpic > 0 && status.aktservice != NULL)
-                ret = setvmpeg(status.aktservice->videodev, 0, 0, 0, 0);
-
-        return ret;
-}
-
 /*
 int checkdev(char* dev)

titan/titan/mipselport.h

@@ -870 +870 @@
 }
 
+int setvmpeg(struct dvbdev* node, int value, int flag)
+{
+        debug(1000, "in");
+        char* vmpegdev = NULL, *tmpstr = NULL, *buf = NULL;
+        int ret = 0;
+
+        if(node == NULL) return 1;
+        if(flag == 0) vmpegdev = getconfig("vmpegleftdev", NULL);
+        if(flag == 1) vmpegdev = getconfig("vmpegtopdev", NULL);
+        if(flag == 2) vmpegdev = getconfig("vmpegwidthdev", NULL);
+        if(flag == 3) vmpegdev = getconfig("vmpegheightdev", NULL);
+
+        if(vmpegdev != NULL)
+        {
+                buf = malloc(MINMALLOC);
+                if(buf == NULL)
+                {
+                        err("no mem");
+                        return 1;
+                }
+                
+                tmpstr = malloc(10);
+                if(tmpstr == NULL)
+                {
+                        err("no mem");
+                        free(buf);
+                        return 1;
+                }
+                
+                snprintf(buf, MINMALLOC, vmpegdev, node->devnr);
+                snprintf(tmpstr, 10, "%x", value);
+                debug(100, "set %s to %s", buf, tmpstr);
+                status.tvpic = 1;
+                ret = writesys(buf, tmpstr, 1);
+                
+                free(tmpstr);
+                free(buf);
+                return ret;
+        }
+
+        debug(1000, "out");
+        return 0;
+}
+
+//flag 0: wh = width
+//flag 1: wh = height
+int setvmpegrect(struct dvbdev* node, int left, int top, int wh, int flag)
+{
+        int ret = 0;
+        
+        if(flag == 0)
+        {
+                ret = setvmpeg(node, wh, 2);
+                ret = setvmpeg(node, wh / 1.4, 3);
+        }
+        if(flag == 1)
+        {
+                ret = setvmpeg(node, wh, 3);
+                ret = setvmpeg(node, wh * 1.3, 2);
+        }
+                
+        ret = setvmpeg(node, left, 0);
+        ret = setvmpeg(node, top, 1);
+        
+        return ret;
+}
+
+int resetvmpeg(struct dvbdev* node)
+{
+        int ret = 0;
+
+        ret = setvmpeg(node, 0, 0);
+        ret = setvmpeg(node, 0, 1);
+        ret = setvmpeg(node, 0, 2);
+        ret = setvmpeg(node, 0, 3);
+        
+        return ret;
+}
+
+int resettvpic()
+{
+/*
+        if(status.tvpic == 1 && status.aktservice != NULL)
+        {
+                status.tvpic = 0;
+                resetvmpeg(status.aktservice->videodev);
+        }
+*/
+        int ret = 0;
+
+        if(status.tvpic > 0 && status.aktservice != NULL)
+        {
+                status.tvpic = 0;
+                ret = resetvmpeg(status.aktservice->videodev);
+        }
+
+        return ret;
+}
+
 #endif

titan/titan/sh4port.h

@@ -741 +741 @@
 }
 
+int setvmpeg(struct dvbdev* node, int posx, int posy, int width, int height)
+{
+        if(status.tvpic == 1 && (posx != 0 || posy != 0 || width != 0 || height != 0))
+                return 0;
+
+        if(getconfigint("minitv", NULL) == 1) 
+                return 0;
+        
+        char* vmpegdev = NULL, *tmpstr = NULL, *buf = NULL;
+        int ret = 0;
+
+        if(node == NULL) return 1;
+        vmpegdev = getconfig("vmpegalldev", NULL);
+
+        if(vmpegdev != NULL)
+        {
+                buf = malloc(MINMALLOC);
+                if(buf == NULL)
+                {
+                        err("no mem");
+                        return 1;
+                }
+                
+                tmpstr = malloc(MINMALLOC);
+                if(tmpstr == NULL)
+                {
+                        err("no mem");
+                        free(buf);
+                        return 1;
+                }
+                
+                snprintf(buf, MINMALLOC, vmpegdev, node->devnr);
+                snprintf(tmpstr, MINMALLOC, "%x %x %x %x", posx, posy, width, height);
+                debug(100, "set %s to %s", buf, tmpstr);
+
+                status.tvpic = 1;
+                ret = writesys(buf, tmpstr, 1);
+
+                //reset
+                if(posx == 0 && posy == 0 && width == 0 && height == 0)
+                        status.tvpic = 0;
+                
+                free(tmpstr);
+                free(buf);
+                return ret;
+        }
+
+        return 0;
+}
+
+//flag 0: wh = width
+//flag 1: wh = height
+int setvmpegrect(struct dvbdev* node, int posx, int posy, int wh, int flag)
+{
+        int ret = 0;
+        int leftoffset = status.leftoffset;
+        int rightoffset = status.rightoffset;
+        int topoffset = status.topoffset;
+        int bottomoffset = status.bottomoffset;
+
+        float rx = (float)fb->width / 720;
+        float ry = (float)fb->height / 576;
+
+        leftoffset = (float)leftoffset / rx;
+        rightoffset = (float)rightoffset / rx;
+        topoffset = (float)topoffset / ry;
+        bottomoffset = (float)bottomoffset / ry;
+
+        rx = (float)720 / (float)(720 - leftoffset - rightoffset);
+        ry = (float)576 / (float)(576 - topoffset - bottomoffset);
+
+        posx = (float)posx / rx;
+        posx += leftoffset;
+
+        posy = (float)posy / ry;
+        posy += topoffset;
+
+        if(flag == 0)
+        {
+                wh = ((float)wh / rx);
+                ret = setvmpeg(node, posx, posy, wh, (int)((float)wh / 1.2));
+        }
+
+        if(flag == 1)
+        {
+                wh = ((float)wh / ry);
+                ret = setvmpeg(node, posx, posy, (int)((float)wh * 1.2), wh);
+        }
+
+        return ret;
+}
+
+int resettvpic()
+{
+        int ret = 0;
+
+        if(status.tvpic > 0 && status.aktservice != NULL)
+                ret = setvmpeg(status.aktservice->videodev, 0, 0, 0, 0);
+
+        return ret;
+}
+
 #endif