i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: avoid assert in ffmpeg

Browse Source 
The input colorspace must be set.
This commit is contained in:
Adrien Destugues
2020-08-05 23:06:31 +02:00
parent 4fb9b30056
commit a11a58d4d0
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
+11 -2
View File
@@ -273,6 +273,15 @@ AVCodecEncoder::_Setup()
if (fInputFormat.type == B_MEDIA_RAW_VIDEO) { if (fInputFormat.type == B_MEDIA_RAW_VIDEO) {
TRACE(" B_MEDIA_RAW_VIDEO\n"); TRACE(" B_MEDIA_RAW_VIDEO\n");
// Check input parameters
AVPixelFormat pixFmt = colorspace_to_pixfmt(
fInputFormat.u.raw_video.display.format);
if (pixFmt == AV_PIX_FMT_NONE) {
TRACE("Invalid input colorspace");
return B_BAD_DATA;
}
// frame rate // frame rate
fCodecContext->time_base = (AVRational){1, (int)fInputFormat.u.raw_video.field_rate}; fCodecContext->time_base = (AVRational){1, (int)fInputFormat.u.raw_video.field_rate};
fCodecContext->framerate = (AVRational){(int)fInputFormat.u.raw_video.field_rate, 1}; fCodecContext->framerate = (AVRational){(int)fInputFormat.u.raw_video.field_rate, 1};
@@ -336,8 +345,8 @@ AVCodecEncoder::_Setup()
fFrame->linesize[2] = fDstFrame.linesize[2]; fFrame->linesize[2] = fDstFrame.linesize[2];
fFrame->linesize[3] = fDstFrame.linesize[3]; fFrame->linesize[3] = fDstFrame.linesize[3];
fSwsContext = sws_getContext(fCodecContext->width, fCodecContext->height, fSwsContext = sws_getContext(fCodecContext->width,
colorspace_to_pixfmt(fInputFormat.u.raw_video.display.format), fCodecContext->height, pixFmt,
fCodecContext->width, fCodecContext->height, fCodecContext->width, fCodecContext->height,
fCodecContext->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL); fCodecContext->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);