Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove dubious code block from open(), that would try to play the pipeline on a fakesink. Currently this servers no purpose, but it just makes opening files slower. 

Refer to #1904
This commit is contained in:
mark 2006-10-31 17:08:07 +00:00
parent b87465f387
commit f5f9db7ba8
1 changed files with 2 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
campcaster/src/modules/playlistExecutor/src/GstreamerPlayer.cxx
View File

@ -252,17 +252,14 @@ GstreamerPlayer :: open(const std::string fileUrl)
DEBUG_BLOCK DEBUG_BLOCK
std::string filePath;
GstElement * pipe;
GstElement * fakesink;
gint64 position;
if (isOpen()) { if (isOpen()) {
close(); close();
} }
debug() << "Opening URL: " << fileUrl << endl; debug() << "Opening URL: " << fileUrl << endl;
std::string filePath;
if (fileUrl.find("file://") == 0) { if (fileUrl.find("file://") == 0) {
filePath = fileUrl.substr(7, fileUrl.size()); filePath = fileUrl.substr(7, fileUrl.size());
} }
@ -282,29 +279,6 @@ GstreamerPlayer :: open(const std::string fileUrl)
throw std::invalid_argument(std::string("can't open URL ") + fileUrl); throw std::invalid_argument(std::string("can't open URL ") + fileUrl);
} }
// connect the decoder unto a fakesink, and iterate on it until the
// first bytes come out. this is to make sure that _really_ all
// initialiation is done at opening
pipe = gst_pipeline_new("pipe");
fakesink = gst_element_factory_make("fakesink", "fakesink");
gst_object_ref(GST_OBJECT(filesrc));
gst_object_ref(GST_OBJECT(decoder));
gst_element_link_many(decoder, fakesink, NULL);
gst_bin_add_many(GST_BIN(pipe), filesrc, decoder, fakesink, NULL);
gst_element_set_state(pipe, GST_STATE_PLAYING);
position = 0LL;
while (position == 0LL && gst_bin_iterate(GST_BIN(pipe))) {
GstFormat format = GST_FORMAT_DEFAULT;
gst_element_query(fakesink, GST_QUERY_POSITION, &format, &position);
}
gst_element_set_state(pipe, GST_STATE_PAUSED);
gst_bin_remove_many(GST_BIN(pipe), filesrc, decoder, NULL);
gst_element_unlink(decoder, fakesink);
gst_object_unref(GST_OBJECT(pipe));
// converts between different audio formats (e.g. bitrate) // converts between different audio formats (e.g. bitrate)
audioconvert = gst_element_factory_make("audioconvert", NULL); audioconvert = gst_element_factory_make("audioconvert", NULL);