X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=protocol%2Famcp%2FAMCPCommandsImpl.cpp;h=c16087b205039d95e209be068e4c386b939479b9;hb=8149170b1061536ab991fea3bbd4d033f154303e;hp=726e4bdfdfa2b054ee6b2a2d4f9b49eb450d22a7;hpb=d3c39d4f68af2362fdb4799e826b978ffbb45bf2;p=casparcg diff --git a/protocol/amcp/AMCPCommandsImpl.cpp b/protocol/amcp/AMCPCommandsImpl.cpp index 726e4bdfd..c16087b20 100644 --- a/protocol/amcp/AMCPCommandsImpl.cpp +++ b/protocol/amcp/AMCPCommandsImpl.cpp @@ -1,43 +1,58 @@ /* -* copyright (c) 2010 Sveriges Television AB +* Copyright (c) 2011 Sveriges Television AB * -* This file is part of CasparCG. +* This file is part of CasparCG (www.casparcg.com). * -* CasparCG is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. +* CasparCG is free software: you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation, either version 3 of the License, or +* (at your option) any later version. * -* CasparCG 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 General Public License for more details. - -* You should have received a copy of the GNU General Public License -* along with CasparCG. If not, see . +* CasparCG 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 General Public License for more details. +* +* You should have received a copy of the GNU General Public License +* along with CasparCG. If not, see . * +* Author: Nicklas P Andersson */ #include "../StdAfx.h" +#if defined(_MSC_VER) +#pragma warning (push, 1) // TODO: Legacy code, just disable warnings +#endif + #include "AMCPCommandsImpl.h" #include "AMCPProtocolStrategy.h" #include #include +#include +#include +#include #include #include #include -#include -#include +#include +#include +#include #include #include +#include +#include +#include #include +#include #include #include +#include +#include #include #include @@ -50,10 +65,7 @@ #include #include #include - -#if defined(_MSC_VER) -#pragma warning (push, 1) // TODO: Legacy code, just disable warnings -#endif +#include /* Return codes @@ -81,52 +93,54 @@ namespace caspar { namespace protocol { using namespace core; +std::wstring MediaInfo(const boost::filesystem::wpath& path) +{ + if(boost::filesystem::is_regular_file(path)) + { + std::wstring clipttype = TEXT(" N/A "); + std::wstring extension = boost::to_upper_copy(path.extension()); + if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" || + extension == L"GIF" || extension == L"BMP") + clipttype = TEXT(" STILL "); + else if(extension == TEXT(".WAV") || extension == TEXT(".MP3")) + clipttype = TEXT(" STILL "); + else if(caspar::ffmpeg::is_valid_file(path.file_string()) || extension == L".CT") + clipttype = TEXT(" MOVIE "); + + if(clipttype != TEXT(" N/A ")) + { + auto is_not_digit = [](char c){ return std::isdigit(c) == 0; }; + + auto relativePath = boost::filesystem::wpath(path.file_string().substr(env::media_folder().size()-1, path.file_string().size())); + + auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(path))); + writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end()); + auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end()); + + auto sizeStr = boost::lexical_cast(boost::filesystem::file_size(path)); + sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end()); + auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end()); + + auto str = relativePath.replace_extension(TEXT("")).external_file_string(); + if(str[0] == '\\' || str[0] == '/') + str = std::wstring(str.begin() + 1, str.end()); + + return std::wstring() + TEXT("\"") + str + + + TEXT("\" ") + clipttype + + + TEXT(" ") + sizeStr + + + TEXT(" ") + writeTimeWStr + + + TEXT("\r\n"); + } + } + return L""; +} + std::wstring ListMedia() { std::wstringstream replyString; - for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) - { - if(boost::filesystem::is_regular_file(itr->path())) - { - std::wstring clipttype = TEXT(" N/A "); - std::wstring extension = boost::to_upper_copy(itr->path().extension()); - if(extension == TEXT(".TGA") || extension == TEXT(".COL") || extension == L".PNG" || extension == L".JPEG" || extension == L".JPG" || - extension == L"GIF" || extension == L"BMP") - clipttype = TEXT(" STILL "); - else if(extension == TEXT(".SWF") || extension == TEXT(".DV") || extension == TEXT(".MOV") || extension == TEXT(".MPG") || - extension == TEXT(".AVI") || extension == TEXT(".FLV") || extension == TEXT(".F4V") || extension == TEXT(".MP4") || - extension == L".M2V" || extension == L".H264" || extension == L".MKV" || extension == L".WMV" || extension == L".DIVX" || - extension == L".XVID" || extension == L".OGG") - clipttype = TEXT(" MOVIE "); - else if(extension == TEXT(".WAV") || extension == TEXT(".MP3")) - clipttype = TEXT(" STILL "); - - if(clipttype != TEXT(" N/A ")) - { - auto is_not_digit = [](char c){ return std::isdigit(c) == 0; }; - - auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::media_folder().size()-1, itr->path().file_string().size())); - - auto writeTimeStr = boost::posix_time::to_iso_string(boost::posix_time::from_time_t(boost::filesystem::last_write_time(itr->path()))); - writeTimeStr.erase(std::remove_if(writeTimeStr.begin(), writeTimeStr.end(), is_not_digit), writeTimeStr.end()); - auto writeTimeWStr = std::wstring(writeTimeStr.begin(), writeTimeStr.end()); - - auto sizeStr = boost::lexical_cast(boost::filesystem::file_size(itr->path())); - sizeStr.erase(std::remove_if(sizeStr.begin(), sizeStr.end(), is_not_digit), sizeStr.end()); - auto sizeWStr = std::wstring(sizeStr.begin(), sizeStr.end()); - - auto str = relativePath.replace_extension(TEXT("")).external_file_string(); - if(str[0] == '\\' || str[0] == '/') - str = std::wstring(str.begin() + 1, str.end()); - - replyString << TEXT("\"") << str - << TEXT("\" ") << clipttype - << TEXT(" ") << sizeStr - << TEXT(" ") << writeTimeWStr - << TEXT("\r\n"); - } - } - } + for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) + replyString << MediaInfo(itr->path()); + return boost::to_upper_copy(replyString.str()); } @@ -136,7 +150,7 @@ std::wstring ListTemplates() for (boost::filesystem::wrecursive_directory_iterator itr(env::template_folder()), end; itr != end; ++itr) { - if(boost::filesystem::is_regular_file(itr->path()) && itr->path().extension() == L".ft") + if(boost::filesystem::is_regular_file(itr->path()) && (itr->path().extension() == L".ft" || itr->path().extension() == L".ct")) { auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::template_folder().size()-1, itr->path().file_string().size())); @@ -189,27 +203,62 @@ void AMCPCommand::Clear() _parameters.clear(); } -bool ParamCommand::DoExecute() +bool DiagnosticsCommand::DoExecute() +{ + try + { + diagnostics::show_graphs(true); + + SetReplyString(TEXT("202 DIAG OK\r\n")); + + return true; + } + catch(...) + { + CASPAR_LOG_CURRENT_EXCEPTION(); + SetReplyString(TEXT("502 DIAG FAILED\r\n")); + return false; + } +} + +bool CallCommand::DoExecute() { //Perform loading of the clip try { - auto what = _parameters.at(2); + auto what = _parameters.at(0); + + std::wstring param = _parameters2.at(1); + for(auto it = std::begin(_parameters2)+2; it != std::end(_parameters2); ++it) + param += L" " + *it; + + boost::unique_future result; if(what == L"B") - GetChannel()->stage()->background(GetLayerIndex()).get()->param(_parameters.at(3)); + result = GetChannel()->stage()->call(GetLayerIndex(), false, param); else if(what == L"F") - GetChannel()->stage()->foreground(GetLayerIndex()).get()->param(_parameters.at(3)); + result = GetChannel()->stage()->call(GetLayerIndex(), true, param); + else + result = GetChannel()->stage()->call(GetLayerIndex(), true, _parameters.at(0) + L" " + param); - CASPAR_LOG(info) << "Executed param: " << _parameters[0] << TEXT(" successfully"); + if(!result.timed_wait(boost::posix_time::seconds(2))) + BOOST_THROW_EXCEPTION(timed_out()); - SetReplyString(TEXT("202 PARAM OK\r\n")); + CASPAR_LOG(info) << "Executed call: " << _parameters[0] << TEXT(" successfully"); + + std::wstringstream replyString; + if(result.get().empty()) + replyString << TEXT("202 CALL OK\r\n"); + else + replyString << TEXT("201 CALL OK\r\n") << result.get() << L"\r\n"; + + SetReplyString(replyString.str()); return true; } catch(...) { CASPAR_LOG_CURRENT_EXCEPTION(); - SetReplyString(TEXT("502 PARAM FAILED\r\n")); + SetReplyString(TEXT("502 CALL FAILED\r\n")); return false; } } @@ -219,240 +268,202 @@ bool MixerCommand::DoExecute() //Perform loading of the clip try { - if(_parameters[0] == L"VIDEO") + if(_parameters[0] == L"KEYER" || _parameters[0] == L"IS_KEY") { - if(_parameters[1] == L"IS_KEY") + bool value = lexical_cast_or_default(_parameters.at(1), false); + auto transform = [=](frame_transform transform) -> frame_transform { - bool value = lexical_cast_or_default(_parameters.at(2), false); - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_is_key(value); - return transform; - }; + transform.is_key = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform); - } - else if(_parameters[1] == L"OPACITY") - { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform); + } + else if(_parameters[0] == L"OPACITY") + { + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; - double value = boost::lexical_cast(_parameters.at(2)); + double value = boost::lexical_cast(_parameters.at(1)); - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_opacity(value); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"GAIN") + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - double value = boost::lexical_cast(_parameters.at(2)); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_gain(value); - return transform; - }; + transform.opacity = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"FILL_RECT") + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"FILL" || _parameters[0] == L"FILL_RECT") + { + int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0; + std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear"; + double x = boost::lexical_cast(_parameters.at(1)); + double y = boost::lexical_cast(_parameters.at(2)); + double x_s = boost::lexical_cast(_parameters.at(3)); + double y_s = boost::lexical_cast(_parameters.at(4)); + + auto transform = [=](frame_transform transform) mutable -> frame_transform { - int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0; - std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear"; - double x = boost::lexical_cast(_parameters.at(2)); - double y = boost::lexical_cast(_parameters.at(3)); - double x_s = boost::lexical_cast(_parameters.at(4)); - double y_s = boost::lexical_cast(_parameters.at(5)); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_fill_translation(x, y); - transform.set_fill_scale(x_s, y_s); - transform.set_clip_translation(x, y); - transform.set_clip_scale(x_s, y_s); - return transform; - }; + transform.fill_translation[0] = x; + transform.fill_translation[1] = y; + transform.fill_scale[0] = x_s; + transform.fill_scale[1] = y_s; + transform.clip_translation[0] = x; + transform.clip_translation[1] = y; + transform.clip_scale[0] = x_s; + transform.clip_scale[1] = y_s; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"CLIP_RECT") + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"CLIP" || _parameters[0] == L"CLIP_RECT") + { + int duration = _parameters.size() > 5 ? lexical_cast_or_default(_parameters[5], 0) : 0; + std::wstring tween = _parameters.size() > 6 ? _parameters[6] : L"linear"; + double x = boost::lexical_cast(_parameters.at(1)); + double y = boost::lexical_cast(_parameters.at(2)); + double x_s = boost::lexical_cast(_parameters.at(3)); + double y_s = boost::lexical_cast(_parameters.at(4)); + + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0; - std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear"; - double x = boost::lexical_cast(_parameters.at(2)); - double y = boost::lexical_cast(_parameters.at(3)); - double x_s = boost::lexical_cast(_parameters.at(4)); - double y_s = boost::lexical_cast(_parameters.at(5)); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_clip_translation(x, y); - transform.set_clip_scale(x_s, y_s); - return transform; - }; + transform.clip_translation[0] = x; + transform.clip_translation[1] = y; + transform.clip_scale[0] = x_s; + transform.clip_scale[1] = y_s; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"GRID") + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"GRID") + { + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + int n = boost::lexical_cast(_parameters.at(1)); + double delta = 1.0/static_cast(n); + for(int x = 0; x < n; ++x) { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - int n = boost::lexical_cast(_parameters.at(2)); - double delta = 1.0/static_cast(n); - for(int x = 0; x < n; ++x) + for(int y = 0; y < n; ++y) { - for(int y = 0; y < n; ++y) - { - int index = x+y*n+1; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_fill_translation(x*delta, y*delta); - transform.set_fill_scale(delta, delta); - transform.set_clip_translation(x*delta, y*delta); - transform.set_clip_scale(delta, delta); - return transform; - }; - GetChannel()->mixer()->apply_image_transform(index, transform, duration, tween); - } + int index = x+y*n+1; + auto transform = [=](frame_transform transform) -> frame_transform + { + transform.fill_translation[0] = x*delta; + transform.fill_translation[1] = y*delta; + transform.fill_scale[0] = delta; + transform.fill_scale[1] = delta; + transform.clip_translation[0] = x*delta; + transform.clip_translation[1] = y*delta; + transform.clip_scale[0] = delta; + transform.clip_scale[1] = delta; + return transform; + }; + GetChannel()->stage()->apply_frame_transform(index, transform, duration, tween); } } - else if(_parameters[1] == L"BLEND") - { - auto blend_str = _parameters.at(2); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_blend_mode(get_blend_mode(blend_str)); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform); - } - else if(_parameters[1] == L"ALPHA") - { - auto blend_str = _parameters.at(2); - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_alpha_mode(get_alpha_mode(blend_str)); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform); - } - else if(_parameters[1] == L"BRIGHTNESS") - { - auto value = boost::lexical_cast(_parameters.at(2)); - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_brightness(value); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"SATURATION") + } + else if(_parameters[0] == L"BLEND") + { + auto blend_str = _parameters.at(1); + int layer = GetLayerIndex(); + GetChannel()->mixer()->set_blend_mode(GetLayerIndex(), get_blend_mode(blend_str)); + } + else if(_parameters[0] == L"BRIGHTNESS") + { + auto value = boost::lexical_cast(_parameters.at(1)); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + auto transform = [=](frame_transform transform) -> frame_transform { - auto value = boost::lexical_cast(_parameters.at(2)); - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_saturation(value); - return transform; - }; + transform.brightness = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"CONTRAST") + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"SATURATION") + { + auto value = boost::lexical_cast(_parameters.at(1)); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + auto transform = [=](frame_transform transform) -> frame_transform { - auto value = boost::lexical_cast(_parameters.at(2)); - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_contrast(value); - return transform; - }; + transform.saturation = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"LEVELS") + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"CONTRAST") + { + auto value = boost::lexical_cast(_parameters.at(1)); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + auto transform = [=](frame_transform transform) -> frame_transform { - image_transform::levels value; - value.min_input = boost::lexical_cast(_parameters.at(2)); - value.max_input = boost::lexical_cast(_parameters.at(3)); - value.gamma = boost::lexical_cast(_parameters.at(4)); - value.min_output = boost::lexical_cast(_parameters.at(5)); - value.max_output = boost::lexical_cast(_parameters.at(6)); - int duration = _parameters.size() > 7 ? lexical_cast_or_default(_parameters[7], 0) : 0; - std::wstring tween = _parameters.size() > 8 ? _parameters[8] : L"linear"; - - auto transform = [=](image_transform transform) -> image_transform - { - transform.set_levels(value); - return transform; - }; + transform.contrast = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_image_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"RESET") + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"LEVELS") + { + levels value; + value.min_input = boost::lexical_cast(_parameters.at(1)); + value.max_input = boost::lexical_cast(_parameters.at(2)); + value.gamma = boost::lexical_cast(_parameters.at(3)); + value.min_output = boost::lexical_cast(_parameters.at(4)); + value.max_output = boost::lexical_cast(_parameters.at(5)); + int duration = _parameters.size() > 6 ? lexical_cast_or_default(_parameters[6], 0) : 0; + std::wstring tween = _parameters.size() > 7 ? _parameters[7] : L"linear"; + + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; - std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + transform.levels = value; + return transform; + }; - int layer = GetLayerIndex(); - GetChannel()->mixer()->set_image_transform(GetLayerIndex(), image_transform(), duration, tween); - } + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); } - else if(_parameters[0] == L"AUDIO") + else if(_parameters[0] == L"VOLUME") { - if(_parameters[1] == L"GAIN") - { - int duration = _parameters.size() > 3 ? lexical_cast_or_default(_parameters[3], 0) : 0; - std::wstring tween = _parameters.size() > 4 ? _parameters[4] : L"linear"; - double value = boost::lexical_cast(_parameters[2]); + int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; + std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; + double value = boost::lexical_cast(_parameters[1]); - auto transform = [=](audio_transform transform) -> audio_transform - { - transform.set_gain(value); - return transform; - }; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->apply_audio_transform(GetLayerIndex(), transform, duration, tween); - } - else if(_parameters[1] == L"RESET") + auto transform = [=](frame_transform transform) -> frame_transform { - int duration = _parameters.size() > 2 ? lexical_cast_or_default(_parameters[2], 0) : 0; - std::wstring tween = _parameters.size() > 3 ? _parameters[3] : L"linear"; - - int layer = GetLayerIndex(); - GetChannel()->mixer()->set_audio_transform(GetLayerIndex(), audio_transform(), duration, tween); - } + transform.volume = value; + return transform; + }; + + int layer = GetLayerIndex(); + GetChannel()->stage()->apply_frame_transform(GetLayerIndex(), transform, duration, tween); + } + else if(_parameters[0] == L"CLEAR") + { + int layer = GetLayerIndex(std::numeric_limits::max()); + if(layer == std::numeric_limits::max()) + GetChannel()->stage()->clear_transforms(); + else + GetChannel()->stage()->clear_transforms(layer); } - else if(_parameters[0] == L"RESET") + else { - GetChannel()->mixer()->reset_transforms(); + SetReplyString(TEXT("404 MIXER ERROR\r\n")); + return false; } SetReplyString(TEXT("202 MIXER OK\r\n")); @@ -489,13 +500,13 @@ bool SwapCommand::DoExecute() int l1 = GetLayerIndex(); int l2 = boost::lexical_cast(strs.at(1)); - ch1->stage()->swap_layer(l1, l2, *ch2->stage()); + ch1->stage()->swap_layer(l1, l2, ch2->stage()); } else { auto ch1 = GetChannel(); auto ch2 = GetChannels().at(boost::lexical_cast(_parameters[0])-1); - ch1->stage()->swap(*ch2->stage()); + ch1->stage()->swap_layers(ch2->stage()); } CASPAR_LOG(info) << "Swapped successfully"; @@ -523,7 +534,8 @@ bool AddCommand::DoExecute() //Perform loading of the clip try { - GetChannel()->output()->add(GetLayerIndex(), create_consumer(_parameters)); + auto consumer = create_consumer(_parameters); + GetChannel()->output()->add(GetLayerIndex(consumer->index()), consumer); CASPAR_LOG(info) << "Added " << _parameters[0] << TEXT(" successfully"); @@ -550,7 +562,11 @@ bool RemoveCommand::DoExecute() //Perform loading of the clip try { - GetChannel()->output()->remove(GetLayerIndex()); + auto index = GetLayerIndex(std::numeric_limits::min()); + if(index == std::numeric_limits::min()) + index = create_consumer(_parameters)->index(); + + GetChannel()->output()->remove(index); SetReplyString(TEXT("202 REMOVE OK\r\n")); @@ -588,13 +604,13 @@ bool LoadCommand::DoExecute() catch(file_not_found&) { CASPAR_LOG_CURRENT_EXCEPTION(); - SetReplyString(TEXT("404 LOADBG ERROR\r\n")); + SetReplyString(TEXT("404 LOAD ERROR\r\n")); return false; } catch(...) { CASPAR_LOG_CURRENT_EXCEPTION(); - SetReplyString(TEXT("502 LOADBG FAILED\r\n")); + SetReplyString(TEXT("502 LOAD FAILED\r\n")); return false; } } @@ -630,7 +646,7 @@ bool LoadCommand::DoExecute() // std::wstring filename = templatename; // filename.append(extension); // -// flash::get_default_cg_producer(info.video_channel, std::max(DEFAULT_CHANNEL_LAYER+1, info.layer_index)) +// flash::flash::get_default_cg_producer(info.video_channel, std::max(DEFAULT_CHANNEL_LAYER+1, info.layer_index)) // ->add(flash_layer_index, filename, play_on_load, start_label, data); // // CASPAR_LOG(info) << L"Executed [amcp_channel_cg_add]"; @@ -690,7 +706,7 @@ bool LoadbgCommand::DoExecute() bool auto_play = std::find(_parameters.begin(), _parameters.end(), L"AUTO") != _parameters.end(); - auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().mode, pFP, transitionInfo); + auto pFP2 = create_transition_producer(GetChannel()->get_video_format_desc().field_mode, pFP, transitionInfo); GetChannel()->stage()->load(GetLayerIndex(), pFP2, false, auto_play ? transitionInfo.duration : -1); // TODO: LOOP CASPAR_LOG(info) << "Loaded " << _parameters[0] << TEXT(" successfully to background"); @@ -791,7 +807,7 @@ bool ClearCommand::DoExecute() bool PrintCommand::DoExecute() { - GetChannel()->output()->add(99978, create_consumer(boost::assign::list_of(L"IMAGE"))); + GetChannel()->output()->add(create_consumer(boost::assign::list_of(L"IMAGE"))); SetReplyString(TEXT("202 PRINT OK\r\n")); @@ -922,14 +938,14 @@ bool CGCommand::DoExecuteAdd() { } } - std::wstring fullFilename = find_flash_template(env::template_folder() + _parameters[2]); + std::wstring fullFilename = flash::find_template(env::template_folder() + _parameters[2]); if(!fullFilename.empty()) { std::wstring extension = boost::filesystem::wpath(fullFilename).extension(); std::wstring filename = _parameters[2]; filename.append(extension); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT("")); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->add(layer, filename, bDoStart, label, (pDataString!=0) ? pDataString : TEXT("")); SetReplyString(TEXT("202 CG OK\r\n")); } else @@ -950,7 +966,7 @@ bool CGCommand::DoExecutePlay() return false; } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->play(layer); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->play(layer); } else { @@ -972,7 +988,7 @@ bool CGCommand::DoExecuteStop() return false; } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->stop(layer, 0); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->stop(layer, 0); } else { @@ -993,8 +1009,9 @@ bool CGCommand::DoExecuteNext() SetReplyString(TEXT("403 CG ERROR\r\n")); return false; } + int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->next(layer); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->next(layer); } else { @@ -1015,8 +1032,9 @@ bool CGCommand::DoExecuteRemove() SetReplyString(TEXT("403 CG ERROR\r\n")); return false; } + int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->remove(layer); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->remove(layer); } else { @@ -1030,25 +1048,47 @@ bool CGCommand::DoExecuteRemove() bool CGCommand::DoExecuteClear() { - GetChannel()->stage()->clear(GetLayerIndex(cg_producer::DEFAULT_LAYER)); + GetChannel()->stage()->clear(GetLayerIndex(flash::cg_producer::DEFAULT_LAYER)); SetReplyString(TEXT("202 CG OK\r\n")); return true; } bool CGCommand::DoExecuteUpdate() { - if(_parameters.size() > 2) + try { - if(!ValidateLayer(_parameters[1])) + if(!ValidateLayer(_parameters.at(1))) { SetReplyString(TEXT("403 CG ERROR\r\n")); return false; } - int layer = _ttoi(_parameters[1].c_str()); - //TODO: Implement indirect data loading from file. Same as in Add - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->update(layer, _parameters2[2]); + + std::wstring dataString = _parameters2.at(2); + if(dataString.at(0) != TEXT('<')) + { + //The data is not an XML-string, it must be a filename + std::wstring filename = env::data_folder(); + filename.append(dataString); + filename.append(TEXT(".ftd")); + + //open file + std::wifstream datafile(filename.c_str()); + if(datafile) + { + std::wstringstream data; + //read all data + data << datafile.rdbuf(); + datafile.close(); + + //extract data to _parameters + dataString = data.str(); + } + } + + int layer = _ttoi(_parameters.at(1).c_str()); + flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->update(layer, dataString); } - else + catch(...) { SetReplyString(TEXT("402 CG ERROR\r\n")); return true; @@ -1060,6 +1100,9 @@ bool CGCommand::DoExecuteUpdate() bool CGCommand::DoExecuteInvoke() { + std::wstringstream replyString; + replyString << TEXT("201 CG OK\r\n"); + if(_parameters.size() > 2) { if(!ValidateLayer(_parameters[1])) @@ -1068,23 +1111,44 @@ bool CGCommand::DoExecuteInvoke() return false; } int layer = _ttoi(_parameters[1].c_str()); - get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]); + auto result = flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->invoke(layer, _parameters2[2]); + replyString << result << TEXT("\r\n"); } else { SetReplyString(TEXT("402 CG ERROR\r\n")); return true; } - - SetReplyString(TEXT("202 CG OK\r\n")); + + SetReplyString(replyString.str()); return true; } bool CGCommand::DoExecuteInfo() { - // TODO - //get_default_cg_producer(GetChannel())->Info(); - SetReplyString(TEXT("600 CG FAILED\r\n")); + std::wstringstream replyString; + replyString << TEXT("201 CG OK\r\n"); + + if(_parameters.size() > 1) + { + if(!ValidateLayer(_parameters[1])) + { + SetReplyString(TEXT("403 CG ERROR\r\n")); + return false; + } + + int layer = _ttoi(_parameters[1].c_str()); + auto desc = flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->description(layer); + + replyString << desc << TEXT("\r\n"); + } + else + { + auto info = flash::get_default_cg_producer(safe_ptr(GetChannel()), GetLayerIndex(flash::cg_producer::DEFAULT_LAYER))->template_host_info(); + replyString << info << TEXT("\r\n"); + } + + SetReplyString(replyString.str()); return true; } @@ -1121,7 +1185,7 @@ bool DataCommand::DoExecuteStore() return false; } - datafile << _parameters[2]; + datafile << _parameters2[2]; datafile.close(); std::wstring replyString = TEXT("202 DATA STORE OK\r\n"); @@ -1171,7 +1235,24 @@ bool DataCommand::DoExecuteList() { std::wstringstream replyString; replyString << TEXT("200 DATA LIST OK\r\n"); - replyString << ListMedia(); + + for (boost::filesystem::wrecursive_directory_iterator itr(env::data_folder()), end; itr != end; ++itr) + { + if(boost::filesystem::is_regular_file(itr->path())) + { + if(!boost::iequals(itr->path().extension(), L".ftd")) + continue; + + auto relativePath = boost::filesystem::wpath(itr->path().file_string().substr(env::data_folder().size()-1, itr->path().file_string().size())); + + auto str = relativePath.replace_extension(TEXT("")).external_file_string(); + if(str[0] == '\\' || str[0] == '/') + str = std::wstring(str.begin() + 1, str.end()); + + replyString << str << TEXT("\r\n"); + } + } + replyString << TEXT("\r\n"); SetReplyString(boost::to_upper_copy(replyString.str())); @@ -1181,30 +1262,34 @@ bool DataCommand::DoExecuteList() bool CinfCommand::DoExecute() { std::wstringstream replyString; + + try + { + std::wstring info; + for (boost::filesystem::wrecursive_directory_iterator itr(env::media_folder()), end; itr != end; ++itr) + { + auto path = itr->path(); + auto file = path.replace_extension(L"").filename(); + if(boost::iequals(file, _parameters.at(0))) + info += MediaInfo(itr->path()) + L"\r\n"; + } - std::wstring filename = _parameters[0]; - - // TODO: - - //FileInfo fileInfo; - - //MediaManagerPtr pMediaManager = GetApplication()->FindMediaFile(filename, &fileInfo); - //if(pMediaManager != 0 && fileInfo.filetype.length() >0) //File was found - //{ - // if(pMediaManager->getFileInfo(&fileInfo)) - // { - // TCHAR numBuffer[32]; - // _ui64tot_s(fileInfo.size, numBuffer, 32, 10); - - // replyString << TEXT("201 CINF OK\r\n\"") << fileInfo.filename << TEXT("\" ") << fileInfo.type << TEXT("/") << fileInfo.filetype << TEXT("/") << fileInfo.encoding << TEXT(" ") << numBuffer << TEXT("\r\n"); - - // SetReplyString(replyString.str()); - // return true; - // } - //} - - SetReplyString(TEXT("404 CINF ERROR\r\n")); - return false; + if(info.empty()) + { + SetReplyString(TEXT("404 CINF ERROR\r\n")); + return false; + } + replyString << TEXT("200 CINF OK\r\n"); + replyString << info << "\r\n"; + } + catch(...) + { + SetReplyString(TEXT("404 CINF ERROR\r\n")); + return false; + } + + SetReplyString(replyString.str()); + return true; } void GenerateChannelInfo(int index, const safe_ptr& pChannel, std::wstringstream& replyString) @@ -1215,30 +1300,137 @@ void GenerateChannelInfo(int index, const safe_ptr& pChanne bool InfoCommand::DoExecute() { std::wstringstream replyString; + + boost::property_tree::xml_writer_settings w(' ', 3); - if(_parameters.size() >= 1) + try { - int channelIndex = _ttoi(_parameters[0].c_str())-1; + if(_parameters.size() >= 1 && _parameters[0] == L"TEMPLATE") + { + replyString << L"201 INFO TEMPLATE OK\r\n"; - if(channelIndex < channels_.size()) + // Needs to be extended for any file, not just flash. + + auto filename = flash::find_template(env::template_folder() + _parameters.at(1)); + + std::wstringstream str; + str << widen(flash::read_template_meta_info(filename)); + boost::property_tree::wptree info; + boost::property_tree::xml_parser::read_xml(str, info, boost::property_tree::xml_parser::trim_whitespace | boost::property_tree::xml_parser::no_comments); + + boost::property_tree::xml_parser::write_xml(replyString, info, w); + } + else if(_parameters.size() >= 1 && _parameters[0] == L"CONFIG") + { + replyString << L"201 INFO CONFIG OK\r\n"; + + boost::property_tree::write_xml(replyString, caspar::env::properties(), w); + } + else if(_parameters.size() >= 1 && _parameters[0] == L"PATHS") { - replyString << TEXT("201 INFO OK\r\n"); - GenerateChannelInfo(channelIndex, channels_[channelIndex], replyString); + replyString << L"201 INFO PATHS OK\r\n"; + + boost::property_tree::wptree info; + info.add_child(L"paths", caspar::env::properties().get_child(L"configuration.paths")); + info.add(L"paths.initial-path", boost::filesystem2::initial_path().directory_string() + L"\\"); + + boost::property_tree::write_xml(replyString, info, w); } - else + else if(_parameters.size() >= 1 && _parameters[0] == L"SYSTEM") { - SetReplyString(TEXT("401 INFO ERROR\r\n")); - return false; + replyString << L"201 INFO SYSTEM OK\r\n"; + + boost::property_tree::wptree info; + + info.add(L"system.name", caspar::get_system_product_name()); + info.add(L"system.windows.name", caspar::get_win_product_name()); + info.add(L"system.windows.service-pack", caspar::get_win_sp_version()); + info.add(L"system.cpu", caspar::get_cpu_info()); + + BOOST_FOREACH(auto device, caspar::decklink::get_device_list()) + info.add(L"system.decklink.device", device); + + BOOST_FOREACH(auto device, caspar::bluefish::get_device_list()) + info.add(L"system.bluefish.device", device); + + info.add(L"system.flash", caspar::flash::get_version()); + info.add(L"system.free-image", caspar::image::get_version()); + info.add(L"system.ffmpeg.avcodec", caspar::ffmpeg::get_avcodec_version()); + info.add(L"system.ffmpeg.avformat", caspar::ffmpeg::get_avformat_version()); + info.add(L"system.ffmpeg.avfilter", caspar::ffmpeg::get_avfilter_version()); + info.add(L"system.ffmpeg.avutil", caspar::ffmpeg::get_avutil_version()); + info.add(L"system.ffmpeg.swscale", caspar::ffmpeg::get_swscale_version()); + + boost::property_tree::write_xml(replyString, info, w); + } + else if(_parameters.size() >= 1 && _parameters[0] == L"SERVER") + { + replyString << L"201 INFO SYSTEM OK\r\n"; + + boost::property_tree::wptree info; + + int index = 0; + BOOST_FOREACH(auto channel, channels_) + info.add_child(L"channels.channel", channel->info()) + .add(L"index", ++index); + + boost::property_tree::write_xml(replyString, info, w); + } + else // channel + { + if(_parameters.size() >= 1) + { + replyString << TEXT("201 INFO OK\r\n"); + boost::property_tree::wptree info; + + std::vector split; + boost::split(split, _parameters[0], boost::is_any_of("-")); + + int layer = std::numeric_limits::min(); + int channel = boost::lexical_cast(split[0]) - 1; + + if(split.size() > 1) + layer = boost::lexical_cast(split[1]); + + if(layer == std::numeric_limits::min()) + { + info.add_child(L"channel", channels_.at(channel)->info()) + .add(L"index", channel); + } + else + { + if(_parameters.size() >= 2) + { + if(_parameters[1] == L"B") + info.add_child(L"producer", channels_.at(channel)->stage()->background(layer).get()->info()); + else + info.add_child(L"producer", channels_.at(channel)->stage()->foreground(layer).get()->info()); + } + else + { + info.add_child(L"layer", channels_.at(channel)->stage()->info(layer).get()) + .add(L"index", layer); + } + } + boost::property_tree::xml_parser::write_xml(replyString, info, w); + } + else + { + // This is needed for backwards compatibility with old clients + replyString << TEXT("200 INFO OK\r\n"); + for(size_t n = 0; n < channels_.size(); ++n) + GenerateChannelInfo(n, channels_[n], replyString); + } + } } - else + catch(...) { - replyString << TEXT("200 INFO OK\r\n"); - for(size_t n = 0; n < channels_.size(); ++n) - GenerateChannelInfo(n, channels_[n], replyString); - replyString << TEXT("\r\n"); + SetReplyString(TEXT("403 INFO ERROR\r\n")); + return false; } + replyString << TEXT("\r\n"); SetReplyString(replyString.str()); return true; } @@ -1275,14 +1467,14 @@ bool TlsCommand::DoExecute() bool VersionCommand::DoExecute() { - std::wstring replyString = TEXT("201 VERSION OK\r\n SERVER: ") + env::version() + TEXT("\r\n"); + std::wstring replyString = TEXT("201 VERSION OK\r\n") + env::version() + TEXT("\r\n"); if(_parameters.size() > 0) { if(_parameters[0] == L"FLASH") - replyString = TEXT("201 VERSION OK\r\n FLASH: ") + get_flash_version() + TEXT("\r\n"); + replyString = TEXT("201 VERSION OK\r\n") + flash::get_version() + TEXT("\r\n"); else if(_parameters[0] == L"TEMPLATEHOST") - replyString = TEXT("201 VERSION OK\r\n TEMPLATEHOST: ") + get_cg_version() + TEXT("\r\n"); + replyString = TEXT("201 VERSION OK\r\n") + flash::get_cg_version() + TEXT("\r\n"); else if(_parameters[0] != L"SERVER") replyString = TEXT("403 VERSION ERROR\r\n"); }