Mirrors/moonlight-qt
2
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt synced 2024-12-15 22:02:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Adapt to constification of AVCodec in FFmpeg master

Browse source
This commit is contained in:
Cameron Gutman 2021-05-24 23:26:38 -05:00
parent c17c8e2a2c
commit 56119eebae
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/streaming/video/ffmpeg.cpp
View file

@ -226,7 +226,7 @@ bool FFmpegVideoDecoder::createFrontendRenderer(PDECODER_PARAMETERS params, bool
return true; return true;
} }
bool FFmpegVideoDecoder::completeInitialization(AVCodec* decoder, PDECODER_PARAMETERS params, bool testFrame, bool eglOnly) bool FFmpegVideoDecoder::completeInitialization(const AVCodec* decoder, PDECODER_PARAMETERS params, bool testFrame, bool eglOnly)
{ {
// In test-only mode, we should only see test frames // In test-only mode, we should only see test frames
SDL_assert(!m_TestOnly || testFrame); SDL_assert(!m_TestOnly || testFrame);
@ -582,7 +582,7 @@ IFFmpegRenderer* FFmpegVideoDecoder::createHwAccelRenderer(const AVCodecHWConfig
} }
} }
bool FFmpegVideoDecoder::tryInitializeRenderer(AVCodec* decoder, bool FFmpegVideoDecoder::tryInitializeRenderer(const AVCodec* decoder,
PDECODER_PARAMETERS params, PDECODER_PARAMETERS params,
const AVCodecHWConfig* hwConfig, const AVCodecHWConfig* hwConfig,
std::function<IFFmpegRenderer*()> createRendererFunc) std::function<IFFmpegRenderer*()> createRendererFunc)
@ -667,7 +667,7 @@ bool FFmpegVideoDecoder::tryInitializeRenderer(AVCodec* decoder,
bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decoderName, bool FFmpegVideoDecoder::tryInitializeRendererForDecoderByName(const char *decoderName,
PDECODER_PARAMETERS params) PDECODER_PARAMETERS params)
{ {
AVCodec* decoder = avcodec_find_decoder_by_name(decoderName); const AVCodec* decoder = avcodec_find_decoder_by_name(decoderName);
if (decoder == nullptr) { if (decoder == nullptr) {
return false; return false;
} }
@ -767,7 +767,7 @@ bool FFmpegVideoDecoder::initialize(PDECODER_PARAMETERS params)
} }
} }
AVCodec* decoder; const AVCodec* decoder;
if (params->videoFormat & VIDEO_FORMAT_MASK_H264) { if (params->videoFormat & VIDEO_FORMAT_MASK_H264) {
decoder = avcodec_find_decoder(AV_CODEC_ID_H264); decoder = avcodec_find_decoder(AV_CODEC_ID_H264);

4
app/streaming/video/ffmpeg.h
View file

@ -26,7 +26,7 @@ public:
virtual IFFmpegRenderer* getBackendRenderer(); virtual IFFmpegRenderer* getBackendRenderer();
private: private:
bool completeInitialization(AVCodec* decoder, PDECODER_PARAMETERS params, bool testFrame, bool eglOnly); bool completeInitialization(const AVCodec* decoder, PDECODER_PARAMETERS params, bool testFrame, bool eglOnly);
void stringifyVideoStats(VIDEO_STATS& stats, char* output); void stringifyVideoStats(VIDEO_STATS& stats, char* output);
@ -39,7 +39,7 @@ private:
bool tryInitializeRendererForDecoderByName(const char* decoderName, bool tryInitializeRendererForDecoderByName(const char* decoderName,
PDECODER_PARAMETERS params); PDECODER_PARAMETERS params);
bool tryInitializeRenderer(AVCodec* decoder, bool tryInitializeRenderer(const AVCodec* decoder,
PDECODER_PARAMETERS params, PDECODER_PARAMETERS params,
const AVCodecHWConfig* hwConfig, const AVCodecHWConfig* hwConfig,
std::function<IFFmpegRenderer*()> createRendererFunc); std::function<IFFmpegRenderer*()> createRendererFunc);