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

* Disabled tracing.

Browse Source 
* Use the configured source color space when converting instead of hardcoding
   B_RGB32. (Resolved TODO)


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34929 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-01-07 01:14:20 +00:00
parent f947df7ded
commit 59ec4d2f76
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
View File

@ -15,9 +15,11 @@ extern "C" {
#include "rational.h" #include "rational.h"
} }
#include "gfx_util.h"
#undef TRACE #undef TRACE
#define TRACE_AV_CODEC_ENCODER //#define TRACE_AV_CODEC_ENCODER
#ifdef TRACE_AV_CODEC_ENCODER #ifdef TRACE_AV_CODEC_ENCODER
# define TRACE printf # define TRACE printf
# define TRACE_IO(a...) # define TRACE_IO(a...)
@ -309,10 +311,10 @@ 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];
// TODO: Use actual pixel format from media_format!
fSwsContext = sws_getContext(fContext->width, fContext->height, fSwsContext = sws_getContext(fContext->width, fContext->height,
PIX_FMT_RGB32, fContext->width, fContext->height, colorspace_to_pixfmt(fInputFormat.u.raw_video.display.format),
fContext->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL); fContext->width, fContext->height,
fContext->pix_fmt, SWS_FAST_BILINEAR, NULL, NULL, NULL);
} else if (fInputFormat.type == B_MEDIA_RAW_AUDIO) { } else if (fInputFormat.type == B_MEDIA_RAW_AUDIO) {
TRACE(" B_MEDIA_RAW_AUDIO\n"); TRACE(" B_MEDIA_RAW_AUDIO\n");