From ceda074b8614e42363a969e32032582caef72278 Mon Sep 17 00:00:00 2001 From: Tofu Linden Date: Fri, 18 Dec 2009 15:10:24 -0800 Subject: gstreamer plugin now does the 'right' thing wrt resizing downwards *and up to its natural size again*. Though I don't like the logic so I'll be rejigging it again next. --- .../gstreamer010/llmediaimplgstreamertriviallogging.h | 2 +- indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h index 799808aa8b..ed8f910f43 100644 --- a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h +++ b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h @@ -53,7 +53,7 @@ extern "C" { }while(0) #define NULLMSG(...) do{}while(0) -#define DEBUGMSG NULLMSG +#define DEBUGMSG STDERRMSG #define INFOMSG STDERRMSG #define WARNMSG STDERRMSG ///////////////////////////////////////////////////////////////////////// diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp index d21ff26f83..daedece1f3 100644 --- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp +++ b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp @@ -195,6 +195,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus *bus, } else { + // TODO: grok 'duration' message type DEBUGMSG("Got GST message type: %s", LLGST_MESSAGE_TYPE_NAME (message)); } @@ -841,9 +842,12 @@ MediaPluginGStreamer010::sizeChanged() { // the shared writing space has possibly changed size/location/whatever - // Check to see whether the movie's natural size has updated - if (mNaturalWidth != mPreviousNaturalWidth || - mNaturalHeight != mPreviousNaturalHeight) + // Check to see whether the movie's NATURAL size has been set yet + if ((mNaturalWidth != mPreviousNaturalWidth || + mNaturalHeight != mPreviousNaturalHeight) + && + (1 == mPreviousNaturalWidth && + 1 == mPreviousNaturalHeight)) { mPreviousNaturalWidth = mNaturalWidth; mPreviousNaturalHeight = mNaturalHeight; -- cgit v1.2.3