Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implemented a workaround for a potential crash when scaling frames in VideoFFmpegComponent.

Browse source
This commit is contained in:
Leon Styhre 2021-05-15 20:16:48 +02:00
parent c4e542a7a4
commit 282d2fa445
1 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
es-core/src/components/VideoFFmpegComponent.cpp
View file

@ -221,7 +221,7 @@ void VideoFFmpegComponent::readFrames()
// We have a video frame that needs conversion to RGBA format. // We have a video frame that needs conversion to RGBA format.
uint8_t* frameRGBA[4]; uint8_t* frameRGBA[4];
int lineSizes[4]; int lineSize[4];
int allocatedSize = 0; int allocatedSize = 0;
// The pts value is the presentation time, i.e. the time stamp when // The pts value is the presentation time, i.e. the time stamp when
@ -231,10 +231,20 @@ void VideoFFmpegComponent::readFrames()
double pts = static_cast<double>(mPacket->dts) * double pts = static_cast<double>(mPacket->dts) *
av_q2d(mVideoStream->time_base); av_q2d(mVideoStream->time_base);
// Due to some unknown reason, attempting to scale frames where
// coded_width is larger than width leads to graphics corruption or
// crashes. The only workaround I've been able to find is to decrease the
// source width by one pixel. Unfortunately this leads to a noticeably
// softer picture, but as few videos have this issue it's an acceptable
// workaround for now. Possibly this problem is caused by an FFmpeg bug.
int sourceWidth = mVideoCodecContext->width;
if (mVideoCodecContext->coded_width > mVideoCodecContext->width)
sourceWidth--;
// Conversion using libswscale. // Conversion using libswscale.
struct SwsContext* conversionContext = sws_getContext( struct SwsContext* conversionContext = sws_getContext(
mVideoCodecContext->coded_width, sourceWidth,
mVideoCodecContext->coded_height, mVideoCodecContext->height,
mVideoCodecContext->pix_fmt, mVideoCodecContext->pix_fmt,
mVideoFrame->width, mVideoFrame->width,
mVideoFrame->height, mVideoFrame->height,
@ -246,7 +256,7 @@ void VideoFFmpegComponent::readFrames()
allocatedSize = av_image_alloc( allocatedSize = av_image_alloc(
frameRGBA, frameRGBA,
lineSizes, lineSize,
mVideoFrame->width, mVideoFrame->width,
mVideoFrame->height, mVideoFrame->height,
AV_PIX_FMT_RGB32, AV_PIX_FMT_RGB32,
@ -257,9 +267,9 @@ void VideoFFmpegComponent::readFrames()
const_cast<uint8_t const* const*>(mVideoFrame->data), const_cast<uint8_t const* const*>(mVideoFrame->data),
mVideoFrame->linesize, mVideoFrame->linesize,
0, 0,
mVideoCodecContext->coded_height, mVideoCodecContext->height,
frameRGBA, frameRGBA,
lineSizes); lineSize);
VideoFrame currFrame; VideoFrame currFrame;