summaryrefslogtreecommitdiff
path: root/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2009-12-18 15:10:24 -0800
committerTofu Linden <tofu.linden@lindenlab.com>2009-12-18 15:10:24 -0800
commitceda074b8614e42363a969e32032582caef72278 (patch)
treef7cfc2a667f1f2412f6586f03cb55c908b496957 /indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
parent68b8831fd6d994683082349816755459d75af918 (diff)
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.
Diffstat (limited to 'indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp')
-rw-r--r--indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp10
1 files changed, 7 insertions, 3 deletions
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;