From 76032584ac236cdfb117475382d2649022cc4b0e Mon Sep 17 00:00:00 2001 From: emb <> Date: Thu, 8 Jan 2015 22:33:26 -0600 Subject: [PATCH] Removed QOS from video playback. Removed unused buffer. --- RetroFE/Source/Graphics/Component/VideoComponent.cpp | 10 +--------- RetroFE/Source/Graphics/Component/VideoComponent.h | 1 - RetroFE/Source/Video/GStreamerVideo.cpp | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/RetroFE/Source/Graphics/Component/VideoComponent.cpp b/RetroFE/Source/Graphics/Component/VideoComponent.cpp index 6efac3e..c5da5ea 100644 --- a/RetroFE/Source/Graphics/Component/VideoComponent.cpp +++ b/RetroFE/Source/Graphics/Component/VideoComponent.cpp @@ -21,8 +21,7 @@ #include "../../SDL.h" VideoComponent::VideoComponent(IVideo *videoInst, std::string videoFile, float scaleX, float scaleY) - : VideoTexture(NULL) - , VideoFile(videoFile) + : VideoFile(videoFile) , VideoInst(videoInst) , ScaleX(scaleX) , ScaleY(scaleY) @@ -67,13 +66,6 @@ void VideoComponent::FreeGraphicsMemory() VideoInst->Stop(); IsPlaying = false; - if (VideoTexture != NULL) - { - SDL_LockMutex(SDL::GetMutex()); - SDL_DestroyTexture(VideoTexture); - SDL_UnlockMutex(SDL::GetMutex()); - } - Component::FreeGraphicsMemory(); } diff --git a/RetroFE/Source/Graphics/Component/VideoComponent.h b/RetroFE/Source/Graphics/Component/VideoComponent.h index f71fb01..870a5ed 100644 --- a/RetroFE/Source/Graphics/Component/VideoComponent.h +++ b/RetroFE/Source/Graphics/Component/VideoComponent.h @@ -28,7 +28,6 @@ public: } private: - SDL_Texture *VideoTexture; std::string VideoFile; std::string Name; IVideo *VideoInst; diff --git a/RetroFE/Source/Video/GStreamerVideo.cpp b/RetroFE/Source/Video/GStreamerVideo.cpp index ef027e3..41e9d6d 100644 --- a/RetroFE/Source/Video/GStreamerVideo.cpp +++ b/RetroFE/Source/Video/GStreamerVideo.cpp @@ -229,7 +229,7 @@ bool GStreamerVideo::Play(std::string file) } - g_object_set(G_OBJECT(VideoSink), "sync", TRUE, "qos", TRUE, NULL); + g_object_set(G_OBJECT(VideoSink), "sync", TRUE, "qos", FALSE, NULL); GstPad *videoSinkPad = gst_ghost_pad_new("sink", videoConvertSinkPad); if(!videoSinkPad)