From c3bdd9bd1feb312555c79d72f174a2bb908e249f Mon Sep 17 00:00:00 2001 From: samsamsam Date: Sat, 2 Feb 2019 18:44:05 +0100 Subject: [PATCH] Fix VP9 playback for the Octagon SF4008 Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/b6019d4f652a1323f808b33b65fc26b1ec7d888a Author: samsamsam Date: 2019-02-02 (Sat, 02 Feb 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libeplayer3-arm/main/exteplayer.c | 2 +- libeplayer3-arm/output/writer/common/misc.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libeplayer3-arm/main/exteplayer.c b/libeplayer3-arm/main/exteplayer.c index f9761db..3826844 100644 --- a/libeplayer3-arm/main/exteplayer.c +++ b/libeplayer3-arm/main/exteplayer.c @@ -699,7 +699,7 @@ int main(int argc, char *argv[]) memset(argvBuff, '\0', sizeof(argvBuff)); int commandRetVal = -1; /* inform client that we can handle additional commands */ - fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 52); + fprintf(stderr, "{\"EPLAYER3_EXTENDED\":{\"version\":%d}}\n", 53); PlayFiles_t playbackFiles; memset(&playbackFiles, 0x00, sizeof(playbackFiles)); diff --git a/libeplayer3-arm/output/writer/common/misc.c b/libeplayer3-arm/output/writer/common/misc.c index a514faa..dce61a5 100644 --- a/libeplayer3-arm/output/writer/common/misc.c +++ b/libeplayer3-arm/output/writer/common/misc.c @@ -137,8 +137,12 @@ stb_type_t GetSTBType() { type = STB_DREAMBOX; } - else if (access("/proc/stb/info/vumodel", F_OK) != -1) + else if (access("/proc/stb/info/vumodel", F_OK) != -1 && \ + access("/proc/stb/info/boxtype", F_OK) == -1) { + // some STB like Octagon SF4008 has also /proc/stb/info/vumodel + // but VU PLUS does not have /proc/stb/info/boxtype + // please see: https://gitlab.com/e2i/e2iplayer/issues/282 type = STB_VUPLUS; } else if (access("/sys/firmware/devicetree/base/soc/hisilicon_clock/name", F_OK) != -1)