June 2013 - MPlayer-cvslog - lists.mplayerhq.hu

r36332 - trunk/libvo/vo_sdl.c
by reimar 11 Jun '13

11 Jun '13

Author: reimar Date: Tue Jun 11 20:38:56 2013 New Revision: 36332 Log: Ensure that the allocated surface is always large enough. Modified: trunk/libvo/vo_sdl.c Modified: trunk/libvo/vo_sdl.c ============================================================================== --- trunk/libvo/vo_sdl.c Mon Jun 10 23:33:28 2013 (r36331) +++ trunk/libvo/vo_sdl.c Tue Jun 11 20:38:56 2013 (r36332) @@ -68,6 +68,7 @@ #include "aspect.h" #include "libmpcodecs/vfcap.h" #include "osdep/setenv.h" +#include "libavutil/common.h" #ifdef CONFIG_X11 #include <X11/Xlib.h> @@ -712,7 +713,7 @@ static int setup_surfaces(void) int surfwidth, surfheight; surfwidth = priv->width; - surfheight = priv->height + (priv->surface->h - priv->dstheight) / v_scale; + surfheight = priv->height + FFMAX(priv->surface->h - priv->dstheight, 0) / v_scale + 1; surfheight&= ~1; /* Place the image in the middle of the screen */ priv->y = (surfheight - priv->height) / 2;

1 0

r36331 - trunk/libvo/gl_common.c
by reimar 10 Jun '13

10 Jun '13

Author: reimar Date: Mon Jun 10 23:33:28 2013 New Revision: 36331 Log: vo_gl: Fix chroma with rectangle=1. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Mon Jun 10 23:19:38 2013 (r36330) +++ trunk/libvo/gl_common.c Mon Jun 10 23:33:28 2013 (r36331) @@ -2043,8 +2043,8 @@ static void draw_vertices(GLfloat x, GLf int py = 2*i + 1; mpglTexCoord2f(texcoords[px], texcoords[py]); if (is_yv12) { - mpglMultiTexCoord2f(GL_TEXTURE1, texcoords2[px], texcoords[py]); - mpglMultiTexCoord2f(GL_TEXTURE2, texcoords2[px], texcoords[py]); + mpglMultiTexCoord2f(GL_TEXTURE1, texcoords2[px], texcoords2[py]); + mpglMultiTexCoord2f(GL_TEXTURE2, texcoords2[px], texcoords2[py]); } if (use_stipple) mpglMultiTexCoord2f(GL_TEXTURE3, texcoords3[px], texcoords3[py]);

1 0

r36330 - trunk/libvo/vo_vdpau.c
by reimar 10 Jun '13

10 Jun '13

Author: reimar Date: Mon Jun 10 23:19:38 2013 New Revision: 36330 Log: Fix compilation, remove assignment of variable that was removed due to being unused otherwise. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Mon Jun 10 00:52:16 2013 (r36329) +++ trunk/libvo/vo_vdpau.c Mon Jun 10 23:19:38 2013 (r36330) @@ -689,7 +689,6 @@ static int config(uint32_t width, uint32 && !create_vdp_decoder(image_format, vid_width, vid_height, 2)) return -1; - int_pause = 0; visible_buf = 0; {

1 0

r36328 - in trunk/libvo: vo_corevideo.m vo_quartz.c vo_vdpau.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Mon Jun 10 00:35:47 2013 New Revision: 36328 Log: Remove some unused code that has no effect. Modified: trunk/libvo/vo_corevideo.m trunk/libvo/vo_quartz.c trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Mon Jun 10 00:30:25 2013 (r36327) +++ trunk/libvo/vo_corevideo.m Mon Jun 10 00:35:47 2013 (r36328) @@ -390,9 +390,6 @@ static int control(uint32_t request, voi switch (request) { case VOCTRL_DRAW_IMAGE: return draw_image(data); - case VOCTRL_PAUSE: - case VOCTRL_RESUME: - return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t*)data); case VOCTRL_GET_IMAGE: return get_image(data); case VOCTRL_ONTOP: vo_ontop = !vo_ontop; if(!shared_buffer){ [mpGLView ontop]; } else { [mplayerosxProto ontop]; } return VO_TRUE; Modified: trunk/libvo/vo_quartz.c ============================================================================== --- trunk/libvo/vo_quartz.c Mon Jun 10 00:30:25 2013 (r36327) +++ trunk/libvo/vo_quartz.c Mon Jun 10 00:35:47 2013 (r36328) @@ -96,7 +96,6 @@ int levelList[] = kCGScreenSaverWindowLevelKey }; -static int int_pause = 0; static float winAlpha = 1; static int mouseHide = FALSE; static float winSizeMult = 1; @@ -1157,8 +1156,6 @@ static int control(uint32_t request, voi { switch (request) { - case VOCTRL_PAUSE: return int_pause = 1; - case VOCTRL_RESUME: return int_pause = 0; case VOCTRL_FULLSCREEN: vo_fs = !vo_fs; window_fullscreen(); return VO_TRUE; case VOCTRL_ONTOP: vo_ontop = !vo_ontop; window_ontop(); return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t *) data); Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Mon Jun 10 00:30:25 2013 (r36327) +++ trunk/libvo/vo_vdpau.c Mon Jun 10 00:35:47 2013 (r36328) @@ -215,7 +215,6 @@ static VdpProcamp procamp; * X11 specific */ static int visible_buf; -static int int_pause; static void draw_eosd(void); @@ -1359,10 +1358,6 @@ static int control(uint32_t request, voi CHECK_ST_WARNING("Error changing deinterlacing settings") } return VO_TRUE; - case VOCTRL_PAUSE: - return int_pause = 1; - case VOCTRL_RESUME: - return int_pause = 0; case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t *)data); case VOCTRL_GET_IMAGE:

1 0

r36327 - trunk/libvo/vo_matrixview.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Mon Jun 10 00:30:25 2013 New Revision: 36327 Log: Remove some now unused code. Modified: trunk/libvo/vo_matrixview.c Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Mon Jun 10 00:27:59 2013 (r36326) +++ trunk/libvo/vo_matrixview.c Mon Jun 10 00:30:25 2013 (r36327) @@ -50,7 +50,6 @@ const LIBVO_EXTERN(matrixview) static MPGLContext glctx; -static int int_pause; static int eq_contrast; static int eq_brightness; static uint32_t image_width; @@ -106,8 +105,6 @@ static int config(uint32_t width, uint32 image_width = width; image_format = format; - int_pause = 0; - flags |= VOFLAG_DEPTH; if (mpglcontext_create_window(&glctx, d_width, d_height, flags, title) < 0) return -1; @@ -259,10 +256,6 @@ static int preinit(const char *arg) static int control(uint32_t request, void *data) { switch (request) { - case VOCTRL_PAUSE: - case VOCTRL_RESUME: - int_pause = (request == VOCTRL_PAUSE); - return VO_TRUE; case VOCTRL_QUERY_FORMAT: return query_format(*(uint32_t*)data); case VOCTRL_ONTOP:

1 0

r36326 - trunk/libvo/vo_matrixview.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Mon Jun 10 00:27:59 2013 New Revision: 36326 Log: Redraw on expose even if not paused. Modified: trunk/libvo/vo_matrixview.c Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Mon Jun 10 00:26:52 2013 (r36325) +++ trunk/libvo/vo_matrixview.c Mon Jun 10 00:27:59 2013 (r36326) @@ -148,8 +148,7 @@ static void check_events(void) int e = glctx.check_events(); if (e & VO_EVENT_RESIZE) { resize(); - } - if (e & VO_EVENT_EXPOSE && int_pause) + } else if (e & VO_EVENT_EXPOSE) flip_page(); }

1 0

r36325 - trunk/libvo/vo_matrixview.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Mon Jun 10 00:26:52 2013 New Revision: 36325 Log: matrixview: redraw image while scaling on OSX. Modified: trunk/libvo/vo_matrixview.c Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Mon Jun 10 00:25:47 2013 (r36324) +++ trunk/libvo/vo_matrixview.c Mon Jun 10 00:26:52 2013 (r36325) @@ -92,6 +92,11 @@ static void brightness_set(int value) matrixview_brightness_set(brightness); } +static void resize(void) +{ + matrixview_reshape(vo_dwidth, vo_dheight); + flip_page(); +} static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, @@ -130,6 +135,10 @@ static int config(uint32_t width, uint32 contrast_set(eq_contrast); brightness_set(eq_brightness); matrixview_reshape(vo_dwidth, vo_dheight); + +#ifdef CONFIG_GL_OSX + vo_osx_redraw_func = resize; +#endif return 0; } @@ -138,7 +147,7 @@ static void check_events(void) { int e = glctx.check_events(); if (e & VO_EVENT_RESIZE) { - matrixview_reshape(vo_dwidth, vo_dheight); + resize(); } if (e & VO_EVENT_EXPOSE && int_pause) flip_page(); @@ -262,7 +271,7 @@ static int control(uint32_t request, voi return VO_TRUE; case VOCTRL_FULLSCREEN: glctx.fullscreen(); - matrixview_reshape(vo_dwidth, vo_dheight); + resize(); return VO_TRUE; case VOCTRL_BORDER: glctx.border();

1 0

r36324 - trunk/libvo/vo_gl.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Mon Jun 10 00:25:47 2013 New Revision: 36324 Log: Remove unnecessary wrapper function. Modified: trunk/libvo/vo_gl.c Modified: trunk/libvo/vo_gl.c ============================================================================== --- trunk/libvo/vo_gl.c Mon Jun 10 00:16:15 2013 (r36323) +++ trunk/libvo/vo_gl.c Mon Jun 10 00:25:47 2013 (r36324) @@ -678,14 +678,6 @@ static int create_window(uint32_t d_widt return mpglcontext_create_window(&glctx, d_width, d_height, flags, title); } -#ifdef CONFIG_GL_OSX -static void osx_redraw(void) -{ - // resize will call redraw to refresh the screen - resize(); -} -#endif - /* connect to server, create and map window, * allocate colors and (shared) memory */ @@ -717,7 +709,7 @@ config(uint32_t width, uint32_t height, initGl(); #ifdef CONFIG_GL_OSX - vo_osx_redraw_func = osx_redraw; + vo_osx_redraw_func = resize; #endif return 0; }

1 0

r36323 - in trunk/libvo: matrixview.c matrixview.h vo_matrixview.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Mon Jun 10 00:16:15 2013 New Revision: 36323 Log: Remove unused arguments, add "const" Modified: trunk/libvo/matrixview.c trunk/libvo/matrixview.h trunk/libvo/vo_matrixview.c Modified: trunk/libvo/matrixview.c ============================================================================== --- trunk/libvo/matrixview.c Mon Jun 10 00:05:43 2013 (r36322) +++ trunk/libvo/matrixview.c Mon Jun 10 00:16:15 2013 (r36323) @@ -126,7 +126,7 @@ static void draw_flare(float x, float y, mpglVertex3f(x - 1, y - 2, z); } -static void draw_text(uint8_t *pic) +static void draw_text(const uint8_t *pic) { int x, y; int p = 0; @@ -326,8 +326,7 @@ void matrixview_reshape(int w, int h) } -void matrixview_draw(int w, int h, double currentTime, float frameTime, - uint8_t *data) +void matrixview_draw(double currentTime, const uint8_t *data) { // Clear the color and depth buffers. mpglClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); Modified: trunk/libvo/matrixview.h ============================================================================== --- trunk/libvo/matrixview.h Mon Jun 10 00:05:43 2013 (r36322) +++ trunk/libvo/matrixview.h Mon Jun 10 00:16:15 2013 (r36323) @@ -23,8 +23,7 @@ void matrixview_init (int w, int h); void matrixview_reshape (int w, int h); -void matrixview_draw (int w, int h, double currentTime, float frameTime, - uint8_t *data); +void matrixview_draw (double currentTime, const uint8_t *data); void matrixview_matrix_resize(int w, int h); void matrixview_contrast_set(float contrast); void matrixview_brightness_set(float brightness); Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Mon Jun 10 00:05:43 2013 (r36322) +++ trunk/libvo/vo_matrixview.c Mon Jun 10 00:16:15 2013 (r36323) @@ -153,7 +153,7 @@ static void draw_osd(void) static void flip_page(void) { - matrixview_draw(vo_dwidth, vo_dheight, GetTimer(), 0.0, map_image[0]); + matrixview_draw(GetTimer(), map_image[0]); // Needed at least on PPC Mac Mini on OSX. Should not hurt // much to do always. mpglFlush();

1 0

r36322 - trunk/libvo/vo_matrixview.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Mon Jun 10 00:05:43 2013 New Revision: 36322 Log: Matrixview: fix getting only blank screen on OSX. Modified: trunk/libvo/vo_matrixview.c Modified: trunk/libvo/vo_matrixview.c ============================================================================== --- trunk/libvo/vo_matrixview.c Mon Jun 10 00:03:50 2013 (r36321) +++ trunk/libvo/vo_matrixview.c Mon Jun 10 00:05:43 2013 (r36322) @@ -154,6 +154,9 @@ static void draw_osd(void) static void flip_page(void) { matrixview_draw(vo_dwidth, vo_dheight, GetTimer(), 0.0, map_image[0]); + // Needed at least on PPC Mac Mini on OSX. Should not hurt + // much to do always. + mpglFlush(); glctx.swapGlBuffers(&glctx); }

1 0