X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dae87f93abd93555095575886b8b1ef126f0a0da..3fc1adbd94297c3b275031be87cb15dedb422b1f:/src/unix/mediactrl.cpp diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index 1fd4298a0a..94a3ab61a9 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -17,10 +17,6 @@ // Pre-compiled header stuff //--------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "mediactrl.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -65,12 +61,15 @@ #include //strstr #include "wx/log.h" -#include "wx/msgdlg.h" #ifdef __WXGTK__ //for /related for GDK_WINDOW_XWINDOW # include "wx/gtk/win_gtk.h" # include +# if wxUSE_DYNLIB_CLASS +# include "wx/dynlib.h" +# endif +//# include //gstreamer gnome interface - needs deps #endif @@ -124,8 +123,6 @@ public: #endif GstElement* m_player; //GStreamer media element -// GstElement* m_audiosink; - GstElement* m_videosink; wxSize m_videoSize; wxControl* m_ctrl; @@ -203,9 +200,14 @@ gint wxGStreamerMediaBackend::OnGTKRealize(GtkWidget* theWidget, GdkWindow *window = GTK_PIZZA(theWidget)->bin_window; wxASSERT(window); - gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_videosink), - GDK_WINDOW_XWINDOW( window ) - ); + GstElement* videosink; + g_object_get (G_OBJECT (be->m_player), "video-sink", &videosink, NULL); + + GstElement* overlay = gst_bin_get_by_interface (GST_BIN (videosink), + GST_TYPE_X_OVERLAY); + gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(overlay), + GDK_WINDOW_XWINDOW( window ) + ); return 0; } @@ -217,8 +219,6 @@ gint wxGStreamerMediaBackend::OnGTKRealize(GtkWidget* theWidget, // wxGStreamerMediaBackend::Cleanup // // Frees the gstreamer interfaces if there were any created -//TODO: Do we need to free the video interface? I'm getting segfaults -//if I do... //--------------------------------------------------------------------------- void wxGStreamerMediaBackend::Cleanup() { @@ -226,11 +226,6 @@ void wxGStreamerMediaBackend::Cleanup() { gst_element_set_state (m_player, GST_STATE_NULL); gst_object_unref (GST_OBJECT (m_player)); - - //if(GST_IS_OBJECT(m_videosink)) - // gst_object_unref (GST_OBJECT (m_videosink)); - //if(GST_IS_OBJECT(m_audiosink)) - // gst_object_unref (GST_OBJECT (m_audiosink)); } } @@ -275,6 +270,8 @@ bool wxGStreamerMediaBackend::TransCapsToVideoSize(wxGStreamerMediaBackend* be, gst_structure_get_int (s, "width", &be->m_videoSize.x); gst_structure_get_int (s, "height", &be->m_videoSize.y); + wxLogDebug(wxT("Native video size: [%i,%i]"), be->m_videoSize.x, be->m_videoSize.y); + const GValue *par; par = gst_structure_get_value (s, "pixel-aspect-ratio"); @@ -290,6 +287,8 @@ bool wxGStreamerMediaBackend::TransCapsToVideoSize(wxGStreamerMediaBackend* be, be->m_videoSize.y = (int) ((float) den * be->m_videoSize.y / num); } + wxLogDebug(wxT("Adjusted video size: [%i,%i]"), be->m_videoSize.x, be->m_videoSize.y); + be->PostRecalcSize(); return true; }//end if caps @@ -309,6 +308,7 @@ void wxGStreamerMediaBackend::PostRecalcSize() m_ctrl->GetParent()->Layout(); m_ctrl->GetParent()->Refresh(); m_ctrl->GetParent()->Update(); + m_ctrl->SetSize(m_ctrl->GetSize()); } //--------------------------------------------------------------------------- @@ -354,7 +354,13 @@ void wxGStreamerMediaBackend::OnError(GstElement *play, gchar *debug, gpointer data) { - wxMessageBox(wxString::Format(wxT("Error in wxMediaCtrl!\nError Message:%s"), wxString(err->message, wxConvLocal).c_str())); + wxLogSysError( + wxString::Format( + wxT("Error in wxMediaCtrl!\nError Message:%s\nDebug:%s\n"), + (const wxChar*)wxConvUTF8.cMB2WX(err->message), + (const wxChar*)wxConvUTF8.cMB2WX(debug) + ) + ); } @@ -386,14 +392,13 @@ void wxGStreamerMediaBackend::OnVideoCapsReady(GstPad* pad, GParamSpec* pspec, g // wxGStreamerMediaBackend::Load (URI version) // // 1) Stops/Cleanups the previous instance if there is any -// 2) Creates the gstreamer interfaces - playbin and xvimagesink for video -// 3) If there is no playbin or video sink it bails out -// 4) Sets the playbin to have our video sink so we can set the window later -// 5) Set up the error and end-of-stream callbacks for our player -// 6) Make sure our video sink can support the x overlay interface -// 7) Make sure the passed URI is valid and tell playbin to load it -// 8) Use the xoverlay extension to tell gstreamer to play in our window -// 9) Get the video size - pause required to set the stream in action +// 2) Creates the gstreamer playbin +// 3) If there is no playbin bail out +// 4) Set up the error and end-of-stream callbacks for our player +// 5) Make our video sink and make sure it supports the x overlay interface +// 6) Make sure the passed URI is valid and tell playbin to load it +// 7) Use the xoverlay extension to tell gstreamer to play in our window +// 8) Get the video size - pause required to set the stream in action //--------------------------------------------------------------------------- bool wxGStreamerMediaBackend::Load(const wxURI& location) { @@ -402,46 +407,73 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) //2 m_player = gst_element_factory_make ("playbin", "play"); -// m_audiosink = gst_element_factory_make ("alsasink", "audiosink"); - m_videosink = gst_element_factory_make ("xvimagesink", "videosink"); //3 - //no playbin -- outta here :) - if (!m_player || !GST_IS_OBJECT(m_videosink)) + if (!m_player) return false; -// //have alsa? -// if (GST_IS_OBJECT(m_audiosink) == false) -// { -// //nope, try OSS -// m_audiosink = gst_element_factory_make ("osssink", "audiosink"); -// wxASSERT_MSG(GST_IS_OBJECT(m_audiosink), wxT("WARNING: Alsa and OSS drivers for gstreamer not found - audio will be unavailable for wxMediaCtrl")); -// } - + //4 + g_signal_connect (m_player, "eos", G_CALLBACK (OnFinish), this); + g_signal_connect (m_player, "error", G_CALLBACK (OnError), this); + + //5 + GstElement* overlay = NULL; + GstElement* videosink; + +#if defined(__WXGTK__) && wxUSE_DYNLIB_CLASS + + //use gnome-specific gstreamer extensions + //if synthisis (?) file not found, it + //spits out a warning and uses ximagesink + wxDynamicLibrary gstgconf; + if(gstgconf.Load(gstgconf.CanonicalizeName(wxT("gstgconf-0.8")))) + { + typedef GstElement* (*LPgst_gconf_get_default_video_sink) (void); + LPgst_gconf_get_default_video_sink pGst_gconf_get_default_video_sink = + (LPgst_gconf_get_default_video_sink) + gstgconf.GetSymbol(wxT("gst_gconf_get_default_video_sink")); + + if (pGst_gconf_get_default_video_sink) + { + videosink = (*pGst_gconf_get_default_video_sink) (); + wxASSERT( GST_IS_BIN(videosink) ); + overlay = gst_bin_get_by_interface (GST_BIN (videosink), + GST_TYPE_X_OVERLAY); + } + + gstgconf.Detach(); + } + + if ( ! GST_IS_X_OVERLAY(overlay) ) + { +#endif + wxLogDebug(wxT("Could not load Gnome preferences, reverting to xvimagesink for video for gstreamer")); + videosink = gst_element_factory_make ("xvimagesink", "videosink"); + if ( !GST_IS_OBJECT(videosink) ) + videosink = gst_element_factory_make ("ximagesink", "videosink"); + + overlay = videosink; + + wxASSERT( GST_IS_X_OVERLAY(overlay) ); + if ( ! GST_IS_X_OVERLAY(overlay) ) + return false; +#if defined(__WXGTK__) && wxUSE_DYNLIB_CLASS + } +#endif - //4 g_object_set (G_OBJECT (m_player), - "video-sink", m_videosink, + "video-sink", videosink, // "audio-sink", m_audiosink, - NULL); - - //5 - g_signal_connect (m_player, "eos", G_CALLBACK (OnError), this); - g_signal_connect (m_player, "error", G_CALLBACK (OnFinish), this); + NULL); //6 - wxASSERT( GST_IS_X_OVERLAY(m_videosink) ); - if ( ! GST_IS_X_OVERLAY(m_videosink) ) - return false; - - //7 wxString locstring = location.BuildUnescapedURI(); wxASSERT(gst_uri_protocol_is_valid("file")); wxASSERT(gst_uri_is_valid(locstring.mb_str())); g_object_set (G_OBJECT (m_player), "uri", (const char*)locstring.mb_str(), NULL); - - //8 + + //7 #ifdef __WXGTK__ if(!GTK_WIDGET_REALIZED(m_ctrl->m_wxwindow)) { @@ -459,7 +491,7 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) #endif - gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(m_videosink), + gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(overlay), #ifdef __WXGTK__ GDK_WINDOW_XWINDOW( window ) #else @@ -470,14 +502,20 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) #ifdef __WXGTK__ } //end else block #endif - - //9 - wxASSERT(gst_element_set_state (m_player, - GST_STATE_PAUSED) == GST_STATE_SUCCESS); + //8 + int nResult = gst_element_set_state (m_player, GST_STATE_PAUSED); + if(nResult != GST_STATE_SUCCESS) + { + wxLogDebug(wxT("Could not set initial state to paused!")); + return false; + } + const GList *list = NULL; g_object_get (G_OBJECT (m_player), "stream-info", &list, NULL); + bool bVideoFound = false; + for ( ; list != NULL; list = list->next) { GObject *info = (GObject *) list->data; @@ -515,6 +553,9 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) G_CALLBACK(wxGStreamerMediaBackend::OnVideoCapsReady), this); } + + bVideoFound = true; + break; }//end if video else { @@ -523,7 +564,17 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) } }//end searching through info list + if(!bVideoFound) + { + wxLogDebug(wxT("No video found for gstreamer stream")); + } m_nPausedPos = 0; + + //send loaded event + wxMediaEvent theEvent(wxEVT_MEDIA_LOADED, + m_ctrl->GetId()); + m_ctrl->AddPendingEvent(theEvent); + return true; }