iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed flipping in the avisynth prs filter, but still glitchy and crashing 

Originally committed to SVN as r280.
This commit is contained in:
Rodrigo Braz Monteiro 2006-04-01 13:27:57 +00:00
parent 7a3ab721bb
commit f17f7e03e6
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
avisynth_prs/draw_prs.cpp
View File

@ -84,6 +84,8 @@ PVideoFrame __stdcall DrawPRS::GetFrame(int n, IScriptEnvironment* env) {
frame.h = avsFrame->GetHeight(); frame.h = avsFrame->GetHeight();
frame.pitch = avsFrame->GetPitch(); frame.pitch = avsFrame->GetPitch();
frame.colorSpace = ColorSpace_RGB32; frame.colorSpace = ColorSpace_RGB32;
frame.flipColors = true;
frame.flipVertical = true;
// Draw into the frame // Draw into the frame
file.DrawFrame(n,&frame); file.DrawFrame(n,&frame);

28
prs/prs_video_frame.cpp
View File

@ -61,6 +61,8 @@ PRSVideoFrame::PRSVideoFrame () {
w = 0; w = 0;
h = 0; h = 0;
ownData = false; ownData = false;
flipColors = false;
flipVertical = false;
} }
@ -82,6 +84,11 @@ void PRSVideoFrame::Overlay(PRSVideoFrame *dstFrame,int x,int y,unsigned char al
const unsigned char *src; const unsigned char *src;
unsigned char *dst; unsigned char *dst;
// Flip?
bool flipVer = flipVertical != dstFrame->flipVertical;
bool flipCol = flipColors != dstFrame->flipColors;
if (flipCol) y = dstFrame->h - h - y;
// Get boundaries // Get boundaries
int srcBpp = 4; int srcBpp = 4;
int dstBpp = 4; int dstBpp = 4;
@ -93,23 +100,32 @@ void PRSVideoFrame::Overlay(PRSVideoFrame *dstFrame,int x,int y,unsigned char al
int rowLen = MID(0,w,dstFrame->w - x); int rowLen = MID(0,w,dstFrame->w - x);
// Values // Values
unsigned char sc1,sc2,sc3,a,ia; unsigned char sc1,sc2,sc3,a,ia,aux;
unsigned char dc1,dc2,dc3,da; unsigned char dc1,dc2,dc3,da;
// Draw each row // Draw each row
for (int j=0;j<height;j++) { for (int j=0;j<height;j++) {
src = (const unsigned char *) data[0] + j*srcRowLen; src = (const unsigned char *) data[0] + j*srcRowLen;
dst = (unsigned char *) dstFrame->data[0] + (j+dstStarty)*dstRowLen + x*dstBpp; dst = (unsigned char *) dstFrame->data[0] + x*dstBpp;
if (flipCol) dst += (h-j-1+dstStarty)*dstRowLen;
else dst += (j+dstStarty)*dstRowLen;
// Draw the row // Draw the row
for (int i=0;i<rowLen;i++) { for (int i=0;i<rowLen;i++) {
// Read source // Read source
sc3 = *src++;
sc2 = *src++;
sc1 = *src++; sc1 = *src++;
sc2 = *src++;
sc3 = *src++;
a = *src++; a = *src++;
ia = 255-a; ia = 255-a;
// Swap colors
if (flipCol) {
aux = sc1;
sc1 = sc3;
sc3 = aux;
}
// Read destination // Read destination
dc1 = *(dst); dc1 = *(dst);
dc2 = *(dst+1); dc2 = *(dst+1);
@ -120,8 +136,8 @@ void PRSVideoFrame::Overlay(PRSVideoFrame *dstFrame,int x,int y,unsigned char al
*dst++ = (sc1*a + dc1*ia)/255; *dst++ = (sc1*a + dc1*ia)/255;
*dst++ = (sc2*a + dc2*ia)/255; *dst++ = (sc2*a + dc2*ia)/255;
*dst++ = (sc3*a + dc3*ia)/255; *dst++ = (sc3*a + dc3*ia)/255;
//*dst++ = 255-(ia*(255-da)/255); *dst++ = 255-(ia*(255-da)/255);
*dst++ = da; //*dst++ = da;
} }
} }
} }

3
prs/prs_video_frame.h
View File

@ -57,6 +57,9 @@ public:
int pitch; // Pitch (that is, width plus invisible area for optimization) int pitch; // Pitch (that is, width plus invisible area for optimization)
ColorSpaceType colorSpace; // Color space ColorSpaceType colorSpace; // Color space
bool flipVertical; // Frame is flipped vertically
bool flipColors; // Colors are flipped
PRSVideoFrame(); PRSVideoFrame();
~PRSVideoFrame(); ~PRSVideoFrame();