moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 22:23:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Provide another frame if avcodec_receive_frame() returns EAGAIN

Browse Source
This commit is contained in:
Cameron Gutman
2020-01-26 15:36:22 -08:00
parent b9463b3c0e
commit 4c579aa826
1 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/streaming/video/ffmpeg.cpp
+28 -14
View File
@@ -311,17 +311,6 @@ bool FFmpegVideoDecoder::completeInitialization(AVCodec* decoder, PDECODER_PARAM
return false; return false;
} }
// Most FFmpeg decoders process input using a "push" model.
// We'll see those fail here if the format is not supported.
err = avcodec_send_packet(m_VideoDecoderCtx, &m_Pkt);
if (err < 0) {
char errorstring[512];
av_strerror(err, errorstring, sizeof(errorstring));
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"Test decode failed: %s", errorstring);
return false;
}
AVFrame* frame = av_frame_alloc(); AVFrame* frame = av_frame_alloc();
if (!frame) { if (!frame) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, SDL_LogError(SDL_LOG_CATEGORY_APPLICATION,
@@ -329,9 +318,34 @@ bool FFmpegVideoDecoder::completeInitialization(AVCodec* decoder, PDECODER_PARAM
return false; return false;
} }
// A few FFmpeg decoders (h264_mmal) process here using a "pull" model. // Some decoders won't output on the first frame, so we'll submit
// Those decoders will fail here if the format is not supported. // a few test frames if we get an EAGAIN error.
err = avcodec_receive_frame(m_VideoDecoderCtx, frame); for (int retries = 0; retries < 5; retries++) {
// Most FFmpeg decoders process input using a "push" model.
// We'll see those fail here if the format is not supported.
err = avcodec_send_packet(m_VideoDecoderCtx, &m_Pkt);
if (err < 0) {
av_frame_free(&frame);
char errorstring[512];
av_strerror(err, errorstring, sizeof(errorstring));
SDL_LogWarn(SDL_LOG_CATEGORY_APPLICATION,
"Test decode failed: %s", errorstring);
return false;
}
// A few FFmpeg decoders (h264_mmal) process here using a "pull" model.
// Those decoders will fail here if the format is not supported.
err = avcodec_receive_frame(m_VideoDecoderCtx, frame);
if (err == AVERROR(EAGAIN)) {
// Wait a little while to let the hardware work
SDL_Delay(100);
}
else {
// Done!
break;
}
}
av_frame_free(&frame); av_frame_free(&frame);
if (err < 0) { if (err < 0) {
char errorstring[512]; char errorstring[512];