OU
/
CWE-ou-minkata
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
2
1
Fork 0
Code Releases Activity
Browse Source

Change code style

Florian Meißner 10 years ago
parent
3b38161756
commit
754a35f3ff
2 changed files with 42 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 106
      Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
  2. 4
      Sources/Plasma/PubUtilLib/plAudio/plWin32VideoSound.cpp

106
Sources/Plasma/FeatureLib/pfMoviePlayer/plMoviePlayer.cpp
Unescape View File

@ -68,15 +68,14 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "webm/mkvparser.hpp" #include "webm/mkvparser.hpp"
#define SAFE_OP(x, err) \ #define SAFE_OP(x, err) \
{ \ { \
int64_t ret = 0; \ int64_t ret = 0; \
ret = x; \ ret = x; \
if (ret < 0) \ if (ret < 0) { \
{ \ hsAssert(false, "failed to " err); \
hsAssert(false, "failed to " err); \ return false; \
return false; \ } \
} \ }
}
// ===================================================== // =====================================================
@ -97,8 +96,7 @@ public:
static VPX* Create() static VPX* Create()
{ {
VPX* instance = new VPX; VPX* instance = new VPX;
if(vpx_codec_dec_init(&instance->codec, iface, nullptr, 0)) if (vpx_codec_dec_init(&instance->codec, iface, nullptr, 0)) {
{
hsAssert(false, vpx_codec_error_detail(&instance->codec)); hsAssert(false, vpx_codec_error_detail(&instance->codec));
delete instance; delete instance;
return nullptr; return nullptr;
@ -108,8 +106,7 @@ public:
vpx_image_t* Decode(uint8_t* buf, uint32_t size) vpx_image_t* Decode(uint8_t* buf, uint32_t size)
{ {
if (vpx_codec_decode(&codec, buf, size, nullptr, 0) != VPX_CODEC_OK) if (vpx_codec_decode(&codec, buf, size, nullptr, 0) != VPX_CODEC_OK) {
{
const char* detail = vpx_codec_error_detail(&codec); const char* detail = vpx_codec_error_detail(&codec);
hsAssert(false, detail ? detail : "unspecified decode error"); hsAssert(false, detail ? detail : "unspecified decode error");
return nullptr; return nullptr;
@ -144,25 +141,20 @@ public:
fStatus = fTrack->GetFirst(fCurrentBlock); fStatus = fTrack->GetFirst(fCurrentBlock);
// Continue through the blocks until our current movie time // Continue through the blocks until our current movie time
while (fCurrentBlock && fStatus == 0) while (fCurrentBlock && fStatus == 0) {
{
const mkvparser::Block* block = fCurrentBlock->GetBlock(); const mkvparser::Block* block = fCurrentBlock->GetBlock();
int64_t time = block->GetTime(fCurrentBlock->GetCluster()) - fTrack->GetCodecDelay(); int64_t time = block->GetTime(fCurrentBlock->GetCluster()) - fTrack->GetCodecDelay();
if (time <= movieTimeNs) if (time <= movieTimeNs) {
{
// We want to play this block, add it to the frames buffer // We want to play this block, add it to the frames buffer
frames.reserve(frames.size() + block->GetFrameCount()); frames.reserve(frames.size() + block->GetFrameCount());
for (int32_t i = 0; i < block->GetFrameCount(); i++) for (int32_t i = 0; i < block->GetFrameCount(); i++) {
{
const mkvparser::Block::Frame data = block->GetFrame(i); const mkvparser::Block::Frame data = block->GetFrame(i);
uint8_t* buf = new uint8_t[data.len]; uint8_t* buf = new uint8_t[data.len];
data.Read(reader, buf); data.Read(reader, buf);
frames.push_back(std::make_tuple(std::unique_ptr<uint8_t>(buf), static_cast<int32_t>(data.len))); frames.push_back(std::make_tuple(std::unique_ptr<uint8_t>(buf), static_cast<int32_t>(data.len)));
} }
fStatus = fTrack->GetNext(fCurrentBlock, fCurrentBlock); fStatus = fTrack->GetNext(fCurrentBlock, fCurrentBlock);
} } else {
else
{
// We've got all frames that have to play... come back for more later! // We've got all frames that have to play... come back for more later!
return true; return true;
} }
@ -174,15 +166,15 @@ public:
// ===================================================== // =====================================================
plMoviePlayer::plMoviePlayer() : plMoviePlayer::plMoviePlayer()
fPlate(nullptr), : fPlate(nullptr),
fTexture(nullptr), fTexture(nullptr),
fReader(nullptr), fReader(nullptr),
fMovieTime(0), fMovieTime(0),
fLastFrameTime(0), fLastFrameTime(0),
fPosition(hsPoint2()), fPosition(hsPoint2()),
fPlaying(false), fPlaying(false),
fPaused(false) fPaused(false)
{ {
fScale.Set(1.0f, 1.0f); fScale.Set(1.0f, 1.0f);
} }
@ -193,8 +185,7 @@ plMoviePlayer::~plMoviePlayer()
// The plPlate owns the Mipmap Texture, so it destroys it for us // The plPlate owns the Mipmap Texture, so it destroys it for us
plPlateManager::Instance().DestroyPlate(fPlate); plPlateManager::Instance().DestroyPlate(fPlate);
#ifdef MOVIE_AVAILABLE #ifdef MOVIE_AVAILABLE
if (fReader) if (fReader) {
{
fReader->Close(); fReader->Close();
delete fReader; delete fReader;
} }
@ -204,8 +195,7 @@ plMoviePlayer::~plMoviePlayer()
bool plMoviePlayer::IOpenMovie() bool plMoviePlayer::IOpenMovie()
{ {
#ifdef MOVIE_AVAILABLE #ifdef MOVIE_AVAILABLE
if (!plFileInfo(fMoviePath).Exists()) if (!plFileInfo(fMoviePath).Exists()) {
{
hsAssert(false, "Tried to play a movie that doesn't exist"); hsAssert(false, "Tried to play a movie that doesn't exist");
return false; return false;
} }
@ -226,26 +216,20 @@ bool plMoviePlayer::IOpenMovie()
// Use first tracks unless another one matches the current game language // Use first tracks unless another one matches the current game language
const mkvparser::Tracks* tracks = fSegment->GetTracks(); const mkvparser::Tracks* tracks = fSegment->GetTracks();
for (uint32_t i = 0; i < tracks->GetTracksCount(); ++i) for (uint32_t i = 0; i < tracks->GetTracksCount(); ++i) {
{
const mkvparser::Track* track = tracks->GetTrackByIndex(i); const mkvparser::Track* track = tracks->GetTrackByIndex(i);
if (!track) if (!track)
continue; continue;
switch (track->GetType()) switch (track->GetType()) {
{
case mkvparser::Track::kAudio: case mkvparser::Track::kAudio:
{ if (!fAudioTrack || ICheckLanguage(track))
if (!fAudioTrack || ICheckLanguage(track)) fAudioTrack.reset(new TrackMgr(track));
fAudioTrack.reset(new TrackMgr(track)); break;
break;
}
case mkvparser::Track::kVideo: case mkvparser::Track::kVideo:
{ if (!fVideoTrack || ICheckLanguage(track))
if (!fVideoTrack || ICheckLanguage(track)) fVideoTrack.reset(new TrackMgr(track));
fVideoTrack.reset(new TrackMgr(track)); break;
break;
}
} }
} }
return true; return true;
@ -269,8 +253,7 @@ bool plMoviePlayer::ILoadAudio()
fAudioSound.reset(new plWin32VideoSound(header)); fAudioSound.reset(new plWin32VideoSound(header));
// Initialize Opus // Initialize Opus
if (strcmp(audio->GetCodecId(), WEBM_CODECID_OPUS) != 0) if (strcmp(audio->GetCodecId(), WEBM_CODECID_OPUS) != 0) {
{
plStatusLog::AddLineS("movie.log", "%s: Not an Opus audio track!", fMoviePath.AsString().c_str()); plStatusLog::AddLineS("movie.log", "%s: Not an Opus audio track!", fMoviePath.AsString().c_str());
return false; return false;
} }
@ -287,8 +270,7 @@ bool plMoviePlayer::ILoadAudio()
decoded.reserve(frames.size() * audio->GetChannels() * maxFrameSize); decoded.reserve(frames.size() * audio->GetChannels() * maxFrameSize);
int16_t* frameData = new int16_t[maxFrameSize * audio->GetChannels()]; int16_t* frameData = new int16_t[maxFrameSize * audio->GetChannels()];
for (const auto& frame : frames) for (const auto& frame : frames) {
{
const std::unique_ptr<uint8_t>& buf = std::get<0>(frame); const std::unique_ptr<uint8_t>& buf = std::get<0>(frame);
int32_t size = std::get<1>(frame); int32_t size = std::get<1>(frame);
@ -322,21 +304,18 @@ void plMoviePlayer::IProcessVideoFrame(const std::vector<blkbuf_t>& frames)
vpx_image_t* img = nullptr; vpx_image_t* img = nullptr;
// We have to decode all the frames, but we only want to display the most recent one to the user. // We have to decode all the frames, but we only want to display the most recent one to the user.
for (const auto& frame : frames) for (const auto& frame : frames) {
{
const std::unique_ptr<uint8_t>& buf = std::get<0>(frame); const std::unique_ptr<uint8_t>& buf = std::get<0>(frame);
uint32_t size = static_cast<uint32_t>(std::get<1>(frame)); uint32_t size = static_cast<uint32_t>(std::get<1>(frame));
img = fVpx->Decode(buf.get(), size); img = fVpx->Decode(buf.get(), size);
} }
if (img) if (img) {
{
// According to VideoLAN[1], I420 is the most common image format in videos. I am inclined to believe this as our // According to VideoLAN[1], I420 is the most common image format in videos. I am inclined to believe this as our
// attemps to convert the common Uru videos use I420 image data. So, as a shortcut, we will only implement that format. // attemps to convert the common Uru videos use I420 image data. So, as a shortcut, we will only implement that format.
// If for some reason we need other formats, please, be my guest! // If for some reason we need other formats, please, be my guest!
// [1] = http://wiki.videolan.org/YUV#YUV_4:2:0_.28I420.2FJ420.2FYV12.29 // [1] = http://wiki.videolan.org/YUV#YUV_4:2:0_.28I420.2FJ420.2FYV12.29
switch (img->fmt) switch (img->fmt) {
{
case VPX_IMG_FMT_I420: case VPX_IMG_FMT_I420:
plPlanarImage::Yuv420ToRgba(img->d_w, img->d_h, img->stride, img->planes, reinterpret_cast<uint8_t*>(fTexture->GetImage())); plPlanarImage::Yuv420ToRgba(img->d_w, img->d_h, img->stride, img->planes, reinterpret_cast<uint8_t*>(fTexture->GetImage()));
break; break;
@ -364,8 +343,7 @@ bool plMoviePlayer::Start()
// Initialize VPX // Initialize VPX
const mkvparser::VideoTrack* video = static_cast<const mkvparser::VideoTrack*>(fVideoTrack->GetTrack()); const mkvparser::VideoTrack* video = static_cast<const mkvparser::VideoTrack*>(fVideoTrack->GetTrack());
if (strcmp(video->GetCodecId(), WEBM_CODECID_VP9) != 0) if (strcmp(video->GetCodecId(), WEBM_CODECID_VP9) != 0) {
{
plStatusLog::AddLineS("movie.log", "%s: Not a VP9 video track!", fMoviePath.AsString().c_str()); plStatusLog::AddLineS("movie.log", "%s: Not a VP9 video track!", fMoviePath.AsString().c_str());
return false; return false;
} }
@ -378,8 +356,7 @@ bool plMoviePlayer::Start()
plPlateManager& plateMgr = plPlateManager::Instance(); plPlateManager& plateMgr = plPlateManager::Instance();
float plateWidth = video->GetWidth() * fScale.fX; float plateWidth = video->GetWidth() * fScale.fX;
float plateHeight = video->GetHeight() * fScale.fY; float plateHeight = video->GetHeight() * fScale.fY;
if (plateWidth > plateMgr.GetPipeWidth() || plateHeight > plateMgr.GetPipeHeight()) if (plateWidth > plateMgr.GetPipeWidth() || plateHeight > plateMgr.GetPipeHeight()) {
{
float scale = std::min(plateMgr.GetPipeWidth() / plateWidth, plateMgr.GetPipeHeight() / plateHeight); float scale = std::min(plateMgr.GetPipeWidth() / plateWidth, plateMgr.GetPipeHeight() / plateHeight);
plateWidth *= scale; plateWidth *= scale;
plateHeight *= scale; plateHeight *= scale;
@ -419,8 +396,7 @@ bool plMoviePlayer::NextFrame()
fMovieTime += frameTimeDelta; fMovieTime += frameTimeDelta;
std::vector<blkbuf_t> video; std::vector<blkbuf_t> video;
if (!fVideoTrack || !fVideoTrack->GetFrames(fReader, fMovieTime * 1000000, video)) if (!fVideoTrack || !fVideoTrack->GetFrames(fReader, fMovieTime * 1000000, video)) {
{
Stop(); Stop();
return false; return false;
} }

4
Sources/Plasma/PubUtilLib/plAudio/plWin32VideoSound.cpp
Unescape View File

@ -89,8 +89,7 @@ void plWin32VideoSound::FillSoundBuffer(void* buffer, size_t size)
void plWin32VideoSound::IDerivedActuallyPlay() void plWin32VideoSound::IDerivedActuallyPlay()
{ {
if (!fReallyPlaying) if (!fReallyPlaying) {
{
fDSoundBuffer->Play(); fDSoundBuffer->Play();
fReallyPlaying = true; fReallyPlaying = true;
} }
@ -104,7 +103,6 @@ bool plWin32VideoSound::LoadSound(bool is3D)
void plWin32VideoSound::SetStartPos(unsigned bytes) void plWin32VideoSound::SetStartPos(unsigned bytes)
{ {
//do nothing //do nothing
hsAssert(false, "unimplemented cause unnecessary for this class"); hsAssert(false, "unimplemented cause unnecessary for this class");
} }

Write Preview
Loading…
Cancel
Save