From b5ff2c2138345efa8a2f06ead8217486ac690b87 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 29 May 2018 18:06:21 +0200 Subject: [PATCH 1/3] fix framerate for movieplayer Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/6ad87ad3c1db2107aaec1e462711192269b53fbf Author: Jacek Jendrzej Date: 2018-05-29 (Tue, 29 May 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 6fb8495..16e209b 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -730,7 +730,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); From 173d00231ba404944f0b7ab58bc78d9cbb24d477 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 29 May 2018 18:37:58 +0200 Subject: [PATCH 2/3] fix getAspectRatio for movieplayer Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/baddea3b221c2bf77d2dc367cb9d3961917bf023 Author: Jacek Jendrzej Date: 2018-05-29 (Tue, 29 May 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 16e209b..3da7ada 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -411,7 +411,7 @@ int cVideo::getAspectRatio(void) { /* in movieplayer mode, fd is not opened -> fall back to procfs */ int n = proc_get_hex(VMPEG_aspect[devnum]); - return n * 2 + 1; + return n; } if (fop(ioctl, VIDEO_GET_SIZE, &s) < 0) { From 176110a0fcbd8f3d58eb5d4d7e60fb0dd89bad5b Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 29 May 2018 16:32:47 +0200 Subject: [PATCH 3/3] set av input on start Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/a1f1070da5a18e2dc75e145f0aec1ffe1bc6e274 Author: Jacek Jendrzej Date: 2018-05-29 (Tue, 29 May 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 3da7ada..439eace 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -329,6 +329,7 @@ cVideo::cVideo(int, void *, void *, unsigned int unit) hdmiFd = -1; standby_cec_activ = autoview_cec_activ = false; openDevice(); + setAVInput(ENCODER); } cVideo::~cVideo(void)