X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4945572cac28d920706dba1ae822aa3fc22106d..7d09b97f5321d0accd758eb420c008853ad9ec26:/src/unix/mediactrl.cpp diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index cf20c15e2e..33d06eaca2 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: unix/mediactrl.cpp +// Name: src/unix/mediactrl.cpp // Purpose: Built-in Media Backends for Unix // Author: Ryan Norton // Modified by: @@ -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" @@ -118,19 +114,19 @@ public: GError *err, gchar *debug, gpointer data); static void OnVideoCapsReady(GstPad* pad, GParamSpec* pspec, gpointer data); - + static bool TransCapsToVideoSize(wxGStreamerMediaBackend* be, GstPad* caps); void PostRecalcSize(); - + #ifdef __WXGTK__ static gint OnGTKRealize(GtkWidget* theWidget, wxGStreamerMediaBackend* be); #endif GstElement* m_player; //GStreamer media element - + wxSize m_videoSize; wxControl* m_ctrl; - + wxLongLong m_nPausedPos; DECLARE_DYNAMIC_CLASS(wxGStreamerMediaBackend); @@ -143,7 +139,7 @@ public: // //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -IMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend); +IMPLEMENT_DYNAMIC_CLASS(wxGStreamerMediaBackend, wxMediaBackend) //--------------------------------------------------------------------------- // wxGStreamerMediaBackend Constructor @@ -157,7 +153,7 @@ wxGStreamerMediaBackend::wxGStreamerMediaBackend() : m_player(NULL), m_videoSize //--------------------------------------------------------------------------- // wxGStreamerMediaBackend Destructor // -// Stops/cleans up memory +// Stops/cleans up memory //--------------------------------------------------------------------------- wxGStreamerMediaBackend::~wxGStreamerMediaBackend() { @@ -191,28 +187,28 @@ extern void wxapp_install_idle_handler(); extern bool g_isIdle; extern bool g_mainThreadLocked; -gint wxGStreamerMediaBackend::OnGTKRealize(GtkWidget* theWidget, +gint wxGStreamerMediaBackend::OnGTKRealize(GtkWidget* theWidget, wxGStreamerMediaBackend* be) { DEBUG_MAIN_THREAD - + if (g_isIdle) wxapp_install_idle_handler(); wxYield(); //FIXME: X Server gets an error if I don't do this or a messagebox beforehand?!?!?? - + GdkWindow *window = GTK_PIZZA(theWidget)->bin_window; wxASSERT(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; } @@ -248,7 +244,7 @@ bool wxGStreamerMediaBackend::CreateControl(wxControl* ctrl, wxWindow* parent, { //init gstreamer gst_init(NULL, NULL); - + m_ctrl = ctrl; return m_ctrl->wxControl::Create(parent, id, pos, size, @@ -274,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"); @@ -289,10 +287,12 @@ bool wxGStreamerMediaBackend::TransCapsToVideoSize(wxGStreamerMediaBackend* be, be->m_videoSize.y = (int) ((float) den * be->m_videoSize.y / num); } - be->PostRecalcSize(); + wxLogDebug(wxT("Adjusted video size: [%i,%i]"), be->m_videoSize.x, be->m_videoSize.y); + + be->PostRecalcSize(); return true; }//end if caps - + return false; } @@ -308,6 +308,7 @@ void wxGStreamerMediaBackend::PostRecalcSize() m_ctrl->GetParent()->Layout(); m_ctrl->GetParent()->Refresh(); m_ctrl->GetParent()->Update(); + m_ctrl->SetSize(m_ctrl->GetSize()); } //--------------------------------------------------------------------------- @@ -355,7 +356,7 @@ void wxGStreamerMediaBackend::OnError(GstElement *play, { wxLogSysError( wxString::Format( - wxT("Error in wxMediaCtrl!\nError Message:%s\nDebug:%s\n"), + wxT("Error in wxMediaCtrl!\nError Message:%s\nDebug:%s\n"), (const wxChar*)wxConvUTF8.cMB2WX(err->message), (const wxChar*)wxConvUTF8.cMB2WX(debug) ) @@ -370,10 +371,10 @@ void wxGStreamerMediaBackend::OnError(GstElement *play, //--------------------------------------------------------------------------- bool wxGStreamerMediaBackend::Load(const wxString& fileName) { - return Load( - wxURI( - wxString( wxT("file://") ) + fileName - ) + return Load( + wxURI( + wxString( wxT("file://") ) + fileName + ) ); } @@ -384,7 +385,7 @@ bool wxGStreamerMediaBackend::Load(const wxString& fileName) //--------------------------------------------------------------------------- void wxGStreamerMediaBackend::OnVideoCapsReady(GstPad* pad, GParamSpec* pspec, gpointer data) { - wxGStreamerMediaBackend::TransCapsToVideoSize((wxGStreamerMediaBackend*) data, pad); + wxGStreamerMediaBackend::TransCapsToVideoSize((wxGStreamerMediaBackend*) data, pad); } //--------------------------------------------------------------------------- @@ -403,14 +404,14 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) { //1 Cleanup(); - + //2 m_player = gst_element_factory_make ("playbin", "play"); //3 if (!m_player) return false; - + //4 g_signal_connect (m_player, "eos", G_CALLBACK (OnFinish), this); g_signal_connect (m_player, "error", G_CALLBACK (OnError), this); @@ -422,47 +423,48 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) #if defined(__WXGTK__) && wxUSE_DYNLIB_CLASS //use gnome-specific gstreamer extensions - //if synthisis (?) file not found, it + //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 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) + 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) ) - { + + if ( ! GST_IS_X_OVERLAY(overlay) ) + { #endif - 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; + 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 g_object_set (G_OBJECT (m_player), "video-sink", videosink, // "audio-sink", m_audiosink, - NULL); + NULL); //6 wxString locstring = location.BuildUnescapedURI(); @@ -470,17 +472,17 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) wxASSERT(gst_uri_is_valid(locstring.mb_str())); g_object_set (G_OBJECT (m_player), "uri", (const char*)locstring.mb_str(), NULL); - - //7 + + //7 #ifdef __WXGTK__ if(!GTK_WIDGET_REALIZED(m_ctrl->m_wxwindow)) { //Not realized yet - set to connect at realization time - gtk_signal_connect( GTK_OBJECT(m_ctrl->m_wxwindow), + gtk_signal_connect( GTK_OBJECT(m_ctrl->m_wxwindow), "realize", GTK_SIGNAL_FUNC(wxGStreamerMediaBackend::OnGTKRealize), (gpointer) this ); - } + } else { wxYield(); //see realize callback... @@ -488,7 +490,7 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) wxASSERT(window); #endif - + gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(overlay), #ifdef __WXGTK__ GDK_WINDOW_XWINDOW( window ) @@ -497,18 +499,23 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) #endif ); -#ifdef __WXGTK__ +#ifdef __WXGTK__ } //end else block -#endif - +#endif + //8 - - wxASSERT(gst_element_set_state (m_player, - GST_STATE_PAUSED) == GST_STATE_SUCCESS); + 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; @@ -528,12 +535,12 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) //but a lot of old plugins still use "pad" :) pspec = g_object_class_find_property ( G_OBJECT_GET_CLASS (info), "object"); - + if (!pspec) g_object_get (info, "pad", &pad, NULL); else g_object_get (info, "object", &pad, NULL); - + pad = (GstPad *) GST_PAD_REALIZE (pad); wxASSERT(pad); @@ -541,20 +548,33 @@ bool wxGStreamerMediaBackend::Load(const wxURI& location) { //wait for those caps to get ready g_signal_connect( - pad, - "notify::caps", + pad, + "notify::caps", G_CALLBACK(wxGStreamerMediaBackend::OnVideoCapsReady), this); } + + bVideoFound = true; + break; }//end if video else { m_videoSize = wxSize(0,0); PostRecalcSize(); } - }//end searching through info list + }//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; } @@ -622,12 +642,12 @@ wxMediaState wxGStreamerMediaBackend::GetState() //--------------------------------------------------------------------------- // wxGStreamerMediaBackend::GetPosition // -// If paused, returns our marked position - otherwise it queries the +// If paused, returns our marked position - otherwise it queries the // GStreamer playbin for the position and returns that // //TODO: //TODO: In lue of the last big TODO, when you pause and seek gstreamer -//TODO: doesn't update the position sometimes, so we need to keep track of whether +//TODO: doesn't update the position sometimes, so we need to keep track of whether //TODO: we have paused or not and keep track of the time after the pause //TODO: and whenever the user seeks while paused //TODO: @@ -640,7 +660,7 @@ wxLongLong wxGStreamerMediaBackend::GetPosition() { gint64 pos; GstFormat fmtTime = GST_FORMAT_TIME; - + if (!gst_element_query (m_player, GST_QUERY_POSITION, &fmtTime, &pos)) return 0; return pos / GST_MSECOND ; @@ -654,7 +674,7 @@ wxLongLong wxGStreamerMediaBackend::GetPosition() // Note that GST_MSECOND is 1000000 (GStreamer uses nanoseconds - so // there is 1000000 nanoseconds in a millisecond) // -// If paused marks where we seeked to +// If paused marks where we seeked to //--------------------------------------------------------------------------- bool wxGStreamerMediaBackend::SetPosition(wxLongLong where) { @@ -664,10 +684,10 @@ bool wxGStreamerMediaBackend::SetPosition(wxLongLong where) { if (GetState() != wxMEDIASTATE_PLAYING) m_nPausedPos = where; - + return true; - } - + } + return false; } @@ -702,7 +722,7 @@ void wxGStreamerMediaBackend::Move(int x, int y, int w, int h) // Returns our cached video size from Load/OnVideoCapsReady //--------------------------------------------------------------------------- wxSize wxGStreamerMediaBackend::GetVideoSize() const -{ +{ return m_videoSize; } @@ -741,12 +761,7 @@ bool wxGStreamerMediaBackend::SetPlaybackRate(double dRate) #endif //wxUSE_GSTREAMER //in source file that contains stuff you don't directly use -#include -FORCE_LINK_ME(basewxmediabackends); +#include "wx/html/forcelnk.h" +FORCE_LINK_ME(basewxmediabackends) #endif //wxUSE_MEDIACTRL - - - - -