From 09b01147754c40e9e20a87c6f0d7899ceebdb5bb Mon Sep 17 00:00:00 2001 From: TangoCash Date: Thu, 4 May 2017 12:39:23 +0200 Subject: [PATCH 1/4] playback: fix compiling generic pc Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ddc3bf3d300ee4abbfc67c3fa7ecc56e3fa26d5c Author: TangoCash Date: 2017-05-04 (Thu, 04 May 2017) Origin message was: ------------------ -playback: fix compiling generic pc ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- generic-pc/playback.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/generic-pc/playback.cpp b/generic-pc/playback.cpp index 47d483a..9b6899f 100644 --- a/generic-pc/playback.cpp +++ b/generic-pc/playback.cpp @@ -18,7 +18,7 @@ bool cPlayback::Start(std::string filename, std::string headers) return Start((char*) filename.c_str(),0,0,0,0,0, headers); } -bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int, std::string headers) +bool cPlayback::Start(char *filename, int vpid, int vtype, int apid, int ac3, int duration, std::string headers) { printf("%s:%s - filename=%s vpid=%u vtype=%d apid=%u ac3=%d duration=%i\n", FILENAME, __func__, filename, vpid, vtype, apid, ac3, duration); @@ -140,3 +140,8 @@ cPlayback::~cPlayback() { printf("%s:%s\n", FILENAME, __func__); } + +uint64_t cPlayback::GetReadCount() +{ + return 0; +} From 6c74b8f4c5c90a2a0b4b6c03f52ebccfc603d40a Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 9 Jun 2017 13:25:49 +0200 Subject: [PATCH 2/4] implement GetVideoSystem Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/23afdef65c2442eeabb4760c274372d86fd065ed Author: TangoCash Date: 2017-06-09 (Fri, 09 Jun 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/video.cpp | 34 ++++++++++++++++++++++++++++++++++ libspark/video_lib.h | 3 +++ 2 files changed, 37 insertions(+) diff --git a/libspark/video.cpp b/libspark/video.cpp index f40cbcd..22f084d 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -348,6 +348,40 @@ int cVideo::setBlank(int) return Stop(1); } +int cVideo::GetVideoSystem() +{ + lt_debug("%s\n", __func__); + char current[32]; + static const char *modes[] = { + "pal", // VIDEO_STD_NTSC + "pal", // VIDEO_STD_SECAM + "pal", // VIDEO_STD_PAL + "480p", // VIDEO_STD_480P + "576p50", // VIDEO_STD_576P + "720p60", // VIDEO_STD_720P60 + "1080i60", // VIDEO_STD_1080I60 + "720p50", // VIDEO_STD_720P50 + "1080i50", // VIDEO_STD_1080I50 + "1080p30", // VIDEO_STD_1080P30 + "1080p24", // VIDEO_STD_1080P24 + "1080p25", // VIDEO_STD_1080P25 + "1080p50", // VIDEO_STD_1080P50 + "1080p60", // VIDEO_STD_1080P60 + "1080p2397", // VIDEO_STD_1080P2397 + "1080p2997" // VIDEO_STD_1080P2997 + }; + + int ret = proc_get("/proc/stb/video/videomode", current, 32); + for (int i=0; i Date: Fri, 9 Jun 2017 14:01:47 +0200 Subject: [PATCH 3/4] align videomodes Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b66a63553b50b3b0acb79898854e54ab63c7ab21 Author: TangoCash Date: 2017-06-09 (Fri, 09 Jun 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/video.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libspark/video.cpp b/libspark/video.cpp index 22f084d..cb734c1 100644 --- a/libspark/video.cpp +++ b/libspark/video.cpp @@ -368,7 +368,8 @@ int cVideo::GetVideoSystem() "1080p50", // VIDEO_STD_1080P50 "1080p60", // VIDEO_STD_1080P60 "1080p2397", // VIDEO_STD_1080P2397 - "1080p2997" // VIDEO_STD_1080P2997 + "1080p2997", // VIDEO_STD_1080P2997 + "720p50" // VIDEO_STD_AUTO }; int ret = proc_get("/proc/stb/video/videomode", current, 32); @@ -399,8 +400,11 @@ int cVideo::SetVideoSystem(int video_system, bool remember) "1080p30", // VIDEO_STD_1080P30 "1080p24", // VIDEO_STD_1080P24 "1080p25", // VIDEO_STD_1080P25 - "720p50", // VIDEO_STD_AUTO -> not implemented - "1080p50" // VIDEO_STD_1080P50 -> SPARK only + "1080p50", // VIDEO_STD_1080P50 + "1080p60", // VIDEO_STD_1080P60 + "1080p2397", // VIDEO_STD_1080P2397 + "1080p2997", // VIDEO_STD_1080P2997 + "720p50" // VIDEO_STD_AUTO }; if (video_system > VIDEO_STD_MAX) From d8dfd55f6b502f39808689a8f2b96a9395d9ccf9 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Fri, 9 Jun 2017 14:03:09 +0200 Subject: [PATCH 4/4] align videomodes Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/7f9a31d29c903df9913ec5d656c65be424867a17 Author: TangoCash Date: 2017-06-09 (Fri, 09 Jun 2017) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libspark/video_lib.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libspark/video_lib.h b/libspark/video_lib.h index 3f8a7c2..e172cb9 100644 --- a/libspark/video_lib.h +++ b/libspark/video_lib.h @@ -101,9 +101,12 @@ typedef enum { VIDEO_STD_1080P30, VIDEO_STD_1080P24, VIDEO_STD_1080P25, + VIDEO_STD_1080P50, + VIDEO_STD_1080P60, + VIDEO_STD_1080P2397, + VIDEO_STD_1080P2997, VIDEO_STD_AUTO, - VIDEO_STD_1080P50, /* SPARK only */ - VIDEO_STD_MAX + VIDEO_STD_MAX = VIDEO_STD_AUTO } VIDEO_STD; /* not used, for dummy functions */