Downloaded from http://trac.wxwidgets.org/ticket/14976

This fix is included in wxWidgets 3.1.0

Index: wxwidgets3.0-3.0.2+dfsg/configure.in

===================================================================

--- wxwidgets3.0-3.0.2+dfsg.orig/configure.in

+++ wxwidgets3.0-3.0.2+dfsg/configure.in

@@ -7543,43 +7543,22 @@ if test "$wxUSE_MEDIACTRL" = "yes" -o "$

         wxUSE_GSTREAMER="no"

         dnl -------------------------------------------------------------------

-        dnl Test for at least 0.8 gstreamer module from pkg-config

-        dnl Even totem doesn't accept 0.9 evidently.

-        dnl

-        dnl So, we first check to see if 0.10 if available - if not we

-        dnl try the older 0.8 version

+        dnl Test for at least gstreamer 1.0 module from pkg-config

         dnl -------------------------------------------------------------------

-        GST_VERSION_MAJOR=0

-        GST_VERSION_MINOR=10

+        GST_VERSION_MAJOR=1

+        GST_VERSION_MINOR=0

         GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR

-        if test "$wxUSE_GSTREAMER8" = "no"; then

-            PKG_CHECK_MODULES(GST,

-                [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],

-                [

-                    wxUSE_GSTREAMER="yes"

-                    GST_LIBS="$GST_LIBS -lgstinterfaces-$GST_VERSION"

-                ],

-                [

-                    AC_MSG_WARN([GStreamer 0.10 not available, falling back to 0.8])

-                    GST_VERSION_MINOR=8

-                ]

-            )

-        else

-            dnl check only for 0.8

-            GST_VERSION_MINOR=8

-        fi

-

-        if test $GST_VERSION_MINOR = "8"; then

-            GST_VERSION=$GST_VERSION_MAJOR.$GST_VERSION_MINOR

-            PKG_CHECK_MODULES(GST,

-                [gstreamer-$GST_VERSION gstreamer-interfaces-$GST_VERSION gstreamer-gconf-$GST_VERSION],

-                wxUSE_GSTREAMER="yes",

-                [

-                    AC_MSG_WARN([GStreamer 0.8/0.10 not available.])

-                ])

-        fi

-

+        PKG_CHECK_MODULES(GST,

+            [gstreamer-$GST_VERSION gstreamer-plugins-base-$GST_VERSION],

+            [

+                wxUSE_GSTREAMER="yes"

+                GST_LIBS="$GST_LIBS -lgstvideo-$GST_VERSION"

+            ],

+            [

+                AC_MSG_WARN([GStreamer 1.0 not available])

+            ]

+        )

         if test "$wxUSE_GSTREAMER" = "yes"; then

             CPPFLAGS="$GST_CFLAGS $CPPFLAGS"

Index: wxwidgets3.0-3.0.2+dfsg/src/unix/mediactrl.cpp

===================================================================

--- wxwidgets3.0-3.0.2+dfsg.orig/src/unix/mediactrl.cpp

+++ wxwidgets3.0-3.0.2+dfsg/src/unix/mediactrl.cpp

@@ -19,13 +19,7 @@

 #include <gst/gst.h>                // main gstreamer header

-// xoverlay/video stuff, gst-gconf for 0.8

-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10

-#   include <gst/interfaces/xoverlay.h>

-#else

-#   include <gst/xoverlay/xoverlay.h>

-#   include <gst/gconf/gconf.h>        // gstreamer glib configuration

-#endif

+#include <gst/video/videooverlay.h>

 #ifndef  WX_PRECOMP

     #include "wx/log.h"             // wxLogDebug/wxLogSysError/wxLogTrace

@@ -48,11 +42,11 @@

 //-----------------------------------------------------------------------------

 /*

-   This is the GStreamer backend for unix. Currently we require 0.8 or

-   0.10. Here we use the "playbin" GstElement for ease of use.

+   This is the GStreamer backend for unix. Currently we require 1.0.

+   Here we use the "playbin" GstElement for ease of use.

-   Note that now we compare state change functions to GST_STATE_FAILURE

-   now rather than GST_STATE_SUCCESS as newer gstreamer versions return

+   Note that now we compare state change functions to GST_STATE_CHANGE_FAILURE

+   now rather than GST_STATE_CHANGE_SUCCESS as newer gstreamer versions return

    non-success values for returns that are otherwise successful but not

    immediate.

@@ -60,11 +54,8 @@

    moment but with a tad bit of work it could theorectically work in

    straight wxX11 et al.

-   One last note is that resuming from pausing/seeking can result

-   in erratic video playback (GStreamer-based bug, happens in totem as well)

-   - this is better in 0.10, however. One thing that might make it worse

-   here is that we don't preserve the aspect ratio of the video and stretch

-   it to the whole window.

+   One last note is that we don't preserve the aspect ratio of the video and

+   stretch it to the whole window.

    Note that there are some things used here that could be undocumented -

    for reference see the media player Kiss and Totem as well as some

@@ -72,12 +63,10 @@

    that attempted thread-safety...

    Then there is the issue of m_asynclock. This serves several purposes:

-   1) It prevents the C callbacks from sending wx state change events

-      so that we don't get duplicate ones in 0.8

-   2) It makes the sync and async handlers in 0.10 not drop any

+   1) It makes the sync and async handlers not drop any

       messages so that while we are polling it we get the messages in

       SyncStateChange instead of the queue.

-   3) Keeps the pausing in Stop() synchronous

+   2) Keeps the pausing in Stop() synchronous

    RN: Note that I've tried to follow the wxGTK conventions here as close

    as possible. In the implementation the C Callbacks come first, then

@@ -90,43 +79,9 @@

 //=============================================================================

 //-----------------------------------------------------------------------------

-//  GStreamer (most version compatibility) macros

+//  GStreamer macros

 //-----------------------------------------------------------------------------

-// In 0.9 there was a HUGE change to GstQuery and the

-// gst_element_query function changed dramatically and split off

-// into two separate ones

-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR <= 8

-#    define wxGst_element_query_duration(e, f, p) \

-                gst_element_query(e, GST_QUERY_TOTAL, f, p)

-#    define wxGst_element_query_position(e, f, p) \

-                gst_element_query(e, GST_QUERY_POSITION, f, p)

-#elif GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR == 9

-// However, the actual 0.9 version has a slightly different definition

-// and instead of gst_element_query_duration it has two parameters to

-// gst_element_query_position instead

-#    define wxGst_element_query_duration(e, f, p) \

-                gst_element_query_position(e, f, 0, p)

-#    define wxGst_element_query_position(e, f, p) \

-                gst_element_query_position(e, f, p, 0)

-#else

-#    define wxGst_element_query_duration \

-                gst_element_query_duration

-#    define wxGst_element_query_position \

-                gst_element_query_position

-#endif

-

-// Other 0.10 macros

-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10

-#   define GST_STATE_FAILURE GST_STATE_CHANGE_FAILURE

-#   define GST_STATE_SUCCESS GST_STATE_CHANGE_SUCCESS

-#   define GstElementState GstState

-#   define gst_gconf_get_default_video_sink() \

-        gst_element_factory_make ("gconfvideosink", "video-sink");

-#   define gst_gconf_get_default_audio_sink() \

-        gst_element_factory_make ("gconfaudiosink", "audio-sink");

-#endif

-

 // Max wait time for element state waiting - GST_CLOCK_TIME_NONE for inf

 #define wxGSTREAMER_TIMEOUT (100 * GST_MSECOND) // Max 100 milliseconds

@@ -189,11 +144,11 @@ public:

     bool CheckForErrors();

     bool DoLoad(const wxString& locstring);

     wxMediaCtrl* GetControl() { return m_ctrl; } // for C Callbacks

-    void HandleStateChange(GstElementState oldstate, GstElementState newstate);

+    void HandleStateChange(GstState oldstate, GstState newstate);

     bool QueryVideoSizeFromElement(GstElement* element);

     bool QueryVideoSizeFromPad(GstPad* caps);

-    void SetupXOverlay();

-    bool SyncStateChange(GstElement* element, GstElementState state,

+    void SetupVideoOverlay();

+    bool SyncStateChange(GstElement* element, GstState state,

                          gint64 llTimeout = wxGSTREAMER_TIMEOUT);

     bool TryAudioSink(GstElement* audiosink);

     bool TryVideoSink(GstElement* videosink);

@@ -203,7 +158,7 @@ public:

     double          m_dRate;        // Current playback rate -

                                     // see GetPlaybackRate for notes

     wxLongLong      m_llPausedPos;  // Paused position - see Pause()

-    GstXOverlay*    m_xoverlay;     // X Overlay that contains the GST video

+    GstVideoOverlay*    m_videooverlay;     // Video Overlay that contains the GST video

     wxMutex         m_asynclock;    // See "discussion of internals"

     class wxGStreamerMediaEventHandler* m_eventHandler; // see below

@@ -284,7 +239,7 @@ expose_event(GtkWidget* widget, GdkEvent

 {

     // I've seen this recommended somewhere...

     // TODO: Is this needed? Maybe it is just cruft...

-    // gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay),

+    // gst_video_overlay_set_window_handle( GST_VIDEO_OVERLAY(be->m_videooverlay),

     //                              GDK_WINDOW_XWINDOW( window ) );

     // If we have actual video.....

@@ -294,7 +249,7 @@ expose_event(GtkWidget* widget, GdkEvent

         // GST Doesn't redraw automatically while paused

         // Plus, the video sometimes doesn't redraw when it looses focus

         // or is painted over so we just tell it to redraw...

-        gst_x_overlay_expose(be->m_xoverlay);

+        gst_video_overlay_expose(be->m_videooverlay);

     }

     else

     {

@@ -334,7 +289,7 @@ static gint gtk_window_realize_callback(

     GdkWindow* window = gtk_widget_get_window(widget);

     wxASSERT(window);

-    gst_x_overlay_set_xwindow_id( GST_X_OVERLAY(be->m_xoverlay),

+    gst_video_overlay_set_window_handle( GST_VIDEO_OVERLAY(be->m_videooverlay),

                                 GDK_WINDOW_XID(window)

                                 );

     GtkWidget* w = be->GetControl()->m_wxwindow;

@@ -349,30 +304,6 @@ static gint gtk_window_realize_callback(

 #endif // wxGTK

 //-----------------------------------------------------------------------------

-// "state-change" from m_playbin/GST_MESSAGE_STATE_CHANGE

-//

-// Called by gstreamer when the state changes - here we

-// send the appropriate corresponding wx event.

-//

-// 0.8 only as HandleStateChange does this in both versions

-//-----------------------------------------------------------------------------

-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR < 10

-extern "C" {

-static void gst_state_change_callback(GstElement *play,

-                                      GstElementState oldstate,

-                                      GstElementState newstate,

-                                      wxGStreamerMediaBackend* be)

-{

-    if(be->m_asynclock.TryLock() == wxMUTEX_NO_ERROR)

-    {

-        be->HandleStateChange(oldstate, newstate);

-        be->m_asynclock.Unlock();

-    }

-}

-}

-#endif // <0.10

-

-//-----------------------------------------------------------------------------

 // "eos" from m_playbin/GST_MESSAGE_EOS

 //

 // Called by gstreamer when the media is done playing ("end of stream")

@@ -425,69 +356,17 @@ static void gst_notify_caps_callback(Gst

 }

 //-----------------------------------------------------------------------------

-// "notify::stream-info" from m_playbin

-//

-// Run through the stuff in "stream-info" of m_playbin for a valid

-// video pad, and then attempt to query the video size from it - if not

-// set up an event to do so when ready.

-//

-// Currently unused - now we just query it directly using

-// QueryVideoSizeFromElement.

-//

-// (Undocumented?)

-//-----------------------------------------------------------------------------

-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10

-extern "C" {

-static void gst_notify_stream_info_callback(GstElement* WXUNUSED(element),

-                                            GParamSpec* WXUNUSED(pspec),

-                                            wxGStreamerMediaBackend* be)

-{

-    wxLogTrace(wxTRACE_GStreamer, wxT("gst_notify_stream_info_callback"));

-    be->QueryVideoSizeFromElement(be->m_playbin);

-}

-}

-#endif

-

-//-----------------------------------------------------------------------------

-// "desired-size-changed" from m_xoverlay

-//

-// 0.8-specific this provides us with the video size when it changes -

-// even though we get the caps as well this seems to come before the

-// caps notification does...

-//

-// Note it will return 16,16 for an early-bird value or for audio

-//-----------------------------------------------------------------------------

-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR < 10

-extern "C" {

-static void gst_desired_size_changed_callback(GstElement * play,

-                                              guint width, guint height,

-                                              wxGStreamerMediaBackend* be)

-{

-    if(!(width == 16 && height == 16))

-    {

-        be->m_videoSize.x = width;

-        be->m_videoSize.y = height;

-    }

-    else

-        be->QueryVideoSizeFromElement(be->m_playbin);

-}

-}

-#endif

-

-//-----------------------------------------------------------------------------

 // gst_bus_async_callback [static]

 // gst_bus_sync_callback [static]

 //

-// Called by m_playbin for notifications such as end-of-stream in 0.10 -

-// in previous versions g_signal notifications were used. Because everything

+// Called by m_playbin for notifications such as end-of-stream. Because everything

 // in centered in one switch statement though it reminds one of old WinAPI

 // stuff.

 //

 // gst_bus_sync_callback is that sync version that is called on the main GUI

 // thread before the async version that we use to set the xwindow id of the

-// XOverlay (NB: This isn't currently used - see CreateControl()).

+// VideoOverlay (NB: This isn't currently used - see CreateControl()).

 //-----------------------------------------------------------------------------

-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10

 extern "C" {

 static gboolean gst_bus_async_callback(GstBus* WXUNUSED(bus),

                                        GstMessage* message,

@@ -537,8 +416,7 @@ static GstBusSyncReply gst_bus_sync_call

 {

     // Pass a non-xwindowid-setting event on to the async handler where it

     // belongs

-    if (GST_MESSAGE_TYPE (message) != GST_MESSAGE_ELEMENT ||

-        !gst_structure_has_name (message->structure, "prepare-xwindow-id"))

+    if (!gst_is_video_overlay_prepare_window_handle_message (message))

     {

         //

         // NB: Unfortunately, the async callback can be quite

@@ -552,12 +430,11 @@ static GstBusSyncReply gst_bus_sync_call

             return GST_BUS_DROP;

     }

-    wxLogTrace(wxTRACE_GStreamer, wxT("Got prepare-xwindow-id"));

-    be->SetupXOverlay();

+    wxLogTrace(wxTRACE_GStreamer, wxT("Got prepare-window-handle"));

+    be->SetupVideoOverlay();

     return GST_BUS_DROP; // We handled this message - drop from the queue

 }

 }

-#endif

 //-----------------------------------------------------------------------------

 //

@@ -569,11 +446,11 @@ static GstBusSyncReply gst_bus_sync_call

 // wxGStreamerMediaBackend::HandleStateChange

 //

 // Handles a state change event from our C Callback for "state-change" or

-// the async queue in 0.10. (Mostly this is here to avoid locking the

+// the async queue . (Mostly this is here to avoid locking the

 // the mutex twice...)

 //-----------------------------------------------------------------------------

-void wxGStreamerMediaBackend::HandleStateChange(GstElementState oldstate,

-                                                GstElementState newstate)

+void wxGStreamerMediaBackend::HandleStateChange(GstState oldstate,

+                                                GstState newstate)

 {

     switch(newstate)

     {

@@ -604,83 +481,13 @@ void wxGStreamerMediaBackend::HandleStat

 }

 //-----------------------------------------------------------------------------

-// wxGStreamerMediaBackend::QueryVideoSizeFromElement

-//

-// Run through the stuff in "stream-info" of element for a valid

-// video pad, and then attempt to query the video size from it - if not

-// set up an event to do so when ready. Return true

-// if we got a valid video pad.

-//-----------------------------------------------------------------------------

-bool wxGStreamerMediaBackend::QueryVideoSizeFromElement(GstElement* element)

-{

-    const GList *list = NULL;

-    g_object_get (G_OBJECT (element), "stream-info", &list, NULL);

-

-    for ( ; list != NULL; list = list->next)

-    {

-        GObject *info = (GObject *) list->data;

-        gint type;

-        GParamSpec *pspec;

-        GEnumValue *val;

-        GstPad *pad = NULL;

-

-        g_object_get (info, "type", &type, NULL);

-        pspec = g_object_class_find_property (

-                        G_OBJECT_GET_CLASS (info), "type");

-        val = g_enum_get_value (G_PARAM_SPEC_ENUM (pspec)->enum_class, type);

-

-        if (!strncasecmp(val->value_name, "video", 5) ||

-            !strncmp(val->value_name, "GST_STREAM_TYPE_VIDEO", 21))

-        {

-            // Newer gstreamer 0.8+ plugins are SUPPOSED to have "object"...

-            // 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);

-

-#if GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR <= 8

-            // Killed in 0.9, presumely because events and such

-            // should be pushed on pads regardless of whether they

-            // are currently linked

-            pad = (GstPad *) GST_PAD_REALIZE (pad);

-            wxASSERT(pad);

-#endif

-

-            if(!QueryVideoSizeFromPad(pad))

-            {

-                // wait for those caps to get ready

-                g_signal_connect(

-                pad,

-                "notify::caps",

-                G_CALLBACK(gst_notify_caps_callback),

-                this);

-            }

-            break;

-        }// end if video

-    }// end searching through info list

-

-    // no video (or extremely delayed stream-info)

-    if(list == NULL)

-    {

-        m_videoSize = wxSize(0,0);

-        return false;

-    }

-

-    return true;

-}

-

-//-----------------------------------------------------------------------------

 // wxGStreamerMediaBackend::QueryVideoSizeFromPad

 //

 // Gets the size of our video (in wxSize) from a GstPad

 //-----------------------------------------------------------------------------

 bool wxGStreamerMediaBackend::QueryVideoSizeFromPad(GstPad* pad)

 {

-    const GstCaps* caps = GST_PAD_CAPS(pad);

+    GstCaps* caps = gst_pad_get_current_caps(pad);

     if ( caps )

     {

         const GstStructure *s = gst_caps_get_structure (caps, 0);

@@ -706,23 +513,26 @@ bool wxGStreamerMediaBackend::QueryVideo

                 m_videoSize.y = (int) ((float) den * m_videoSize.y / num);

         }

-         wxLogTrace(wxTRACE_GStreamer, wxT("Adjusted video size: [%i,%i]"),

-                     m_videoSize.x, m_videoSize.y);

+        wxLogTrace(wxTRACE_GStreamer, wxT("Adjusted video size: [%i,%i]"),

+                    m_videoSize.x, m_videoSize.y);

+

+        gst_caps_unref (caps);

         return true;

     } // end if caps

+    m_videoSize = wxSize(0,0);

     return false; // not ready/massive failure

 }

 //-----------------------------------------------------------------------------

-// wxGStreamerMediaBackend::SetupXOverlay

+// wxGStreamerMediaBackend::SetupVideoOverlay

 //

-// Attempts to set the XWindow id of our GstXOverlay to tell it which

+// Attempts to set the XWindow id of our GstVideoOverlay to tell it which

 // window to play video in.

 //-----------------------------------------------------------------------------

-void wxGStreamerMediaBackend::SetupXOverlay()

+void wxGStreamerMediaBackend::SetupVideoOverlay()

 {

-    // Use the xoverlay extension to tell gstreamer to play in our window

+    // Use the videooverlay extension to tell gstreamer to play in our window

 #ifdef __WXGTK__

     if (!gtk_widget_get_realized(m_ctrl->m_wxwindow))

     {

@@ -739,7 +549,7 @@ void wxGStreamerMediaBackend::SetupXOver

         GdkWindow* window = gtk_widget_get_window(m_ctrl->m_wxwindow);

         wxASSERT(window);

 #endif

-        gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(m_xoverlay),

+        gst_video_overlay_set_window_handle(GST_VIDEO_OVERLAY(m_videooverlay),

 #ifdef __WXGTK__

                         GDK_WINDOW_XID(window)

 #else

@@ -769,9 +579,8 @@ void wxGStreamerMediaBackend::SetupXOver

 //

 // PRECONDITION: Assumes m_asynclock is Lock()ed

 //-----------------------------------------------------------------------------

-#if GST_VERSION_MAJOR > 0 || GST_VERSION_MINOR >= 10

 bool wxGStreamerMediaBackend::SyncStateChange(GstElement* element,

-                                              GstElementState desiredstate,

+                                              GstState desiredstate,

                                               gint64 llTimeout)

 {

     GstBus* bus = gst_element_get_bus(element);

@@ -844,23 +653,6 @@ bool wxGStreamerMediaBackend::SyncStateC

     return bSuccess;

 }

-#else // 0.8 implementation

-bool wxGStreamerMediaBackend::SyncStateChange(GstElement* element,

-                                              GstElementState desiredstate,

-                                              gint64 llTimeout)

-{

-    gint64 llTimeWaited = 0;

-    while(GST_STATE(element) != desiredstate)

-    {

-        if(llTimeWaited >= llTimeout)

-            break;

-        llTimeWaited += 10*GST_MSECOND;

-        wxMilliSleep(10);

-    }

-

-    return llTimeWaited != llTimeout;

-}

-#endif

 //-----------------------------------------------------------------------------

 // wxGStreamerMediaBackend::TryAudioSink