funkey/RetroFE
1
0
Fork 0
mirror of https://github.com/FunKey-Project/RetroFE.git synced 2025-12-13 02:08:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Not specifying height/width uses videos native size.

Browse Source
This commit is contained in:
emb 2015-02-09 21:25:26 -06:00
parent a81b1bc5ad
commit a4c29eeb7b
6 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RetroFE/Source/Graphics/Component/ReloadableMedia.cpp
View File

@ -65,6 +65,14 @@ void ReloadableMedia::Update(float dt)
if(LoadedComponent)
{
// video needs to run a frame to start getting size info
if(GetBaseViewInfo()->GetImageHeight() == 0 && GetBaseViewInfo()->GetImageWidth() == 0)
{
GetBaseViewInfo()->SetImageWidth(LoadedComponent->GetBaseViewInfo()->GetImageWidth());
GetBaseViewInfo()->SetImageHeight(LoadedComponent->GetBaseViewInfo()->GetImageHeight());
}
LoadedComponent->Update(dt);
}
@ -147,6 +155,8 @@ void ReloadableMedia::ReloadTexture()
if(LoadedComponent)
{
LoadedComponent->AllocateGraphicsMemory();
GetBaseViewInfo()->SetImageWidth(LoadedComponent->GetBaseViewInfo()->GetImageWidth());
GetBaseViewInfo()->SetImageHeight(LoadedComponent->GetBaseViewInfo()->GetImageHeight());
found = true;
}
}

16
RetroFE/Source/Graphics/Component/VideoComponent.cpp
View File

@ -45,6 +45,13 @@ void VideoComponent::Update(float dt)
if(IsPlaying)
{
VideoInst->Update(dt);
// video needs to run a frame to start getting size info
if(GetBaseViewInfo()->GetImageHeight() == 0 && GetBaseViewInfo()->GetImageWidth() == 0)
{
GetBaseViewInfo()->SetImageHeight(static_cast<float>(VideoInst->GetHeight()));
GetBaseViewInfo()->SetImageWidth(static_cast<float>(VideoInst->GetWidth()));
}
}
Component::Update(dt);
@ -69,6 +76,15 @@ void VideoComponent::FreeGraphicsMemory()
Component::FreeGraphicsMemory();
}
void VideoComponent::LaunchEnter()
{
FreeGraphicsMemory();
}
void VideoComponent::LaunchExit()
{
AllocateGraphicsMemory();
}
void VideoComponent::Draw()
{
ViewInfo *info = GetBaseViewInfo();

10
RetroFE/Source/Graphics/Component/VideoComponent.h
View File

@ -30,14 +30,8 @@ public:
void Draw();
void FreeGraphicsMemory();
void AllocateGraphicsMemory();
void LaunchEnter()
{
FreeGraphicsMemory();
}
void LaunchExit()
{
AllocateGraphicsMemory();
}
void LaunchEnter();
void LaunchExit();
private:
std::string VideoFile;

13
RetroFE/Source/Video/GStreamerVideo.cpp
View File

@ -323,9 +323,20 @@ void GStreamerVideo::FreeElements()
gst_object_unref(Playbin);
Playbin = NULL;
}
}
int GStreamerVideo::GetHeight()
{
return static_cast<int>(Height);
}
int GStreamerVideo::GetWidth()
{
return static_cast<int>(Width);
}
void GStreamerVideo::Draw()
{
FrameReady = false;

2
RetroFE/Source/Video/GStreamerVideo.h
View File

@ -38,6 +38,8 @@ public:
void Draw();
void SetNumLoops(int n);
void FreeElements();
int GetHeight();
int GetWidth();
private:
static void ProcessNewBuffer (GstElement *fakesink, GstBuffer *buf, GstPad *pad, gpointer data);

2
RetroFE/Source/Video/IVideo.h
View File

@ -29,4 +29,6 @@ public:
virtual SDL_Texture *GetTexture() const = 0;
virtual void Update(float dt) = 0;
virtual void Draw() = 0;
virtual int GetHeight() = 0;
virtual int GetWidth() = 0;
};