mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:46:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

[402/906] gloverlay: fix some warnings

Browse source
This commit is contained in:
Julien Isorce 2009-11-17 01:08:09 +01:00 committed by Matthew Waters
parent a7a5c7ee8a
commit 416a4c6161
1 changed files with 64 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

128
gst/gl/gstgloverlay.c
View file

@ -235,17 +235,17 @@ gst_gl_overlay_draw_texture_video_on_png (GstGLOverlay * overlay, GLuint tex)
// height = (gfloat) overlay->height; // height = (gfloat) overlay->height;
// } // }
if (overlay->pbuftexture != 0) { if (overlay->pbuftexture != 0) {
size = (overlay->size_png) / 50.0; size = (overlay->size_png) / 50.0f;
posx = (overlay->pos_x_png - 50.0) / 50.0; posx = (overlay->pos_x_png - 50.0f) / 50.0f;
posx = posx =
(posx - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posx + (size / 2) > (posx - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posx + (size / 2) >
1.00) ? (1.0 - size / 2) : posx; 1.00) ? (1.0f - size / 2) : posx;
posy = (overlay->pos_y_png - 50.0) / 50.0; posy = (overlay->pos_y_png - 50.0f) / 50.0f;
posy = posy =
(posy - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posy + (size / 2) > (posy - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posy + (size / 2) >
1.00) ? (1.0 - size / 2) : posy; 1.00) ? (1.0f - size / 2) : posy;
ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width; ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width;
translate = overlay->size_png / 400.0; translate = overlay->size_png / 400.0f;
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, overlay->pbuftexture); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, overlay->pbuftexture);
@ -254,27 +254,27 @@ gst_gl_overlay_draw_texture_video_on_png (GstGLOverlay * overlay, GLuint tex)
if (overlay->rotate_png == 2) if (overlay->rotate_png == 2)
glRotatef (overlay->angle_png, 0, 1, 0); glRotatef (overlay->angle_png, 0, 1, 0);
glBegin (GL_QUADS); glBegin (GL_QUADS);
glTexCoord3f (0.0, 0.0, 0.0); glTexCoord3f (0.0f, 0.0f, 0.0f);
glVertex3f (posx - (size / 2), posy - (size / 2), 0.0); glVertex3f (posx - (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, 0.0, 0.0); glTexCoord3f (width, 0.0, 0.0);
glVertex3f (posx + (size / 2), posy - (size / 2), 0.0); glVertex3f (posx + (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, height, 0.0); glTexCoord3f (width, height, 0.0);
glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0f);
glTexCoord3f (0.0, height, 0.0); glTexCoord3f (0.0, height, 0.0);
glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0f);
glEnd (); glEnd ();
} }
size = (overlay->size_video) / 50.0; size = (overlay->size_video) / 50.0f;
posx = (overlay->pos_x_video - 50.0) / 50.0; posx = (overlay->pos_x_video - 50.0f) / 50.0f;
posx = posx =
(posx - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posx + (size / 2) > (posx - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posx + (size / 2) >
1.00) ? (1.0 - size / 2) : posx; 1.00) ? (1.0f - size / 2) : posx;
posy = (overlay->pos_y_video - 50.0) / 50.0; posy = (overlay->pos_y_video - 50.0f) / 50.0f;
posy = posy =
(posy - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posy + (size / 2) > (posy - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posy + (size / 2) >
1.00) ? (1.0 - size / 2) : posy; 1.00) ? (1.0f - size / 2) : posy;
ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width; ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width;
translate = overlay->size_video / 400.0; translate = overlay->size_video / 400.0f;
glActiveTexture (GL_TEXTURE0); glActiveTexture (GL_TEXTURE0);
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
@ -284,14 +284,14 @@ gst_gl_overlay_draw_texture_video_on_png (GstGLOverlay * overlay, GLuint tex)
if (overlay->rotate_video) if (overlay->rotate_video)
glRotatef (overlay->angle_video, 0, 1, 0); glRotatef (overlay->angle_video, 0, 1, 0);
glBegin (GL_QUADS); glBegin (GL_QUADS);
glTexCoord3f (0.0, 0.0, 0.0); glTexCoord3f (0.0f, 0.0f, 0.0f);
glVertex3f (posx - (size / 2), posy - (size / 2), 0.0); glVertex3f (posx - (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, 0.0, 0.0); glTexCoord3f (width, 0.0f, 0.0f);
glVertex3f (posx + (size / 2), posy - (size / 2), 0.0); glVertex3f (posx + (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, height, 0.0); glTexCoord3f (width, height, 0.0);
glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0f);
glTexCoord3f (0.0, height, 0.0); glTexCoord3f (0.0f, height, 0.0f);
glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0f);
glEnd (); glEnd ();
glFlush (); glFlush ();
} }
@ -309,17 +309,17 @@ gst_gl_overlay_draw_texture_png_on_video (GstGLOverlay * overlay, GLuint tex)
gfloat ratio = 0.0; gfloat ratio = 0.0;
gfloat translate = 0.0; gfloat translate = 0.0;
size = (overlay->size_video) / 50.0; size = (overlay->size_video) / 50.0f;
posx = (overlay->pos_x_video - 50.0) / 50.0; posx = (overlay->pos_x_video - 50.0f) / 50.0f;
posx = posx =
(posx - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posx + (size / 2) > (posx - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posx + (size / 2) >
1.00) ? (1.0 - size / 2) : posx; 1.00) ? (1.0f - size / 2) : posx;
posy = (overlay->pos_y_video - 50.0) / 50.0; posy = (overlay->pos_y_video - 50.0f) / 50.0f;
posy = posy =
(posy - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posy + (size / 2) > (posy - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posy + (size / 2) >
1.00) ? (1.0 - size / 2) : posy; 1.00) ? (1.0f - size / 2) : posy;
ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width; ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width;
translate = overlay->size_video / 400.0; translate = overlay->size_video / 400.0f;
glActiveTexture (GL_TEXTURE0); glActiveTexture (GL_TEXTURE0);
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
@ -329,14 +329,14 @@ gst_gl_overlay_draw_texture_png_on_video (GstGLOverlay * overlay, GLuint tex)
if (overlay->rotate_video) if (overlay->rotate_video)
glRotatef (overlay->angle_video, 0, 1, 0); glRotatef (overlay->angle_video, 0, 1, 0);
glBegin (GL_QUADS); glBegin (GL_QUADS);
glTexCoord3f (0.0, 0.0, 0.0); glTexCoord3f (0.0f, 0.0f, 0.0f);
glVertex3f (posx - (size / 2), posy - (size / 2), 0.0); glVertex3f (posx - (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, 0.0, 0.0); glTexCoord3f (width, 0.0f, 0.0f);
glVertex3f (posx + (size / 2), posy - (size / 2), 0.0); glVertex3f (posx + (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, height, 0.0); glTexCoord3f (width, height, 0.0f);
glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0f);
glTexCoord3f (0.0, height, 0.0); glTexCoord3f (0.0f, height, 0.0f);
glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0f);
glEnd (); glEnd ();
if (overlay->pbuftexture == 0) if (overlay->pbuftexture == 0)
return; return;
@ -345,17 +345,17 @@ gst_gl_overlay_draw_texture_png_on_video (GstGLOverlay * overlay, GLuint tex)
//width = (gfloat) overlay->width; //width = (gfloat) overlay->width;
//height = (gfloat) overlay->height; //height = (gfloat) overlay->height;
// } // }
size = (overlay->size_png) / 50.0; size = (overlay->size_png) / 50.0f;
posx = (overlay->pos_x_png - 50.0) / 50.0; posx = (overlay->pos_x_png - 50.0f) / 50.0f;
posx = posx =
(posx - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posx + (size / 2) > (posx - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posx + (size / 2) >
1.00) ? (1.0 - size / 2) : posx; 1.00) ? (1.0f - size / 2) : posx;
posy = (overlay->pos_y_png - 50.0) / 50.0; posy = (overlay->pos_y_png - 50.0f) / 50.0f;
posy = posy =
(posy - (size / 2) < -1.00) ? (-1.0 + size / 2) : (posy + (size / 2) > (posy - (size / 2) < -1.00) ? (-1.0f + size / 2) : (posy + (size / 2) >
1.00) ? (1.0 - size / 2) : posy; 1.00) ? (1.0f - size / 2) : posy;
ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width; ratio = ((posx + (size / 2)) - (posx - (size / 2))) * height / width;
translate = overlay->size_png / 400.0; translate = overlay->size_png / 400.0f;
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_TEXTURE_RECTANGLE_ARB); glEnable (GL_TEXTURE_RECTANGLE_ARB);
glBindTexture (GL_TEXTURE_RECTANGLE_ARB, overlay->pbuftexture); glBindTexture (GL_TEXTURE_RECTANGLE_ARB, overlay->pbuftexture);
@ -364,14 +364,14 @@ gst_gl_overlay_draw_texture_png_on_video (GstGLOverlay * overlay, GLuint tex)
if (overlay->rotate_png == 2) if (overlay->rotate_png == 2)
glRotatef (overlay->angle_png, 0, 1, 0); glRotatef (overlay->angle_png, 0, 1, 0);
glBegin (GL_QUADS); glBegin (GL_QUADS);
glTexCoord3f (0.0, 0.0, 0.0); glTexCoord3f (0.0f, 0.0f, 0.0f);
glVertex3f (posx - (size / 2), posy - (size / 2), 0.0); glVertex3f (posx - (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, 0.0, 0.0); glTexCoord3f (width, 0.0f, 0.0f);
glVertex3f (posx + (size / 2), posy - (size / 2), 0.0); glVertex3f (posx + (size / 2), posy - (size / 2), 0.0f);
glTexCoord3f (width, height, 0.0); glTexCoord3f (width, height, 0.0f);
glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx + (size / 2), posy - (size / 2) + ratio, 0.0f);
glTexCoord3f (0.0, height, 0.0); glTexCoord3f (0.0f, height, 0.0f);
glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0); glVertex3f (posx - (size / 2), posy - (size / 2) + ratio, 0.0f);
glEnd (); glEnd ();
glFlush (); glFlush ();
} }
@ -387,11 +387,11 @@ gst_gl_overlay_init (GstGLOverlay * overlay, GstGLOverlayClass * klass)
overlay->pbuftexture = 0; overlay->pbuftexture = 0;
overlay->width = 0; overlay->width = 0;
overlay->height = 0; overlay->height = 0;
overlay->pos_x_png = 0.0; overlay->pos_x_png = 0;
overlay->pos_y_png = 0.0; overlay->pos_y_png = 0;
overlay->size_png = 100; overlay->size_png = 100;
overlay->pos_x_video = 0.0; overlay->pos_x_video = 0;
overlay->pos_y_video = 0.0; overlay->pos_y_video = 0;
overlay->size_video = 100; overlay->size_video = 100;
overlay->video_top = FALSE; overlay->video_top = FALSE;
overlay->rotate_png = 0; overlay->rotate_png = 0;