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

Make ffmpeg and ffms video providers endianness-aware and always get the video in pixel format expected by the video display.

Browse source 
Originally committed to SVN as r2492.
This commit is contained in:
Niels Martin Hansen 2008-11-26 02:03:53 +00:00
parent e802fa3c84
commit 42dd599579
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
aegisub/video_provider_ffmpegsource.cpp
View file

@ -40,6 +40,7 @@
#include "video_provider_ffmpegsource.h" #include "video_provider_ffmpegsource.h"
#include "video_context.h" #include "video_context.h"
#include "options.h" #include "options.h"
#include "aegisub_endian.h"
/////////////// ///////////////
@ -217,13 +218,18 @@ const AegiVideoFrame FFmpegSourceVideoProvider::GetFrame(int _n, int FormatType)
// this is what we'll return eventually // this is what we'll return eventually
AegiVideoFrame &DstFrame = CurFrame; AegiVideoFrame &DstFrame = CurFrame;
bool big_endian = Endian::BigToMachine((int)1)==(int)1;
// choose output format // choose output format
if (FormatType & FORMAT_RGB32) { if (FormatType & FORMAT_RGB32 && big_endian) {
DstFormat = FFMS_PIX_FMT_BGR32_1;
DstFrame.format = FORMAT_RGB32;
} else if (FormatType & FORMAT_RGB32 && !big_endian) {
DstFormat = FFMS_PIX_FMT_RGB32; DstFormat = FFMS_PIX_FMT_RGB32;
DstFrame.format = FORMAT_RGB32; DstFrame.format = FORMAT_RGB32;
} else if (FormatType & FORMAT_RGB24) { } else if (FormatType & FORMAT_RGB24) {
DstFormat = FFMS_PIX_FMT_RGB24; DstFormat = FFMS_PIX_FMT_BGR24;
DstFrame.format = FORMAT_RGB24; DstFrame.format = FORMAT_RGB24;
} else if (FormatType & FORMAT_YV12) { } else if (FormatType & FORMAT_YV12) {
DstFormat = FFMS_PIX_FMT_YUV420P; // may or may not work DstFormat = FFMS_PIX_FMT_YUV420P; // may or may not work

2
aegisub/video_provider_lavc.cpp
View file

@ -283,7 +283,7 @@ const AegiVideoFrame LAVCVideoProvider::GetFrame(int n,int formatType) {
int w = codecContext->width; int w = codecContext->width;
int h = codecContext->height; int h = codecContext->height;
PixelFormat srcFormat = codecContext->pix_fmt; PixelFormat srcFormat = codecContext->pix_fmt;
PixelFormat dstFormat = PIX_FMT_RGB32; PixelFormat dstFormat = PIX_FMT_BGRA;
// Allocate RGB32 buffer // Allocate RGB32 buffer
if(!sws_context) //first frame if(!sws_context) //first frame