From 99795c6d1f0e0b6ed4ed3fa05955deaa56f4b7ed Mon Sep 17 00:00:00 2001 From: Jacek Jendrzej Date: Sun, 29 Dec 2019 22:45:16 +0100 Subject: [PATCH] libarmbox/playback_libeplayer3: fix audio track select, broken pointer size Origin commit data ------------------ Branch: master Commit: https://github.com/neutrino-images/ni-libstb-hal/commit/4313875647db6bb0a383d3e9888f87a8f2d4ed27 Author: Jacek Jendrzej Date: 2019-12-29 (Sun, 29 Dec 2019) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- libarmbox/playback_libeplayer3.cpp | 4 ++-- libarmbox/playback_libeplayer3.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/libarmbox/playback_libeplayer3.cpp b/libarmbox/playback_libeplayer3.cpp index 8ff38c9..50413e3 100644 --- a/libarmbox/playback_libeplayer3.cpp +++ b/libarmbox/playback_libeplayer3.cpp @@ -522,10 +522,10 @@ 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(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language) { hal_info("%s\n", __func__); - int max_numpida = *numpida; + const int max_numpida = 40;//MAX_PLAYBACK_PIDS defined in neutrino movieplayer.h *numpida = 0; if (player && player->manager && player->manager->audio) diff --git a/libarmbox/playback_libeplayer3.h b/libarmbox/playback_libeplayer3.h index 2e13905..054c528 100644 --- a/libarmbox/playback_libeplayer3.h +++ b/libarmbox/playback_libeplayer3.h @@ -56,8 +56,7 @@ class cPlayback 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(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language) { FindAllPids((int*) apids, (unsigned int*) ac3flags, (unsigned int*) numpida, language); }; + void FindAllPids(uint16_t *apids, unsigned short *ac3flags, uint16_t *numpida, std::string *language); void FindAllSubs(int *pids, unsigned int *supported, unsigned int *numpida, std::string *language); void FindAllSubs(uint16_t *pids, unsigned short *supported, uint16_t *numpida, std::string *language) { FindAllSubs((int*) pids, (unsigned int*) supported, (unsigned int*) numpida, language); }; bool SelectSubtitles(int pid, std::string charset = "");