#include <lib/base/init_num.h>
#include <lib/base/init.h>
#include <gst/gst.h>
- /* for subtitles */
+#include <sys/stat.h>
+/* for subtitles */
#include <lib/gui/esubtitle.h>
// eServiceFactoryMP3
if (!ext)
ext = filename;
- int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin"));
+ int is_mpeg_ps = !(strcasecmp(ext, ".mpeg") && strcasecmp(ext, ".mpg") && strcasecmp(ext, ".vob") && strcasecmp(ext, ".bin") && strcasecmp(ext, ".dat"));
int is_mpeg_ts = !strcasecmp(ext, ".ts");
int is_matroska = !strcasecmp(ext, ".mkv");
int is_avi = !strcasecmp(ext, ".avi");
eDebug("filename: %s, is_mpeg_ps: %d, is_mpeg_ts: %d, is_video: %d, is_streaming: %d, is_mp3: %d, is_matroska: %d, is_avi: %d, is_AudioCD: %d", filename, is_mpeg_ps, is_mpeg_ts, is_video, is_streaming, is_mp3, is_matroska, is_avi, is_AudioCD);
int is_audio = !is_video;
-
+
int all_ok = 0;
m_gst_pipeline = gst_pipeline_new ("mediaplayer");
m_audioStreams.push_back(audioStreamElem);
} else /* is_video */
{
+ char srt_filename[strlen(filename)+1];
+ strncpy(srt_filename,filename,strlen(filename)-3);
+ srt_filename[strlen(filename)-3]='\0';
+ strcat(srt_filename, "srt");
+ struct stat buffer;
+ if (stat(srt_filename, &buffer) == 0)
+ {
+ eDebug("subtitle file found: %s",srt_filename);
+ GstElement *subsource;
+ subsource = gst_element_factory_make ("filesrc", "srt_source");
+ g_object_set (G_OBJECT (subsource), "location", filename, NULL);
+ GstElement *parser = gst_element_factory_make("subparse", "srt_parse");
+ eDebug ("subparse = %p", parser);
+ GstElement *sink = gst_element_factory_make("fakesink", "srt_sink");
+ eDebug ("fakesink = %p", sink);
+ g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
+ gst_bin_add_many(GST_BIN (m_gst_pipeline), subsource, parser, sink, NULL);
+ gboolean res = gst_element_link(subsource, parser);
+ eDebug ("parser link = %d", res);
+ res = gst_element_link(parser, sink);
+ eDebug ("sink link = %d", res);
+ g_signal_connect(sink, "handoff", G_CALLBACK(gstCBsubtitleAvail), this);
+ subtitleStream subs;
+ subs.element = sink;
+ m_subtitleStreams.push_back(subs);
+ }
+ else
+ eDebug("subtitle file not found: %s",srt_filename);
+
gst_bin_add_many(GST_BIN(m_gst_pipeline), source, videodemux, audio, queue_audio, video, queue_video, NULL);
switch_audio = gst_element_factory_make ("input-selector", "switch_audio");
if (switch_audio)
return -1;
}
g_object_get (G_OBJECT (selector), "n-pads", &nb_sources, NULL);
- if ( i >= m_audioStreams.size() || i >= nb_sources || m_currentAudioStream >= m_audioStreams.size() )
+ if ( (unsigned int)i >= m_audioStreams.size() || i >= nb_sources || (unsigned int)m_currentAudioStream >= m_audioStreams.size() )
return -2;
char sinkpad[8];
sprintf(sinkpad, "sink%d", i);
if (gst_tag_list_get_string(tags, GST_TAG_AUDIO_CODEC, &g_audiocodec) && m_audioStreams.size())
{
std::vector<audioStream>::iterator IterAudioStream = m_audioStreams.begin();
- while ( IterAudioStream->language_code.length() && IterAudioStream != m_audioStreams.end())
- IterAudioStream++;
+ while ( IterAudioStream != m_audioStreams.end() && (!IterAudioStream->language_code.empty() || IterAudioStream->type != audioStream::atUnknown))
+ ++IterAudioStream;
if ( g_strrstr(g_audiocodec, "MPEG-1 layer 2") )
IterAudioStream->type = audioStream::atMP2;
else if ( g_strrstr(g_audiocodec, "MPEG-1 layer 3") )
IterAudioStream->type = audioStream::atMP3;
+ else if ( g_strrstr(g_audiocodec, "AAC audio") ) // dont checked if correct
+ IterAudioStream->type = audioStream::atAAC;
+ else if ( g_strrstr(g_audiocodec, "DTS audio") )
+ IterAudioStream->type = audioStream::atDTS;
else if ( g_strrstr(g_audiocodec, "AC-3 audio") )
IterAudioStream->type = audioStream::atAC3;
else if ( g_strrstr(g_audiocodec, "Uncompressed 16-bit PCM audio") )
IterAudioStream->type = audioStream::atPCM;
+ else
+ eDebug("unknown audiocodec '%s'!", g_audiocodec);
gchar *g_language;
if ( gst_tag_list_get_string(tags, GST_TAG_LANGUAGE_CODE, &g_language) )
IterAudioStream->language_code = std::string(g_language);
eDebug ("fakesink %s = %p", elemname, sink);
g_object_set (G_OBJECT(sink), "signal-handoffs", TRUE, NULL);
gst_bin_add_many(pipeline, parser, sink, NULL);
- GstPadLinkReturn res = gst_pad_link(pad, gst_element_get_static_pad(parser, "sink"));
+ gboolean res = gst_pad_link(pad, gst_element_get_static_pad(parser, "sink"));
eDebug ("parser link = %d", res);
res = gst_element_link(parser, sink);
eDebug ("sink link = %d", res);
void eServiceMP3::gstCBsubtitleAvail(GstElement *element, GstBuffer *buffer, GstPad *pad, gpointer user_data)
{
- const char *text = (unsigned char *)GST_BUFFER_DATA(buffer);
+ const unsigned char *text = (unsigned char *)GST_BUFFER_DATA(buffer);
eServiceMP3 *_this = (eServiceMP3*)user_data;
gchar *sourceName;
sourceName = gst_object_get_name(GST_OBJECT(element));
{
eDVBTeletextSubtitlePage page;
gRGB rgbcol(0xD0,0xD0,0xD0);
- page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, text));
+ page.m_elements.push_back(eDVBTeletextSubtitlePageElement(rgbcol, (const char*)text));
(_this->m_subtitle_widget)->setPage(page);
}
else
- eDebug("on inactive element: %s (%p) saw subtitle: %s",sourceName, element, text);
- return TRUE;
+ eDebug("on inactive element: %s (%p) saw subtitle: %s",sourceName, element, (const char*)text);
}
RESULT eServiceMP3::enableSubtitles(eWidget *parent, ePyObject tuple)
ePyObject entry;
int tuplesize = PyTuple_Size(tuple);
int type = 0;
- int page, magazine, pid;
+ int pid;
if (!PyTuple_Check(tuple))
goto error_out;
return 0;
error_out:
eDebug("enableSubtitles needs a tuple as 2nd argument!\n"
- "for gst subtitles (2, subtitle_stream_count)"
+ "for gst subtitles (2, subtitle_stream_count)");
return -1;
}
git.cweiske.de / enigma2.git / blobdiff