From 79a3136f4b8aca1370cc5558476deebb22c3d210 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Tue, 2 Oct 2018 20:19:04 +0200 Subject: [PATCH 1/9] workaround arm hardware, timshift time in vfd - thx DBoxOldie Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b8c3c42e0f2be64d9f7bc523b413f3ad19405098 Author: Frankenstone Date: 2018-10-02 (Tue, 02 Oct 2018) ------------------ This commit was generated by Migit --- libarmbox/playback_libeplayer3.cpp | 11 +++++++++++ libarmbox/playback_libeplayer3.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/libarmbox/playback_libeplayer3.cpp b/libarmbox/playback_libeplayer3.cpp index 78c21a5..8a3cf8f 100644 --- a/libarmbox/playback_libeplayer3.cpp +++ b/libarmbox/playback_libeplayer3.cpp @@ -42,6 +42,8 @@ bool cPlayback::Open(playmode_t PlayMode) } pm = PlayMode; + got_vpts_ts = false; + vpts_ts = 0; fn_ts = ""; fn_xml = ""; last_size = 0; @@ -448,6 +450,15 @@ bool cPlayback::GetPosition(int &position, int &duration) } else { + /* workaround for crazy vpts value during timeshift */ + if (!got_vpts_ts && pm == PLAYMODE_TS) + { + vpts_ts = vpts; + got_vpts_ts = true; + } + if (got_vpts_ts) + vpts -= vpts_ts; + /* end workaround */ /* len is in nanoseconds. we have 90 000 pts per second. */ position = vpts / 90; } diff --git a/libarmbox/playback_libeplayer3.h b/libarmbox/playback_libeplayer3.h index 0709384..3829762 100644 --- a/libarmbox/playback_libeplayer3.h +++ b/libarmbox/playback_libeplayer3.h @@ -20,10 +20,12 @@ class cPlayback bool enabled; bool playing, first; bool no_probe; + bool got_vpts_ts; int nPlaybackSpeed; int mAudioStream; int mSubtitleStream; int mTeletextStream; + int64_t vpts_ts; bool Stop(void); bool decoders_closed; playmode_t pm; From d69ec44a6267f2e85233d8932f504794d79c2d6b Mon Sep 17 00:00:00 2001 From: BPanther Date: Sun, 2 Sep 2018 14:19:42 +0200 Subject: [PATCH 2/9] vusolo4k: more tuner Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/cd755cfa91555be791c5a65d42de86625cc3983f Author: BPanther Date: 2018-09-02 (Sun, 02 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/ca_ci.cpp | 42 ++++++++++++++++++++++++++++++++++++++++++ include/ca_ci.h | 14 ++++++++++++++ include/dmx_hal.h | 4 ++++ libarmbox/dmx.cpp | 14 ++++++++++++++ 4 files changed, 74 insertions(+) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index 0f6c05d..335c8c4 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -1011,6 +1011,44 @@ void cCA::setSource(eDVBCISlot* slot) case TUNER_D: fprintf(ci, "D"); break; +#if BOXMODEL_VUSOLO4K + case TUNER_E: + fprintf(ci, "E"); + break; + case TUNER_F: + fprintf(ci, "F"); + break; + case TUNER_G: + fprintf(ci, "G"); + break; + case TUNER_H: + fprintf(ci, "H"); + break; + case TUNER_I: + fprintf(ci, "I"); + break; + case TUNER_J: + fprintf(ci, "J"); + break; + case TUNER_K: + fprintf(ci, "K"); + break; + case TUNER_L: + fprintf(ci, "L"); + break; + case TUNER_M: + fprintf(ci, "M"); + break; + case TUNER_N: + fprintf(ci, "N"); + break; + case TUNER_O: + fprintf(ci, "O"); + break; + case TUNER_P: + fprintf(ci, "P"); + break; +#endif } fclose(ci); } @@ -1025,7 +1063,11 @@ void cCA::setInputs() char choices[64]; FILE * fd = 0; +#if BOXMODEL_VUSOLO4K + for (int number = 0; number < 16; number++) // tuner A to P, input 0 to 15 +#else for (int number = 0; number < 4; number++) // tuner A to D, input 0 to 3 +#endif { snprintf(choices, 64, "/proc/stb/tsmux/input%d_choices", number); if(access(choices, R_OK) < 0) diff --git a/include/ca_ci.h b/include/ca_ci.h index 5a75650..802f314 100644 --- a/include/ca_ci.h +++ b/include/ca_ci.h @@ -126,6 +126,20 @@ typedef enum { TUNER_B, TUNER_C, TUNER_D +#if BOXMODEL_VUSOLO4K + , TUNER_E + , TUNER_F + , TUNER_G + , TUNER_H + , TUNER_I + , TUNER_J + , TUNER_K + , TUNER_L + , TUNER_M + , TUNER_N + , TUNER_O + , TUNER_P +#endif } source_t; typedef enum { diff --git a/include/dmx_hal.h b/include/dmx_hal.h index 4463b70..c97d8cb 100644 --- a/include/dmx_hal.h +++ b/include/dmx_hal.h @@ -36,7 +36,11 @@ extern "C" { #include +#if BOXMODEL_VUSOLO4K +#define MAX_DMX_UNITS 16 +#else #define MAX_DMX_UNITS 4 +#endif typedef enum { diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp index 10f2f32..8d973ba 100644 --- a/libarmbox/dmx.cpp +++ b/libarmbox/dmx.cpp @@ -75,7 +75,11 @@ static const char *DMX_T[] = { static int dmx_source[NUM_DEMUX] = { 0, 0, 0, 0 }; /* map the device numbers. */ +#if BOXMODEL_VUSOLO4K +#define NUM_DEMUXDEV 16 +#else #define NUM_DEMUXDEV 8 +#endif static const char *devname[NUM_DEMUXDEV] = { "/dev/dvb/adapter0/demux0", "/dev/dvb/adapter0/demux1", @@ -85,6 +89,16 @@ static const char *devname[NUM_DEMUXDEV] = { "/dev/dvb/adapter0/demux5", "/dev/dvb/adapter0/demux6", "/dev/dvb/adapter0/demux7" +#if BOXMODEL_VUSOLO4K + , "/dev/dvb/adapter0/demux8" + , "/dev/dvb/adapter0/demux9" + , "/dev/dvb/adapter0/demux10" + , "/dev/dvb/adapter0/demux11" + , "/dev/dvb/adapter0/demux12" + , "/dev/dvb/adapter0/demux13" + , "/dev/dvb/adapter0/demux14" + , "/dev/dvb/adapter0/demux15" +#endif }; /* did we already DMX_SET_SOURCE on that demux device? */ static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false }; From 6b283e1bda1ba5a6e7b86be0f4dcbc7688430efb Mon Sep 17 00:00:00 2001 From: BPanther Date: Sun, 2 Sep 2018 15:37:35 +0200 Subject: [PATCH 3/9] vusolo4k: more tuner fix Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c32a217825e481b9fb90e5ce5943e2ca592ea6d4 Author: BPanther Date: 2018-09-02 (Sun, 02 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/ca_ci.cpp | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index 335c8c4..c608cdf 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -1128,6 +1128,44 @@ void cCA::setInputSource(eDVBCISlot* slot, bool ci) case TUNER_D: fprintf(input, "D"); break; +#if BOXMODEL_VUSOLO4K + case TUNER_E: + fprintf(input, "E"); + break; + case TUNER_F: + fprintf(input, "F"); + break; + case TUNER_G: + fprintf(input, "G"); + break; + case TUNER_H: + fprintf(input, "H"); + break; + case TUNER_I: + fprintf(input, "I"); + break; + case TUNER_J: + fprintf(input, "J"); + break; + case TUNER_K: + fprintf(input, "K"); + break; + case TUNER_L: + fprintf(input, "L"); + break; + case TUNER_M: + fprintf(input, "M"); + break; + case TUNER_N: + fprintf(input, "N"); + break; + case TUNER_O: + fprintf(input, "O"); + break; + case TUNER_P: + fprintf(input, "P"); + break; +#endif } } fclose(input); From c108bee60c8d484209f5cb9f0d7614e3dc0b3bbf Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 4 Sep 2018 01:10:04 +0200 Subject: [PATCH 4/9] fix vusolo4k Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/352a30bd31350eee1c76dcaed226ef58cb8df5a8 Author: BPanther Date: 2018-09-04 (Tue, 04 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- include/ca_ci.h | 1 + include/dmx_hal.h | 1 + libarmbox/dmx.cpp | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/include/ca_ci.h b/include/ca_ci.h index 802f314..ee15f94 100644 --- a/include/ca_ci.h +++ b/include/ca_ci.h @@ -1,6 +1,7 @@ #ifndef __CA_H_ #define __CA_H_ +#include #include #include #include diff --git a/include/dmx_hal.h b/include/dmx_hal.h index c97d8cb..8ad5f3d 100644 --- a/include/dmx_hal.h +++ b/include/dmx_hal.h @@ -18,6 +18,7 @@ #ifndef __dmx_hal__ #define __dmx_hal__ +#include #include #include #include diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp index 8d973ba..2db4b4c 100644 --- a/libarmbox/dmx.cpp +++ b/libarmbox/dmx.cpp @@ -20,6 +20,7 @@ * along with this program. If not, see . */ +#include #include #include #include @@ -101,7 +102,7 @@ static const char *devname[NUM_DEMUXDEV] = { #endif }; /* did we already DMX_SET_SOURCE on that demux device? */ -static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false }; +static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false }; typedef struct dmx_pdata { int last_source; From 9d7451f001dd6aa72e04557fe6ebb7484dd79d61 Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 4 Sep 2018 01:46:38 +0200 Subject: [PATCH 5/9] fix vusolo4k Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0e5f6ec13eb7a6451d92af1c16ea8b8cc29da614 Author: BPanther Date: 2018-09-04 (Tue, 04 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/dmx.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libarmbox/dmx.cpp b/libarmbox/dmx.cpp index 2db4b4c..400303f 100644 --- a/libarmbox/dmx.cpp +++ b/libarmbox/dmx.cpp @@ -102,7 +102,11 @@ static const char *devname[NUM_DEMUXDEV] = { #endif }; /* did we already DMX_SET_SOURCE on that demux device? */ +#if BOXMODEL_VUSOLO4K static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false, false, false, false, false, false, false, false, false }; +#else +static bool init[NUM_DEMUXDEV] = { false, false, false, false, false, false, false, false }; +#endif typedef struct dmx_pdata { int last_source; From 70945367bf2675edbca704902d8a25035e7b12a0 Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 01:09:27 +0200 Subject: [PATCH 6/9] sh4 hwcaps update Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/c8033a8a52b749b4d884516a0c3de05711bfadc0 Author: BPanther Date: 2018-09-27 (Thu, 27 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libduckbox/hardware_caps.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 8550149..643a963 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -48,6 +48,8 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 0; caps.has_CI = 2; caps.display_can_set_brightness = 1; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 12; } else if (!strncmp(buf, "ufs912", 6)) { strcpy(caps.boxvendor, "DUCKBOX"); @@ -111,6 +113,8 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 0; caps.has_CI = 2; caps.display_can_set_brightness = 1; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 12; } else if (!strncmp(buf, "octagon1008", 11)) { strcpy(caps.boxvendor, "DUCKBOX"); @@ -122,6 +126,8 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 0; caps.has_CI = 2; caps.display_can_set_brightness = 1; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 8; } else if (!strncmp(buf, "hs7110", 6)) { strcpy(caps.boxvendor, "DUCKBOX"); @@ -188,6 +194,8 @@ hw_caps_t *get_hwcaps(void) caps.has_fan = 1; caps.has_CI = 2; caps.display_can_set_brightness = 1; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 14; } else if (!strncmp(buf, "cuberevo-250hd", 4)) { strcpy(caps.boxvendor, "DUCKBOX"); From e439e181ccbdc37eb73d135776dd17da1c296a20 Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 13:11:39 +0200 Subject: [PATCH 7/9] update hwcaps for hl101 (thx sid8796) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/4d1f48dad67e6734566aba389e6f1e3a81ee68e0 Author: BPanther Date: 2018-09-27 (Thu, 27 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libduckbox/hardware_caps.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 643a963..932d4eb 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -282,10 +282,13 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, buf); caps.can_shutdown = 1; caps.has_HDMI = 1; - caps.has_SCART = 2; - caps.can_cec = 0; + caps.has_SCART = 1; + caps.can_cec = 1; caps.has_fan = 0; caps.has_CI = 2; + caps.display_can_set_brightness = 1; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 8; } else if (!strncmp(buf, "arivalink200", 12)) { strcpy(caps.boxvendor, "DUCKBOX"); From 466d9220a20fafb5b7ab69b7a2a01198843a574c Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 13:20:13 +0200 Subject: [PATCH 8/9] revert Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/2e808c600acf4d346f073f795f4e17a95efd5044 Author: BPanther Date: 2018-09-27 (Thu, 27 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libduckbox/hardware_caps.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 932d4eb..643a963 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -282,13 +282,10 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, buf); caps.can_shutdown = 1; caps.has_HDMI = 1; - caps.has_SCART = 1; - caps.can_cec = 1; + caps.has_SCART = 2; + caps.can_cec = 0; caps.has_fan = 0; caps.has_CI = 2; - caps.display_can_set_brightness = 1; - caps.display_type = HW_DISPLAY_LINE_TEXT; - caps.display_xres = 8; } else if (!strncmp(buf, "arivalink200", 12)) { strcpy(caps.boxvendor, "DUCKBOX"); From 490ecd582b6d743d97c13ac5821e474bd29f2c3f Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 13:23:43 +0200 Subject: [PATCH 9/9] fix/update hwcaps for hl101 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/2644bc3a78f4b1f5abdac13808a445955ed8c294 Author: BPanther Date: 2018-09-27 (Thu, 27 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 2 +- libduckbox/hardware_caps.c | 8 ++++++-- libeplayer3-arm/main/exteplayer.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index 1255b0c..f9991d0 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -379,7 +379,7 @@ int cVideo::setAspectRatio(int aspect, int mode) { static const char *a[] = { "n/a", "4:3", "14:9", "16:9" }; // static const char *m[] = { "panscan", "letterbox", "bestfit", "nonlinear", "(unset)" }; - static const char *m[] = { "letterbox", "panscan", "bestfit", "nonlinear", "(unset)" }; + static const char *m[] = { "letterbox", "panscan", "bestfit", "nonlinear", "(unset)" }; int n; int mo = (mode < 0||mode > 3) ? 4 : mode; diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 643a963..5382929 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -282,10 +282,14 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxname, buf); caps.can_shutdown = 1; caps.has_HDMI = 1; - caps.has_SCART = 2; - caps.can_cec = 0; + caps.has_SCART = 1; + caps.has_SCART_input = 1; + caps.can_cec = 1; caps.has_fan = 0; caps.has_CI = 2; + caps.display_can_set_brightness = 1; + caps.display_type = HW_DISPLAY_LINE_TEXT; + caps.display_xres = 8; } else if (!strncmp(buf, "arivalink200", 12)) { strcpy(caps.boxvendor, "DUCKBOX"); diff --git a/libeplayer3-arm/main/exteplayer.c b/libeplayer3-arm/main/exteplayer.c index 019a91d..8ebce36 100644 --- a/libeplayer3-arm/main/exteplayer.c +++ b/libeplayer3-arm/main/exteplayer.c @@ -678,7 +678,7 @@ static int ParseParams(int argc, char *argv[], PlayFiles_t *playbackFiles, int * int main(int argc, char *argv[]) { - system("echo 'encoder' > /proc/stb/avs/0/input"); + system("echo 'encoder' > /proc/stb/avs/0/input"); pthread_t termThread; int isTermThreadStarted = 0;