Skip to content

Commit 34c5ba8

Browse files
committed
TEMP: drop screenshot support
Broken by "Screenshot rework".
1 parent 312cde4 commit 34c5ba8

4 files changed

Lines changed: 2 additions & 15 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/ScreenshotSurfaceAML.cpp

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ std::unique_ptr<IScreenshotSurface> CScreenshotSurfaceAML::CreateSurface()
2828
return std::unique_ptr<CScreenshotSurfaceAML>(new CScreenshotSurfaceAML());
2929
}
3030

31-
bool CScreenshotSurfaceAML::Capture()
31+
bool CScreenshotSurfaceAML::Read(const ScreenshotContext& ctx)
3232
{
33-
std::unique_lock<CCriticalSection> lock(CServiceBroker::GetWinSystem()->GetGfxContext());
34-
CServiceBroker::GetGUI()->GetWindowManager().Render();
35-
3633
#ifndef HAS_GLES
3734
glReadBuffer(GL_BACK);
3835
#endif

xbmc/platform/linux/ScreenshotSurfaceAML.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ class CScreenshotSurfaceAML : public IScreenshotSurface
1919
static void Register();
2020
static std::unique_ptr<IScreenshotSurface> CreateSurface();
2121

22-
bool Capture() override;
22+
bool Read(const ScreenshotContext& ctx) override;
2323
};

0 commit comments

Comments
 (0)