summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo.verdejo@collabora.co.uk>2011-04-06 13:20:17 -0400
committerReynaldo H. Verdejo Pinochet <reynaldo.verdejo@collabora.co.uk>2011-04-08 11:20:53 -0400
commit74bf6ff3e9305492db5391364e459bb05fbc97d9 (patch)
tree40e636e49a7202f0434b9b5849e6cadc55813243
parentda9ca8305800bbcb14bbe10659430bd9f1c2d5de (diff)
Making GstMetadataRetriever display thumbnails:
Get mAudiosink created from setup() Wait for prepareSync to set the pipeline to paused. Add videoscale to the pipeline. Some more debug messages.
-rwxr-xr-xgstplayer/GstDriver.cpp4
-rw-r--r--gstplayer/GstMetadataRetrieverDriver.cpp24
-rw-r--r--gstplayer/GstMetadataRetrieverDriver.h1
3 files changed, 16 insertions, 13 deletions
diff --git a/gstplayer/GstDriver.cpp b/gstplayer/GstDriver.cpp
index 16dc22f..aaf8ac2 100755
--- a/gstplayer/GstDriver.cpp
+++ b/gstplayer/GstDriver.cpp
@@ -667,8 +667,10 @@ GstDriver::getStreamsInfo ()
}
if (n_video > 0) {
+ LOGV("We Have a video stream");
mHaveStreamVideo = TRUE;
- }
+ } else
+ LOGV("We don't have a video stream");
mHaveStreamInfo = TRUE;
}
diff --git a/gstplayer/GstMetadataRetrieverDriver.cpp b/gstplayer/GstMetadataRetrieverDriver.cpp
index c39e359..274d3b2 100644
--- a/gstplayer/GstMetadataRetrieverDriver.cpp
+++ b/gstplayer/GstMetadataRetrieverDriver.cpp
@@ -43,6 +43,7 @@ GstMetadataRetrieverDriver::GstMetadataRetrieverDriver():
mPipeline(NULL),
mAppsrc(NULL),
mColorTransform(NULL),
+ mScaler(NULL),
mPlayBin(NULL),
mAppSink(NULL),
mAudioSink(NULL),
@@ -103,9 +104,6 @@ GstMetadataRetrieverDriver::cb_newpad(GstElement *mPlayBin, GstPad *pad,
str = gst_caps_get_structure (caps, 0);
if (g_strrstr (gst_structure_get_name (str), "audio")) {
LOGI ("cb_newpad Called for an audio pad");
- data->mAudioSink = gst_element_factory_make ("fakesink", NULL);
- gst_bin_add (GST_BIN (data->mPipeline), data->mAudioSink);
- gst_element_set_state (data->mAudioSink, GST_STATE_PAUSED);
err = gst_element_link (data->mPlayBin, data->mAudioSink);
}
else
@@ -135,26 +133,28 @@ void GstMetadataRetrieverDriver::setup(int mode)
LOGI("For URI:%s", mUri);
mPipeline = gst_pipeline_new ("pipeline");
mColorTransform = gst_element_factory_make ("ffmpegcolorspace", NULL);
+ mScaler = gst_element_factory_make ("videoscale", NULL);
mPlayBin = gst_element_factory_make ("uridecodebin", "src");
mAppSink = gst_element_factory_make ("appsink", "sink");
+ mAudioSink = gst_element_factory_make ("fakesink", NULL);
g_object_set (G_OBJECT (mPlayBin), "uri", mUri, NULL);
g_object_set (G_OBJECT (mAppSink), "enable-last-buffer", "true", NULL);
- g_signal_connect (mPlayBin, "pad-added", G_CALLBACK (cb_newpad),
- this);
gst_bin_add_many (GST_BIN (mPipeline), mPlayBin, mColorTransform,
- mAppSink, NULL);
+ mAudioSink, mScaler, mAppSink, NULL);
- if (!gst_element_link (mColorTransform, mAppSink))
+ if (!gst_element_link (mColorTransform, mScaler))
LOGE("Failed to link %s to %s",
GST_ELEMENT_NAME (mColorTransform),
- GST_ELEMENT_NAME (mAppSink));
+ GST_ELEMENT_NAME (mScaler));
- gst_element_set_state (mPlayBin, GST_STATE_PAUSED);
- gst_element_set_state (mAppSink, GST_STATE_PAUSED);
- gst_element_set_state (mColorTransform, GST_STATE_PAUSED);
+ if (!gst_element_link (mScaler, mAppSink))
+ LOGE("Failed to link %s to %s",
+ GST_ELEMENT_NAME (mScaler),
+ GST_ELEMENT_NAME (mAppSink));
+ g_signal_connect (mPlayBin, "pad-added", G_CALLBACK (cb_newpad), this);
} else {
description = g_strdup_printf("uridecodebin uri=%s name=src ! fakesink name=sink", mUri);
mPipeline = gst_parse_launch(description, &error);
@@ -166,6 +166,7 @@ void GstMetadataRetrieverDriver::setup(int mode)
}
LOGV("pipeline creation: %s", GST_ELEMENT_NAME (mPipeline));
+
// verbose info (as gst-launch -v)
// Activate the trace with the command: "setprop persist.gst.verbose 1"
char value[PROPERTY_VALUE_MAX];
@@ -177,7 +178,6 @@ void GstMetadataRetrieverDriver::setup(int mode)
G_CALLBACK (gst_object_default_deep_notify), NULL);
}
- //gst_element_set_state (mPipeline, GST_STATE_NULL);
mState = GST_STATE_NULL;
}
diff --git a/gstplayer/GstMetadataRetrieverDriver.h b/gstplayer/GstMetadataRetrieverDriver.h
index 181cc3a..a3b790d 100644
--- a/gstplayer/GstMetadataRetrieverDriver.h
+++ b/gstplayer/GstMetadataRetrieverDriver.h
@@ -58,6 +58,7 @@ private:
GstElement* mPipeline;
GstElement* mAppsrc;
GstElement* mColorTransform;
+ GstElement* mScaler;
GstElement* mPlayBin;
GstElement* mAppSink;
GstElement* mAudioSink;