- 7e4f4fd907
- dc7076847f
- 8292a45148


Origin commit data
------------------
Branch: master
Commit: 1e26cd81b3
Author: Frankenstone <dampf_acc@online.de>
Date: 2018-05-30 (Wed, 30 May 2018)



------------------
This commit was generated by Migit
This commit is contained in:
Frankenstone
2018-05-30 18:36:02 +02:00
parent a5664e7726
commit 0b63d2cd38

View File

@@ -392,7 +392,7 @@ int cVideo::getAspectRatio(void)
{ {
/* in movieplayer mode, fd is not opened -> fall back to procfs */ /* in movieplayer mode, fd is not opened -> fall back to procfs */
int n = proc_get_hex(VMPEG_aspect[devnum]); int n = proc_get_hex(VMPEG_aspect[devnum]);
return n * 2 + 1; return n;
} }
if (fop(ioctl, VIDEO_GET_SIZE, &s) < 0) if (fop(ioctl, VIDEO_GET_SIZE, &s) < 0)
{ {
@@ -800,7 +800,7 @@ static inline int rate2csapi(int rate)
return 4; return 4;
case 50000: case 50000:
return 5; return 5;
case 50940: case 59940:
return 6; return 6;
case 60000: case 60000:
return 7; return 7;
@@ -817,7 +817,10 @@ void cVideo::getPictureInfo(int &width, int &height, int &rate)
if (fd == -1) if (fd == -1)
{ {
/* in movieplayer mode, fd is not opened -> fall back to procfs */ /* in movieplayer mode, fd is not opened -> fall back to procfs */
r = proc_get_hex(VMPEG_framerate[devnum]); char buf[16];
int n = proc_get(VMPEG_framerate[devnum], buf, 16);
if (n > 0)
sscanf(buf, "%i", &r);
width = proc_get_hex(VMPEG_xres[devnum]); width = proc_get_hex(VMPEG_xres[devnum]);
height = proc_get_hex(VMPEG_yres[devnum]); height = proc_get_hex(VMPEG_yres[devnum]);
rate = rate2csapi(r); rate = rate2csapi(r);