From 81c62025827eca9015a97ba9ddf183f784472d02 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Fri, 15 Feb 2019 19:31:01 -0800 Subject: [PATCH] Rename renderFrameAtVsync() to renderFrame() in preparation for further refactoring --- app/streaming/video/ffmpeg-renderers/dxva2.cpp | 2 +- app/streaming/video/ffmpeg-renderers/dxva2.h | 12 ++++++------ app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp | 2 +- app/streaming/video/ffmpeg-renderers/renderer.h | 2 +- app/streaming/video/ffmpeg-renderers/sdlvid.cpp | 2 +- app/streaming/video/ffmpeg-renderers/sdlvid.h | 2 +- app/streaming/video/ffmpeg-renderers/vaapi.cpp | 2 +- app/streaming/video/ffmpeg-renderers/vaapi.h | 2 +- app/streaming/video/ffmpeg-renderers/vdpau.cpp | 2 +- app/streaming/video/ffmpeg-renderers/vdpau.h | 2 +- app/streaming/video/ffmpeg-renderers/vt.mm | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/streaming/video/ffmpeg-renderers/dxva2.cpp b/app/streaming/video/ffmpeg-renderers/dxva2.cpp index cdfa2bb8..f2ef3811 100644 --- a/app/streaming/video/ffmpeg-renderers/dxva2.cpp +++ b/app/streaming/video/ffmpeg-renderers/dxva2.cpp @@ -734,7 +734,7 @@ void DXVA2Renderer::notifyOverlayUpdated(Overlay::OverlayType) } } -void DXVA2Renderer::renderFrameAtVsync(AVFrame *frame) +void DXVA2Renderer::renderFrame(AVFrame *frame) { IDirect3DSurface9* surface = reinterpret_cast(frame->data[3]); HRESULT hr; diff --git a/app/streaming/video/ffmpeg-renderers/dxva2.h b/app/streaming/video/ffmpeg-renderers/dxva2.h index 5556a8ca..be9ec628 100644 --- a/app/streaming/video/ffmpeg-renderers/dxva2.h +++ b/app/streaming/video/ffmpeg-renderers/dxva2.h @@ -21,12 +21,12 @@ public: int width, int height, int maxFps, - bool enableVsync); - virtual bool prepareDecoderContext(AVCodecContext* context); - virtual void renderFrameAtVsync(AVFrame* frame); - virtual bool needsTestFrame(); - virtual int getDecoderCapabilities(); - virtual FramePacingConstraint getFramePacingConstraint(); + bool enableVsync) override; + virtual bool prepareDecoderContext(AVCodecContext* context) override; + virtual void renderFrame(AVFrame* frame) override; + virtual bool needsTestFrame() override; + virtual int getDecoderCapabilities() override; + virtual FramePacingConstraint getFramePacingConstraint() override; virtual void notifyOverlayUpdated(Overlay::OverlayType) override; private: diff --git a/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp b/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp index 06d241fa..a5b34d5d 100644 --- a/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp +++ b/app/streaming/video/ffmpeg-renderers/pacer/pacer.cpp @@ -244,7 +244,7 @@ void Pacer::renderFrame(AVFrame* frame) m_VideoStats->totalPacerTime += beforeRender - frame->pts; // Render it - m_VsyncRenderer->renderFrameAtVsync(frame); + m_VsyncRenderer->renderFrame(frame); Uint32 afterRender = SDL_GetTicks(); addRenderTimeToHistory(afterRender - beforeRender); diff --git a/app/streaming/video/ffmpeg-renderers/renderer.h b/app/streaming/video/ffmpeg-renderers/renderer.h index c68a906a..96f0d78d 100644 --- a/app/streaming/video/ffmpeg-renderers/renderer.h +++ b/app/streaming/video/ffmpeg-renderers/renderer.h @@ -23,7 +23,7 @@ public: int maxFps, bool enableVsync) = 0; virtual bool prepareDecoderContext(AVCodecContext* context) = 0; - virtual void renderFrameAtVsync(AVFrame* frame) = 0; + virtual void renderFrame(AVFrame* frame) = 0; virtual bool needsTestFrame() = 0; virtual int getDecoderCapabilities() = 0; virtual FramePacingConstraint getFramePacingConstraint() = 0; diff --git a/app/streaming/video/ffmpeg-renderers/sdlvid.cpp b/app/streaming/video/ffmpeg-renderers/sdlvid.cpp index 9e6324d6..182cd81f 100644 --- a/app/streaming/video/ffmpeg-renderers/sdlvid.cpp +++ b/app/streaming/video/ffmpeg-renderers/sdlvid.cpp @@ -171,7 +171,7 @@ bool SdlRenderer::initialize(SDL_Window* window, return true; } -void SdlRenderer::renderFrameAtVsync(AVFrame* frame) +void SdlRenderer::renderFrame(AVFrame* frame) { SDL_UpdateYUVTexture(m_Texture, nullptr, frame->data[0], diff --git a/app/streaming/video/ffmpeg-renderers/sdlvid.h b/app/streaming/video/ffmpeg-renderers/sdlvid.h index 2275ef1a..11667e2e 100644 --- a/app/streaming/video/ffmpeg-renderers/sdlvid.h +++ b/app/streaming/video/ffmpeg-renderers/sdlvid.h @@ -15,7 +15,7 @@ public: int maxFps, bool enableVsync) override; virtual bool prepareDecoderContext(AVCodecContext* context) override; - virtual void renderFrameAtVsync(AVFrame* frame) override; + virtual void renderFrame(AVFrame* frame) override; virtual bool needsTestFrame() override; virtual int getDecoderCapabilities() override; virtual FramePacingConstraint getFramePacingConstraint() override; diff --git a/app/streaming/video/ffmpeg-renderers/vaapi.cpp b/app/streaming/video/ffmpeg-renderers/vaapi.cpp index a5eebfbb..d826e187 100644 --- a/app/streaming/video/ffmpeg-renderers/vaapi.cpp +++ b/app/streaming/video/ffmpeg-renderers/vaapi.cpp @@ -183,7 +183,7 @@ IFFmpegRenderer::FramePacingConstraint VAAPIRenderer::getFramePacingConstraint() } void -VAAPIRenderer::renderFrameAtVsync(AVFrame* frame) +VAAPIRenderer::renderFrame(AVFrame* frame) { VASurfaceID surface = (VASurfaceID)(uintptr_t)frame->data[3]; AVHWDeviceContext* deviceContext = (AVHWDeviceContext*)m_HwContext->data; diff --git a/app/streaming/video/ffmpeg-renderers/vaapi.h b/app/streaming/video/ffmpeg-renderers/vaapi.h index 6b9354b3..2c536065 100644 --- a/app/streaming/video/ffmpeg-renderers/vaapi.h +++ b/app/streaming/video/ffmpeg-renderers/vaapi.h @@ -37,7 +37,7 @@ public: int maxFps, bool enableVsync); virtual bool prepareDecoderContext(AVCodecContext* context); - virtual void renderFrameAtVsync(AVFrame* frame); + virtual void renderFrame(AVFrame* frame); virtual bool needsTestFrame(); virtual int getDecoderCapabilities(); virtual FramePacingConstraint getFramePacingConstraint(); diff --git a/app/streaming/video/ffmpeg-renderers/vdpau.cpp b/app/streaming/video/ffmpeg-renderers/vdpau.cpp index b1b01c20..229ca624 100644 --- a/app/streaming/video/ffmpeg-renderers/vdpau.cpp +++ b/app/streaming/video/ffmpeg-renderers/vdpau.cpp @@ -251,7 +251,7 @@ IFFmpegRenderer::FramePacingConstraint VDPAURenderer::getFramePacingConstraint() return PACING_ANY; } -void VDPAURenderer::renderFrameAtVsync(AVFrame* frame) +void VDPAURenderer::renderFrame(AVFrame* frame) { VdpStatus status; VdpVideoSurface videoSurface = (VdpVideoSurface)(uintptr_t)frame->data[3]; diff --git a/app/streaming/video/ffmpeg-renderers/vdpau.h b/app/streaming/video/ffmpeg-renderers/vdpau.h index 764d543f..fcace5d0 100644 --- a/app/streaming/video/ffmpeg-renderers/vdpau.h +++ b/app/streaming/video/ffmpeg-renderers/vdpau.h @@ -20,7 +20,7 @@ public: int maxFps, bool enableVsync); virtual bool prepareDecoderContext(AVCodecContext* context); - virtual void renderFrameAtVsync(AVFrame* frame); + virtual void renderFrame(AVFrame* frame); virtual bool needsTestFrame(); virtual int getDecoderCapabilities(); virtual FramePacingConstraint getFramePacingConstraint(); diff --git a/app/streaming/video/ffmpeg-renderers/vt.mm b/app/streaming/video/ffmpeg-renderers/vt.mm index fef786b7..afa7fefb 100644 --- a/app/streaming/video/ffmpeg-renderers/vt.mm +++ b/app/streaming/video/ffmpeg-renderers/vt.mm @@ -47,7 +47,7 @@ public: } // Caller frees frame after we return - virtual void renderFrameAtVsync(AVFrame* frame) override + virtual void renderFrame(AVFrame* frame) override { OSStatus status; CVPixelBufferRef pixBuf = reinterpret_cast(frame->data[3]);