mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Fix an ancient bug in the ffms2 video provider that caused access violations when trying to output YV12 images. Nobody discovered this before because nobody tried to use YV12.

Browse source 
Originally committed to SVN as r3152.
This commit is contained in:
Karl Blomster 2009-07-16 19:20:14 +00:00
parent fb8196dcf8
commit 8087622edd
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
aegisub/src/video_provider_ffmpegsource.cpp
View file

@ -298,17 +298,17 @@ const AegiVideoFrame FFmpegSourceVideoProvider::GetFrame(int _n, int FormatType)
AegiVideoFrame &DstFrame = CurFrame; AegiVideoFrame &DstFrame = CurFrame;
// choose output format // choose output format
if (FormatType & FORMAT_RGB32) { if (0 /*FormatType & FORMAT_RGB32*/) {
DstFormat = FFMS_GetPixFmt("bgra"); DstFormat = FFMS_GetPixFmt("bgra");
DstFrame.format = FORMAT_RGB32; DstFrame.format = FORMAT_RGB32;
} else if (FormatType & FORMAT_RGB24) { } else if (FormatType & FORMAT_RGB24) {
DstFormat = FFMS_GetPixFmt("bgr24"); DstFormat = FFMS_GetPixFmt("bgr24");
DstFrame.format = FORMAT_RGB24; DstFrame.format = FORMAT_RGB24;
} else if (FormatType & FORMAT_YV12) { } else if (FormatType & FORMAT_YV12) {
DstFormat = FFMS_GetPixFmt("yuv420p"); // may or may not work DstFormat = FFMS_GetPixFmt("yuv420p");
DstFrame.format = FORMAT_YV12; DstFrame.format = FORMAT_YV12;
} else if (FormatType & FORMAT_YUY2) { } else if (FormatType & FORMAT_YUY2) {
DstFormat = FFMS_GetPixFmt("yuyv422"); DstFormat = FFMS_GetPixFmt("yuyv422"); // may or may not work
DstFrame.format = FORMAT_YUY2; DstFrame.format = FORMAT_YUY2;
} else } else
throw _T("FFmpegSource video provider: upstream provider requested unknown or unsupported pixel format"); throw _T("FFmpegSource video provider: upstream provider requested unknown or unsupported pixel format");
@ -343,10 +343,14 @@ const AegiVideoFrame FFmpegSourceVideoProvider::GetFrame(int _n, int FormatType)
DstFrame.pitch[i] = SrcFrame->Linesize[i]; DstFrame.pitch[i] = SrcFrame->Linesize[i];
DstFrame.Allocate(); DstFrame.Allocate();
// copy data to destination, skipping planes with no data in them // copy data to destination
for (int j = 0; j < 4; j++) { memcpy(DstFrame.data[0], SrcFrame->Data[0], DstFrame.pitch[0] * DstFrame.h);
if (SrcFrame->Linesize[j] > 0) // if we're dealing with YUV formats we need to copy the U and V planes as well
memcpy(DstFrame.data[j], SrcFrame->Data[j], DstFrame.pitch[j] * DstFrame.h); if (DstFrame.format == FORMAT_YUY2 || DstFrame.format == FORMAT_YV12) {
// YV12 has half the vertical U/V resolution too because of the subsampling
int UVHeight = DstFrame.format == FORMAT_YUY2 ? DstFrame.h : DstFrame.h / 2;
memcpy(DstFrame.data[1], SrcFrame->Data[1], DstFrame.pitch[1] * UVHeight);
memcpy(DstFrame.data[2], SrcFrame->Data[2], DstFrame.pitch[2] * UVHeight);
} }
return DstFrame; return DstFrame;