games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-03 13:01:33 +02:00
Code Issues Releases Activity

Formatting

Browse Source
This commit is contained in:
Ivan Savenko 2024-05-15 16:15:25 +00:00
parent e39461165a
commit 02da800151
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/media/CVideoHandler.cpp
View File

@ -216,10 +216,10 @@ void FFMpegStream::decodeNextFrame()
{ {
AVPacket packet; AVPacket packet;
for (;;) for(;;)
{ {
int rc = avcodec_receive_frame(codecContext, frame); int rc = avcodec_receive_frame(codecContext, frame);
if (rc == AVERROR(EAGAIN)) if(rc == AVERROR(EAGAIN))
break; break;
if(rc < 0) if(rc < 0)
@ -252,7 +252,7 @@ void FFMpegStream::decodeNextFrame()
throwFFmpegError(rc); throwFFmpegError(rc);
rc = avcodec_receive_frame(codecContext, frame); rc = avcodec_receive_frame(codecContext, frame);
if (rc == AVERROR(EAGAIN)) if(rc == AVERROR(EAGAIN))
{ {
av_packet_unref(&packet); av_packet_unref(&packet);
continue; continue;
@ -272,7 +272,7 @@ bool CVideoInstance::loadNextFrame()
decodeNextFrame(); decodeNextFrame();
const AVFrame * frame = getCurrentFrame(); const AVFrame * frame = getCurrentFrame();
if (!frame) if(!frame)
return false; return false;
uint8_t * data[4] = {}; uint8_t * data[4] = {};
@ -292,7 +292,7 @@ bool CVideoInstance::loadNextFrame()
SDL_UpdateTexture(textureRGB, nullptr, data[0], linesize[0]); SDL_UpdateTexture(textureRGB, nullptr, data[0], linesize[0]);
av_freep(&data[0]); av_freep(&data[0]);
} }
if (surface) if(surface)
{ {
// Avoid buffer overflow caused by sws_scale(): // Avoid buffer overflow caused by sws_scale():
// http://trac.ffmpeg.org/ticket/9254 // http://trac.ffmpeg.org/ticket/9254
@ -357,21 +357,21 @@ void CVideoInstance::show(const Point & position, Canvas & canvas)
double FFMpegStream::getCurrentFrameEndTime() double FFMpegStream::getCurrentFrameEndTime()
{ {
# if(LIBAVUTIL_VERSION_MAJOR < 58) #if(LIBAVUTIL_VERSION_MAJOR < 58)
auto packet_duration = frame->pkt_duration; auto packet_duration = frame->pkt_duration;
# else #else
auto packet_duration = frame->duration; auto packet_duration = frame->duration;
# endif #endif
return (frame->pts + packet_duration) * av_q2d(formatContext->streams[streamIndex]->time_base); return (frame->pts + packet_duration) * av_q2d(formatContext->streams[streamIndex]->time_base);
} }
double FFMpegStream::getCurrentFrameDuration() double FFMpegStream::getCurrentFrameDuration()
{ {
# if(LIBAVUTIL_VERSION_MAJOR < 58) #if(LIBAVUTIL_VERSION_MAJOR < 58)
auto packet_duration = frame->pkt_duration; auto packet_duration = frame->pkt_duration;
# else #else
auto packet_duration = frame->duration; auto packet_duration = frame->duration;
# endif #endif
return (packet_duration) * av_q2d(formatContext->streams[streamIndex]->time_base); return (packet_duration) * av_q2d(formatContext->streams[streamIndex]->time_base);
} }
@ -552,7 +552,7 @@ bool CVideoPlayer::openAndPlayVideoImpl(const VideoPath & name, const Point & po
else else
SDL_RenderClear(mainRenderer); SDL_RenderClear(mainRenderer);
if (instance.textureYUV) if(instance.textureYUV)
SDL_RenderCopy(mainRenderer, instance.textureYUV, nullptr, &rect); SDL_RenderCopy(mainRenderer, instance.textureYUV, nullptr, &rect);
else else
SDL_RenderCopy(mainRenderer, instance.textureRGB, nullptr, &rect); SDL_RenderCopy(mainRenderer, instance.textureRGB, nullptr, &rect);
@ -567,7 +567,7 @@ bool CVideoPlayer::openAndPlayVideoImpl(const VideoPath & name, const Point & po
auto timeSpentBusy = boost::chrono::duration_cast<boost::chrono::milliseconds>(timePointAfterPresent - lastTimePoint); auto timeSpentBusy = boost::chrono::duration_cast<boost::chrono::milliseconds>(timePointAfterPresent - lastTimePoint);
logGlobal->info("Sleeping for %d", (targetFrameTime - timeSpentBusy).count()); logGlobal->info("Sleeping for %d", (targetFrameTime - timeSpentBusy).count());
if (targetFrameTime > timeSpentBusy) if(targetFrameTime > timeSpentBusy)
boost::this_thread::sleep_for(targetFrameTime - timeSpentBusy); boost::this_thread::sleep_for(targetFrameTime - timeSpentBusy);
lastTimePoint = boost::chrono::steady_clock::now(); lastTimePoint = boost::chrono::steady_clock::now();
@ -577,7 +577,7 @@ bool CVideoPlayer::openAndPlayVideoImpl(const VideoPath & name, const Point & po
bool CVideoPlayer::playIntroVideo(const VideoPath & name) bool CVideoPlayer::playIntroVideo(const VideoPath & name)
{ {
return openAndPlayVideoImpl(name, Point(0,0), true, true, true); return openAndPlayVideoImpl(name, Point(0, 0), true, true, true);
} }
void CVideoPlayer::playSpellbookAnimation(const VideoPath & name, const Point & position) void CVideoPlayer::playSpellbookAnimation(const VideoPath & name, const Point & position)
@ -596,7 +596,7 @@ std::unique_ptr<IVideoInstance> CVideoPlayer::open(const VideoPath & name, bool
return result; return result;
} }
std::pair<std::unique_ptr<ui8 []>, si64> CVideoPlayer::getAudio(const VideoPath & videoToOpen) std::pair<std::unique_ptr<ui8[]>, si64> CVideoPlayer::getAudio(const VideoPath & videoToOpen)
{ {
CAudioInstance audio; CAudioInstance audio;
return audio.extractAudio(videoToOpen); return audio.extractAudio(videoToOpen);

6
client/media/CVideoHandler.h
View File

@ -12,7 +12,6 @@
#ifndef DISABLE_VIDEO #ifndef DISABLE_VIDEO
# include "IVideoPlayer.h" # include "IVideoPlayer.h"
# include "../lib/Rect.h" # include "../lib/Rect.h"
struct SDL_Surface; struct SDL_Surface;
@ -64,14 +63,13 @@ public:
class CAudioInstance final : public FFMpegStream class CAudioInstance final : public FFMpegStream
{ {
public: public:
std::pair<std::unique_ptr<ui8 []>, si64> extractAudio(const VideoPath & videoToOpen); std::pair<std::unique_ptr<ui8[]>, si64> extractAudio(const VideoPath & videoToOpen);
}; };
class CVideoInstance final : public IVideoInstance, public FFMpegStream class CVideoInstance final : public IVideoInstance, public FFMpegStream
{ {
friend class CVideoPlayer; friend class CVideoPlayer;
struct SwsContext * sws = nullptr; struct SwsContext * sws = nullptr;
SDL_Texture * textureRGB = nullptr; SDL_Texture * textureRGB = nullptr;
SDL_Texture * textureYUV = nullptr; SDL_Texture * textureYUV = nullptr;
@ -105,7 +103,7 @@ public:
bool playIntroVideo(const VideoPath & name) final; bool playIntroVideo(const VideoPath & name) final;
void playSpellbookAnimation(const VideoPath & name, const Point & position) final; void playSpellbookAnimation(const VideoPath & name, const Point & position) final;
std::unique_ptr<IVideoInstance> open(const VideoPath & name, bool scaleToScreen) final; std::unique_ptr<IVideoInstance> open(const VideoPath & name, bool scaleToScreen) final;
std::pair<std::unique_ptr<ui8 []>, si64> getAudio(const VideoPath & videoToOpen) final; std::pair<std::unique_ptr<ui8[]>, si64> getAudio(const VideoPath & videoToOpen) final;
}; };
#endif #endif