github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-05 03:06:28 +01:00
Code Releases Activity

removing useless code, improving readability

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12449 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2004-05-08 23:53:20 +00:00
parent 12744612d9
commit f0978d51d9
1 changed files with 14 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
libvo/vo_gl2.c
View File

@ -81,7 +81,7 @@ static int int_pause;
static uint32_t texture_width; static uint32_t texture_width;
static uint32_t texture_height; static uint32_t texture_height;
static int texnumx, texnumy, memory_x_len, memory_x_start_offset, raw_line_len; static int texnumx, texnumy, raw_line_len;
static GLfloat texpercx, texpercy; static GLfloat texpercx, texpercy;
static struct TexSquare * texgrid; static struct TexSquare * texgrid;
static GLint gl_internal_format; static GLint gl_internal_format;
@ -114,6 +114,8 @@ struct TexSquare
int dirtyXoff, dirtyYoff, dirtyWidth, dirtyHeight; int dirtyXoff, dirtyYoff, dirtyWidth, dirtyHeight;
}; };
static void resetTexturePointers(unsigned char *imageSource);
static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py) static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py)
{ {
*px=(float)x*texpercx; *px=(float)x*texpercx;
@ -124,7 +126,6 @@ static void CalcFlatPoint(int x,int y,GLfloat *px,GLfloat *py)
static int initTextures() static int initTextures()
{ {
unsigned char *line_1=0, *line_2=0, *mem_start=0;
struct TexSquare *tsq=0; struct TexSquare *tsq=0;
int e_x, e_y, s, i=0; int e_x, e_y, s, i=0;
int x=0, y=0; int x=0, y=0;
@ -209,14 +210,7 @@ static int initTextures()
texgrid = (struct TexSquare *) texgrid = (struct TexSquare *)
calloc (texnumx * texnumy, sizeof (struct TexSquare)); calloc (texnumx * texnumy, sizeof (struct TexSquare));
line_1 = (unsigned char *) ImageData; raw_line_len = image_width * image_bytes;
line_2 = (unsigned char *) ImageData+(image_width*image_bytes);
mem_start = (unsigned char *) ImageData;
raw_line_len = line_2 - line_1;
memory_x_len = raw_line_len / image_bytes;
mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] texture-usage %d*width=%d, %d*height=%d\n", mp_msg (MSGT_VO, MSGL_DBG2, "[gl2] texture-usage %d*width=%d, %d*height=%d\n",
(int) texnumx, (int) texture_width, (int) texnumy, (int) texnumx, (int) texture_width, (int) texnumy,
@ -245,16 +239,6 @@ static int initTextures()
CalcFlatPoint (x + 1, y + 1, &(tsq->fx3), &(tsq->fy3)); CalcFlatPoint (x + 1, y + 1, &(tsq->fx3), &(tsq->fy3));
CalcFlatPoint (x, y + 1, &(tsq->fx4), &(tsq->fy4)); CalcFlatPoint (x, y + 1, &(tsq->fx4), &(tsq->fy4));
/* calculate the pixel store data,
to use the machine-bitmap for our texture
*/
memory_x_start_offset = 0 * image_bytes +
x * texture_width * image_bytes;
tsq->texture = line_1 +
y * texture_height * raw_line_len +
memory_x_start_offset;
tsq->isDirty=GL_TRUE; tsq->isDirty=GL_TRUE;
tsq->isTexture=GL_FALSE; tsq->isTexture=GL_FALSE;
tsq->texobj=0; tsq->texobj=0;
@ -294,38 +278,29 @@ static int initTextures()
} /* for all texnumx */ } /* for all texnumx */
} /* for all texnumy */ } /* for all texnumy */
resetTexturePointers (ImageData);
return 0; return 0;
} }
static void resetTexturePointers(unsigned char *imageSource) static void resetTexturePointers(unsigned char *imageSource)
{ {
unsigned char *line_1=0, *line_2=0, *mem_start=0; unsigned char *texdata_start, *line_start;
struct TexSquare *tsq=0; struct TexSquare *tsq = texgrid;
int x=0, y=0; int x=0, y=0;
line_1 = (unsigned char *) imageSource; line_start = (unsigned char *) imageSource;
line_2 = (unsigned char *) imageSource+(image_width*image_bytes);
mem_start = (unsigned char *) imageSource;
for (y = 0; y < texnumy; y++) for (y = 0; y < texnumy; y++)
{ {
texdata_start = line_start;
for (x = 0; x < texnumx; x++) for (x = 0; x < texnumx; x++)
{ {
tsq = texgrid + y * texnumx + x; tsq->texture = texdata_start;
texdata_start += texture_width * image_bytes;
/* calculate the pixel store data, tsq++;
to use the machine-bitmap for our texture
*/
memory_x_start_offset = 0 * image_bytes +
x * texture_width * image_bytes;
tsq->texture = line_1 +
y * texture_height * raw_line_len +
memory_x_start_offset;
} /* for all texnumx */ } /* for all texnumx */
line_start += texture_height * raw_line_len;
} /* for all texnumy */ } /* for all texnumy */
} }
@ -823,7 +798,7 @@ static int initGl(uint32_t d_width, uint32_t d_height)
glDepthMask(GL_FALSE); glDepthMask(GL_FALSE);
glDisable(GL_CULL_FACE); glDisable(GL_CULL_FACE);
glPixelStorei (GL_UNPACK_ROW_LENGTH, memory_x_len); glPixelStorei (GL_UNPACK_ROW_LENGTH, image_width);
/** /**
* may give a little speed up for a kinda burst read .. * may give a little speed up for a kinda burst read ..