mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

convert AVFrame via wxImage on non-windoze

Browse source 
Originally committed to SVN as r243.
This commit is contained in:
David Lamparter 2006-03-25 23:40:09 +00:00
parent d58f1a28dc
commit 62a9e0d057
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
core/video_provider_lavc.cpp
View file

@ -231,7 +231,11 @@ wxBitmap LAVCVideoProvider::AVFrameToWX(AVFrame *source) {
// Get sizes // Get sizes
int w = codecContext->width; int w = codecContext->width;
int h = codecContext->height; int h = codecContext->height;
#ifdef __WINDOWS__
PixelFormat format = PIX_FMT_RGBA32; PixelFormat format = PIX_FMT_RGBA32;
#else
PixelFormat format = PIX_FMT_RGB24;
#endif
unsigned int size1 = avpicture_get_size(codecContext->pix_fmt,display_w,display_h); unsigned int size1 = avpicture_get_size(codecContext->pix_fmt,display_w,display_h);
unsigned int size2 = avpicture_get_size(format,display_w,display_h); unsigned int size2 = avpicture_get_size(format,display_w,display_h);
@ -275,7 +279,15 @@ wxBitmap LAVCVideoProvider::AVFrameToWX(AVFrame *source) {
img_convert((AVPicture*) frameRGB, format, (AVPicture*) resized, codecContext->pix_fmt, w, h); img_convert((AVPicture*) frameRGB, format, (AVPicture*) resized, codecContext->pix_fmt, w, h);
// Convert to wxBitmap // Convert to wxBitmap
#ifdef __WINDOWS__
wxBitmap bmp((const char*) frameRGB->data[0],w,h,32); wxBitmap bmp((const char*) frameRGB->data[0],w,h,32);
#else
wxImage img(w, h, false);
unsigned char *data = (unsigned char *)malloc(w * h * 3);
memcpy(data, frameRGB->data[0], w * h * 3);
img.SetData(data);
wxBitmap bmp(img);
#endif
av_free(frameRGB); av_free(frameRGB);
if (resized != source) if (resized != source)