From b478785d8960987bd294285fc3d15525f0834d1f Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 20 Mar 2007 01:06:51 +0000 Subject: Move gltest and bmovl-test into the main TOOLS directory, subdirectories for single files are silly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22755 b3059339-0415-0410-9bf9-f77b7e298cf2 --- TOOLS/GL-test/compile.sh | 2 - TOOLS/GL-test/gltest.c | 189 ------------------------------------------ TOOLS/Makefile | 8 +- TOOLS/bmovl-test.c | 116 ++++++++++++++++++++++++++ TOOLS/bmovl-test/Makefile | 7 -- TOOLS/bmovl-test/bmovl-test.c | 116 -------------------------- TOOLS/gltest.c | 189 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 312 insertions(+), 315 deletions(-) delete mode 100755 TOOLS/GL-test/compile.sh delete mode 100644 TOOLS/GL-test/gltest.c create mode 100644 TOOLS/bmovl-test.c delete mode 100644 TOOLS/bmovl-test/Makefile delete mode 100644 TOOLS/bmovl-test/bmovl-test.c create mode 100644 TOOLS/gltest.c diff --git a/TOOLS/GL-test/compile.sh b/TOOLS/GL-test/compile.sh deleted file mode 100755 index 002d4a028d..0000000000 --- a/TOOLS/GL-test/compile.sh +++ /dev/null @@ -1,2 +0,0 @@ - -gcc -g -O4 gltest.c ../../osdep/timer-lx.o -o gltest -L/usr/X11/lib -L/usr/X11R6/lib -lglut -lGL -lGLU -lX11 -lXext -lXmu -lXi -lm diff --git a/TOOLS/GL-test/gltest.c b/TOOLS/GL-test/gltest.c deleted file mode 100644 index e8c6d33146..0000000000 --- a/TOOLS/GL-test/gltest.c +++ /dev/null @@ -1,189 +0,0 @@ -// OpenGL glTexSubImage() test/benchmark prg (C) 2001. by A'rpi/ESP-team - -#include -#include -#include -#include -#include - -// pixel size: 3 or 4 -#define BYTES_PP 3 - -// blit by lines (defined) or frames (not defined) -#define FAST_BLIT - -static uint32_t image_width=720; // DVD size -static uint32_t image_height=576; - -static uint32_t image_format; -static uint32_t image_bpp; -static uint32_t image_bytes; - -static uint32_t texture_width=512; -static uint32_t texture_height=512; - -static unsigned char *ImageData=NULL; - -static GLvoid resize(int x,int y){ - printf("Resize: %dx%d\n",x,y); - glViewport( 0, 0, x, y ); - - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glOrtho(0, image_width, image_height, 0, -1,1); - - glMatrixMode(GL_MODELVIEW); - glLoadIdentity(); -} - -float akarmi=0; - -int counter=0; -float gen_time=0; -float up_time=0; -float render_time=0; - -unsigned char sintable[4096]; - -extern float GetRelativeTime(); - -static void redraw(void) -{ -// glClear(GL_COLOR_BUFFER_BIT); - int x,y,i; - unsigned char *d=ImageData; - int dstride=BYTES_PP*image_width; - - GetRelativeTime(); - - // generate some image: - for(y=0;y2.0){ - printf("%8.3f fps (gen: %2d%% upload: %2d%% render: %2d%%)\n", - (float)counter/total, - (int)(100.0*gen_time/total), - (int)(100.0*up_time/total), - (int)(100.0*render_time/total) - ); - gen_time=up_time=render_time=0; - counter=0; - } } - -} - -static GLvoid IdleFunc(){ - akarmi+=0.1; - glutPostRedisplay(); -} - -int -main(int argc, char **argv) -{ - int i; - - glutInit(&argc, argv); - glutInitWindowSize(640, 480); - glutInitDisplayMode(GLUT_DOUBLE); - (void) glutCreateWindow("csg"); - - glutDisplayFunc(redraw); - glutReshapeFunc(resize); - glutIdleFunc(IdleFunc); - - texture_width=32; - while(texture_width +#include +#include +#include + +#define DEBUG 0 + +static void +blit(int fifo, unsigned char *bitmap, int width, int height, + int xpos, int ypos, int alpha, int clear) +{ + char str[100]; + int nbytes; + + sprintf(str, "RGBA32 %d %d %d %d %d %d\n", + width, height, xpos, ypos, alpha, clear); + + if(DEBUG) printf("Sending %s", str); + + write(fifo, str, strlen(str)); + nbytes = write(fifo, bitmap, width*height*4); + + if(DEBUG) printf("Sent %d bytes of bitmap data...\n", nbytes); +} + +static void +set_alpha(int fifo, int width, int height, int xpos, int ypos, int alpha) { + char str[100]; + + sprintf(str, "ALPHA %d %d %d %d %d\n", + width, height, xpos, ypos, alpha); + + if(DEBUG) printf("Sending %s", str); + + write(fifo, str, strlen(str)); +} + +static void +paint(unsigned char* bitmap, int size, int red, int green, int blue, int alpha) { + + int i; + + for(i=0; i < size; i+=4) { + bitmap[i+0] = red; + bitmap[i+1] = green; + bitmap[i+2] = blue; + bitmap[i+3] = alpha; + } +} + +int main(int argc, char **argv) { + + int fifo=-1; + int width=0, height=0, xpos=0, ypos=0, alpha=0, clear=0; + unsigned char *bitmap; + SDL_Surface *image; + int i; + + if(argc<3) { + printf("Usage: %s \n", argv[0]); + printf("width and height are w/h of MPlayer's screen!\n"); + exit(10); + } + + width = atoi(argv[3]); + height = atoi(argv[4]); + + fifo = open( argv[1], O_RDWR ); + if(!fifo) { + fprintf(stderr, "Error opening FIFO %s!\n", argv[1]); + exit(10); + } + + image = IMG_Load(argv[2]); + if(!image) { + fprintf(stderr, "Couldn't load image %s!\n", argv[2]); + exit(10); + } + + printf("Loaded image %s: width=%d, height=%d\n", argv[2], image->w, image->h); + + // Display and move image + for(i=0; (i < (width - image->w)) && (i < (height - image->h)); i += 5) + blit(fifo, image->pixels, image->w, image->h, i, i, 0, 1); + + // Create a 75x75 bitmap + bitmap = (unsigned char*)malloc(75*75*4); + + // Paint bitmap red, 50% transparent and blit at position 50,50 + paint(bitmap, (75*75*4), 255, 0, 0, 128); + blit(fifo, bitmap, 75, 75, 50, 50, 0, 0); + + // Paint bitmap green, 50% transparent and blit at position -50,50 + paint(bitmap, (75*75*4), 0, 255, 0, 128); + blit(fifo, bitmap, 75, 75, width-50-75, 50, 0, 0); + + // Paint bitmap blue, 50% transparent and blit at position -50,50 + paint(bitmap, (75*75*4), 0, 0, 255, 128); + blit(fifo, bitmap, 75, 75, 50, height-50-75, 0, 0); + + // Blit another image in the middle, completly transparent + blit(fifo, image->pixels, image->w, image->h, + (width/2)-(image->w/2), (height/2)-(image->h/2), -255, 0); + + // Fade in image + for(i=-255; i <= 0; i++) + set_alpha(fifo, image->w, image->h, + (width/2)-(image->w/2), (height/2)-(image->h/2), i); + + + // Clean up + free(bitmap); + SDL_FreeSurface(image); +} diff --git a/TOOLS/bmovl-test/Makefile b/TOOLS/bmovl-test/Makefile deleted file mode 100644 index 0bc8b9ce5f..0000000000 --- a/TOOLS/bmovl-test/Makefile +++ /dev/null @@ -1,7 +0,0 @@ -include ../../config.mak - -bmovl-test$(EXESUF): bmovl-test.c - $(CC) -O3 $(EXTRA_INC) -lSDL_image -o $@ bmovl-test.c - -clean: - rm -f bmovl-test diff --git a/TOOLS/bmovl-test/bmovl-test.c b/TOOLS/bmovl-test/bmovl-test.c deleted file mode 100644 index 651c9c02ac..0000000000 --- a/TOOLS/bmovl-test/bmovl-test.c +++ /dev/null @@ -1,116 +0,0 @@ -/* Small program to test the features of vf_bmovl */ - -#include -#include -#include -#include - -#define DEBUG 0 - -static void -blit(int fifo, unsigned char *bitmap, int width, int height, - int xpos, int ypos, int alpha, int clear) -{ - char str[100]; - int nbytes; - - sprintf(str, "RGBA32 %d %d %d %d %d %d\n", - width, height, xpos, ypos, alpha, clear); - - if(DEBUG) printf("Sending %s", str); - - write(fifo, str, strlen(str)); - nbytes = write(fifo, bitmap, width*height*4); - - if(DEBUG) printf("Sent %d bytes of bitmap data...\n", nbytes); -} - -static void -set_alpha(int fifo, int width, int height, int xpos, int ypos, int alpha) { - char str[100]; - - sprintf(str, "ALPHA %d %d %d %d %d\n", - width, height, xpos, ypos, alpha); - - if(DEBUG) printf("Sending %s", str); - - write(fifo, str, strlen(str)); -} - -static void -paint(unsigned char* bitmap, int size, int red, int green, int blue, int alpha) { - - int i; - - for(i=0; i < size; i+=4) { - bitmap[i+0] = red; - bitmap[i+1] = green; - bitmap[i+2] = blue; - bitmap[i+3] = alpha; - } -} - -int main(int argc, char **argv) { - - int fifo=-1; - int width=0, height=0, xpos=0, ypos=0, alpha=0, clear=0; - unsigned char *bitmap; - SDL_Surface *image; - int i; - - if(argc<3) { - printf("Usage: %s \n", argv[0]); - printf("width and height are w/h of MPlayer's screen!\n"); - exit(10); - } - - width = atoi(argv[3]); - height = atoi(argv[4]); - - fifo = open( argv[1], O_RDWR ); - if(!fifo) { - fprintf(stderr, "Error opening FIFO %s!\n", argv[1]); - exit(10); - } - - image = IMG_Load(argv[2]); - if(!image) { - fprintf(stderr, "Couldn't load image %s!\n", argv[2]); - exit(10); - } - - printf("Loaded image %s: width=%d, height=%d\n", argv[2], image->w, image->h); - - // Display and move image - for(i=0; (i < (width - image->w)) && (i < (height - image->h)); i += 5) - blit(fifo, image->pixels, image->w, image->h, i, i, 0, 1); - - // Create a 75x75 bitmap - bitmap = (unsigned char*)malloc(75*75*4); - - // Paint bitmap red, 50% transparent and blit at position 50,50 - paint(bitmap, (75*75*4), 255, 0, 0, 128); - blit(fifo, bitmap, 75, 75, 50, 50, 0, 0); - - // Paint bitmap green, 50% transparent and blit at position -50,50 - paint(bitmap, (75*75*4), 0, 255, 0, 128); - blit(fifo, bitmap, 75, 75, width-50-75, 50, 0, 0); - - // Paint bitmap blue, 50% transparent and blit at position -50,50 - paint(bitmap, (75*75*4), 0, 0, 255, 128); - blit(fifo, bitmap, 75, 75, 50, height-50-75, 0, 0); - - // Blit another image in the middle, completly transparent - blit(fifo, image->pixels, image->w, image->h, - (width/2)-(image->w/2), (height/2)-(image->h/2), -255, 0); - - // Fade in image - for(i=-255; i <= 0; i++) - set_alpha(fifo, image->w, image->h, - (width/2)-(image->w/2), (height/2)-(image->h/2), i); - - - // Clean up - free(bitmap); - SDL_FreeSurface(image); -} diff --git a/TOOLS/gltest.c b/TOOLS/gltest.c new file mode 100644 index 0000000000..e8c6d33146 --- /dev/null +++ b/TOOLS/gltest.c @@ -0,0 +1,189 @@ +// OpenGL glTexSubImage() test/benchmark prg (C) 2001. by A'rpi/ESP-team + +#include +#include +#include +#include +#include + +// pixel size: 3 or 4 +#define BYTES_PP 3 + +// blit by lines (defined) or frames (not defined) +#define FAST_BLIT + +static uint32_t image_width=720; // DVD size +static uint32_t image_height=576; + +static uint32_t image_format; +static uint32_t image_bpp; +static uint32_t image_bytes; + +static uint32_t texture_width=512; +static uint32_t texture_height=512; + +static unsigned char *ImageData=NULL; + +static GLvoid resize(int x,int y){ + printf("Resize: %dx%d\n",x,y); + glViewport( 0, 0, x, y ); + + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(0, image_width, image_height, 0, -1,1); + + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); +} + +float akarmi=0; + +int counter=0; +float gen_time=0; +float up_time=0; +float render_time=0; + +unsigned char sintable[4096]; + +extern float GetRelativeTime(); + +static void redraw(void) +{ +// glClear(GL_COLOR_BUFFER_BIT); + int x,y,i; + unsigned char *d=ImageData; + int dstride=BYTES_PP*image_width; + + GetRelativeTime(); + + // generate some image: + for(y=0;y2.0){ + printf("%8.3f fps (gen: %2d%% upload: %2d%% render: %2d%%)\n", + (float)counter/total, + (int)(100.0*gen_time/total), + (int)(100.0*up_time/total), + (int)(100.0*render_time/total) + ); + gen_time=up_time=render_time=0; + counter=0; + } } + +} + +static GLvoid IdleFunc(){ + akarmi+=0.1; + glutPostRedisplay(); +} + +int +main(int argc, char **argv) +{ + int i; + + glutInit(&argc, argv); + glutInitWindowSize(640, 480); + glutInitDisplayMode(GLUT_DOUBLE); + (void) glutCreateWindow("csg"); + + glutDisplayFunc(redraw); + glutReshapeFunc(resize); + glutIdleFunc(IdleFunc); + + texture_width=32; + while(texture_width