From d15da192311bbef38b27a07cf27bbf4e33b99b0b Mon Sep 17 00:00:00 2001
From: callum_linden <none@none>
Date: Mon, 9 May 2016 17:11:10 -0700
Subject: [PATCH] Added restart on resize - kind of works
---
.../libvlc/media_plugin_libvlc.cpp | 345 +++++++-----------
1 file changed, 134 insertions(+), 211 deletions(-)
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
index 47ba6f48b47..91744798e78 100644
--- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
+++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp
@@ -35,8 +35,7 @@
#include "media_plugin_base.h"
#include "vlc/vlc.h"
-
-#include <time.h>
+#include "vlc/libvlc_version.h"
////////////////////////////////////////////////////////////////////////////////
//
@@ -52,23 +51,26 @@ class MediaPluginLibVLC :
private:
bool init();
void update( F64 milliseconds );
- bool mFirstTime;
-
- time_t mLastUpdateTime;
- enum Constants { ENumObjects = 10 };
- unsigned char* mBackgroundPixels;
- int mColorR[ ENumObjects ];
- int mColorG[ ENumObjects ];
- int mColorB[ ENumObjects ];
- int mXpos[ ENumObjects ];
- int mYpos[ ENumObjects ];
- int mXInc[ ENumObjects ];
- int mYInc[ ENumObjects ];
- int mBlockSize[ ENumObjects ];
-
- libvlc_instance_t* gLibVLC = 0;
- libvlc_media_t* gLibVLCMedia = 0;
- libvlc_media_player_t* gLibVLCMediaPlayer = 0;
+
+
+ static void* lock(void* data, void** p_pixels);
+ void initVLC();
+ void playMedia(const std::string url);
+ void resetVLC();
+
+ libvlc_instance_t* gLibVLC;
+ libvlc_media_t* gLibVLCMedia;
+ libvlc_media_player_t* gLibVLCMediaPlayer;
+
+
+ //float mCurVideoPosition;
+
+ struct gVLCContext
+ {
+ unsigned char* texture_pixels;
+ libvlc_media_player_t* mp;
+ };
+ struct gVLCContext gVLCCallbackContext;
};
////////////////////////////////////////////////////////////////////////////////
@@ -76,15 +78,18 @@ class MediaPluginLibVLC :
MediaPluginLibVLC::MediaPluginLibVLC( LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data ) :
MediaPluginBase( host_send_func, host_user_data )
{
- mFirstTime = true;
mTextureWidth = 64;
mTextureHeight = 64;
mWidth = 0;
mHeight = 0;
mDepth = 4;
mPixels = 0;
- mLastUpdateTime = 0;
- mBackgroundPixels = 0;
+
+ gLibVLC = 0;
+ gLibVLCMedia = 0;
+ gLibVLCMediaPlayer = 0;
+
+ //mCurVideoPosition = 0;
}
////////////////////////////////////////////////////////////////////////////////
@@ -93,6 +98,88 @@ MediaPluginLibVLC::~MediaPluginLibVLC()
{
}
+/////////////////////////////////////////////////////////////////////////////////
+//
+void* MediaPluginLibVLC::lock(void* data, void** p_pixels)
+{
+ struct gVLCContext* context = (gVLCContext*)data;
+
+ *p_pixels = context->texture_pixels;
+
+ return NULL;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void MediaPluginLibVLC::initVLC()
+{
+ char const* vlc_argv[] =
+ {
+ "--no-xlib",
+ };
+
+ int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv);
+ gLibVLC = libvlc_new(vlc_argc, vlc_argv);
+
+ if (!gLibVLC)
+ {
+ // TODO: do we need to do anything herE?
+ }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void MediaPluginLibVLC::resetVLC()
+{
+ libvlc_media_player_stop(gLibVLCMediaPlayer);
+ libvlc_media_player_release(gLibVLCMediaPlayer);
+ libvlc_release(gLibVLC);
+}
+
+////////////////////////////////////////////////////////////////////////////////
+//
+void MediaPluginLibVLC::playMedia(const std::string url)
+{
+ std::string tmp_url = std::string("https://callum-linden.s3.amazonaws.com/sample_media/jb.mp4");
+
+ if (gLibVLCMediaPlayer)
+ {
+ libvlc_media_player_stop(gLibVLCMediaPlayer);
+ libvlc_media_player_release(gLibVLCMediaPlayer);
+ }
+
+ gLibVLCMedia = libvlc_media_new_location(gLibVLC, tmp_url.c_str());
+ if (!gLibVLCMedia)
+ {
+ printf("libvlc_media_new_location failed\n");
+ }
+ else
+ {
+ printf("libvlc_media_new_location ok\n");
+ }
+
+ gLibVLCMediaPlayer = libvlc_media_player_new_from_media(gLibVLCMedia);
+ if (!gLibVLCMediaPlayer)
+ {
+ printf("libvlc_media_player_new_from_media failed\n");
+ }
+ else
+ {
+ printf("libvlc_media_player_new_from_media ok...\n");
+ }
+
+ libvlc_media_release(gLibVLCMedia);
+
+ gVLCCallbackContext.texture_pixels = mPixels;
+ gVLCCallbackContext.mp = gLibVLCMediaPlayer;
+
+ libvlc_video_set_callbacks(gLibVLCMediaPlayer, lock, NULL, NULL, &gVLCCallbackContext);
+ libvlc_video_set_format(gLibVLCMediaPlayer, "RV32", mWidth, mHeight, mWidth * 4);
+ libvlc_media_player_play(gLibVLCMediaPlayer);
+
+ //libvlc_media_player_set_position(gLibVLCMediaPlayer, mCurVideoPosition);
+}
+
////////////////////////////////////////////////////////////////////////////////
//
void MediaPluginLibVLC::receiveMessage( const char* message_string )
@@ -108,54 +195,7 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
{
if(message_name == "init")
{
- char const* vlc_argv[] =
- {
- "--no-xlib",
- };
-
- int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv);
- gLibVLC = libvlc_new(vlc_argc, vlc_argv);
-
- if (!gLibVLC)
- {
- }
-
- //if (gLibVLCMediaPlayer)
- //{
- // libvlc_media_player_stop(gLibVLCMediaPlayer);
- // libvlc_media_player_release(gLibVLCMediaPlayer);
- //}
-
- const char* url = "https://callum-linden.s3.amazonaws.com/sample_media/jb.mp4";
-
- gLibVLCMedia = libvlc_media_new_location(gLibVLC, url);
- if (!gLibVLCMedia)
- {
- printf("libvlc_media_new_location failed\n");
- }
- else
- {
- printf("libvlc_media_new_location ok\n");
- }
-
- gLibVLCMediaPlayer = libvlc_media_player_new_from_media(gLibVLCMedia);
- if (!gLibVLCMediaPlayer)
- {
- printf("libvlc_media_player_new_from_media failed\n");
- }
- else
- {
- printf("libvlc_media_player_new_from_media ok...\n");
- }
-
- libvlc_media_release(gLibVLCMedia);
-
-// gVLCCallbackContext.texture_pixels = gTexturePixels;
-// gVLCCallbackContext.mp = gLibVLCMediaPlayer;
-
-// libvlc_video_set_callbacks(gLibVLCMediaPlayer, lock, unlock, display, &gVLCCallbackContext);
- libvlc_video_set_format(gLibVLCMediaPlayer, "RV32", mTextureWidth, mTextureHeight, mTextureWidth * 4);
- libvlc_media_player_play(gLibVLCMediaPlayer);
+ initVLC();
LLPluginMessage message("base", "init_response");
LLSD versions = LLSD::emptyMap();
@@ -164,23 +204,25 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER] = LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER_VERSION;
message.setValueLLSD("versions", versions);
- std::string plugin_version = "LibVLC plugin 0.0.0";
- message.setValue("plugin_version", plugin_version);
+ std::ostringstream s;
+ s << "LibVLC plugin ";
+ s << LIBVLC_VERSION_MAJOR;
+ s << ".";
+ s << LIBVLC_VERSION_MINOR;
+ s << ".";
+ s << LIBVLC_VERSION_REVISION;
+
+ message.setValue("plugin_version", s.str());
sendMessage(message);
}
else if(message_name == "idle")
{
- // no response is necessary here.
- F64 time = message_in.getValueReal("time");
-
- // Convert time to milliseconds for update()
- update((int)(time * 1000.0f));
+ // TODO move to VLC callback when VLC wants to draw a frame
+ setDirty(0, 0, mWidth, mHeight);
}
else if(message_name == "cleanup")
{
- libvlc_media_player_stop(gLibVLCMediaPlayer);
- libvlc_media_player_release(gLibVLCMediaPlayer);
- libvlc_release(gLibVLC);
+ resetVLC();
}
else if(message_name == "shm_added")
{
@@ -201,6 +243,13 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
{
if(mPixels == iter->second.mAddress)
{
+ /// only do thisis URLs are the same if ( )
+ //mCurVideoPosition = libvlc_media_player_get_position(gLibVLCMediaPlayer);
+
+ libvlc_media_player_stop(gLibVLCMediaPlayer);
+ libvlc_media_player_release(gLibVLCMediaPlayer);
+ gLibVLCMediaPlayer = 0;
+
// This is the currently active pixel buffer. Make sure we stop drawing to it.
mPixels = NULL;
mTextureSegmentName.clear();
@@ -233,9 +282,9 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
message.setValueS32("default_height", 1024);
message.setValueS32("depth", mDepth);
message.setValueU32("internalformat", GL_RGB);
- message.setValueU32("format", GL_RGBA);
+ message.setValueU32("format", GL_BGRA_EXT);
message.setValueU32("type", GL_UNSIGNED_BYTE);
- message.setValueBoolean("coords_opengl", true);
+ message.setValueBoolean("coords_opengl", false);
sendMessage(message);
}
else if(message_name == "size_change")
@@ -255,10 +304,11 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
mPixels = (unsigned char*)iter->second.mAddress;
mWidth = width;
mHeight = height;
-
mTextureWidth = texture_width;
mTextureHeight = texture_height;
- };
+
+ playMedia("");
+ };
};
LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_response");
@@ -268,10 +318,6 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
message.setValueS32("texture_width", texture_width);
message.setValueS32("texture_height", texture_height);
sendMessage(message);
-
- mLastUpdateTime = 0;
- mFirstTime = true;
-
}
else if(message_name == "load_uri")
{
@@ -281,7 +327,6 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
std::string event = message_in.getValue("event");
if(event == "down")
{
-
}
else if(event == "up")
{
@@ -297,128 +342,6 @@ void MediaPluginLibVLC::receiveMessage( const char* message_string )
}
}
-////////////////////////////////////////////////////////////////////////////////
-//
-void MediaPluginLibVLC::update( F64 milliseconds )
-{
- if ( mWidth < 1 || mWidth > 2048 || mHeight < 1 || mHeight > 2048 )
- return;
-
- if ( mPixels == 0 )
- return;
-
- if ( mFirstTime )
- {
- for( int n = 0; n < ENumObjects; ++n )
- {
- mXpos[ n ] = ( mWidth / 2 ) + rand() % ( mWidth / 16 ) - ( mWidth / 32 );
- mYpos[ n ] = ( mHeight / 2 ) + rand() % ( mHeight / 16 ) - ( mHeight / 32 );
-
- mColorR[ n ] = rand() % 0x60 + 0x60;
- mColorG[ n ] = rand() % 0x60 + 0x60;
- mColorB[ n ] = rand() % 0x60 + 0x60;
-
- mXInc[ n ] = 0;
- while ( mXInc[ n ] == 0 )
- mXInc[ n ] = rand() % 7 - 3;
-
- mYInc[ n ] = 0;
- while ( mYInc[ n ] == 0 )
- mYInc[ n ] = rand() % 9 - 4;
-
- mBlockSize[ n ] = rand() % 0x30 + 0x10;
- };
-
- delete [] mBackgroundPixels;
-
- mBackgroundPixels = new unsigned char[ mWidth * mHeight * mDepth ];
-
- mFirstTime = false;
- };
-
- if ( time( NULL ) > mLastUpdateTime + 3 )
- {
- const int num_squares = rand() % 20 + 4;
- int sqr1_r = rand() % 0x80 + 0x20;
- int sqr1_g = rand() % 0x80 + 0x20;
- int sqr1_b = rand() % 0x80 + 0x20;
- int sqr2_r = rand() % 0x80 + 0x20;
- int sqr2_g = rand() % 0x80 + 0x20;
- int sqr2_b = rand() % 0x80 + 0x20;
-
- for ( int y1 = 0; y1 < num_squares; ++y1 )
- {
- for ( int x1 = 0; x1 < num_squares; ++x1 )
- {
- int px_start = mWidth * x1 / num_squares;
- int px_end = ( mWidth * ( x1 + 1 ) ) / num_squares;
- int py_start = mHeight * y1 / num_squares;
- int py_end = ( mHeight * ( y1 + 1 ) ) / num_squares;
-
- for( int y2 = py_start; y2 < py_end; ++y2 )
- {
- for( int x2 = px_start; x2 < px_end; ++x2 )
- {
- int rowspan = mWidth * mDepth;
-
- if ( ( y1 % 2 ) ^ ( x1 % 2 ) )
- {
- mBackgroundPixels[ y2 * rowspan + x2 * mDepth + 0 ] = sqr1_r;
- mBackgroundPixels[ y2 * rowspan + x2 * mDepth + 1 ] = sqr1_g;
- mBackgroundPixels[ y2 * rowspan + x2 * mDepth + 2 ] = sqr1_b;
- }
- else
- {
- mBackgroundPixels[ y2 * rowspan + x2 * mDepth + 0 ] = sqr2_r;
- mBackgroundPixels[ y2 * rowspan + x2 * mDepth + 1 ] = sqr2_g;
- mBackgroundPixels[ y2 * rowspan + x2 * mDepth + 2 ] = sqr2_b;
- };
- };
- };
- };
- };
-
- time( &mLastUpdateTime );
- };
-
- memcpy( mPixels, mBackgroundPixels, mWidth * mHeight * mDepth );
-
- for( int n = 0; n < ENumObjects; ++n )
- {
- if ( rand() % 50 == 0 )
- {
- mXInc[ n ] = 0;
- while ( mXInc[ n ] == 0 )
- mXInc[ n ] = rand() % 7 - 3;
-
- mYInc[ n ] = 0;
- while ( mYInc[ n ] == 0 )
- mYInc[ n ] = rand() % 9 - 4;
- };
-
- if ( mXpos[ n ] + mXInc[ n ] < 0 || mXpos[ n ] + mXInc[ n ] >= mWidth - mBlockSize[ n ] )
- mXInc[ n ]= -mXInc[ n ];
-
- if ( mYpos[ n ] + mYInc[ n ] < 0 || mYpos[ n ] + mYInc[ n ] >= mHeight - mBlockSize[ n ] )
- mYInc[ n ]= -mYInc[ n ];
-
- mXpos[ n ] += mXInc[ n ];
- mYpos[ n ] += mYInc[ n ];
-
- for( int y = 0; y < mBlockSize[ n ]; ++y )
- {
- for( int x = 0; x < mBlockSize[ n ]; ++x )
- {
- mPixels[ ( mXpos[ n ] + x ) * mDepth + ( mYpos[ n ] + y ) * mDepth * mWidth + 0 ] = mColorR[ n ];
- mPixels[ ( mXpos[ n ] + x ) * mDepth + ( mYpos[ n ] + y ) * mDepth * mWidth + 1 ] = mColorG[ n ];
- mPixels[ ( mXpos[ n ] + x ) * mDepth + ( mYpos[ n ] + y ) * mDepth * mWidth + 2 ] = mColorB[ n ];
- };
- };
- };
-
- setDirty( 0, 0, mWidth, mHeight );
-};
-
////////////////////////////////////////////////////////////////////////////////
//
bool MediaPluginLibVLC::init()
--
GitLab