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

r36311 - trunk/configure
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Sun Jun 9 15:54:47 2013 New Revision: 36311 Log: Add hack to fix compilation issues on OSX with broken libiconv. Such a hack is not really a good solution, but since the issue is relatively common it seems worth it for the moment. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 9 12:13:08 2013 (r36310) +++ trunk/configure Sun Jun 9 15:54:47 2013 (r36311) @@ -3939,7 +3939,10 @@ int main(void) { } EOF _iconv=no - for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do + # NOTE: -L/usr/lib is a hack to avoid issues due to a + # broken libiconv that e.g. macports installs into /opt/local/lib + # which might get addded to the search path later by e.g. SDL + for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done

1 0

r36310 - trunk/libvo/gl_common.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Sun Jun 9 12:13:08 2013 New Revision: 36310 Log: Fully uninitialize EGL. Unfortunately that doesn't seem to help against the insane number of memory leaks reported inside MESA EGL by valgrind. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun Jun 9 12:09:41 2013 (r36309) +++ trunk/libvo/gl_common.c Sun Jun 9 12:13:08 2013 (r36310) @@ -2561,13 +2561,18 @@ static int setGlWindow_egl(MPGLContext * */ static void releaseGlContext_egl(MPGLContext *ctx) { EGLContext *context = &ctx->context.egl; - if (*context != EGL_NO_CONTEXT) - { + if (*context != EGL_NO_CONTEXT) { mpglFinish(); eglMakeCurrent(eglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglDestroyContext(eglDisplay, *context); } *context = EGL_NO_CONTEXT; + if (eglSurface != EGL_NO_SURFACE) + eglDestroySurface(eglDisplay, eglSurface); + eglSurface = EGL_NO_SURFACE; + if (eglDisplay != EGL_NO_DISPLAY) + eglTerminate(eglDisplay); + eglDisplay = EGL_NO_DISPLAY; } static void swapGlBuffers_egl(MPGLContext *ctx) {

1 0

r36309 - trunk/libvo/gl_common.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Sun Jun 9 12:09:41 2013 New Revision: 36309 Log: Set GL_UNPACK_ROW_LENGTH even for GLES. This avoids issues with implementations like MESA that incorrectly do not ignore it. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun Jun 9 11:46:20 2013 (r36308) +++ trunk/libvo/gl_common.c Sun Jun 9 12:09:41 2013 (r36309) @@ -787,11 +787,10 @@ void glUploadTex(GLenum target, GLenum f if (!mpglBegin) { // we have to copy line-by-line for GLES if (stride != w*bpp) slice = 1; - } else { - // this is not always correct, but should work for MPlayer - glAdjustAlignment(stride); - mpglPixelStorei(GL_UNPACK_ROW_LENGTH, stride / bpp); } + // this is not always correct, but should work for MPlayer + glAdjustAlignment(stride); + mpglPixelStorei(GL_UNPACK_ROW_LENGTH, stride / bpp); if (slice < 0) { mpglPixelStorei(GL_UNPACK_CLIENT_STORAGE_APPLE, GL_TRUE); mpglTexImage2D(target, 0, GL_RGB, w, h, 0, format, type, data);

1 0

r36308 - trunk/libvo/gl_common.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Sun Jun 9 11:46:20 2013 New Revision: 36308 Log: SwapInterval support for GLES/EGL. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun Jun 9 11:40:27 2013 (r36307) +++ trunk/libvo/gl_common.c Sun Jun 9 11:46:20 2013 (r36308) @@ -2422,6 +2422,10 @@ static void GLAPIENTRY dummy_color(GLuby static void GLAPIENTRY dummy_texenvi(GLenum t, GLenum p, GLint v) { } +static int GLAPIENTRY SwapInterval_egl(int i) { + return eglSwapInterval(eglDisplay, i); +} + static int setGlWindow_egl(MPGLContext *ctx) { static const EGLint cfg_attribs[] = { EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT, EGL_NONE }; @@ -2538,6 +2542,7 @@ static int setGlWindow_egl(MPGLContext * getFunctions(eglgpa, eglQueryString(eglDisplay, EGL_EXTENSIONS)); mpglBegin = NULL; mpglDrawBuffer = NULL; + mpglSwapInterval = SwapInterval_egl; gpu_def_sl_program = new_gpu_program(); gpu_yuv_sl_program = new_gpu_program();

1 0

r36307 - trunk/libvo/gl_common.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Sun Jun 9 11:40:27 2013 New Revision: 36307 Log: Cosmetics: remove tabs that slipped in by accident. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Sun Jun 9 11:16:11 2013 (r36306) +++ trunk/libvo/gl_common.c Sun Jun 9 11:40:27 2013 (r36307) @@ -2501,10 +2501,10 @@ static int setGlWindow_egl(MPGLContext * } mp_msg(MSGT_VO, MSGL_V, "0x%03x %2i %2i %2i %2i %2i %2i %c %c %c %c %2i 0x%03x %s (0x%x)\n", id, rs, gs, bs, as, ds, ss, - renderable & EGL_OPENGL_BIT ? '+' : '-', - renderable & EGL_OPENGL_ES_BIT ? '+' : '-', - renderable & EGL_OPENGL_ES2_BIT ? '+' : '-', - renderable & EGL_OPENVG_BIT ? '+' : '-', + renderable & EGL_OPENGL_BIT ? '+' : '-', + renderable & EGL_OPENGL_ES_BIT ? '+' : '-', + renderable & EGL_OPENGL_ES2_BIT ? '+' : '-', + renderable & EGL_OPENVG_BIT ? '+' : '-', samples, surfaces, caveatstr, caveat); } free(configs);

1 0

r36306 - trunk/libvo/gl_common.c
by reimar 09 Jun '13

09 Jun '13

Author: reimar Date: Sun Jun 9 11:16:11 2013 New Revision: 36306 Log: Add support for printing available egl configs. In contrast to glxinfo, the es2_info too is too half-assed to print this info, so it is easiest to just include it here. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Fri Jun 7 21:18:16 2013 (r36305) +++ trunk/libvo/gl_common.c Sun Jun 9 11:16:11 2013 (r36306) @@ -2429,6 +2429,7 @@ static int setGlWindow_egl(MPGLContext * EGLContext *context = &ctx->context.egl; EGLContext new_context = NULL; EGLConfig eglConfig; + EGLint id; int num_configs; #ifdef CONFIG_GL_EGL_ANDROID EGLint w, h; @@ -2471,9 +2472,48 @@ static int setGlWindow_egl(MPGLContext * eglDestroyContext(eglDisplay, *context); eglDestroySurface(eglDisplay, eglSurface); } + if (mp_msg_test(MSGT_VO, MSGL_DBG2)) { + EGLConfig *configs; + EGLint count = 0, i; + eglGetConfigs(eglDisplay, NULL, 0, &count); + configs = calloc(count, sizeof(*configs)); + eglGetConfigs(eglDisplay, configs, count, &count); + mp_msg(MSGT_VO, MSGL_V, " ID | sizes | gl |es2| samples | caveat\n" + " r g b a d s | es| vg | surfaces |\n"); + for (i = 0; i < count; i++) { + EGLint rs, gs, bs, as, ds, ss, samples, surfaces, renderable, caveat; + const char *caveatstr = "unknown"; + eglGetConfigAttrib(eglDisplay, configs[i], EGL_CONFIG_ID, &id); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_RED_SIZE, &rs); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_GREEN_SIZE, &gs); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_BLUE_SIZE, &bs); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_ALPHA_SIZE, &as); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_DEPTH_SIZE, &ds); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_STENCIL_SIZE, &ss); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_SAMPLES, &samples); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_SURFACE_TYPE, &surfaces); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_RENDERABLE_TYPE, &renderable); + eglGetConfigAttrib(eglDisplay, configs[i], EGL_CONFIG_CAVEAT, &caveat); + switch (caveat) { + case EGL_SLOW_CONFIG: caveatstr = "slow"; break; + case EGL_NON_CONFORMANT_CONFIG: caveatstr = "nonconf"; break; + case EGL_NONE: caveatstr = "none"; break; + } + mp_msg(MSGT_VO, MSGL_V, "0x%03x %2i %2i %2i %2i %2i %2i %c %c %c %c %2i 0x%03x %s (0x%x)\n", + id, rs, gs, bs, as, ds, ss, + renderable & EGL_OPENGL_BIT ? '+' : '-', + renderable & EGL_OPENGL_ES_BIT ? '+' : '-', + renderable & EGL_OPENGL_ES2_BIT ? '+' : '-', + renderable & EGL_OPENVG_BIT ? '+' : '-', + samples, surfaces, caveatstr, caveat); + } + free(configs); + } if (!eglChooseConfig(eglDisplay, cfg_attribs, &eglConfig, 1, &num_configs) || num_configs != 1) return SET_WINDOW_FAILED; + eglGetConfigAttrib(eglDisplay, eglConfig, EGL_CONFIG_ID, &id); + mp_msg(MSGT_VO, MSGL_V, "Chosen config %x\n", id); eglSurface = eglCreateWindowSurface(eglDisplay, eglConfig, vo_window, NULL); if (eglSurface == EGL_NO_SURFACE) return SET_WINDOW_FAILED;

1 0

r36305 - in trunk: configure libvo/gl_common.c
by reimar 07 Jun '13

07 Jun '13

Author: reimar Date: Fri Jun 7 21:18:16 2013 New Revision: 36305 Log: vo_gl: some Android fixes. Load libui dynamically so compilation is possible with unmodified NDK, avoid crash with > 8-bit YUV input. Modified: trunk/configure trunk/libvo/gl_common.c Modified: trunk/configure ============================================================================== --- trunk/configure Thu Jun 6 15:08:48 2013 (r36304) +++ trunk/configure Fri Jun 7 21:18:16 2013 (r36305) @@ -5289,10 +5289,7 @@ int main(int argc, char *argv[]) { #else glXCreateContext(NULL, NULL, NULL, True); #endif -#ifdef GL_EGL_ANDROID - EGLNativeWindowType android_createDisplaySurface(void); - android_createDisplaySurface(); -#elif !defined(GL_EGL_X11) +#if !defined(GL_EGL_X11) && !defined(GL_EGL_ANDROID) glFinish(); #endif return 0; @@ -5307,15 +5304,14 @@ EOF break fi done - if cc_check -DGL_EGL_ANDROID -lEGL -lui ; then - _gl=yes - _gl_egl_android=yes - libs_mplayer="$libs_mplayer -lEGL -lui $ld_dl" - fi if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then _gl=yes _gl_egl_x11=yes libs_mplayer="$libs_mplayer -lEGL $ld_dl" + elif cc_check -DGL_EGL_ANDROID -lEGL ; then + _gl=yes + _gl_egl_android=yes + libs_mplayer="$libs_mplayer -lEGL $ld_dl" fi if win32 && cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Thu Jun 6 15:08:48 2013 (r36304) +++ trunk/libvo/gl_common.c Fri Jun 7 21:18:16 2013 (r36305) @@ -635,7 +635,8 @@ void glCreateClearTex(GLenum target, GLe if (format == GL_LUMINANCE && type == GL_UNSIGNED_SHORT) { // ensure we get enough bits GLint bits = 0; - mpglGetTexLevelParameteriv(target, 0, GL_TEXTURE_LUMINANCE_SIZE, &bits); + if (mpglGetTexLevelParameteriv) + mpglGetTexLevelParameteriv(target, 0, GL_TEXTURE_LUMINANCE_SIZE, &bits); if (bits >= 0 && bits < 14 && (use_depth_l16 || HAVE_BIGENDIAN)) { fmt = GL_DEPTH_COMPONENT; format = GL_DEPTH_COMPONENT; @@ -2394,7 +2395,7 @@ static EGLSurface eglSurface = EGL_NO_SU static EGLNativeWindowType vo_window; #define eglGetProcAddress(a) 0 #define mDisplay EGL_DEFAULT_DISPLAY -EGLNativeWindowType android_createDisplaySurface(void); +static EGLNativeWindowType (*android_createDisplaySurface)(void); #endif static void *eglgpa(const GLubyte *name) { void *res = eglGetProcAddress(name); @@ -2440,8 +2441,17 @@ static int setGlWindow_egl(MPGLContext * } if (WinID != -1) vo_window = (EGLNativeWindowType)(intptr_t)WinID; - if (!vo_window) + if (!vo_window) { + if (!android_createDisplaySurface) { + void *handle = dlopen("libui.so", RTLD_LAZY); + if (!handle) + return SET_WINDOW_FAILED; + android_createDisplaySurface = dlsym(handle, "android_createDisplaySurface"); + if (!android_createDisplaySurface) + return SET_WINDOW_FAILED; + } vo_window = android_createDisplaySurface(); + } if (!vo_window) return SET_WINDOW_FAILED; #endif

1 0

r36304 - trunk/libvo/vo_vdpau.c
by reimar 06 Jun '13

06 Jun '13

Author: reimar Date: Thu Jun 6 15:08:48 2013 New Revision: 36304 Log: Do not lose OSD and subtitles on resize. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Thu Jun 6 15:06:35 2013 (r36303) +++ trunk/libvo/vo_vdpau.c Thu Jun 6 15:08:48 2013 (r36304) @@ -328,8 +328,11 @@ static void resize(void) } } video_to_output_surface(); - if (visible_buf) + if (visible_buf) { + draw_eosd(); + draw_osd(); flip_page(); + } } static void preemption_callback(VdpDevice device, void *context)

1 0

r36303 - trunk/libvo/vo_vdpau.c
by reimar 06 Jun '13

06 Jun '13

Author: reimar Date: Thu Jun 6 15:06:35 2013 New Revision: 36303 Log: Handle expose event also when not paused and do not draw frame twice in case of redraw events. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Thu Jun 6 15:05:16 2013 (r36302) +++ trunk/libvo/vo_vdpau.c Thu Jun 6 15:06:35 2013 (r36303) @@ -774,8 +774,7 @@ static void check_events(void) if (e & VO_EVENT_RESIZE) resize(); - - if ((e & VO_EVENT_EXPOSE || e & VO_EVENT_RESIZE) && int_pause) { + else if (e & VO_EVENT_EXPOSE) { /* did we already draw a buffer */ if (visible_buf) { /* redraw the last visible buffer */

1 0

r36302 - trunk/libvo/vo_vdpau.c
by reimar 06 Jun '13

06 Jun '13

Author: reimar Date: Thu Jun 6 15:05:16 2013 New Revision: 36302 Log: Fix expose event redraw to actually redraw the correct frame. Modified: trunk/libvo/vo_vdpau.c Modified: trunk/libvo/vo_vdpau.c ============================================================================== --- trunk/libvo/vo_vdpau.c Thu Jun 6 15:03:50 2013 (r36301) +++ trunk/libvo/vo_vdpau.c Thu Jun 6 15:05:16 2013 (r36302) @@ -781,7 +781,7 @@ static void check_events(void) /* redraw the last visible buffer */ VdpStatus vdp_st; vdp_st = vdp_presentation_queue_display(vdp_flip_queue, - output_surfaces[surface_num], + output_surfaces[(surface_num + NUM_OUTPUT_SURFACES - 1) % NUM_OUTPUT_SURFACES], vo_dwidth, vo_dheight, 0); CHECK_ST_WARNING("Error when calling vdp_presentation_queue_display")

1 0