mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-31 01:10:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'mpx' of https://github.com/tuxbox-neutrino/library-stb-hal

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 360cb17317
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-05-29 (Tue, 29 May 2018)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2018-05-29 22:06:26 +02:00
parent 302aba3bf0 dc7076847f
commit 216a33be2e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libarmbox/video.cpp
View File

@@ -329,6 +329,7 @@ cVideo::cVideo(int, void *, void *, unsigned int unit)
hdmiFd = -1; hdmiFd = -1;
standby_cec_activ = autoview_cec_activ = false; standby_cec_activ = autoview_cec_activ = false;
openDevice(); openDevice();
setAVInput(ENCODER);
} }
cVideo::~cVideo(void) cVideo::~cVideo(void)
@@ -411,7 +412,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)
{ {
@@ -730,7 +731,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);