Merge from trunk. Conflicts manually resolved in:

U indra/llui/lluictrlfactory.cpp
U indra/newview/llinventorybridge.cpp
U indra/newview/llviewertexture.cpp
U indra/newview/llviewertexture.h

1 files changed, 45 insertions, 33 deletions

diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index d21ff26f83..26173314a7 100644
--- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -105,7 +105,7 @@ private:
         void mouseUp( int x, int y );
         void mouseMove( int x, int y );
 
-        bool sizeChanged();
+        void sizeChanged();
 	
 	static bool mDoneInit;
 	
@@ -115,13 +115,16 @@ private:
 
 	int mDepth;
 
-	// media natural size
+	// media NATURAL size
 	int mNaturalWidth;
 	int mNaturalHeight;
-	int mNaturalRowbytes;
-	// previous media natural size so we can detect changes
-	int mPreviousNaturalWidth;
-	int mPreviousNaturalHeight;
+	// media current size
+	int mCurrentWidth;
+	int mCurrentHeight;
+	int mCurrentRowbytes;
+	  // previous media size so we can detect changes
+	  int mPreviousWidth;
+	  int mPreviousHeight;
 	// desired render size from host
 	int mWidth;
 	int mHeight;
@@ -149,7 +152,7 @@ MediaPluginGStreamer010::MediaPluginGStreamer010(
 	void *host_user_data ) :
 	MediaPluginBase(host_send_func, host_user_data),
 	mBusWatchID ( 0 ),
-	mNaturalRowbytes ( 4 ),
+	mCurrentRowbytes ( 4 ),
 	mTextureFormatPrimary ( GL_RGBA ),
 	mTextureFormatType ( GL_UNSIGNED_INT_8_8_8_8_REV ),
 	mSeekWanted(false),
@@ -195,6 +198,7 @@ MediaPluginGStreamer010::processGSTEvents(GstBus     *bus,
 	}
 	else
 	{
+		// TODO: grok 'duration' message type
 		DEBUGMSG("Got GST message type: %s",
 			 LLGST_MESSAGE_TYPE_NAME (message));
 	}
@@ -429,8 +433,8 @@ MediaPluginGStreamer010::update(int milliseconds)
 		{
 			DEBUGMSG("NEW FRAME READY");
 
-			if (mVideoSink->retained_frame_width != mNaturalWidth ||
-			    mVideoSink->retained_frame_height != mNaturalHeight)
+			if (mVideoSink->retained_frame_width != mCurrentWidth ||
+			    mVideoSink->retained_frame_height != mCurrentHeight)
 				// *TODO: also check for change in format
 			{
 				// just resize container, don't consume frame
@@ -457,39 +461,38 @@ MediaPluginGStreamer010::update(int milliseconds)
 
 				GST_OBJECT_UNLOCK(mVideoSink);
 
-				mNaturalRowbytes = neww * newd;
+				mCurrentRowbytes = neww * newd;
 				DEBUGMSG("video container resized to %dx%d",
 					 neww, newh);
 
 				mDepth = newd;
-				mNaturalWidth = neww;
-				mNaturalHeight = newh;
+				mCurrentWidth = neww;
+				mCurrentHeight = newh;
 				sizeChanged();
 				return true;
 			}
 
 			if (mPixels &&
-			    mNaturalHeight <= mHeight &&
-			    mNaturalWidth <= mWidth &&
+			    mCurrentHeight <= mHeight &&
+			    mCurrentWidth <= mWidth &&
 			    !mTextureSegmentName.empty())
 			{
-				
 				// we're gonna totally consume this frame - reset 'ready' flag
-				mVideoSink->retained_frame_ready = FALSE;				
+				mVideoSink->retained_frame_ready = FALSE;
 				int destination_rowbytes = mWidth * mDepth;
-				for (int row=0; row<mNaturalHeight; ++row)
+				for (int row=0; row<mCurrentHeight; ++row)
 				{
 					memcpy(&mPixels
 					        [destination_rowbytes * row],
 					       &mVideoSink->retained_frame_data
-					        [mNaturalRowbytes * row],
-					       mNaturalRowbytes);
+					        [mCurrentRowbytes * row],
+					       mCurrentRowbytes);
 				}
 
 				GST_OBJECT_UNLOCK(mVideoSink);
 				DEBUGMSG("NEW FRAME REALLY TRULY CONSUMED, TELLING HOST");
 
-				setDirty(0,0,mNaturalWidth,mNaturalHeight);
+				setDirty(0,0,mCurrentWidth,mCurrentHeight);
 			}
 			else
 			{
@@ -836,27 +839,35 @@ MediaPluginGStreamer010::startup()
 }
 
 
-bool
+void
 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 (1 == mNaturalWidth &&
+	    1 == mNaturalHeight)
 	{
-		mPreviousNaturalWidth = mNaturalWidth;
-		mPreviousNaturalHeight = mNaturalHeight;
+		mNaturalWidth = mCurrentWidth;
+		mNaturalHeight = mCurrentHeight;
+		DEBUGMSG("Media NATURAL size better detected as %dx%d",
+			 mNaturalWidth, mNaturalHeight);
+	}
+
+	// if the size has changed then the shm has changed and the app needs telling
+	if (mCurrentWidth != mPreviousWidth ||
+	    mCurrentHeight != mPreviousHeight)
+	{
+		mPreviousWidth = mCurrentWidth;
+		mPreviousHeight = mCurrentHeight;
 
 		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_request");
 		message.setValue("name", mTextureSegmentName);
 		message.setValueS32("width", mNaturalWidth);
 		message.setValueS32("height", mNaturalHeight);
-		DEBUGMSG("<--- Sending size change request to application with name: '%s' - size is %d x %d", mTextureSegmentName.c_str(), mNaturalWidth, mNaturalHeight);
+		DEBUGMSG("<--- Sending size change request to application with name: '%s' - natural size is %d x %d", mTextureSegmentName.c_str(), mNaturalWidth, mNaturalHeight);
 		sendMessage(message);
 	}
-	
-	return true;
 }
 
 
@@ -941,10 +952,12 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 				// lame to have to decide this now, it depends on the movie.  Oh well.
 				mDepth = 4;
 
+				mCurrentWidth = 1;
+				mCurrentHeight = 1;
+				mPreviousWidth = 1;
+				mPreviousHeight = 1;
 				mNaturalWidth = 1;
 				mNaturalHeight = 1;
-				mPreviousNaturalWidth = 1;
-				mPreviousNaturalHeight = 1;
 				mWidth = 1;
 				mHeight = 1;
 				mTextureWidth = 1;
@@ -985,7 +998,6 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 				INFOMSG("MediaPluginGStreamer010::receiveMessage: shared memory added, name: %s, size: %d, address: %p", name.c_str(), int(info.mSize), info.mAddress);
 
 				mSharedSegments.insert(SharedSegmentMap::value_type(name, info));
-
 			}
 			else if(message_name == "shm_remove")
 			{
@@ -1064,7 +1076,7 @@ void MediaPluginGStreamer010::receiveMessage(const char *message_string)
 							INFOMSG("**** = REAL RESIZE REQUEST FROM APP");
 							
 							GST_OBJECT_LOCK(mVideoSink);
-							mVideoSink->resize_forced = true;
+							mVideoSink->resize_forced_always = true;
 							mVideoSink->resize_try_width = texture_width;
 							mVideoSink->resize_try_height = texture_height;
 							GST_OBJECT_UNLOCK(mVideoSink);