Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Hack to automatically deinterlace video, this needs to be improved later on,

Browse Source 
but is better than before in any case. The deinterlacing is nothing fancy,
basically, it just drops the first field... the implementation to use this
is also not as efficient as it could be, it currently allocates a temporary
frame always...


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31996 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2009-07-30 20:49:04 +00:00
parent eeb4be0c7f
commit 435924897f
1 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/add-ons/media/plugins/ffmpeg/AVCodecDecoder.cpp
View File

@ -643,6 +643,32 @@ AVCodecDecoder::_DecodeVideo(void* outBuffer, int64* outFrameCount,
// fContext->frame_rate); // fContext->frame_rate);
if (gotPicture) { if (gotPicture) {
int width = fOutputVideoFormat.display.line_width;
int height = fOutputVideoFormat.display.line_count;
AVPicture deinterlacedPicture;
bool useDeinterlacedPicture = false;
if (fInputPicture->interlaced_frame) {
AVPicture source;
source.data[0] = fInputPicture->data[0];
source.data[1] = fInputPicture->data[1];
source.data[2] = fInputPicture->data[2];
source.data[3] = fInputPicture->data[3];
source.linesize[0] = fInputPicture->linesize[0];
source.linesize[1] = fInputPicture->linesize[1];
source.linesize[2] = fInputPicture->linesize[2];
source.linesize[3] = fInputPicture->linesize[3];
avpicture_alloc(&deinterlacedPicture,
fContext->pix_fmt, width, height);
if (avpicture_deinterlace(&deinterlacedPicture, &source,
fContext->pix_fmt, width, height) < 0) {
TRACE("[v] avpicture_deinterlace() - error\n");
} else
useDeinterlacedPicture = true;
}
#if DO_PROFILING #if DO_PROFILING
bigtime_t formatConversionStart = system_time(); bigtime_t formatConversionStart = system_time();
#endif #endif
@ -659,10 +685,26 @@ AVCodecDecoder::_DecodeVideo(void* outBuffer, int64* outFrameCount,
= fOutputVideoFormat.display.bytes_per_row; = fOutputVideoFormat.display.bytes_per_row;
if (fFormatConversionFunc != NULL) { if (fFormatConversionFunc != NULL) {
if (useDeinterlacedPicture) {
AVFrame inputFrame;
inputFrame.data[0] = deinterlacedPicture.data[0];
inputFrame.data[1] = deinterlacedPicture.data[1];
inputFrame.data[2] = deinterlacedPicture.data[2];
inputFrame.data[3] = deinterlacedPicture.data[3];
inputFrame.linesize[0] = deinterlacedPicture.linesize[0];
inputFrame.linesize[1] = deinterlacedPicture.linesize[1];
inputFrame.linesize[2] = deinterlacedPicture.linesize[2];
inputFrame.linesize[3] = deinterlacedPicture.linesize[3];
(*fFormatConversionFunc)(&inputFrame,
fOutputPicture, width, height);
} else {
(*fFormatConversionFunc)(fInputPicture, fOutputPicture, (*fFormatConversionFunc)(fInputPicture, fOutputPicture,
fOutputVideoFormat.display.line_width, width, height);
fOutputVideoFormat.display.line_count);
} }
}
if (fInputPicture->interlaced_frame)
avpicture_free(&deinterlacedPicture);
#ifdef DEBUG #ifdef DEBUG
dump_ffframe(fInputPicture, "ffpict"); dump_ffframe(fInputPicture, "ffpict");
// dump_ffframe(fOutputPicture, "opict"); // dump_ffframe(fOutputPicture, "opict");