From d4d6e0f2a11ae90a582394d1c2d43eee699d4e68 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 29 May 2018 18:06:21 +0200 Subject: [PATCH 1/4] fix framerate for movieplayer Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/30ab6eebc4b09aaf1231715d62f54f744f8a9df1 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 a807eb0..f4ae1b3 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 9c3682de283a14c7d18b334a1e9a7e12c8579619 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 29 May 2018 18:37:58 +0200 Subject: [PATCH 2/4] fix getAspectRatio for movieplayer Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/03af3ec950e2cb6449c76d3420f6675471947ce7 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 f4ae1b3..463428d 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 0a7ebe3cb8223829b2def31a0333ad40899e6d54 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Tue, 29 May 2018 16:32:47 +0200 Subject: [PATCH 3/4] set av input on start Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/41ca398eee13f99ccca2e12ed8015ea56da31836 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 463428d..81435d7 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) From 10479dd33ffc1b89c8eb732448ad6e52fd5cfef1 Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Wed, 30 May 2018 10:40:58 +0200 Subject: [PATCH 4/4] fix signalisation bitrate 599940 (by bazi98) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9c788ccfcb78bb70abf63c74c328ed6f14891caf Author: Jacek Jendrzej Date: 2018-05-30 (Wed, 30 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 81435d7..0f8381d 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -714,7 +714,7 @@ static inline int rate2csapi(int rate) return 4; case 50000: return 5; - case 50940: + case 59940: return 6; case 60000: return 7;