Fix configure
Not sure how Prebuilt.cmake worked in my repo but not others, but okay. Of course I'd forget to stage the libvlc directory. And somehow vlc-bin wasn't added to autobuild.xml?!
This commit is contained in:
Lirusaito
@@ -2675,6 +2675,70 @@
|
|||||||
<key>version</key>
|
<key>version</key>
|
||||||
<string>14.12.25810.0</string>
|
<string>14.12.25810.0</string>
|
||||||
</map>
|
</map>
|
||||||
|
<key>vlc-bin</key>
|
||||||
|
<map>
|
||||||
|
<key>copyright</key>
|
||||||
|
<string>Copyright (C) 1998-2016 VLC authors and VideoLAN</string>
|
||||||
|
<key>license</key>
|
||||||
|
<string>GPL2</string>
|
||||||
|
<key>license_file</key>
|
||||||
|
<string>LICENSES/vlc.txt</string>
|
||||||
|
<key>name</key>
|
||||||
|
<string>vlc-bin</string>
|
||||||
|
<key>platforms</key>
|
||||||
|
<map>
|
||||||
|
<key>darwin64</key>
|
||||||
|
<map>
|
||||||
|
<key>archive</key>
|
||||||
|
<map>
|
||||||
|
<key>hash</key>
|
||||||
|
<string>e5635e173c75dc0675b48ab5f5e4868b</string>
|
||||||
|
<key>url</key>
|
||||||
|
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12143/71451/vlc_bin-2.2.8.511703-darwin64-511703.tar.bz2</string>
|
||||||
|
</map>
|
||||||
|
<key>name</key>
|
||||||
|
<string>darwin64</string>
|
||||||
|
</map>
|
||||||
|
<key>linux</key>
|
||||||
|
<map>
|
||||||
|
<key>archive</key>
|
||||||
|
<map>
|
||||||
|
<key>hash</key>
|
||||||
|
<string>2f410640df3f9812d1abff02a414cfa8</string>
|
||||||
|
<key>url</key>
|
||||||
|
<string>https://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-vlc-bin/rev/315283/arch/Linux/vlc_bin-2.2.3-linux-201606011750-r10.tar.bz2</string>
|
||||||
|
</map>
|
||||||
|
<key>name</key>
|
||||||
|
<string>linux</string>
|
||||||
|
</map>
|
||||||
|
<key>windows</key>
|
||||||
|
<map>
|
||||||
|
<key>archive</key>
|
||||||
|
<map>
|
||||||
|
<key>hash</key>
|
||||||
|
<string>add560654a53cb1c554044a4fac3c718</string>
|
||||||
|
<key>url</key>
|
||||||
|
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12144/71458/vlc_bin-2.2.8.511703-windows-511703.tar.bz2</string>
|
||||||
|
</map>
|
||||||
|
<key>name</key>
|
||||||
|
<string>windows</string>
|
||||||
|
</map>
|
||||||
|
<key>windows64</key>
|
||||||
|
<map>
|
||||||
|
<key>archive</key>
|
||||||
|
<map>
|
||||||
|
<key>hash</key>
|
||||||
|
<string>94bf04b49acc1e1bf2c06e2232f8a083</string>
|
||||||
|
<key>url</key>
|
||||||
|
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12145/71463/vlc_bin-2.2.8.511703-windows64-511703.tar.bz2</string>
|
||||||
|
</map>
|
||||||
|
<key>name</key>
|
||||||
|
<string>windows64</string>
|
||||||
|
</map>
|
||||||
|
</map>
|
||||||
|
<key>version</key>
|
||||||
|
<string>2.2.8.511703</string>
|
||||||
|
</map>
|
||||||
<key>xmlrpc-epi</key>
|
<key>xmlrpc-epi</key>
|
||||||
<map>
|
<map>
|
||||||
<key>copyright</key>
|
<key>copyright</key>
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ if(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED)
|
|||||||
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
|
set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES")
|
||||||
|
|
||||||
include(FindAutobuild)
|
include(FindAutobuild)
|
||||||
include(Variables)
|
|
||||||
if(INSTALL_PROPRIETARY)
|
if(INSTALL_PROPRIETARY)
|
||||||
include(FindSCP)
|
include(FindSCP)
|
||||||
endif(INSTALL_PROPRIETARY)
|
endif(INSTALL_PROPRIETARY)
|
||||||
@@ -40,14 +39,13 @@ macro (use_prebuilt_binary _binary)
|
|||||||
|
|
||||||
if(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
|
if(${PREBUILD_TRACKING_DIR}/sentinel_installed IS_NEWER_THAN ${PREBUILD_TRACKING_DIR}/${_binary}_installed OR NOT ${${_binary}_installed} EQUAL 0)
|
||||||
if(DEBUG_PREBUILT)
|
if(DEBUG_PREBUILT)
|
||||||
message("cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
|
message(STATUS "cd ${CMAKE_SOURCE_DIR} && ${AUTOBUILD_EXECUTABLE} install
|
||||||
--install-dir=${AUTOBUILD_INSTALL_DIR}
|
--install-dir=${AUTOBUILD_INSTALL_DIR}
|
||||||
${_binary} ")
|
${_binary} ")
|
||||||
endif(DEBUG_PREBUILT)
|
endif(DEBUG_PREBUILT)
|
||||||
execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
|
execute_process(COMMAND "${AUTOBUILD_EXECUTABLE}"
|
||||||
install
|
install
|
||||||
--install-dir=${AUTOBUILD_INSTALL_DIR}
|
--install-dir=${AUTOBUILD_INSTALL_DIR}
|
||||||
-p ${AUTOBUILD_PLATFORM_NAME}
|
|
||||||
${_binary}
|
${_binary}
|
||||||
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
|
||||||
RESULT_VARIABLE ${_binary}_installed
|
RESULT_VARIABLE ${_binary}_installed
|
||||||
|
|||||||
83
indra/plugins/libvlc/CMakeLists.txt
Normal file
83
indra/plugins/libvlc/CMakeLists.txt
Normal file
@@ -0,0 +1,83 @@
|
|||||||
|
# -*- cmake -*-
|
||||||
|
|
||||||
|
project(media_plugin_libvlc)
|
||||||
|
|
||||||
|
include(00-Common)
|
||||||
|
include(LLCommon)
|
||||||
|
include(LLImage)
|
||||||
|
include(LLPlugin)
|
||||||
|
include(LLMath)
|
||||||
|
include(LLRender)
|
||||||
|
include(LLWindow)
|
||||||
|
include(Linking)
|
||||||
|
include(PluginAPI)
|
||||||
|
include(MediaPluginBase)
|
||||||
|
include(OpenGL)
|
||||||
|
include(Variables)
|
||||||
|
|
||||||
|
include(LibVLCPlugin)
|
||||||
|
|
||||||
|
include_directories(
|
||||||
|
${LLPLUGIN_INCLUDE_DIRS}
|
||||||
|
${MEDIA_PLUGIN_BASE_INCLUDE_DIRS}
|
||||||
|
${LLCOMMON_INCLUDE_DIRS}
|
||||||
|
${LLMATH_INCLUDE_DIRS}
|
||||||
|
${LLIMAGE_INCLUDE_DIRS}
|
||||||
|
${LLRENDER_INCLUDE_DIRS}
|
||||||
|
${LLWINDOW_INCLUDE_DIRS}
|
||||||
|
${VLC_INCLUDE_DIR}
|
||||||
|
)
|
||||||
|
include_directories(SYSTEM
|
||||||
|
${LLCOMMON_SYSTEM_INCLUDE_DIRS}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
### media_plugin_libvlc
|
||||||
|
|
||||||
|
set(media_plugin_libvlc_SOURCE_FILES
|
||||||
|
media_plugin_libvlc.cpp
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library(media_plugin_libvlc
|
||||||
|
SHARED
|
||||||
|
${media_plugin_libvlc_SOURCE_FILES}
|
||||||
|
)
|
||||||
|
|
||||||
|
target_link_libraries(media_plugin_libvlc
|
||||||
|
${LLPLUGIN_LIBRARIES}
|
||||||
|
${MEDIA_PLUGIN_BASE_LIBRARIES}
|
||||||
|
${LLCOMMON_LIBRARIES}
|
||||||
|
${VLC_PLUGIN_LIBRARIES}
|
||||||
|
${PLUGIN_API_WINDOWS_LIBRARIES}
|
||||||
|
)
|
||||||
|
|
||||||
|
set_target_properties(media_plugin_libvlc PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
|
||||||
|
|
||||||
|
if (WINDOWS)
|
||||||
|
if (ADDRESS_SIZE EQUAL 32)
|
||||||
|
set_target_properties(
|
||||||
|
media_plugin_libvlc
|
||||||
|
PROPERTIES
|
||||||
|
LINK_FLAGS "/MANIFEST:NO /SAFESEH:NO"
|
||||||
|
)
|
||||||
|
else (ADDRESS_SIZE EQUAL 32)
|
||||||
|
set_target_properties(
|
||||||
|
media_plugin_libvlc
|
||||||
|
PROPERTIES
|
||||||
|
LINK_FLAGS "/MANIFEST:NO"
|
||||||
|
)
|
||||||
|
endif (ADDRESS_SIZE EQUAL 32)
|
||||||
|
endif (WINDOWS)
|
||||||
|
|
||||||
|
if (DARWIN)
|
||||||
|
# Don't prepend 'lib' to the executable name, and don't embed a full path in the library's install name
|
||||||
|
set_target_properties(
|
||||||
|
media_plugin_libvlc
|
||||||
|
PROPERTIES
|
||||||
|
PREFIX ""
|
||||||
|
BUILD_WITH_INSTALL_RPATH TRUE
|
||||||
|
INSTALL_NAME_DIR "@executable_path"
|
||||||
|
LINK_FLAGS "-exported_symbols_list ${CMAKE_CURRENT_SOURCE_DIR}/../base/media_plugin_base.exp"
|
||||||
|
)
|
||||||
|
|
||||||
|
endif (DARWIN)
|
||||||
713
indra/plugins/libvlc/media_plugin_libvlc.cpp
Normal file
713
indra/plugins/libvlc/media_plugin_libvlc.cpp
Normal file
@@ -0,0 +1,713 @@
|
|||||||
|
// This is an open source non-commercial project. Dear PVS-Studio, please check it.
|
||||||
|
// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
|
||||||
|
/**
|
||||||
|
* @file media_plugin_libvlc.cpp
|
||||||
|
* @brief LibVLC plugin for LLMedia API plugin system
|
||||||
|
*
|
||||||
|
* @cond
|
||||||
|
* $LicenseInfo:firstyear=2008&license=viewerlgpl$
|
||||||
|
* Second Life Viewer Source Code
|
||||||
|
* Copyright (C) 2010, Linden Research, Inc.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public
|
||||||
|
* License as published by the Free Software Foundation;
|
||||||
|
* version 2.1 of the License only.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
|
*
|
||||||
|
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
||||||
|
* $/LicenseInfo$
|
||||||
|
* @endcond
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "linden_common.h"
|
||||||
|
|
||||||
|
#include "llgl.h"
|
||||||
|
#include "llplugininstance.h"
|
||||||
|
#include "llpluginmessage.h"
|
||||||
|
#include "llpluginmessageclasses.h"
|
||||||
|
#include "media_plugin_base.h"
|
||||||
|
|
||||||
|
#include "vlc/vlc.h"
|
||||||
|
#include "vlc/libvlc_version.h"
|
||||||
|
|
||||||
|
#if LL_WINDOWS
|
||||||
|
// needed for waveOut call - see below for description
|
||||||
|
#include <mmsystem.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
class MediaPluginLibVLC :
|
||||||
|
public MediaPluginBase
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
MediaPluginLibVLC(LLPluginInstance::sendMessageFunction host_send_func, void *host_user_data);
|
||||||
|
~MediaPluginLibVLC();
|
||||||
|
|
||||||
|
/*virtual*/ void receiveMessage(const char* message_string) override;
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool init();
|
||||||
|
|
||||||
|
void initVLC();
|
||||||
|
void playMedia();
|
||||||
|
void resetVLC();
|
||||||
|
void setVolume(const F64 volume);
|
||||||
|
void setVolumeVLC();
|
||||||
|
void updateTitle(const char* title);
|
||||||
|
void postLogMessage(const std::string& level, const std::string& msg);
|
||||||
|
|
||||||
|
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
|
||||||
|
/* override, but that is not supported in gcc 4.6 */;
|
||||||
|
|
||||||
|
static void eventCallbacks(const libvlc_event_t* event, void* ptr);
|
||||||
|
|
||||||
|
static void logCallback(void *data, int level, const libvlc_log_t *ctx, const char *fmt, va_list args);
|
||||||
|
|
||||||
|
libvlc_instance_t* mLibVLC;
|
||||||
|
libvlc_media_t* mLibVLCMedia;
|
||||||
|
libvlc_media_player_t* mLibVLCMediaPlayer;
|
||||||
|
|
||||||
|
struct mLibVLCContext
|
||||||
|
{
|
||||||
|
mLibVLCContext() : texture_pixels(nullptr), mp(nullptr), parent(nullptr) {};
|
||||||
|
unsigned char* texture_pixels = nullptr;
|
||||||
|
libvlc_media_player_t* mp = nullptr;
|
||||||
|
MediaPluginLibVLC* parent = nullptr;
|
||||||
|
};
|
||||||
|
struct mLibVLCContext mLibVLCCallbackContext;
|
||||||
|
|
||||||
|
std::string mURL;
|
||||||
|
F64 mCurVolume;
|
||||||
|
|
||||||
|
bool mIsLooping;
|
||||||
|
|
||||||
|
float mCurTime;
|
||||||
|
float mDuration;
|
||||||
|
EStatus mVlcStatus;
|
||||||
|
|
||||||
|
bool mEnableMediaPluginLogging;
|
||||||
|
};
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
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 = nullptr;
|
||||||
|
|
||||||
|
mLibVLC = nullptr;
|
||||||
|
mLibVLCMedia = nullptr;
|
||||||
|
mLibVLCMediaPlayer = nullptr;
|
||||||
|
|
||||||
|
mCurVolume = 0.0;
|
||||||
|
|
||||||
|
mIsLooping = false;
|
||||||
|
|
||||||
|
mCurTime = 0.0;
|
||||||
|
mDuration = 0.0;
|
||||||
|
|
||||||
|
mURL = std::string();
|
||||||
|
|
||||||
|
mEnableMediaPluginLogging = false;
|
||||||
|
|
||||||
|
mVlcStatus = STATUS_NONE;
|
||||||
|
setStatus(STATUS_NONE);
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
MediaPluginLibVLC::~MediaPluginLibVLC()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
void MediaPluginLibVLC::postLogMessage(const std::string& level, const std::string& msg)
|
||||||
|
{
|
||||||
|
if (mEnableMediaPluginLogging)
|
||||||
|
{
|
||||||
|
std::stringstream str;
|
||||||
|
str << "VLC Msg> " << msg;
|
||||||
|
|
||||||
|
LLPluginMessage debug_message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "debug_message");
|
||||||
|
debug_message.setValue("message_text", str.str());
|
||||||
|
debug_message.setValue("message_level", level);
|
||||||
|
sendMessage(debug_message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
void* MediaPluginLibVLC::lock(void* data, void** p_pixels)
|
||||||
|
{
|
||||||
|
struct mLibVLCContext* context = (mLibVLCContext*)data;
|
||||||
|
|
||||||
|
*p_pixels = context->texture_pixels;
|
||||||
|
|
||||||
|
return nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
/////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
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.
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
void MediaPluginLibVLC::display(void* data, void* id)
|
||||||
|
{
|
||||||
|
struct mLibVLCContext* context = (mLibVLCContext*)data;
|
||||||
|
|
||||||
|
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
|
||||||
|
};
|
||||||
|
|
||||||
|
#if LL_DARWIN
|
||||||
|
setenv("VLC_PLUGIN_PATH", ".", 1);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int vlc_argc = sizeof(vlc_argv) / sizeof(*vlc_argv);
|
||||||
|
mLibVLC = libvlc_new(vlc_argc, vlc_argv);
|
||||||
|
|
||||||
|
if (!mLibVLC)
|
||||||
|
{
|
||||||
|
postLogMessage("warn", "Failed to initialize VLC");
|
||||||
|
setStatus(STATUS_ERROR);
|
||||||
|
return;
|
||||||
|
// for the moment, if this fails, the plugin will fail and
|
||||||
|
// the media sub-system will tell the viewer something went wrong.
|
||||||
|
}
|
||||||
|
libvlc_log_set(mLibVLC, logCallback, this);
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
void MediaPluginLibVLC::resetVLC()
|
||||||
|
{
|
||||||
|
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");
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
sendMessage(message);
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
void MediaPluginLibVLC::eventCallbacks(const libvlc_event_t* event, void* ptr)
|
||||||
|
{
|
||||||
|
MediaPluginLibVLC* parent = (MediaPluginLibVLC*)ptr;
|
||||||
|
if (parent == nullptr)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (event->type)
|
||||||
|
{
|
||||||
|
case libvlc_MediaPlayerOpening:
|
||||||
|
parent->postLogMessage("info", "Media loading");
|
||||||
|
parent->mVlcStatus = STATUS_LOADING;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerPlaying:
|
||||||
|
parent->postLogMessage("info", "Media playing");
|
||||||
|
parent->mDuration = (float)(libvlc_media_get_duration(parent->mLibVLCMedia)) / 1000.0f;
|
||||||
|
parent->mVlcStatus = STATUS_PLAYING;
|
||||||
|
parent->setVolumeVLC();
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerPaused:
|
||||||
|
parent->mVlcStatus = STATUS_PAUSED;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerStopped:
|
||||||
|
parent->mVlcStatus = STATUS_DONE;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerEndReached:
|
||||||
|
parent->mVlcStatus = STATUS_DONE;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerEncounteredError:
|
||||||
|
parent->mVlcStatus = STATUS_ERROR;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerTimeChanged:
|
||||||
|
parent->postLogMessage("info", "Media time changed");
|
||||||
|
parent->mCurTime = (float)libvlc_media_player_get_time(parent->mLibVLCMediaPlayer) / 1000.0f;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerPositionChanged:
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerLengthChanged:
|
||||||
|
parent->postLogMessage("info", "Media length changed");
|
||||||
|
parent->mDuration = (float)libvlc_media_get_duration(parent->mLibVLCMedia) / 1000.0f;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case libvlc_MediaPlayerTitleChanged:
|
||||||
|
{
|
||||||
|
parent->postLogMessage("info", "Media title getting metadata");
|
||||||
|
char* title = libvlc_media_get_meta(parent->mLibVLCMedia, libvlc_meta_Title);
|
||||||
|
if (title)
|
||||||
|
{
|
||||||
|
parent->updateTitle(title);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void MediaPluginLibVLC::logCallback(void *data, int level, const libvlc_log_t *ctx, const char *fmt, va_list args)
|
||||||
|
{
|
||||||
|
MediaPluginLibVLC* parent = (MediaPluginLibVLC*) data;
|
||||||
|
|
||||||
|
char tstr[4096];
|
||||||
|
std::vsnprintf(tstr, 4096, fmt, args);
|
||||||
|
std::stringstream out;
|
||||||
|
out << tstr;
|
||||||
|
parent->postLogMessage("info", out.str());
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
void MediaPluginLibVLC::playMedia()
|
||||||
|
{
|
||||||
|
if (mURL.length() == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mLibVLCMediaPlayer)
|
||||||
|
{
|
||||||
|
// stop listening to events while we reset things
|
||||||
|
libvlc_event_manager_t* em = libvlc_media_player_event_manager(mLibVLCMediaPlayer);
|
||||||
|
if (em)
|
||||||
|
{
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerOpening, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerPlaying, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerPaused, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerStopped, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerEndReached, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerEncounteredError, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerTimeChanged, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerPositionChanged, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerLengthChanged, eventCallbacks, nullptr);
|
||||||
|
libvlc_event_detach(em, libvlc_MediaPlayerTitleChanged, eventCallbacks, nullptr);
|
||||||
|
};
|
||||||
|
|
||||||
|
libvlc_media_player_stop(mLibVLCMediaPlayer);
|
||||||
|
libvlc_media_player_release(mLibVLCMediaPlayer);
|
||||||
|
|
||||||
|
mLibVLCMediaPlayer = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mLibVLCMedia)
|
||||||
|
{
|
||||||
|
libvlc_media_release(mLibVLCMedia);
|
||||||
|
|
||||||
|
mLibVLCMedia = nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
mLibVLCMedia = libvlc_media_new_location(mLibVLC, mURL.c_str());
|
||||||
|
if (!mLibVLCMedia)
|
||||||
|
{
|
||||||
|
mLibVLCMediaPlayer = nullptr;
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
|
||||||
|
libvlc_video_set_callbacks(mLibVLCMediaPlayer, lock, unlock, display, &mLibVLCCallbackContext);
|
||||||
|
libvlc_video_set_format(mLibVLCMediaPlayer, "RV32", mWidth, mHeight, mWidth * mDepth);
|
||||||
|
|
||||||
|
// 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=-1");
|
||||||
|
}
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
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 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
|
||||||
|
// 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);
|
||||||
|
#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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
void MediaPluginLibVLC::setVolume(const F64 volume)
|
||||||
|
{
|
||||||
|
mCurVolume = volume;
|
||||||
|
|
||||||
|
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 == "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 = nullptr;
|
||||||
|
|
||||||
|
mPixels = nullptr;
|
||||||
|
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;
|
||||||
|
|
||||||
|
playMedia();
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
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_name == "enable_media_plugin_debugging")
|
||||||
|
{
|
||||||
|
mEnableMediaPluginLogging = message_in.getValueBoolean("enable");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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)
|
||||||
|
{
|
||||||
|
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 (mDuration > 0)
|
||||||
|
{
|
||||||
|
F64 normalized_offset = message_in.getValueReal("time") / mDuration;
|
||||||
|
libvlc_media_player_set_position(mLibVLCMediaPlayer, normalized_offset);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (message_name == "set_loop")
|
||||||
|
{
|
||||||
|
mIsLooping = true;
|
||||||
|
}
|
||||||
|
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);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
};
|
||||||
|
|
||||||
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
|
//
|
||||||
|
int init_media_plugin(LLPluginInstance::sendMessageFunction host_send_func,
|
||||||
|
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;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user