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

Some progress, but still glitchy

Browse source 
Originally committed to SVN as r281.
This commit is contained in:
Rodrigo Braz Monteiro 2006-04-01 14:34:03 +00:00
parent f17f7e03e6
commit 7022fe39ac
3 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
prs/png_wrap.cpp
View file

@ -86,25 +86,42 @@ void PNGWrapper::Read(PRSVideoFrame *frame) {
png_set_read_fn(png_ptr,this,memory_read_data); png_set_read_fn(png_ptr,this,memory_read_data);
// Read data // Read data
png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_IDENTITY, NULL); //png_read_png(png_ptr, info_ptr, PNG_TRANSFORM_EXPAND | PNG_TRANSFORM_PACKING | PNG_TRANSFORM_STRIP_16, NULL);
png_bytepp row_pointers = png_get_rows(png_ptr, info_ptr);
// Get image size // Get image size
int w = png_get_image_width(png_ptr,info_ptr); //int w = png_get_image_width(png_ptr,info_ptr);
int h = png_get_image_height(png_ptr,info_ptr); //int h = png_get_image_height(png_ptr,info_ptr);
// Read info
png_uint_32 w, h;
int bit_depth, color_type, interlace_type, compression_type, filter_method;
png_read_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr, &w, &h, &bit_depth, &color_type, &interlace_type, &compression_type, &filter_method);
// Transformations
color_type = png_get_color_type(png_ptr, info_ptr);
if (color_type == PNG_COLOR_TYPE_PALETTE) png_set_palette_to_rgb(png_ptr);
if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) png_set_gray_1_2_4_to_8(png_ptr);
if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
if (bit_depth > 8) png_set_strip_16(png_ptr);
png_read_update_info(png_ptr, info_ptr);
int rowLen = png_get_rowbytes(png_ptr,info_ptr);
// Allocate frame data // Allocate frame data
int bpp = 4; int bpp = 4;
frame->ownData = true; frame->ownData = true;
frame->data[0] = new char[w*h*bpp]; frame->data[0] = new char[h*rowLen];
frame->w = w; frame->w = rowLen/4;
frame->h = h; frame->h = h;
frame->pitch = w*bpp; frame->pitch = rowLen;
frame->colorSpace = ColorSpace_RGB32; frame->colorSpace = ColorSpace_RGB32;
// Copy data to frame // Get rows
png_bytepp row_pointers = (png_bytepp) png_malloc (png_ptr,sizeof(png_bytep) * h);
char *dst = frame->data[0]; char *dst = frame->data[0];
for (int i=0;i<h;i++) memcpy(dst+i*w*bpp,row_pointers[i],w*bpp); for (size_t i=0;i<h;i++) row_pointers[i] = (png_bytep) (dst+rowLen*i);
png_read_image(png_ptr, row_pointers);
png_read_end(png_ptr, end_info);
// Clean up // Clean up
png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);

1
prs/prs_file.cpp
View file

@ -253,6 +253,7 @@ void PRSFile::DrawFrame(int n,PRSVideoFrame *frame) {
// Get display and image pair // Get display and image pair
PRSDisplay *display = blocks[i]; PRSDisplay *display = blocks[i];
PRSImage *image = GetImageByID(display->id); PRSImage *image = GetImageByID(display->id);
if (!image) continue;
// Decode PNG // Decode PNG
PRSVideoFrame *overFrame = image->GetDecodedFrame(); PRSVideoFrame *overFrame = image->GetDecodedFrame();

2
prs/prs_video_frame.cpp
View file

@ -116,7 +116,7 @@ void PRSVideoFrame::Overlay(PRSVideoFrame *dstFrame,int x,int y,unsigned char al
sc1 = *src++; sc1 = *src++;
sc2 = *src++; sc2 = *src++;
sc3 = *src++; sc3 = *src++;
a = *src++; a = ((*src++) * alpha) / 255;
ia = 255-a; ia = 255-a;
// Swap colors // Swap colors