mirrors/libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/libstb-hal.git synced 2025-08-26 23:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

libspark: fix pick error

Browse Source
This commit is contained in:
Thilo Graf
2019-12-30 23:58:22 +01:00
parent 92f912e541
commit ed84d0ac6e
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libspark/audio.cpp
View File

@@ -322,7 +322,7 @@ int cAudio::StopClip()
}
close(clipfd);
clipfd = -1;
if (mixer_fd >= -1) {
if (mixer_fd > -1) {
close(mixer_fd);
mixer_fd = -1;
}

9
libspark/video.cpp
View File

@@ -803,13 +803,13 @@ static inline int rate2csapi(int rate)
return 1;
case 25000:
return 2;
case 29976:
case 29970:
return 3;
case 30000:
return 4;
case 50000:
return 5;
case 50940:
case 59940:
return 6;
case 60000:
return 7;
@@ -826,7 +826,10 @@ void cVideo::getPictureInfo(int &width, int &height, int &rate)
if (fd == -1)
{
/* 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]);
height = proc_get_hex(VMPEG_yres[devnum]);
rate = rate2csapi(r);