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

Readded 16bpp support for avisynth file opening

Browse source 
Originally committed to SVN as r217.
This commit is contained in:
Fredrik Mellbin 2006-03-11 16:20:40 +00:00
parent b3c69a4567
commit 7b95ba47fb
2 changed files with 51 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
core/video_provider_avs.cpp
View file

@ -50,6 +50,8 @@ AvisynthVideoProvider::AvisynthVideoProvider(wxString _filename, wxString _subfi
ResizedVideo = NULL; ResizedVideo = NULL;
data = NULL; data = NULL;
depth = 0;
last_fnum = -1; last_fnum = -1;
subfilename = _subfilename; subfilename = _subfilename;
@ -63,10 +65,7 @@ AvisynthVideoProvider::AvisynthVideoProvider(wxString _filename, wxString _subfi
if( _subfilename.IsEmpty() ) SubtitledVideo = RGB32Video; if( _subfilename.IsEmpty() ) SubtitledVideo = RGB32Video;
else SubtitledVideo = ApplySubtitles(subfilename, RGB32Video); else SubtitledVideo = ApplySubtitles(subfilename, RGB32Video);
/*
if( _zoom == 1.0 ) ResizedVideo = SubtitledVideo;
else ResizedVideo = ApplyDARZoom(zoom, dar, SubtitledVideo);
*/
ResizedVideo = ApplyDARZoom(zoom, dar, SubtitledVideo); ResizedVideo = ApplyDARZoom(zoom, dar, SubtitledVideo);
vi = ResizedVideo->GetVideoInfo(); vi = ResizedVideo->GetVideoInfo();
@ -219,22 +218,55 @@ wxBitmap AvisynthVideoProvider::GetFrame(int n, bool force) {
PVideoFrame frame = ResizedVideo->GetFrame(n,env); PVideoFrame frame = ResizedVideo->GetFrame(n,env);
//will fail if not rgb32 int ndepth = wxDisplayDepth();
if (!data)
data = new unsigned char[vi.width*vi.height*vi.BitsPerPixel()/8];
unsigned char* dst = data+(vi.width*(vi.height-1)*vi.BitsPerPixel()/8); if (depth != ndepth) {
depth = ndepth;
delete data;
data = NULL;
}
if (!data)
data = new unsigned char[vi.width*vi.height*depth/8];
unsigned char* dst = data+(vi.width*(vi.height-1)*depth/8);
if (depth == 32) {
int rs = vi.RowSize(); int rs = vi.RowSize();
const unsigned char* src = frame->GetReadPtr(); const unsigned char* src = frame->GetReadPtr();
int srcpitch = frame->GetPitch(); int srcpitch = frame->GetPitch();
for (int i = 0; i < vi.height; i++) { for (int y = 0; y < vi.height; y++) {
memcpy(dst,src,rs); memcpy(dst,src,rs);
src+=srcpitch; src+=srcpitch;
dst-=rs; dst-=rs;
} }
} else if (depth == 24) {
//fail
} else if (depth == 16) {
const unsigned char *read_ptr = frame->GetReadPtr();
unsigned short *write_ptr = (unsigned short*) dst;
unsigned char r,g,b;
int srcpitch = frame->GetPitch();
int rs = vi.RowSize();
last_frame = wxBitmap((const char*)data, vi.width, vi.height, vi.BitsPerPixel()); for (int y = 0; y < vi.height; y++) {
for (int x=0,dx=0;x<rs;x+=4,dx++) {
r = read_ptr[x+2];
g = read_ptr[x+1];
b = read_ptr[x];
write_ptr[dx] = ((r>>3)<<11) | ((g>>2)<<5) | b>>3;
}
write_ptr -= vi.width;
read_ptr += srcpitch;
}
} else {
//fail
}
last_frame = wxBitmap((const char*)data, vi.width, vi.height, depth);
last_fnum = n; last_fnum = n;
} }

2
core/video_provider_avs.h
View file

@ -66,6 +66,8 @@ private:
int last_fnum; int last_fnum;
int depth;
unsigned char* data; unsigned char* data;
wxBitmap last_frame; wxBitmap last_frame;