Skip to content

Commit 6862e6d

Browse files
committed
TEMP: fix screenshot support
Broken by "Screenshot rework".
1 parent f047d7f commit 6862e6d

6 files changed

Lines changed: 2 additions & 116 deletions

File tree

xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.cpp

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include "cores/VideoPlayer/DVDCodecs/Video/AMLCodec.h"
1212
#include "cores/VideoPlayer/DVDCodecs/Video/DVDVideoCodecAmlogic.h"
13-
#include "cores/VideoPlayer/VideoRenderers/RenderCapture.h"
1413
#include "cores/VideoPlayer/VideoRenderers/RenderFactory.h"
1514
#include "cores/VideoPlayer/VideoRenderers/RenderFlags.h"
1615
#include "ServiceBroker.h"
@@ -91,14 +90,6 @@ CRenderInfo CRendererAML::GetRenderInfo()
9190
return info;
9291
}
9392

94-
bool CRendererAML::RenderCapture(int index, CRenderCapture* capture)
95-
{
96-
capture->BeginRender();
97-
capture->EndRender();
98-
CScreenshotAML::CaptureVideoFrame((unsigned char *)capture->GetRenderBuffer(), capture->GetWidth(), capture->GetHeight());
99-
return true;
100-
}
101-
10293
void CRendererAML::AddVideoPicture(const VideoPicture &picture, int index)
10394
{
10495
ReleaseBuffer(index);

xbmc/cores/VideoPlayer/VideoRenderers/HwDecRender/RendererAML.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ class CRendererAML : public CBaseRenderer
2020
static CBaseRenderer* Create(CVideoBuffer *buffer);
2121
static bool Register();
2222

23-
virtual bool RenderCapture(int index, CRenderCapture* capture) override;
2423
virtual void AddVideoPicture(const VideoPicture &picture, int index) override;
2524
virtual void ReleaseBuffer(int idx) override;
2625
virtual bool Configure(const VideoPicture &picture, float fps, unsigned int orientation) override;

xbmc/platform/linux/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,4 @@ if(ADDONS_CONFIGURE_AT_STARTUP)
4040
add_compile_definitions(ADDONS_CONFIGURE_AT_STARTUP)
4141
endif()
4242

43-
if("aml" IN_LIST CORE_PLATFORM_NAME_LC)
44-
list(APPEND SOURCES ScreenshotSurfaceAML.cpp)
45-
list(APPEND HEADERS ScreenshotSurfaceAML.h)
46-
endif()
47-
4843
core_add_library(linuxsupport)

xbmc/platform/linux/ScreenshotSurfaceAML.cpp

Lines changed: 0 additions & 76 deletions
This file was deleted.

xbmc/platform/linux/ScreenshotSurfaceAML.h

Lines changed: 0 additions & 23 deletions
This file was deleted.

xbmc/windowing/amlogic/WinSystemAmlogic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
#include "windowing/GraphicContext.h"
2121
#include "windowing/Resolution.h"
2222
#include "platform/linux/powermanagement/LinuxPowerSyscall.h"
23-
#include "platform/linux/ScreenshotSurfaceAML.h"
2423
#include "platform/linux/FDEventMonitor.h"
24+
#include "rendering/gles/ScreenshotSurfaceGLES.h"
2525
#include "resources/LocalizeStrings.h"
2626
#include "resources/ResourcesComponent.h"
2727
#include "settings/DisplaySettings.h"
@@ -302,7 +302,7 @@ bool CWinSystemAmlogic::InitWindowSystem()
302302
RETRO::CRPProcessInfoAmlogic::Register();
303303
RETRO::CRPProcessInfoAmlogic::RegisterRendererFactory(new RETRO::CRendererFactoryOpenGLES);
304304
CRendererAML::Register();
305-
CScreenshotSurfaceAML::Register();
305+
CScreenshotSurfaceGLES::Register();
306306

307307
auto setting = settings->GetSetting(CSettings::SETTING_VIDEOPLAYER_USEDISPLAYASCLOCK);
308308
if (setting)

0 commit comments

Comments
 (0)