merge

--HG--
branch : product-engine

3 files changed, 50 insertions, 30 deletions

diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
index 2244ccc146..799808aa8b 100644
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
+++ b/indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
@@ -37,10 +37,16 @@
 
 #include <cstdio>
 
+extern "C" {
+#include <sys/types.h>
+#include <unistd.h>
+}
+
 /////////////////////////////////////////////////////////////////////////
 // Debug/Info/Warning macros.
 #define MSGMODULEFOO "(media plugin)"
 #define STDERRMSG(...) do{\
+    fprintf(stderr, " pid:%d: ", (int)getpid());\
     fprintf(stderr, MSGMODULEFOO " %s:%d: ", __FUNCTION__, __LINE__);\
     fprintf(stderr, __VA_ARGS__);\
     fputc('\n',stderr);\
diff --git a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
index 5bb0ef5a99..109e20f179 100644
--- a/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
+++ b/indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
@@ -108,11 +108,10 @@ gst_slvideo_show_frame (GstBaseSink * bsink, GstBuffer * buf)
 	
 	slvideo = GST_SLVIDEO(bsink);
 	
-#if 0
-	fprintf(stderr, "\n\ntransferring a frame of %dx%d <- %p (%d)\n\n",
-		slvideo->width, slvideo->height, GST_BUFFER_DATA(buf),
-		slvideo->format);
-#endif
+	DEBUGMSG("\n\ntransferring a frame of %dx%d <- %p (%d)\n\n",
+		 slvideo->width, slvideo->height, GST_BUFFER_DATA(buf),
+		 slvideo->format);
+
 	if (GST_BUFFER_DATA(buf))
 	{
 		// copy frame and frame info into neutral territory
@@ -528,7 +527,7 @@ void gst_slvideo_init_class (void)
 				  "http://www.secondlife.com/");
 #undef PACKAGE
 	ll_gst_plugin_register_static (&gst_plugin_desc);
-	DEBUGMSG(stderr, "\n\n\nCLASS INIT\n\n\n");
+	DEBUGMSG("\n\n\nCLASS INIT\n\n\n");
 }
 
 #endif // LL_GSTREAMER010_ENABLED
diff --git a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
index d21ff26f83..8e850ed7ff 100644
--- a/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
+++ b/indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
@@ -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,39 @@ 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;				
 				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
 			{
@@ -841,12 +845,21 @@ 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 (mCurrentWidth != mPreviousWidth ||
+	    mCurrentHeight != mPreviousHeight) // if the size has changed then the shm has changed and the app needs telling
+	{
+		mPreviousWidth = mCurrentWidth;
+		mPreviousHeight = mCurrentHeight;
 
 		LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_request");
 		message.setValue("name", mTextureSegmentName);
@@ -941,10 +954,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;