From a890028e74f90de4e6bad3b4b18095e18fc6e33a Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Sun, 19 Aug 2018 18:18:55 +0200 Subject: [PATCH 01/25] fix CEC TV ON after deepstandby - init 4 / init 3 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/fbc0796051bd1584135170fb822a0685a8ce46fa Author: Frankenstone Date: 2018-08-19 (Sun, 19 Aug 2018) ------------------ This commit was generated by Migit --- libeplayer3-arm/main/exteplayer.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libeplayer3-arm/main/exteplayer.c b/libeplayer3-arm/main/exteplayer.c index 7538799..6bea361 100644 --- a/libeplayer3-arm/main/exteplayer.c +++ b/libeplayer3-arm/main/exteplayer.c @@ -676,6 +676,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"); pthread_t termThread; int isTermThreadStarted = 0; From bc528209136ca14384ab9870f01a0bdb708299a0 Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 28 Aug 2018 07:46:08 +0200 Subject: [PATCH 02/25] vusolo4k: small fix - but not yet ready Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/158127985f4f45e790fbcb0ec0b92f75713f141b Author: BPanther Date: 2018-08-28 (Tue, 28 Aug 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/hardware_caps.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libarmbox/hardware_caps.c b/libarmbox/hardware_caps.c index 1190939..782e35d 100644 --- a/libarmbox/hardware_caps.c +++ b/libarmbox/hardware_caps.c @@ -7,6 +7,7 @@ * License: GPL v2 or later */ +#include #include #include #include @@ -28,6 +29,23 @@ hw_caps_t *get_hwcaps(void) memset(&caps, 0, sizeof(hw_caps_t)); +#if BOXMODEL_VUSOLO4K + initialized = 1; + caps.has_CI = 1; + caps.can_cec = 1; + caps.can_shutdown = 1; + caps.display_xres = 480; + caps.display_yres = 320; + caps.display_type = HW_DISPLAY_GFX; + caps.display_can_deepstandby = 1; + caps.display_can_set_brightness = 1; + caps.display_has_statusline = 1; + caps.has_button_timer = 1; + caps.has_HDMI = 1; + strcpy(caps.boxvendor, "VU"); + strcpy(caps.boxname, "SOLO4K"); + strcpy(caps.boxarch, "BCM7376"); +#else initialized = 1; caps.has_CI = 1; caps.can_cec = 1; @@ -42,5 +60,6 @@ hw_caps_t *get_hwcaps(void) strcpy(caps.boxvendor, "AX-Technologies"); strcpy(caps.boxname, "HD51"); strcpy(caps.boxarch, "BCM7251S"); +#endif return ∩︀ } From 0e2214d87fcf67e33f4c98d5e3d1684ef98e3ccc Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sat, 1 Sep 2018 12:59:15 +0200 Subject: [PATCH 03/25] reset seek position at the end of playback Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/7e643ba2aeb83fc084ddd6ff760a38e7103fda2c Author: Jacek Jendrzej Date: 2018-09-01 (Sat, 01 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3-arm/container/container_ffmpeg.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libeplayer3-arm/container/container_ffmpeg.c b/libeplayer3-arm/container/container_ffmpeg.c index 5f84216..bb12b6e 100644 --- a/libeplayer3-arm/container/container_ffmpeg.c +++ b/libeplayer3-arm/container/container_ffmpeg.c @@ -1343,6 +1343,8 @@ static void FFMPEGThread(Context_t *context) hasPlayThreadStarted = 0; context->playback->isPlaying = 0; + seek_target_seconds = 0; + do_seek_target_seconds = 0; PlaybackDieNow(1); ffmpeg_printf(10, "terminating\n"); } From ed64720cdf2079e08f7b1e51b2c066978a1ee09b Mon Sep 17 00:00:00 2001 From: BPanther Date: Sun, 2 Sep 2018 14:19:42 +0200 Subject: [PATCH 04/25] vusolo4k: more tuner Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/abbaa56fd4e0b666820f91a29e555756214709ce 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 aa1fbc6..787f132 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 14d1ca72c1368f6e458f26f84ac5dc564ab7d3a2 Mon Sep 17 00:00:00 2001 From: BPanther Date: Sun, 2 Sep 2018 15:37:35 +0200 Subject: [PATCH 05/25] vusolo4k: more tuner fix Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/6c4671c995d1445f1b56ae8015bca121fd0b3103 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 787f132..c691c4f 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 f6203da22dd96162f409d255d63ede879c1217d3 Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 4 Sep 2018 01:10:04 +0200 Subject: [PATCH 06/25] fix vusolo4k Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/7c1cae096a7b2c93fb037aa8b949a9eae4febeb7 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 a791ace10b22eff881a2bb6c70c2f86dfc79cb6b Mon Sep 17 00:00:00 2001 From: BPanther Date: Tue, 4 Sep 2018 01:46:38 +0200 Subject: [PATCH 07/25] fix vusolo4k Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/ebda46a57f82ddf40496ee106a386fb2ca66e403 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 fe7672d1c20af794e93764dec7a2baf93ee8d1c2 Mon Sep 17 00:00:00 2001 From: BPanther Date: Wed, 5 Sep 2018 18:08:50 +0200 Subject: [PATCH 08/25] small fix Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/7f515bced0a84a40bbe1818cd5a6e1944e490796 Author: BPanther Date: 2018-09-05 (Wed, 05 Sep 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- common/ca_ci.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/common/ca_ci.cpp b/common/ca_ci.cpp index c691c4f..c608cdf 100644 --- a/common/ca_ci.cpp +++ b/common/ca_ci.cpp @@ -1732,6 +1732,13 @@ FROM_FIRST: bool cCA::SendCaPMT(eDVBCISlot* slot) { printf("%s -> %s\n", FILENAME, __func__); + if (slot->fd > 0) + { +#if HAVE_ARM_HARDWARE + setInputSource(slot, true); +#endif + setSource(slot); + } if ((slot->fd > 0) && (slot->camIsReady)) { if (slot->hasCAManager) @@ -1747,14 +1754,6 @@ bool cCA::SendCaPMT(eDVBCISlot* slot) slot->camgrSession->sendSPDU(0x90, 0, 0, slot->pmtdata, slot->pmtlen); } } - - if (slot->fd > 0) - { -#if HAVE_ARM_HARDWARE - setInputSource(slot, true); -#endif - setSource(slot); - } return true; } From b3a1ffa5eacbeaa48684b4ddcf92081864ff0142 Mon Sep 17 00:00:00 2001 From: TangoCash Date: Tue, 25 Sep 2018 20:23:08 +0200 Subject: [PATCH 09/25] add frontpanel xres for sh4 (thx dbo) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5a8f84db38df379fef6057b31b72a7d0d630443e Author: TangoCash Date: 2018-09-25 (Tue, 25 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 56e9254..8550149 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -59,6 +59,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 = 16; } else if (!strncmp(buf, "ufs913", 6)) { strcpy(caps.boxvendor, "DUCKBOX"); @@ -70,6 +72,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 = 16; } else if (!strncmp(buf, "ufs922", 6)) { strcpy(caps.boxvendor, "DUCKBOX"); @@ -81,6 +85,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 = 16; } else if (!strncmp(buf, "ufs910", 6)) { strcpy(caps.boxvendor, "DUCKBOX"); @@ -92,6 +98,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 = 16; } else if (!strncmp(buf, "hdbox", 5)) { strcpy(caps.boxvendor, "DUCKBOX"); From 618dafa84c83070717a9dcfc0d6d9caf10810165 Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 01:09:27 +0200 Subject: [PATCH 10/25] sh4 hwcaps update Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/15c788a947a62199f70c2b2630aaf3c5696f4802 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 d3897fa0cf81855cc9d12ff18c1d06892591f390 Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Thu, 27 Sep 2018 13:27:31 +0300 Subject: [PATCH 11/25] [HL101] hwcaps update Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/a902a9271bf5430315bf0477a77715ab0956cf3f Author: Aliaksandr Date: 2018-09-27 (Thu, 27 Sep 2018) Origin message was: ------------------ [HL101] hwcaps update ------------------ This commit was generated by Migit --- libduckbox/hardware_caps.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 643a963..11d1045 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 = 2; 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 89dc97512a315062f862d875960a7d3a6a9475d7 Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 13:11:39 +0200 Subject: [PATCH 12/25] update hwcaps for hl101 (thx sid8796) Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/13c3493c9ea7715f3fffdd4629d72c4512663844 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 dd74af99a5b0a0488fd90ddcbf83429899ffb802 Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 13:20:13 +0200 Subject: [PATCH 13/25] revert Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5e4f8f4d0832c6fe2449c2fd830bdf1def1bd7fc 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 b05b7b48b942acc38564204b232f43f8b6af0a63 Mon Sep 17 00:00:00 2001 From: BPanther Date: Thu, 27 Sep 2018 13:23:43 +0200 Subject: [PATCH 14/25] fix/update hwcaps for hl101 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0de0b60cb1d43f978955a8368ce5579b532173d0 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libduckbox/hardware_caps.c b/libduckbox/hardware_caps.c index 11d1045..5382929 100644 --- a/libduckbox/hardware_caps.c +++ b/libduckbox/hardware_caps.c @@ -283,13 +283,13 @@ hw_caps_t *get_hwcaps(void) caps.can_shutdown = 1; caps.has_HDMI = 1; caps.has_SCART = 1; - caps.has_SCART_input = 1, - caps.can_cec = 2; + 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; + caps.display_xres = 8; } else if (!strncmp(buf, "arivalink200", 12)) { strcpy(caps.boxvendor, "DUCKBOX"); From 6978289456be8754439c38cba36612f4593573e9 Mon Sep 17 00:00:00 2001 From: Frankenstone Date: Tue, 2 Oct 2018 20:19:04 +0200 Subject: [PATCH 15/25] workaround arm hardware, timshift time in vfd - thx DBoxOldie Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/0bdb479cfd24ed659fdfb0595ae2b3c239eeac95 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 16ad24432ab76cface5cb492fee42464c6e19c97 Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 00:26:23 +0200 Subject: [PATCH 16/25] fix segfault in backward Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/5e56e264f4d32c663a9f6ab1f6365e4b7fdada31 Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- .gitignore | 3 +++ libeplayer3-arm/playback/playback.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 303dfee..a92a185 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,6 @@ Makefile.in *.o *.Plo *.Po + +git-* +go_* diff --git a/libeplayer3-arm/playback/playback.c b/libeplayer3-arm/playback/playback.c index 257fb67..96566e0 100644 --- a/libeplayer3-arm/playback/playback.c +++ b/libeplayer3-arm/playback/playback.c @@ -578,7 +578,7 @@ static int PlaybackFastBackward(Context_t *context, int *speed) context->playback->BackWard = 0; context->playback->SlowMotion = 0; context->playback->Speed = 0; - context->output->Command(context, OUTPUT_AUDIOMUTE, "0"); + //context->output->Command(context, OUTPUT_AUDIOMUTE, "0"); } else { @@ -589,7 +589,7 @@ static int PlaybackFastBackward(Context_t *context, int *speed) context->playback->SlowMotion = 0; context->playback->Speed = *speed; context->playback->isSeeking = 1; - context->output->Command(context, OUTPUT_AUDIOMUTE, "1"); + //context->output->Command(context, OUTPUT_AUDIOMUTE, "1"); playback_printf(1, "Speed: %d, Backward: %d\n", context->playback->Speed, context->playback->BackWard); } From c3d6ef0a005665d2dd2f228ce1d7cbed79071e52 Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 00:45:42 +0200 Subject: [PATCH 17/25] fix fastforward Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/7f494e1a778847098e34bbe89a30db6536544d81 Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3-arm/playback/playback.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libeplayer3-arm/playback/playback.c b/libeplayer3-arm/playback/playback.c index 96566e0..4ec98be 100644 --- a/libeplayer3-arm/playback/playback.c +++ b/libeplayer3-arm/playback/playback.c @@ -399,6 +399,7 @@ static int32_t PlaybackContinue(Context_t *context) if (context->playback->SlowMotion || context->playback->isForwarding || context->playback->BackWard) context->output->Command(context, OUTPUT_CLEAR, NULL); + context->output->Command(context, OUTPUT_PAUSE, NULL); context->output->Command(context, OUTPUT_CONTINUE, NULL); if (context->playback->BackWard) @@ -539,7 +540,7 @@ static int PlaybackFastForward(Context_t *context, int *speed) context->playback->Speed = *speed; playback_printf(20, "Speed: %d x {%d}\n", *speed, context->playback->Speed); context->output->Command(context, OUTPUT_FASTFORWARD, NULL); - context->output->Command(context, OUTPUT_CONTINUE, NULL); + //context->output->Command(context, OUTPUT_CONTINUE, NULL); } else { From b5730d8bb2f518003bc1025e16e6677a2d2cb17d Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 00:55:37 +0200 Subject: [PATCH 18/25] fix mute, sound volume Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/88d5610abbe916e90a73fa2a7bd3ddf76db1d2ec Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/audio.cpp | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp index 8265447..c5d315c 100644 --- a/libarmbox/audio.cpp +++ b/libarmbox/audio.cpp @@ -67,6 +67,7 @@ void cAudio::closeDevice(void) int cAudio::do_mute(bool enable, bool remember) { lt_debug("%s(%d, %d)\n", __FUNCTION__, enable, remember); + char str[4]; if (remember) @@ -75,14 +76,12 @@ int cAudio::do_mute(bool enable, bool remember) sprintf(str, "%d", Muted); proc_put("/proc/stb/audio/j1_mute", str, strlen(str)); - if (!enable) + if (fd > 0) { - int f = open("/proc/stb/avs/0/volume", O_RDWR); - read(f, str, 4); - close(f); - str[3] = '\0'; - proc_put("/proc/stb/avs/0/volume", str, strlen(str)); + if (ioctl(fd, AUDIO_SET_MUTE, enable) < 0) + perror("AUDIO_SET_MUTE"); } + return 0; } @@ -102,23 +101,28 @@ int cAudio::setVolume(unsigned int left, unsigned int right) volume = (left + right) / 2; int v = map_volume(volume); -#if 0 - if (clipfd != -1 && mixer_fd != -1) { - int tmp = 0; - /* not sure if left / right is correct here, but it is always the same anyways ;-) */ - if (! Muted) - tmp = left << 8 | right; - int ret = ioctl(mixer_fd, MIXER_WRITE(mixer_num), &tmp); - if (ret == -1) - lt_info("%s: MIXER_WRITE(%d),%04x: %m\n", __func__, mixer_num, tmp); - return ret; + + // convert to -1dB steps + left = map_volume(volume); + right = map_volume(volume); + //now range is 63..0, where 0 is loudest + + audio_mixer_t mixer; + + mixer.volume_left = left; + mixer.volume_right = right; + + if (fd > 0) + { + if (ioctl(fd, AUDIO_SET_MIXER, &mixer) < 0) + perror("AUDIO_SET_MIXER"); } -#endif char str[4]; sprintf(str, "%d", v); proc_put("/proc/stb/avs/0/volume", str, strlen(str)); + return 0; } From 6beb1b8037ea1d791464bb093570ca95a8a6d5e7 Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 01:00:45 +0200 Subject: [PATCH 19/25] try to fix slowly close internet radio/music player Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/06b3be0e6dd1d4567ba07fb47bc5089ba52d1370 Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/audio.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp index c5d315c..d1170f9 100644 --- a/libarmbox/audio.cpp +++ b/libarmbox/audio.cpp @@ -314,6 +314,7 @@ int cAudio::WriteClip(unsigned char *buffer, int size) int cAudio::StopClip() { lt_debug("%s\n", __FUNCTION__); +#if 0 if (clipfd < 0) { lt_info("%s: clipfd not yet opened\n", __FUNCTION__); return -1; @@ -325,6 +326,7 @@ int cAudio::StopClip() mixer_fd = -1; } setVolume(volume, volume); +#endif return 0; }; From b95524d059dfaec36034e23592f7c7236067c2d2 Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 01:13:39 +0200 Subject: [PATCH 20/25] update audio streamtype Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9f8040ce46908aeb7edba09fcb2ca64ebc3e448f Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/audio.cpp | 53 ++++++++++++++++++++----------------------- libarmbox/audio_lib.h | 29 +++++++++++------------ 2 files changed, 39 insertions(+), 43 deletions(-) diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp index d1170f9..7bae671 100644 --- a/libarmbox/audio.cpp +++ b/libarmbox/audio.cpp @@ -150,41 +150,36 @@ void cAudio::SetSyncMode(AVSYNC_TYPE Mode) ioctl(fd, AUDIO_SET_AV_SYNC, Mode); } -#define AUDIO_STREAMTYPE_AC3 0 -#define AUDIO_STREAMTYPE_MPEG 1 -#define AUDIO_STREAMTYPE_DTS 2 -#define AUDIO_STREAMTYPE_AAC 8 -#define AUDIO_STREAMTYPE_AACHE 9 - void cAudio::SetStreamType(AUDIO_FORMAT type) { - int bypass = AUDIO_STREAMTYPE_MPEG; - lt_debug("%s %d\n", __FUNCTION__, type); - StreamType = type; + const char *AF[] = { + "AUDIO_STREAMTYPE_AC3", + "AUDIO_STREAMTYPE_MPEG", + "AUDIO_STREAMTYPE_DTS", + "AUDIO_STREAMTYPE_LPCM", + "AUDIO_STREAMTYPE_AAC", + "AUDIO_STREAMTYPE_AAC_HE", + "AUDIO_STREAMTYPE_MP3", + "AUDIO_STREAMTYPE_AAC_PLUS", + "AUDIO_STREAMTYPE_DTS_HD", + "AUDIO_STREAMTYPE_WMA", + "AUDIO_STREAMTYPE_WMA_PRO", + "AUDIO_STREAMTYPE_AC3_PLUS", + "AUDIO_STREAMTYPE_AMR", + "AUDIO_STREAMTYPE_RAW" + }; - switch (type) + lt_info("%s - type=%s\n", __FUNCTION__, AF[type]); + + if (ioctl(fd, AUDIO_SET_BYPASS_MODE, type) < 0) { - case AUDIO_FMT_DD_PLUS: - case AUDIO_FMT_DOLBY_DIGITAL: - bypass = AUDIO_STREAMTYPE_AC3; - break; - case AUDIO_FMT_AAC: - bypass = AUDIO_STREAMTYPE_AAC; - break; - case AUDIO_FMT_AAC_PLUS: - bypass = AUDIO_STREAMTYPE_AACHE; - break; - case AUDIO_FMT_DTS: - bypass = AUDIO_STREAMTYPE_DTS; - break; - default: - break; + perror("AUDIO_SET_BYPASS_MODE"); + return; } - // Normaly the encoding should be set using AUDIO_SET_ENCODING - // But as we implemented the behavior to bypass (cause of e2) this is correct here - if (ioctl(fd, AUDIO_SET_BYPASS_MODE, bypass) < 0) - lt_info("%s: AUDIO_SET_BYPASS_MODE failed (%m)\n", __func__); + StreamType = type; + + return; } int cAudio::setChannel(int channel) diff --git a/libarmbox/audio_lib.h b/libarmbox/audio_lib.h index 1fb896f..2bcd073 100644 --- a/libarmbox/audio_lib.h +++ b/libarmbox/audio_lib.h @@ -20,20 +20,21 @@ typedef enum { typedef enum { - AUDIO_FMT_AUTO = 0, - AUDIO_FMT_MPEG, - AUDIO_FMT_MP3, - AUDIO_FMT_DOLBY_DIGITAL, - AUDIO_FMT_BASIC = AUDIO_FMT_DOLBY_DIGITAL, - AUDIO_FMT_AAC, - AUDIO_FMT_AAC_PLUS, - AUDIO_FMT_DD_PLUS, - AUDIO_FMT_DTS, - AUDIO_FMT_AVS, - AUDIO_FMT_MLP, - AUDIO_FMT_WMA, - AUDIO_FMT_MPG1, // TD only. For Movieplayer / cPlayback - AUDIO_FMT_ADVANCED = AUDIO_FMT_MLP + AUDIO_FMT_UNKNOWN = -1, + AUDIO_FMT_DOLBY_DIGITAL = 0, + AUDIO_FMT_MPEG = 1, + AUDIO_FMT_DTS = 2, + AUDIO_FMT_LPCM = 6, + AUDIO_FMT_AAC = 8, + AUDIO_FMT_AAC_HE = 9, + AUDIO_FMT_MP3 = 0xa, + AUDIO_FMT_AAC_PLUS = 0xb, + AUDIO_FMT_DTS_HD = 0x10, + AUDIO_FMT_WMA = 0x20, + AUDIO_FMT_WMA_PRO = 0x21, + AUDIO_FMT_DD_PLUS = 0x22, + AUDIO_FMT_AMR = 0x23, + AUDIO_FMT_RAW = 0xf } AUDIO_FORMAT; class mixerVolume; From ebda3bf0417182ce9b0859ba66fcf7a5b28300a5 Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 01:25:00 +0200 Subject: [PATCH 21/25] update video streamtype Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/9e9c66c463c53733df49d599b83fcfb749f74899 Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 56 +++++++++++++------------------------------ libarmbox/video_lib.h | 25 ++++++++++++------- 2 files changed, 34 insertions(+), 47 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index f9991d0..bbb860c 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -140,15 +140,6 @@ static const char *vid_modes[] = { "720p50" // VIDEO_STD_AUTO }; -#define VIDEO_STREAMTYPE_MPEG2 0 -#define VIDEO_STREAMTYPE_MPEG4_H264 1 -#define VIDEO_STREAMTYPE_VC1 3 -#define VIDEO_STREAMTYPE_MPEG4_Part2 4 -#define VIDEO_STREAMTYPE_VC1_SM 5 -#define VIDEO_STREAMTYPE_MPEG1 6 -#define VIDEO_STREAMTYPE_H265_HEVC 7 -#define VIDEO_STREAMTYPE_AVS 16 - ssize_t write_all(int fd, const void *buf, size_t count) { int retval; @@ -760,39 +751,26 @@ void cVideo::SetSyncMode(AVSYNC_TYPE mode) int cVideo::SetStreamType(VIDEO_FORMAT type) { - static const char *VF[] = { - "VIDEO_FORMAT_MPEG2", - "VIDEO_FORMAT_MPEG4", - "VIDEO_FORMAT_VC1", - "VIDEO_FORMAT_JPEG", - "VIDEO_FORMAT_GIF", - "VIDEO_FORMAT_PNG" + const char *VF[] = { + "VIDEO_STREAMTYPE_MPEG2", + "VIDEO_STREAMTYPE_MPEG4_H264", + "VIDEO_STREAMTYPE_MPEG4_H263", + "VIDEO_STREAMTYPE_VC1", + "VIDEO_STREAMTYPE_MPEG4_Part2", + "VIDEO_STREAMTYPE_VC1_SM", + "VIDEO_STREAMTYPE_MPEG1", + "VIDEO_STREAMTYPE_DIVX311" + "VIDEO_STREAMTYPE_H265_HEVC", + "VIDEO_STREAMTYPE_AVS" }; - int t; - lt_debug("#%d: %s type=%s\n", devnum, __func__, VF[type]); - switch (type) - { - case VIDEO_FORMAT_MPEG4_H264: - t = VIDEO_STREAMTYPE_MPEG4_H264; - break; - case VIDEO_FORMAT_MPEG4_H265: - t = VIDEO_STREAMTYPE_H265_HEVC; - break; - case VIDEO_FORMAT_AVS: - t = VIDEO_STREAMTYPE_AVS; - break; - case VIDEO_FORMAT_VC1: - t = VIDEO_STREAMTYPE_VC1; - break; - case VIDEO_FORMAT_MPEG2: - default: - t = VIDEO_STREAMTYPE_MPEG2; - break; - } + lt_info("%s - type=%s\n", __FUNCTION__, VF[type]); + + if (ioctl( fd, VIDEO_SET_STREAMTYPE, type) < 0) + perror("VIDEO_SET_STREAMTYPE"); + + StreamType = type; - if (ioctl(fd, VIDEO_SET_STREAMTYPE, t) < 0) - lt_info("%s VIDEO_SET_STREAMTYPE(%d) failed: %m\n", __func__, t); return 0; } diff --git a/libarmbox/video_lib.h b/libarmbox/video_lib.h index 1631cb4..30164a3 100644 --- a/libarmbox/video_lib.h +++ b/libarmbox/video_lib.h @@ -33,14 +33,23 @@ typedef enum { } COLOR_FORMAT; typedef enum { - VIDEO_FORMAT_MPEG2 = 0, - VIDEO_FORMAT_MPEG4_H264, - VIDEO_FORMAT_VC1, - VIDEO_FORMAT_JPEG, - VIDEO_FORMAT_GIF, - VIDEO_FORMAT_PNG, - VIDEO_FORMAT_MPEG4_H265, - VIDEO_FORMAT_AVS = 16 + VIDEO_STREAMTYPE_UNKNOWN = -1, + VIDEO_STREAMTYPE_MPEG2 = 0, + VIDEO_STREAMTYPE_MPEG4_H264 = 1, + VIDEO_STREAMTYPE_H263 = 2, + VIDEO_STREAMTYPE_VC1 = 3, + VIDEO_STREAMTYPE_MPEG4_Part2 = 4, + VIDEO_STREAMTYPE_VC1_SM = 5, + VIDEO_STREAMTYPE_MPEG1 = 6, + VIDEO_STREAMTYPE_MPEG4_H265 = 7, + VIDEO_STREAMTYPE_VB8 = 8, + VIDEO_STREAMTYPE_VB9 = 9, + VIDEO_STREAMTYPE_XVID = 10, + VIDEO_STREAMTYPE_DIVX311 = 13, + VIDEO_STREAMTYPE_DIVX4 = 14, + VIDEO_STREAMTYPE_DIVX5 = 15, + VIDEO_STREAMTYPE_VB6 = 18, + VIDEO_STREAMTYPE_SPARK = 21 } VIDEO_FORMAT; typedef enum { From 42e8f8a6507bab343a3cfcbbe14cec91b9d7bf3b Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 01:39:50 +0200 Subject: [PATCH 22/25] update SetControl() Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/aa508b25303092dccef139d730fd611e629be768 Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 42 ++++++++++++++++++++++++++++++++++++++++-- libarmbox/video_lib.h | 17 +++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index bbb860c..d0143cc 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -787,7 +787,8 @@ void cVideo::SetDemux(cDemux *) lt_debug("#%d %s not implemented yet\n", devnum, __func__); } -void cVideo::SetControl(int control, int value) { +void cVideo::SetControl(int control, int value) +{ const char *p = NULL; switch (control) { case VIDEO_CONTROL_BRIGHTNESS: @@ -806,10 +807,47 @@ void cVideo::SetControl(int control, int value) { hue = value; p = "/proc/stb/vmpeg/0/pep_hue"; break; + case VIDEO_CONTROL_SHARPNESS: + sharpness = value; + p = "/proc/stb/vmpeg/0/pep_sharpness"; + break; + case VIDEO_CONTROL_BLOCK_NOISE_REDUCTION: + block_noise_reduction = value; + p = "/proc/stb/vmpeg/0/pep_block_noise_reduction"; + break; + case VIDEO_CONTROL_MOSQUITO_NOISE_REDUCTION: + mosquito_noise_reduction = value; + p = "/proc/stb/vmpeg/0/pep_mosquito_noise_reduction"; + break; + case VIDEO_CONTROL_DIGITAL_CONTOUR_REMOVAL: + digital_contour_removal = value; + p = "/proc/stb/vmpeg/0/pep_digital_contour_removal"; + break; + case VIDEO_CONTROL_AUTO_FLESH: + auto_flesh = value; + p = "/proc/stb/vmpeg/0/pep_auto_flesh"; + break; + case VIDEO_CONTROL_GREEN_BOOST: + green_boost = value; + p = "/proc/stb/vmpeg/0/pep_green_boost"; + break; + case VIDEO_CONTROL_BLUE_BOOST: + blue_boost = value; + p = "/proc/stb/vmpeg/0/pep_blue_boost"; + break; + case VIDEO_CONTROL_DYNAMIC_CONTRAST: + dynamic_contrast = value; + p = "/proc/stb/vmpeg/0/pep_dynamic_contrast"; + break; + case VIDEO_CONTROL_SCALER_SHARPNESS: + scaler_sharpness = value; + p = "/proc/stb/vmpeg/0/pep_scaler_sharpness"; + break; } if (p) { char buf[20]; - int len = snprintf(buf, sizeof(buf), "%x00\n", value); + int fix_value = value * 256; + int len = snprintf(buf, sizeof(buf), "%0.8X", fix_value); if (len < (int) sizeof(buf)) proc_put(p, buf, len); } diff --git a/libarmbox/video_lib.h b/libarmbox/video_lib.h index 30164a3..508304e 100644 --- a/libarmbox/video_lib.h +++ b/libarmbox/video_lib.h @@ -140,6 +140,14 @@ typedef enum VIDEO_CONTROL_SATURATION, VIDEO_CONTROL_HUE, VIDEO_CONTROL_SHARPNESS, + VIDEO_CONTROL_BLOCK_NOISE_REDUCTION, + VIDEO_CONTROL_MOSQUITO_NOISE_REDUCTION, + VIDEO_CONTROL_DIGITAL_CONTOUR_REMOVAL, + VIDEO_CONTROL_AUTO_FLESH, + VIDEO_CONTROL_GREEN_BOOST, + VIDEO_CONTROL_BLUE_BOOST, + VIDEO_CONTROL_DYNAMIC_CONTRAST, + VIDEO_CONTROL_SCALER_SHARPNESS, VIDEO_CONTROL_MAX = VIDEO_CONTROL_SHARPNESS } VIDEO_CONTROL; @@ -187,6 +195,15 @@ class cVideo int contrast; int saturation; int hue; + int sharpness; + int block_noise_reduction; + int mosquito_noise_reduction; + int digital_contour_removal; + int auto_flesh; + int green_boost; + int blue_boost; + int dynamic_contrast; + int scaler_sharpness; /* used internally by dmx */ int64_t GetPTS(void); From 386c40d665157b89161d07cef187b74dd930be2c Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 01:46:27 +0200 Subject: [PATCH 23/25] update SetColorFormat() Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e989cbf5fd64644efdf8850288f79d92ce99accb Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/video.cpp | 15 +++++++++++---- libarmbox/video_lib.h | 4 +++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/libarmbox/video.cpp b/libarmbox/video.cpp index d0143cc..a7422de 100644 --- a/libarmbox/video.cpp +++ b/libarmbox/video.cpp @@ -853,7 +853,8 @@ void cVideo::SetControl(int control, int value) } } -void cVideo::SetColorFormat(COLOR_FORMAT color_format) { +void cVideo::SetColorFormat(COLOR_FORMAT color_format) +{ const char *p = NULL; switch(color_format) { case COLORFORMAT_RGB: @@ -868,14 +869,20 @@ void cVideo::SetColorFormat(COLOR_FORMAT color_format) { case COLORFORMAT_SVIDEO: p = "svideo"; break; + case COLORFORMAT_HDMI_AUTO: + p = "Edid(Auto)"; + break; case COLORFORMAT_HDMI_RGB: - p = "hdmi_rgb"; + p = "Hdmi_Rgb"; break; case COLORFORMAT_HDMI_YCBCR444: - p = "hdmi_yuv"; + p = "444"; break; case COLORFORMAT_HDMI_YCBCR422: - p = "hdmi_422"; + p = "422"; + break; + case COLORFORMAT_HDMI_YCBCR420: + p = "420"; break; } if (p) diff --git a/libarmbox/video_lib.h b/libarmbox/video_lib.h index 508304e..f8c665e 100644 --- a/libarmbox/video_lib.h +++ b/libarmbox/video_lib.h @@ -27,9 +27,11 @@ typedef enum { COLORFORMAT_YUV, COLORFORMAT_CVBS, COLORFORMAT_SVIDEO, + COLORFORMAT_HDMI_AUTO, COLORFORMAT_HDMI_RGB, COLORFORMAT_HDMI_YCBCR444, - COLORFORMAT_HDMI_YCBCR422 + COLORFORMAT_HDMI_YCBCR422, + COLORFORMAT_HDMI_YCBCR420 } COLOR_FORMAT; typedef enum { From 948f0b016e262e99aee663272ff9ac2ee674933e Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 03:45:40 +0200 Subject: [PATCH 24/25] add codec info Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/e43c85a3410cfaa2be925a355f26cd67050f14de Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/playback_libeplayer3.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libarmbox/playback_libeplayer3.cpp b/libarmbox/playback_libeplayer3.cpp index 8a3cf8f..b0bc5ed 100644 --- a/libarmbox/playback_libeplayer3.cpp +++ b/libarmbox/playback_libeplayer3.cpp @@ -553,7 +553,13 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu ac3flags[j] = 0; //todo else ac3flags[j] = 0; //todo - language[j] = std::string(_lang); + std::string _language = ""; + _language += std::string(_lang); + _language += " - "; + _language += "("; + _language += TrackList[i + 1]; + _language += ")"; + language[j] = _language; } } free(TrackList[i]); From 1a622bfbc7139504a29f8f10b343fba0f10ba185 Mon Sep 17 00:00:00 2001 From: redblue-pkt Date: Thu, 4 Oct 2018 03:50:48 +0200 Subject: [PATCH 25/25] fix no sound after play video Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/82ec756e6a47d5c53a506d6dbce44f927be0dd56 Author: redblue-pkt Date: 2018-10-04 (Thu, 04 Oct 2018) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/audio.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libarmbox/audio.cpp b/libarmbox/audio.cpp index 7bae671..d6af373 100644 --- a/libarmbox/audio.cpp +++ b/libarmbox/audio.cpp @@ -42,7 +42,7 @@ void cAudio::openDevice(void) if ((fd = open(AUDIO_DEVICE, O_RDWR)) < 0) lt_info("openDevice: open failed (%m)\n"); fcntl(fd, F_SETFD, FD_CLOEXEC); - do_mute(true, false); + //do_mute(true, false); } else lt_info("openDevice: already open (fd = %d)\n", fd);