mirrors/recycled-ni-libstb-hal
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-libstb-hal.git synced 2025-08-27 23:42:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tangocash/master'

Browse Source 
Origin commit data
------------------
Branch: master
Commit: 4a43909e08
Author: max_10 <max_10@gmx.de>
Date: 2017-11-04 (Sat, 04 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
max_10
2017-11-04 15:07:07 +01:00
parent e7f0897b5d 36cdf65683
commit 97de204a1a
1 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
libarmbox/playback_gst.cpp
View File

@@ -30,7 +30,6 @@
#include <pthread.h> #include <pthread.h>
#include <syscall.h> #include <syscall.h>
#include "dmx_lib.h"
#include "audio_lib.h" #include "audio_lib.h"
#include "video_lib.h" #include "video_lib.h"
@@ -42,11 +41,9 @@
#define lt_debug_c(args...) _lt_debug(HAL_DEBUG_PLAYBACK, NULL, args) #define lt_debug_c(args...) _lt_debug(HAL_DEBUG_PLAYBACK, NULL, args)
#define lt_info_c(args...) _lt_info(HAL_DEBUG_PLAYBACK, NULL, args) #define lt_info_c(args...) _lt_info(HAL_DEBUG_PLAYBACK, NULL, args)
static const char * FILENAME = "[playback.cpp]"; static const char * FILENAME = "[playback_gst.cpp]";
extern cVideo * videoDecoder; extern cVideo * videoDecoder;
extern cAudio * audioDecoder; extern cAudio * audioDecoder;
extern cDemux * audioDemux;
extern cDemux * videoDemux;
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/tag/tag.h> #include <gst/tag/tag.h>
@@ -111,7 +108,7 @@ void processMpegTsSection(GstMpegtsSection* section)
} }
} }
void playbinNotifySource(GObject *object, GParamSpec *unused, gpointer user_data) void playbinNotifySource(GObject *object, GParamSpec *param_spec, gpointer user_data)
{ {
GstElement *source = NULL; GstElement *source = NULL;
cPlayback *_this = (cPlayback*)user_data; cPlayback *_this = (cPlayback*)user_data;
@@ -189,7 +186,7 @@ void playbinNotifySource(GObject *object, GParamSpec *unused, gpointer user_data
} }
} }
GstBusSyncReply Gst_bus_call(GstBus * bus, GstMessage *msg, gpointer user_data) GstBusSyncReply Gst_bus_call(GstBus *bus, GstMessage *msg, gpointer user_data)
{ {
gchar * sourceName; gchar * sourceName;
@@ -672,13 +669,19 @@ bool cPlayback::SetAPid(int pid, bool /*ac3*/)
{ {
lt_info("%s: pid %i\n", __func__, pid); lt_info("%s: pid %i\n", __func__, pid);
int current_audio; int to_audio = pid;
if(pid != mAudioStream) for (unsigned int i = 0; i < REC_MAX_APIDS; i++) {
if (real_apids[i])
if (real_apids[i] == pid)
to_audio = i;
}
if(to_audio != mAudioStream)
{ {
g_object_set (G_OBJECT (m_gst_playbin), "current-audio", pid, NULL); g_object_set (G_OBJECT (m_gst_playbin), "current-audio", to_audio, NULL);
printf("%s: switched to audio stream %i\n", __FUNCTION__, pid); printf("%s: switched to audio stream %i\n", __FUNCTION__, to_audio);
mAudioStream = pid; mAudioStream = to_audio;
} }
return true; return true;
@@ -904,12 +907,11 @@ void cPlayback::FindAllPids(int *apids, unsigned int *ac3flags, unsigned int *nu
GstStructure * structure = gst_caps_get_structure(caps, 0); GstStructure * structure = gst_caps_get_structure(caps, 0);
GstTagList * tags = NULL; GstTagList * tags = NULL;
gchar * g_lang = NULL; gchar * g_lang = NULL;
gchar * g_codec = NULL;
// ac3flags // ac3flags
if ( gst_structure_has_name (structure, "audio/mpeg")) if ( gst_structure_has_name (structure, "audio/mpeg"))
{ {
gint mpegversion, layer = -1; gint mpegversion;
if (!gst_structure_get_int (structure, "mpegversion", &mpegversion)) if (!gst_structure_get_int (structure, "mpegversion", &mpegversion))
ac3flags[i] = 0; ac3flags[i] = 0;
@@ -1101,7 +1103,7 @@ int cPlayback::GetAPid(void)
gint current_audio = 0; gint current_audio = 0;
g_object_get (m_gst_playbin, "current-audio", &current_audio, NULL); g_object_get (m_gst_playbin, "current-audio", &current_audio, NULL);
lt_info("%s: %d audio\n", __FUNCTION__, current_audio); lt_info("%s: %d audio\n", __FUNCTION__, current_audio);
return current_audio; return real_apids[current_audio] ? real_apids[current_audio] : current_audio;
} }
int cPlayback::GetVPid(void) int cPlayback::GetVPid(void)