diff options
Diffstat (limited to 'indra/media_plugins/libvlc/media_plugin_libvlc.cpp')
| -rw-r--r-- | indra/media_plugins/libvlc/media_plugin_libvlc.cpp | 906 |
1 files changed, 453 insertions, 453 deletions
diff --git a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp index 89144922cc..a5d8f885fd 100644 --- a/indra/media_plugins/libvlc/media_plugin_libvlc.cpp +++ b/indra/media_plugins/libvlc/media_plugin_libvlc.cpp @@ -50,53 +50,53 @@ typedef SSIZE_T ssize_t; //////////////////////////////////////////////////////////////////////////////// // class MediaPluginLibVLC : - public MediaPluginBase + public MediaPluginBase { public: - MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data); - ~MediaPluginLibVLC(); + MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data); + ~MediaPluginLibVLC(); - /*virtual*/ void receiveMessage(const char* message_string); + /*virtual*/ void receiveMessage(const char* message_string); private: - bool init(); + bool init(); - void initVLC(); - void playMedia(); - void resetVLC(); - void setVolume(const F64 volume); - void setVolumeVLC(); - void updateTitle(const char* title); + void initVLC(); + void playMedia(); + void resetVLC(); + void setVolume(const F64 volume); + void setVolumeVLC(); + void updateTitle(const char* title); - static void* lock(void* data, void** p_pixels); - static void unlock(void* data, void* id, void* const* raw_pixels); - static void display(void* data, void* id); + static void* lock(void* data, void** p_pixels); + static void unlock(void* data, void* id, void* const* raw_pixels); + static void display(void* data, void* id); - /*virtual*/ void setDirty(int left, int top, int right, int bottom) /* override, but that is not supported in gcc 4.6 */; + /*virtual*/ void setDirty(int left, int top, int right, int bottom) /* override, but that is not supported in gcc 4.6 */; void setDurationDirty(); - static void eventCallbacks(const libvlc_event_t* event, void* ptr); + static void eventCallbacks(const libvlc_event_t* event, void* ptr); - libvlc_instance_t* mLibVLC; - libvlc_media_t* mLibVLCMedia; - libvlc_media_player_t* mLibVLCMediaPlayer; + libvlc_instance_t* mLibVLC; + libvlc_media_t* mLibVLCMedia; + libvlc_media_player_t* mLibVLCMediaPlayer; - struct mLibVLCContext - { - unsigned char* texture_pixels; - libvlc_media_player_t* mp; - MediaPluginLibVLC* parent; - }; - struct mLibVLCContext mLibVLCCallbackContext; + struct mLibVLCContext + { + unsigned char* texture_pixels; + libvlc_media_player_t* mp; + MediaPluginLibVLC* parent; + }; + struct mLibVLCContext mLibVLCCallbackContext; - std::string mURL; - F64 mCurVolume; + std::string mURL; + F64 mCurVolume; - bool mIsLooping; + bool mIsLooping; - F64 mCurTime; - F64 mDuration; - EStatus mVlcStatus; + F64 mCurTime; + F64 mDuration; + EStatus mVlcStatus; }; //////////////////////////////////////////////////////////////////////////////// @@ -104,28 +104,28 @@ private: MediaPluginLibVLC::MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data) : MediaPluginBase(host_send_func, host_user_data) { - mTextureWidth = 0; - mTextureHeight = 0; - mWidth = 0; - mHeight = 0; - mDepth = 4; - mPixels = 0; + mTextureWidth = 0; + mTextureHeight = 0; + mWidth = 0; + mHeight = 0; + mDepth = 4; + mPixels = 0; - mLibVLC = 0; - mLibVLCMedia = 0; - mLibVLCMediaPlayer = 0; + mLibVLC = 0; + mLibVLCMedia = 0; + mLibVLCMediaPlayer = 0; - mCurVolume = 0.0; + mCurVolume = 0.0; - mIsLooping = false; + mIsLooping = false; - mCurTime = 0.0; - mDuration = 0.0; + mCurTime = 0.0; + mDuration = 0.0; - mURL = std::string(); + mURL = std::string(); - mVlcStatus = STATUS_NONE; - setStatus(STATUS_NONE); + mVlcStatus = STATUS_NONE; + setStatus(STATUS_NONE); } //////////////////////////////////////////////////////////////////////////////// @@ -138,80 +138,80 @@ MediaPluginLibVLC::~MediaPluginLibVLC() // void* MediaPluginLibVLC::lock(void* data, void** p_pixels) { - struct mLibVLCContext* context = (mLibVLCContext*)data; + struct mLibVLCContext* context = (mLibVLCContext*)data; - *p_pixels = context->texture_pixels; + *p_pixels = context->texture_pixels; - return NULL; + return NULL; } ///////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::unlock(void* data, void* id, void* const* raw_pixels) { - // nothing to do here for the moment - // we *could* modify pixels here to, for example, Y flip, but this is done with - // a VLC video filter transform. + // nothing to do here for the moment + // we *could* modify pixels here to, for example, Y flip, but this is done with + // a VLC video filter transform. } //////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::display(void* data, void* id) { - struct mLibVLCContext* context = (mLibVLCContext*)data; + struct mLibVLCContext* context = (mLibVLCContext*)data; - context->parent->setDirty(0, 0, context->parent->mWidth, context->parent->mHeight); + context->parent->setDirty(0, 0, context->parent->mWidth, context->parent->mHeight); } //////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::initVLC() { - char const* vlc_argv[] = - { - "--no-xlib", - "--video-filter=transform{type=vflip}", // MAINT-6578 Y flip textures in plugin vs client - }; + char const* vlc_argv[] = + { + "--no-xlib", + "--video-filter=transform{type=vflip}", // MAINT-6578 Y flip textures in plugin vs client + }; #if LL_DARWIN - setenv("VLC_PLUGIN_PATH", ".", 1); + setenv("VLC_PLUGIN_PATH", ".", 1); #endif - int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); - mLibVLC = libvlc_new(vlc_argc, vlc_argv); + int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv); + mLibVLC = libvlc_new(vlc_argc, vlc_argv); - if (!mLibVLC) - { - // for the moment, if this fails, the plugin will fail and - // the media sub-system will tell the viewer something went wrong. - } + if (!mLibVLC) + { + // for the moment, if this fails, the plugin will fail and + // the media sub-system will tell the viewer something went wrong. + } } //////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::resetVLC() { - libvlc_media_player_stop(mLibVLCMediaPlayer); - libvlc_media_player_release(mLibVLCMediaPlayer); - libvlc_release(mLibVLC); + libvlc_media_player_stop(mLibVLCMediaPlayer); + libvlc_media_player_release(mLibVLCMediaPlayer); + libvlc_release(mLibVLC); } //////////////////////////////////////////////////////////////////////////////// // *virtual* void MediaPluginLibVLC::setDirty(int left, int top, int right, int bottom) { - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "updated"); + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "updated"); - message.setValueS32("left", left); - message.setValueS32("top", top); - message.setValueS32("right", right); - message.setValueS32("bottom", bottom); + message.setValueS32("left", left); + message.setValueS32("top", top); + message.setValueS32("right", right); + message.setValueS32("bottom", bottom); - message.setValueReal("current_time", mCurTime); - message.setValueReal("duration", mDuration); - message.setValueReal("current_rate", 1.0f); + message.setValueReal("current_time", mCurTime); + message.setValueReal("duration", mDuration); + message.setValueReal("current_rate", 1.0f); - sendMessage(message); + sendMessage(message); } //////////////////////////////////////////////////////////////////////////////// @@ -231,363 +231,363 @@ void MediaPluginLibVLC::setDurationDirty() // void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr) { - MediaPluginLibVLC* parent = (MediaPluginLibVLC*)ptr; - if (parent == 0) - { - return; - } - - switch (event->type) - { - case libvlc_MediaPlayerOpening: - parent->mVlcStatus = STATUS_LOADING; - break; - - case libvlc_MediaPlayerPlaying: - parent->mDuration = (float)(libvlc_media_get_duration(parent->mLibVLCMedia)) / 1000.0f; - parent->mVlcStatus = STATUS_PLAYING; - parent->setVolumeVLC(); + MediaPluginLibVLC* parent = (MediaPluginLibVLC*)ptr; + if (parent == 0) + { + return; + } + + switch (event->type) + { + case libvlc_MediaPlayerOpening: + parent->mVlcStatus = STATUS_LOADING; + break; + + case libvlc_MediaPlayerPlaying: + parent->mDuration = (float)(libvlc_media_get_duration(parent->mLibVLCMedia)) / 1000.0f; + parent->mVlcStatus = STATUS_PLAYING; + parent->setVolumeVLC(); parent->setDurationDirty(); - break; + break; - case libvlc_MediaPlayerPaused: - parent->mVlcStatus = STATUS_PAUSED; - break; + case libvlc_MediaPlayerPaused: + parent->mVlcStatus = STATUS_PAUSED; + break; - case libvlc_MediaPlayerStopped: - parent->mVlcStatus = STATUS_DONE; - break; + case libvlc_MediaPlayerStopped: + parent->mVlcStatus = STATUS_DONE; + break; - case libvlc_MediaPlayerEndReached: - parent->mVlcStatus = STATUS_DONE; + case libvlc_MediaPlayerEndReached: + parent->mVlcStatus = STATUS_DONE; parent->mCurTime = parent->mDuration; parent->setDurationDirty(); - break; + break; - case libvlc_MediaPlayerEncounteredError: - parent->mVlcStatus = STATUS_ERROR; - break; + case libvlc_MediaPlayerEncounteredError: + parent->mVlcStatus = STATUS_ERROR; + break; - case libvlc_MediaPlayerTimeChanged: - parent->mCurTime = (float)libvlc_media_player_get_time(parent->mLibVLCMediaPlayer) / 1000.0f; + case libvlc_MediaPlayerTimeChanged: + parent->mCurTime = (float)libvlc_media_player_get_time(parent->mLibVLCMediaPlayer) / 1000.0f; if (parent->mVlcStatus == STATUS_DONE && libvlc_media_player_is_playing(parent->mLibVLCMediaPlayer)) { parent->mVlcStatus = STATUS_PLAYING; } parent->setDurationDirty(); - break; + break; - case libvlc_MediaPlayerPositionChanged: - break; + case libvlc_MediaPlayerPositionChanged: + break; - case libvlc_MediaPlayerLengthChanged: - parent->mDuration = (float)libvlc_media_get_duration(parent->mLibVLCMedia) / 1000.0f; + case libvlc_MediaPlayerLengthChanged: + parent->mDuration = (float)libvlc_media_get_duration(parent->mLibVLCMedia) / 1000.0f; parent->setDurationDirty(); - break; - - case libvlc_MediaPlayerTitleChanged: - { - char* title = libvlc_media_get_meta(parent->mLibVLCMedia, libvlc_meta_Title); - if (title) - { - parent->updateTitle(title); - } - } - break; - } + break; + + case libvlc_MediaPlayerTitleChanged: + { + char* title = libvlc_media_get_meta(parent->mLibVLCMedia, libvlc_meta_Title); + if (title) + { + parent->updateTitle(title); + } + } + break; + } } //////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::playMedia() { - if (mURL.length() == 0) - { - return; - } - - // A new call to play the media is received after the initial one. Typically - // this is due to a size change request either as the media naturally resizes - // to the size of the prim container, or else, as a 2D window is resized by the - // user. Stopping the media, helps avoid a race condition where the media pixel - // buffer size is out of sync with the declared size (width/height) for a frame - // or two and the plugin crashes as VLC tries to decode a frame into unallocated - // memory. - if (mLibVLCMediaPlayer) - { - libvlc_media_player_stop(mLibVLCMediaPlayer); - } - - mLibVLCMedia = libvlc_media_new_location(mLibVLC, mURL.c_str()); - if (!mLibVLCMedia) - { - mLibVLCMediaPlayer = 0; - setStatus(STATUS_ERROR); - return; - } - - mLibVLCMediaPlayer = libvlc_media_player_new_from_media(mLibVLCMedia); - if (!mLibVLCMediaPlayer) - { - setStatus(STATUS_ERROR); - return; - } - - // listen to events - libvlc_event_manager_t* em = libvlc_media_player_event_manager(mLibVLCMediaPlayer); - if (em) - { - libvlc_event_attach(em, libvlc_MediaPlayerOpening, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerPlaying, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerPaused, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerStopped, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerEndReached, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerEncounteredError, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerTimeChanged, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerPositionChanged, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerLengthChanged, eventCallbacks, this); - libvlc_event_attach(em, libvlc_MediaPlayerTitleChanged, eventCallbacks, this); - } - - libvlc_video_set_callbacks(mLibVLCMediaPlayer, lock, unlock, display, &mLibVLCCallbackContext); - libvlc_video_set_format(mLibVLCMediaPlayer, "RV32", mWidth, mHeight, mWidth * mDepth); - - mLibVLCCallbackContext.parent = this; - mLibVLCCallbackContext.texture_pixels = mPixels; - mLibVLCCallbackContext.mp = mLibVLCMediaPlayer; - - // Send a "navigate begin" event. - // This is really a browser message but the QuickTime plugin did it and - // the media system relies on this message to update internal state so we must send it too - // Note: see "navigate_complete" message below too - // https://jira.secondlife.com/browse/MAINT-6528 - LLPluginMessage message_begin(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin"); - message_begin.setValue("uri", mURL); - message_begin.setValueBoolean("history_back_available", false); - message_begin.setValueBoolean("history_forward_available", false); - sendMessage(message_begin); - - // volume level gets set before VLC is initialized (thanks media system) so we have to record - // it in mCurVolume and set it again here so that volume levels are correctly initialized - setVolume(mCurVolume); - - setStatus(STATUS_LOADED); - - // note this relies on the "set_loop" message arriving before the "start" (play) one - // but that appears to always be the case - if (mIsLooping) - { - libvlc_media_add_option(mLibVLCMedia, "input-repeat=65535"); - } - - libvlc_media_player_play(mLibVLCMediaPlayer); - - // send a "location_changed" message - this informs the media system - // that a new URL is the 'current' one and is used extensively. - // Again, this is really a browser message but we will use it here. - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "location_changed"); - message.setValue("uri", mURL); - sendMessage(message); - - // Send a "navigate complete" event. - // This is really a browser message but the QuickTime plugin did it and - // the media system relies on this message to update internal state so we must send it too - // Note: see "navigate_begin" message above too - // https://jira.secondlife.com/browse/MAINT-6528 - LLPluginMessage message_complete(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_complete"); - message_complete.setValue("uri", mURL); - message_complete.setValueS32("result_code", 200); - message_complete.setValue("result_string", "OK"); - sendMessage(message_complete); + if (mURL.length() == 0) + { + return; + } + + // A new call to play the media is received after the initial one. Typically + // this is due to a size change request either as the media naturally resizes + // to the size of the prim container, or else, as a 2D window is resized by the + // user. Stopping the media, helps avoid a race condition where the media pixel + // buffer size is out of sync with the declared size (width/height) for a frame + // or two and the plugin crashes as VLC tries to decode a frame into unallocated + // memory. + if (mLibVLCMediaPlayer) + { + libvlc_media_player_stop(mLibVLCMediaPlayer); + } + + mLibVLCMedia = libvlc_media_new_location(mLibVLC, mURL.c_str()); + if (!mLibVLCMedia) + { + mLibVLCMediaPlayer = 0; + setStatus(STATUS_ERROR); + return; + } + + mLibVLCMediaPlayer = libvlc_media_player_new_from_media(mLibVLCMedia); + if (!mLibVLCMediaPlayer) + { + setStatus(STATUS_ERROR); + return; + } + + // listen to events + libvlc_event_manager_t* em = libvlc_media_player_event_manager(mLibVLCMediaPlayer); + if (em) + { + libvlc_event_attach(em, libvlc_MediaPlayerOpening, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerPlaying, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerPaused, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerStopped, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerEndReached, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerEncounteredError, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerTimeChanged, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerPositionChanged, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerLengthChanged, eventCallbacks, this); + libvlc_event_attach(em, libvlc_MediaPlayerTitleChanged, eventCallbacks, this); + } + + libvlc_video_set_callbacks(mLibVLCMediaPlayer, lock, unlock, display, &mLibVLCCallbackContext); + libvlc_video_set_format(mLibVLCMediaPlayer, "RV32", mWidth, mHeight, mWidth * mDepth); + + mLibVLCCallbackContext.parent = this; + mLibVLCCallbackContext.texture_pixels = mPixels; + mLibVLCCallbackContext.mp = mLibVLCMediaPlayer; + + // Send a "navigate begin" event. + // This is really a browser message but the QuickTime plugin did it and + // the media system relies on this message to update internal state so we must send it too + // Note: see "navigate_complete" message below too + // https://jira.secondlife.com/browse/MAINT-6528 + LLPluginMessage message_begin(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_begin"); + message_begin.setValue("uri", mURL); + message_begin.setValueBoolean("history_back_available", false); + message_begin.setValueBoolean("history_forward_available", false); + sendMessage(message_begin); + + // volume level gets set before VLC is initialized (thanks media system) so we have to record + // it in mCurVolume and set it again here so that volume levels are correctly initialized + setVolume(mCurVolume); + + setStatus(STATUS_LOADED); + + // note this relies on the "set_loop" message arriving before the "start" (play) one + // but that appears to always be the case + if (mIsLooping) + { + libvlc_media_add_option(mLibVLCMedia, "input-repeat=65535"); + } + + libvlc_media_player_play(mLibVLCMediaPlayer); + + // send a "location_changed" message - this informs the media system + // that a new URL is the 'current' one and is used extensively. + // Again, this is really a browser message but we will use it here. + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "location_changed"); + message.setValue("uri", mURL); + sendMessage(message); + + // Send a "navigate complete" event. + // This is really a browser message but the QuickTime plugin did it and + // the media system relies on this message to update internal state so we must send it too + // Note: see "navigate_begin" message above too + // https://jira.secondlife.com/browse/MAINT-6528 + LLPluginMessage message_complete(LLPLUGIN_MESSAGE_CLASS_MEDIA_BROWSER, "navigate_complete"); + message_complete.setValue("uri", mURL); + message_complete.setValueS32("result_code", 200); + message_complete.setValue("result_string", "OK"); + sendMessage(message_complete); } //////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::updateTitle(const char* title) { - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "name_text"); - message.setValue("name", title); - sendMessage(message); + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "name_text"); + message.setValue("name", title); + sendMessage(message); } void MediaPluginLibVLC::setVolumeVLC() { - if (mLibVLCMediaPlayer) - { - int vlc_vol = (int)(mCurVolume * 100); - - int result = libvlc_audio_set_volume(mLibVLCMediaPlayer, vlc_vol); - if (result == 0) - { - // volume change was accepted by LibVLC - } - else - { - // volume change was NOT accepted by LibVLC and not actioned - } + if (mLibVLCMediaPlayer) + { + int vlc_vol = (int)(mCurVolume * 100); + + int result = libvlc_audio_set_volume(mLibVLCMediaPlayer, vlc_vol); + if (result == 0) + { + // volume change was accepted by LibVLC + } + else + { + // volume change was NOT accepted by LibVLC and not actioned + } #if LL_WINDOWS - // https ://jira.secondlife.com/browse/MAINT-8119 - // CEF media plugin uses code in media_plugins/cef/windows_volume_catcher.cpp to - // set the actual output volume of the plugin process since there is no API in - // CEF to otherwise do this. - // There are explicit calls to change the volume in LibVLC but sometimes they - // are ignored SLPlugin.exe process volume is set to 0 so you never heard audio - // from the VLC media stream. - // The right way to solve this is to move the volume catcher stuff out of - // the CEF plugin and into it's own folder under media_plugins and have it referenced - // by both CEF and VLC. That's for later. The code there boils down to this so for + // https ://jira.secondlife.com/browse/MAINT-8119 + // CEF media plugin uses code in media_plugins/cef/windows_volume_catcher.cpp to + // set the actual output volume of the plugin process since there is no API in + // CEF to otherwise do this. + // There are explicit calls to change the volume in LibVLC but sometimes they + // are ignored SLPlugin.exe process volume is set to 0 so you never heard audio + // from the VLC media stream. + // The right way to solve this is to move the volume catcher stuff out of + // the CEF plugin and into it's own folder under media_plugins and have it referenced + // by both CEF and VLC. That's for later. The code there boils down to this so for // now, as we approach a release, the less risky option is to do it directly vs // calls to volume catcher code. - DWORD left_channel = (DWORD)(mCurVolume * 65535.0f); - DWORD right_channel = (DWORD)(mCurVolume * 65535.0f); - DWORD hw_volume = left_channel << 16 | right_channel; - waveOutSetVolume(NULL, hw_volume); + DWORD left_channel = (DWORD)(mCurVolume * 65535.0f); + DWORD right_channel = (DWORD)(mCurVolume * 65535.0f); + DWORD hw_volume = left_channel << 16 | right_channel; + waveOutSetVolume(NULL, hw_volume); #endif - } - else - { - // volume change was requested but VLC wasn't ready. - // that's okay though because we saved the value in mCurVolume and - // the next volume change after the VLC system is initilzied will set it - } + } + else + { + // volume change was requested but VLC wasn't ready. + // that's okay though because we saved the value in mCurVolume and + // the next volume change after the VLC system is initilzied will set it + } } //////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::setVolume(const F64 volume) { - mCurVolume = volume; + mCurVolume = volume; - setVolumeVLC(); + setVolumeVLC(); } //////////////////////////////////////////////////////////////////////////////// // void MediaPluginLibVLC::receiveMessage(const char* message_string) { - LLPluginMessage message_in; - - if (message_in.parse(message_string) >= 0) - { - std::string message_class = message_in.getClass(); - std::string message_name = message_in.getName(); - if (message_class == LLPLUGIN_MESSAGE_CLASS_BASE) - { - if (message_name == "init") - { - initVLC(); - - LLPluginMessage message("base", "init_response"); - LLSD versions = LLSD::emptyMap(); - versions[LLPLUGIN_MESSAGE_CLASS_BASE] = LLPLUGIN_MESSAGE_CLASS_BASE_VERSION; - versions[LLPLUGIN_MESSAGE_CLASS_MEDIA] = LLPLUGIN_MESSAGE_CLASS_MEDIA_VERSION; - versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME] = LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME_VERSION; - message.setValueLLSD("versions", versions); - - 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") - { - setStatus(mVlcStatus); - } - else if (message_name == "cleanup") - { - resetVLC(); - } - else if (message_name == "force_exit") - { - mDeleteMe = true; - } - else if (message_name == "shm_added") - { - SharedSegmentInfo info; - info.mAddress = message_in.getValuePointer("address"); - info.mSize = (size_t)message_in.getValueS32("size"); - std::string name = message_in.getValue("name"); - - mSharedSegments.insert(SharedSegmentMap::value_type(name, info)); - - } - else if (message_name == "shm_remove") - { - std::string name = message_in.getValue("name"); - - SharedSegmentMap::iterator iter = mSharedSegments.find(name); - if (iter != mSharedSegments.end()) - { - if (mPixels == iter->second.mAddress) - { - libvlc_media_player_stop(mLibVLCMediaPlayer); - libvlc_media_player_release(mLibVLCMediaPlayer); - mLibVLCMediaPlayer = 0; - - mPixels = NULL; - mTextureSegmentName.clear(); - } - mSharedSegments.erase(iter); - } - else - { - //std::cerr << "MediaPluginWebKit::receiveMessage: unknown shared memory region!" << std::endl; - } - - // Send the response so it can be cleaned up. - LLPluginMessage message("base", "shm_remove_response"); - message.setValue("name", name); - sendMessage(message); - } - else - { - //std::cerr << "MediaPluginWebKit::receiveMessage: unknown base message: " << message_name << std::endl; - } - } - else if (message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA) - { - if (message_name == "init") - { - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); - message.setValueS32("default_width", 1024); - message.setValueS32("default_height", 1024); - message.setValueS32("depth", mDepth); - message.setValueU32("internalformat", GL_RGB); - message.setValueU32("format", GL_BGRA_EXT); - message.setValueU32("type", GL_UNSIGNED_BYTE); - message.setValueBoolean("coords_opengl", true); - sendMessage(message); - } - else if (message_name == "size_change") - { - std::string name = message_in.getValue("name"); - S32 width = message_in.getValueS32("width"); - S32 height = message_in.getValueS32("height"); - S32 texture_width = message_in.getValueS32("texture_width"); - S32 texture_height = message_in.getValueS32("texture_height"); - - if (!name.empty()) - { - // Find the shared memory region with this name - SharedSegmentMap::iterator iter = mSharedSegments.find(name); - if (iter != mSharedSegments.end()) - { - mPixels = (unsigned char*)iter->second.mAddress; - mWidth = width; - mHeight = height; - mTextureWidth = texture_width; - mTextureHeight = texture_height; + LLPluginMessage message_in; + + if (message_in.parse(message_string) >= 0) + { + std::string message_class = message_in.getClass(); + std::string message_name = message_in.getName(); + if (message_class == LLPLUGIN_MESSAGE_CLASS_BASE) + { + if (message_name == "init") + { + initVLC(); + + LLPluginMessage message("base", "init_response"); + LLSD versions = LLSD::emptyMap(); + versions[LLPLUGIN_MESSAGE_CLASS_BASE] = LLPLUGIN_MESSAGE_CLASS_BASE_VERSION; + versions[LLPLUGIN_MESSAGE_CLASS_MEDIA] = LLPLUGIN_MESSAGE_CLASS_MEDIA_VERSION; + versions[LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME] = LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME_VERSION; + message.setValueLLSD("versions", versions); + + 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") + { + setStatus(mVlcStatus); + } + else if (message_name == "cleanup") + { + resetVLC(); + } + else if (message_name == "force_exit") + { + mDeleteMe = true; + } + else if (message_name == "shm_added") + { + SharedSegmentInfo info; + info.mAddress = message_in.getValuePointer("address"); + info.mSize = (size_t)message_in.getValueS32("size"); + std::string name = message_in.getValue("name"); + + mSharedSegments.insert(SharedSegmentMap::value_type(name, info)); + + } + else if (message_name == "shm_remove") + { + std::string name = message_in.getValue("name"); + + SharedSegmentMap::iterator iter = mSharedSegments.find(name); + if (iter != mSharedSegments.end()) + { + if (mPixels == iter->second.mAddress) + { + libvlc_media_player_stop(mLibVLCMediaPlayer); + libvlc_media_player_release(mLibVLCMediaPlayer); + mLibVLCMediaPlayer = 0; + + mPixels = NULL; + mTextureSegmentName.clear(); + } + mSharedSegments.erase(iter); + } + else + { + //std::cerr << "MediaPluginWebKit::receiveMessage: unknown shared memory region!" << std::endl; + } + + // Send the response so it can be cleaned up. + LLPluginMessage message("base", "shm_remove_response"); + message.setValue("name", name); + sendMessage(message); + } + else + { + //std::cerr << "MediaPluginWebKit::receiveMessage: unknown base message: " << message_name << std::endl; + } + } + else if (message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA) + { + if (message_name == "init") + { + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "texture_params"); + message.setValueS32("default_width", 1024); + message.setValueS32("default_height", 1024); + message.setValueS32("depth", mDepth); + message.setValueU32("internalformat", GL_RGB); + message.setValueU32("format", GL_BGRA_EXT); + message.setValueU32("type", GL_UNSIGNED_BYTE); + message.setValueBoolean("coords_opengl", true); + sendMessage(message); + } + else if (message_name == "size_change") + { + std::string name = message_in.getValue("name"); + S32 width = message_in.getValueS32("width"); + S32 height = message_in.getValueS32("height"); + S32 texture_width = message_in.getValueS32("texture_width"); + S32 texture_height = message_in.getValueS32("texture_height"); + + if (!name.empty()) + { + // Find the shared memory region with this name + SharedSegmentMap::iterator iter = mSharedSegments.find(name); + if (iter != mSharedSegments.end()) + { + mPixels = (unsigned char*)iter->second.mAddress; + mWidth = width; + mHeight = height; + mTextureWidth = texture_width; + mTextureHeight = texture_height; libvlc_time_t time = 1000.0 * mCurTime; - playMedia(); + playMedia(); if (mLibVLCMediaPlayer) { @@ -603,37 +603,37 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string) mCurTime = (F64)time / 1000.0; } } - }; - }; - - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_response"); - message.setValue("name", name); - message.setValueS32("width", width); - message.setValueS32("height", height); - message.setValueS32("texture_width", texture_width); - message.setValueS32("texture_height", texture_height); - sendMessage(message); - } - else if (message_name == "load_uri") - { - mURL = message_in.getValue("uri"); - playMedia(); - } - } - else - if (message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) - { - if (message_name == "stop") - { - if (mLibVLCMediaPlayer) - { - libvlc_media_player_stop(mLibVLCMediaPlayer); - } - } - else if (message_name == "start") - { - if (mLibVLCMediaPlayer) - { + }; + }; + + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "size_change_response"); + message.setValue("name", name); + message.setValueS32("width", width); + message.setValueS32("height", height); + message.setValueS32("texture_width", texture_width); + message.setValueS32("texture_height", texture_height); + sendMessage(message); + } + else if (message_name == "load_uri") + { + mURL = message_in.getValue("uri"); + playMedia(); + } + } + else + if (message_class == LLPLUGIN_MESSAGE_CLASS_MEDIA_TIME) + { + if (message_name == "stop") + { + if (mLibVLCMediaPlayer) + { + libvlc_media_player_stop(mLibVLCMediaPlayer); + } + } + else if (message_name == "start") + { + if (mLibVLCMediaPlayer) + { if (mVlcStatus == STATUS_DONE && !libvlc_media_player_is_playing(mLibVLCMediaPlayer)) { // stop or vlc will ignore 'play', it will just @@ -641,18 +641,18 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string) // seek was used libvlc_media_player_stop(mLibVLCMediaPlayer); } - libvlc_media_player_play(mLibVLCMediaPlayer); - } - } - else if (message_name == "pause") - { - if (mLibVLCMediaPlayer) - { - libvlc_media_player_set_pause(mLibVLCMediaPlayer, 1); - } - } - else if (message_name == "seek") - { + libvlc_media_player_play(mLibVLCMediaPlayer); + } + } + else if (message_name == "pause") + { + if (mLibVLCMediaPlayer) + { + libvlc_media_player_set_pause(mLibVLCMediaPlayer, 1); + } + } + else if (message_name == "seek") + { if (mLibVLCMediaPlayer) { libvlc_time_t time = 1000.0 * message_in.getValueReal("time"); @@ -674,43 +674,43 @@ void MediaPluginLibVLC::receiveMessage(const char* message_string) setDurationDirty(); } } - } - else if (message_name == "set_loop") - { - bool loop = message_in.getValueBoolean("loop"); - mIsLooping = loop; - } - else if (message_name == "set_volume") - { - // volume comes in 0 -> 1.0 - F64 volume = message_in.getValueReal("volume"); - setVolume(volume); - } - } - } + } + else if (message_name == "set_loop") + { + bool loop = message_in.getValueBoolean("loop"); + mIsLooping = loop; + } + else if (message_name == "set_volume") + { + // volume comes in 0 -> 1.0 + F64 volume = message_in.getValueReal("volume"); + setVolume(volume); + } + } + } } //////////////////////////////////////////////////////////////////////////////// // bool MediaPluginLibVLC::init() { - LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "name_text"); - message.setValue("name", "LibVLC Plugin"); - sendMessage(message); + LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "name_text"); + message.setValue("name", "LibVLC Plugin"); + sendMessage(message); - return true; + return true; }; //////////////////////////////////////////////////////////////////////////////// // int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func, - void* host_user_data, - LLPluginInstance::sendMessageFunction *plugin_send_func, - void **plugin_user_data) + void* host_user_data, + LLPluginInstance::sendMessageFunction *plugin_send_func, + void **plugin_user_data) { - MediaPluginLibVLC* self = new MediaPluginLibVLC(host_send_func, host_user_data); - *plugin_send_func = MediaPluginLibVLC::staticReceiveMessage; - *plugin_user_data = (void*)self; + MediaPluginLibVLC* self = new MediaPluginLibVLC(host_send_func, host_user_data); + *plugin_send_func = MediaPluginLibVLC::staticReceiveMessage; + *plugin_user_data = (void*)self; - return 0; + return 0; } |