From 1616bbe8571c3ce76d62626b4a5d88328e1826f7 Mon Sep 17 00:00:00 2001 From: Markus Volk Date: Sat, 11 Jul 2020 10:04:54 +0200 Subject: [PATCH] playback_hisilicon: add some dummy functions to fix the build Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/1c41b988d366d7c689acb991f5afc609706fe4be Author: Markus Volk Date: 2020-07-11 (Sat, 11 Jul 2020) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/playback_hisilicon.cpp | 24 +++++++++++++++++++++++- libarmbox/playback_hisilicon.h | 6 +++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libarmbox/playback_hisilicon.cpp b/libarmbox/playback_hisilicon.cpp index f5d7471..adb7852 100644 --- a/libarmbox/playback_hisilicon.cpp +++ b/libarmbox/playback_hisilicon.cpp @@ -45,6 +45,28 @@ extern cAudio *audioDecoder; extern cVideo *videoDecoder; +/* dummy functions */ +bool cPlayback::SelectSubtitles(int /*pid*/, std::string /*charset*/) +{ + return false; +} + +void cPlayback::FindAllSubs(short unsigned int * /*pids*/, short unsigned int * /*supp*/, short unsigned int *num, std::string * /*lang*/) +{ + *num = 0; +} + +void cPlayback::SetTitle(int /*title*/) +{ +} + +void cPlayback::GetTitles(std::vector &playlists, std::vector &titles, int ¤t) +{ + playlists.clear(); + titles.clear(); + current = 0; +} + //Used by Fileplay bool cPlayback::Open(playmode_t PlayMode) { @@ -417,7 +439,7 @@ bool cPlayback::SetPosition(int position, bool absolute) return true; } -void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language) +void cPlayback::FindAllPids(short unsigned int *apids, short unsigned int *ac3flags, short unsigned int *numpida, std::string *language) { hal_info("%s\n", __func__); int max_numpida = *numpida; diff --git a/libarmbox/playback_hisilicon.h b/libarmbox/playback_hisilicon.h index c5ce392..b6bc7d0 100644 --- a/libarmbox/playback_hisilicon.h +++ b/libarmbox/playback_hisilicon.h @@ -101,9 +101,11 @@ public: bool GetPosition(int &position, int &duration); void GetPts(uint64_t &pts); bool SetPosition(int position, bool absolute = false); - void FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *numpida, std::string *language); + void FindAllPids(short unsigned int *apids, short unsigned int *ac3flags, short unsigned int *numpida, std::string *language); void FindAllSubtitlePids(int *pids, unsigned int *numpids, std::string *language); void FindAllTeletextsubtitlePids(int */*pids*/, unsigned int *numpidt, std::string */*tlanguage*/, int */*mags*/, int */*pages*/); + void FindAllSubs(short unsigned int *pids, short unsigned int *supported, short unsigned int *numpida, std::string *language); + bool SelectSubtitles(int pid, std::string charset = ""); void RequestAbort(void); bool IsPlaying(void); uint64_t GetReadCount(void); @@ -113,6 +115,8 @@ public: AVFormatContext *GetAVFormatContext(); void ReleaseAVFormatContext(); + void GetTitles(std::vector &playlists, std::vector &titles, int ¤t); + void SetTitle(int title); }; class netlink_event : public OpenThreads::Thread