owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

WIP. some transcoding parameters update for video widget

Browse Source
This commit is contained in:
emeric
2014-09-14 17:12:57 +02:00
parent 29df5a889a
commit 55bdc9795f
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/audio/AudioWidget.cpp
+4 -2
View File
@@ -51,12 +51,14 @@ AudioWidget::playTrack(boost::filesystem::path p)
if (user) if (user)
bitrate = user->getAudioBitrate(); bitrate = user->getAudioBitrate();
else else
{
LMS_LOG(MOD_UI, SEV_ERROR) << "Can't play video: user does not exists!";
return; // TODO logout? return; // TODO logout?
} }
}
Transcode::InputMediaFile inputFile(p); Transcode::InputMediaFile inputFile(p);
// TODO get the input stream bitrate and min the result with the desired bitrate
Transcode::Parameters parameters(inputFile, Transcode::Format::get(Transcode::Format::OGA)); Transcode::Parameters parameters(inputFile, Transcode::Format::get(Transcode::Format::OGA));
parameters.setBitrate(Transcode::Stream::Audio, bitrate); parameters.setBitrate(Transcode::Stream::Audio, bitrate);
@@ -70,7 +72,7 @@ AudioWidget::playTrack(boost::filesystem::path p)
if (!covers.empty()) if (!covers.empty())
{ {
LMS_LOG(MOD_UI, SEV_DEBUG) << "Cover found!"; LMS_LOG(MOD_UI, SEV_DEBUG) << "Cover found!";
if (!covers.front().scale(256)) if (!covers.front().scale(256)) // TODO
LMS_LOG(MOD_UI, SEV_ERROR) << "Cannot resize!"; LMS_LOG(MOD_UI, SEV_ERROR) << "Cannot resize!";
//_imgResource->setMimeType(covers.front().getMimeType()); //_imgResource->setMimeType(covers.front().getMimeType());
ui/video/VideoWidget.cpp
+29 -5
View File
@@ -1,6 +1,8 @@
#include <Wt/WApplication> #include <Wt/WApplication>
#include <Wt/WEnvironment> #include <Wt/WEnvironment>
#include "logger/Logger.hpp"
#include "VideoWidget.hpp" #include "VideoWidget.hpp"
namespace UserInterface { namespace UserInterface {
@@ -38,10 +40,30 @@ VideoWidget::backToList(void)
void void
VideoWidget::playVideo(boost::filesystem::path p) VideoWidget::playVideo(boost::filesystem::path p)
{ {
std::cout << "Want to play video " << p << "'" << std::endl; LMS_LOG(MOD_UI, SEV_DEBUG) << "Want to play video " << p << "'" << std::endl;
try { try {
// TODO get user's encoding preference std::size_t audioBitrate = 0;
std::size_t videoBitrate = 0;
// Get user preferences
{
Wt::Dbo::Transaction transaction(_sessionData.getDatabaseHandler().getSession());
Database::User::pointer user = _sessionData.getDatabaseHandler().getCurrentUser();
if (user)
{
audioBitrate = user->getMaxAudioBitrate();
videoBitrate = user->getMaxVideoBitrate();
}
else
{
LMS_LOG(MOD_UI, SEV_ERROR) << "Can't play video: user does not exists!";
return; // TODO logout?
}
}
LMS_LOG(MOD_UI, SEV_DEBUG) << "Max bitrate set to " << videoBitrate << "/" << audioBitrate;
Transcode::InputMediaFile inputFile(p); Transcode::InputMediaFile inputFile(p);
Transcode::Format::Encoding encoding; Transcode::Format::Encoding encoding;
@@ -53,8 +75,10 @@ VideoWidget::playVideo(boost::filesystem::path p)
Transcode::Parameters parameters(inputFile, Transcode::Format::get(encoding)); Transcode::Parameters parameters(inputFile, Transcode::Format::get(encoding));
parameters.setBitrate(Transcode::Stream::Audio, 128000); // TODO // TODO, make a quality button in order to choose...
parameters.setBitrate(Transcode::Stream::Video, 500000); // TODO
parameters.setBitrate(Transcode::Stream::Audio, 0/*audioBitrate*/);
parameters.setBitrate(Transcode::Stream::Video, 0/*videoBitrate*/);
_mediaPlayer = new VideoMediaPlayerWidget(parameters, this); _mediaPlayer = new VideoMediaPlayerWidget(parameters, this);
_mediaPlayer->close().connect(this, &VideoWidget::backToList); _mediaPlayer->close().connect(this, &VideoWidget::backToList);
@@ -62,7 +86,7 @@ VideoWidget::playVideo(boost::filesystem::path p)
_videoDbWidget->setHidden(true); _videoDbWidget->setHidden(true);
} }
catch( std::exception& e) { catch( std::exception& e) {
std::cerr <<"Caught exception while loading '" << p << "': " << e.what() << std::endl; LMS_LOG(MOD_UI, SEV_ERROR) << "Caught exception while loading '" << p << "': " << e.what() << std::endl;
} }
} }