November 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r34362 - trunk/libvo/vo_caca.c
by reimar 24 Nov '11

24 Nov '11

Author: reimar Date: Thu Nov 24 01:03:14 2011 New Revision: 34362 Log: Reindent. Modified: trunk/libvo/vo_caca.c Modified: trunk/libvo/vo_caca.c ============================================================================== --- trunk/libvo/vo_caca.c Thu Nov 24 01:00:39 2011 (r34361) +++ trunk/libvo/vo_caca.c Thu Nov 24 01:03:14 2011 (r34362) @@ -223,132 +223,132 @@ static void check_events(void) caca_event_t cev; while (caca_get_event(display, CACA_EVENT_ANY, &cev, 0)) { - switch (cev.type) { - case CACA_EVENT_RESIZE: - caca_refresh_display(display); - resize(); - break; - case CACA_EVENT_QUIT: - mplayer_put_key(KEY_CLOSE_WIN); - break; - case CACA_EVENT_MOUSE_MOTION: - vo_mouse_movement(cev.data.mouse.x, cev.data.mouse.y); - break; - case CACA_EVENT_MOUSE_PRESS: - if (!vo_nomouse_input) - mplayer_put_key((MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_DOWN); - break; - case CACA_EVENT_MOUSE_RELEASE: - if (!vo_nomouse_input) - mplayer_put_key(MOUSE_BTN0 + cev.data.mouse.button - 1); - break; - case CACA_EVENT_KEY_PRESS: - { - int key = cev.data.key.ch; - const char *msg_name; - - switch (key) { - case 'd': - case 'D': - /* Toggle dithering algorithm */ - set_next_str(caca_get_dither_algorithm_list(dither), &dither_algo, &msg_name); - caca_set_dither_algorithm(dither, dither_algo); - osdmessage(MESSAGE_DURATION, "Using %s", msg_name); - break; - - case 'a': - case 'A': - /* Toggle antialiasing method */ - set_next_str(caca_get_dither_antialias_list(dither), &dither_antialias, &msg_name); - caca_set_dither_antialias(dither, dither_antialias); - osdmessage(MESSAGE_DURATION, "Using %s", msg_name); - break; - - case 'h': - case 'H': - /* Toggle charset method */ - set_next_str(caca_get_dither_charset_list(dither), &dither_charset, &msg_name); - caca_set_dither_charset(dither, dither_charset); - osdmessage(MESSAGE_DURATION, "Using %s", msg_name); - break; - - case 'c': - case 'C': - /* Toggle color method */ - set_next_str(caca_get_dither_color_list(dither), &dither_color, &msg_name); - caca_set_dither_color(dither, dither_color); - osdmessage(MESSAGE_DURATION, "Using %s", msg_name); - break; - - case CACA_KEY_UP: - mplayer_put_key(KEY_UP); - break; - case CACA_KEY_DOWN: - mplayer_put_key(KEY_DOWN); - break; - case CACA_KEY_LEFT: - mplayer_put_key(KEY_LEFT); - break; - case CACA_KEY_RIGHT: - mplayer_put_key(KEY_RIGHT); - break; - case CACA_KEY_ESCAPE: - mplayer_put_key(KEY_ESC); - break; - case CACA_KEY_PAGEUP: - mplayer_put_key(KEY_PAGE_UP); - break; - case CACA_KEY_PAGEDOWN: - mplayer_put_key(KEY_PAGE_DOWN); - break; - case CACA_KEY_RETURN: - mplayer_put_key(KEY_ENTER); - break; - case CACA_KEY_HOME: - mplayer_put_key(KEY_HOME); - break; - case CACA_KEY_END: - mplayer_put_key(KEY_END); - break; - case CACA_KEY_DELETE: - mplayer_put_key(KEY_DELETE); - break; - case CACA_KEY_INSERT: - mplayer_put_key(KEY_INSERT); - break; - case CACA_KEY_BACKSPACE: - mplayer_put_key(KEY_BACKSPACE); + switch (cev.type) { + case CACA_EVENT_RESIZE: + caca_refresh_display(display); + resize(); break; - case CACA_KEY_TAB: - mplayer_put_key(KEY_TAB); + case CACA_EVENT_QUIT: + mplayer_put_key(KEY_CLOSE_WIN); break; - case CACA_KEY_PAUSE: - mplayer_put_key(KEY_PAUSE); + case CACA_EVENT_MOUSE_MOTION: + vo_mouse_movement(cev.data.mouse.x, cev.data.mouse.y); break; - case CACA_KEY_F1: - case CACA_KEY_F2: - case CACA_KEY_F3: - case CACA_KEY_F4: - case CACA_KEY_F5: - case CACA_KEY_F6: - case CACA_KEY_F7: - case CACA_KEY_F8: - case CACA_KEY_F9: - case CACA_KEY_F10: - case CACA_KEY_F11: - case CACA_KEY_F12: - case CACA_KEY_F13: - case CACA_KEY_F14: - case CACA_KEY_F15: - mplayer_put_key(KEY_F + 1 + key - CACA_KEY_F1); + case CACA_EVENT_MOUSE_PRESS: + if (!vo_nomouse_input) + mplayer_put_key((MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_DOWN); break; - default: - if (key <= 255) - mplayer_put_key(key); + case CACA_EVENT_MOUSE_RELEASE: + if (!vo_nomouse_input) + mplayer_put_key(MOUSE_BTN0 + cev.data.mouse.button - 1); break; + case CACA_EVENT_KEY_PRESS: + { + int key = cev.data.key.ch; + const char *msg_name; + + switch (key) { + case 'd': + case 'D': + /* Toggle dithering algorithm */ + set_next_str(caca_get_dither_algorithm_list(dither), &dither_algo, &msg_name); + caca_set_dither_algorithm(dither, dither_algo); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; + + case 'a': + case 'A': + /* Toggle antialiasing method */ + set_next_str(caca_get_dither_antialias_list(dither), &dither_antialias, &msg_name); + caca_set_dither_antialias(dither, dither_antialias); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; + + case 'h': + case 'H': + /* Toggle charset method */ + set_next_str(caca_get_dither_charset_list(dither), &dither_charset, &msg_name); + caca_set_dither_charset(dither, dither_charset); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; + + case 'c': + case 'C': + /* Toggle color method */ + set_next_str(caca_get_dither_color_list(dither), &dither_color, &msg_name); + caca_set_dither_color(dither, dither_color); + osdmessage(MESSAGE_DURATION, "Using %s", msg_name); + break; + + case CACA_KEY_UP: + mplayer_put_key(KEY_UP); + break; + case CACA_KEY_DOWN: + mplayer_put_key(KEY_DOWN); + break; + case CACA_KEY_LEFT: + mplayer_put_key(KEY_LEFT); + break; + case CACA_KEY_RIGHT: + mplayer_put_key(KEY_RIGHT); + break; + case CACA_KEY_ESCAPE: + mplayer_put_key(KEY_ESC); + break; + case CACA_KEY_PAGEUP: + mplayer_put_key(KEY_PAGE_UP); + break; + case CACA_KEY_PAGEDOWN: + mplayer_put_key(KEY_PAGE_DOWN); + break; + case CACA_KEY_RETURN: + mplayer_put_key(KEY_ENTER); + break; + case CACA_KEY_HOME: + mplayer_put_key(KEY_HOME); + break; + case CACA_KEY_END: + mplayer_put_key(KEY_END); + break; + case CACA_KEY_DELETE: + mplayer_put_key(KEY_DELETE); + break; + case CACA_KEY_INSERT: + mplayer_put_key(KEY_INSERT); + break; + case CACA_KEY_BACKSPACE: + mplayer_put_key(KEY_BACKSPACE); + break; + case CACA_KEY_TAB: + mplayer_put_key(KEY_TAB); + break; + case CACA_KEY_PAUSE: + mplayer_put_key(KEY_PAUSE); + break; + case CACA_KEY_F1: + case CACA_KEY_F2: + case CACA_KEY_F3: + case CACA_KEY_F4: + case CACA_KEY_F5: + case CACA_KEY_F6: + case CACA_KEY_F7: + case CACA_KEY_F8: + case CACA_KEY_F9: + case CACA_KEY_F10: + case CACA_KEY_F11: + case CACA_KEY_F12: + case CACA_KEY_F13: + case CACA_KEY_F14: + case CACA_KEY_F15: + mplayer_put_key(KEY_F + 1 + key - CACA_KEY_F1); + break; + default: + if (key <= 255) + mplayer_put_key(key); + break; + } + } } - } - } } }

1 0

r34361 - trunk/libvo/vo_caca.c
by reimar 24 Nov '11

24 Nov '11

Author: reimar Date: Thu Nov 24 01:00:39 2011 New Revision: 34361 Log: caca: process all pending events instead of exactly one per check_events. Patch by Paul B. Mahol [onemda gmail com]. Modified: trunk/libvo/vo_caca.c Modified: trunk/libvo/vo_caca.c ============================================================================== --- trunk/libvo/vo_caca.c Thu Nov 24 00:59:01 2011 (r34360) +++ trunk/libvo/vo_caca.c Thu Nov 24 01:00:39 2011 (r34361) @@ -221,8 +221,7 @@ static void set_next_str(const char * co static void check_events(void) { caca_event_t cev; - if (!caca_get_event(display, CACA_EVENT_ANY, &cev, 1)) - return; + while (caca_get_event(display, CACA_EVENT_ANY, &cev, 0)) { switch (cev.type) { case CACA_EVENT_RESIZE: @@ -350,6 +349,7 @@ static void check_events(void) } } } + } } static void uninit(void)

1 0

r34360 - trunk/libvo/vo_caca.c
by reimar 23 Nov '11

23 Nov '11

Author: reimar Date: Thu Nov 24 00:59:01 2011 New Revision: 34360 Log: caca: for ordinary keys, send key events on press instead of release. This is consistent with how other vos behave. Patch by Paul B. Mahol [onemda gmail com]. Modified: trunk/libvo/vo_caca.c Modified: trunk/libvo/vo_caca.c ============================================================================== --- trunk/libvo/vo_caca.c Thu Nov 24 00:57:37 2011 (r34359) +++ trunk/libvo/vo_caca.c Thu Nov 24 00:59:01 2011 (r34360) @@ -243,7 +243,7 @@ static void check_events(void) if (!vo_nomouse_input) mplayer_put_key(MOUSE_BTN0 + cev.data.mouse.button - 1); break; - case CACA_EVENT_KEY_RELEASE: + case CACA_EVENT_KEY_PRESS: { int key = cev.data.key.ch; const char *msg_name;

1 0

r34359 - trunk/libvo/vo_caca.c
by reimar 23 Nov '11

23 Nov '11

Author: reimar Date: Thu Nov 24 00:57:37 2011 New Revision: 34359 Log: caca: support mouse events and more keys. Patch by Paul B. Mahol [onemda gmail com]. Modified: trunk/libvo/vo_caca.c Modified: trunk/libvo/vo_caca.c ============================================================================== --- trunk/libvo/vo_caca.c Wed Nov 23 21:47:24 2011 (r34358) +++ trunk/libvo/vo_caca.c Thu Nov 24 00:57:37 2011 (r34359) @@ -39,6 +39,8 @@ #include "sub/sub.h" #include "osdep/keycodes.h" +#include "input/input.h" +#include "input/mouse.h" #include "mp_msg.h" #include "mp_fifo.h" @@ -227,6 +229,20 @@ static void check_events(void) caca_refresh_display(display); resize(); break; + case CACA_EVENT_QUIT: + mplayer_put_key(KEY_CLOSE_WIN); + break; + case CACA_EVENT_MOUSE_MOTION: + vo_mouse_movement(cev.data.mouse.x, cev.data.mouse.y); + break; + case CACA_EVENT_MOUSE_PRESS: + if (!vo_nomouse_input) + mplayer_put_key((MOUSE_BTN0 + cev.data.mouse.button - 1) | MP_KEY_DOWN); + break; + case CACA_EVENT_MOUSE_RELEASE: + if (!vo_nomouse_input) + mplayer_put_key(MOUSE_BTN0 + cev.data.mouse.button - 1); + break; case CACA_EVENT_KEY_RELEASE: { int key = cev.data.key.ch; @@ -295,6 +311,38 @@ static void check_events(void) case CACA_KEY_END: mplayer_put_key(KEY_END); break; + case CACA_KEY_DELETE: + mplayer_put_key(KEY_DELETE); + break; + case CACA_KEY_INSERT: + mplayer_put_key(KEY_INSERT); + break; + case CACA_KEY_BACKSPACE: + mplayer_put_key(KEY_BACKSPACE); + break; + case CACA_KEY_TAB: + mplayer_put_key(KEY_TAB); + break; + case CACA_KEY_PAUSE: + mplayer_put_key(KEY_PAUSE); + break; + case CACA_KEY_F1: + case CACA_KEY_F2: + case CACA_KEY_F3: + case CACA_KEY_F4: + case CACA_KEY_F5: + case CACA_KEY_F6: + case CACA_KEY_F7: + case CACA_KEY_F8: + case CACA_KEY_F9: + case CACA_KEY_F10: + case CACA_KEY_F11: + case CACA_KEY_F12: + case CACA_KEY_F13: + case CACA_KEY_F14: + case CACA_KEY_F15: + mplayer_put_key(KEY_F + 1 + key - CACA_KEY_F1); + break; default: if (key <= 255) mplayer_put_key(key);

1 0

r34358 - trunk/osdep/keycodes.h
by reimar 23 Nov '11

23 Nov '11

Author: reimar Date: Wed Nov 23 21:47:24 2011 New Revision: 34358 Log: Replace constant by define with same value. Modified: trunk/osdep/keycodes.h Modified: trunk/osdep/keycodes.h ============================================================================== --- trunk/osdep/keycodes.h Tue Nov 22 21:24:24 2011 (r34357) +++ trunk/osdep/keycodes.h Wed Nov 23 21:47:24 2011 (r34358) @@ -58,7 +58,7 @@ #define KEY_UP (KEY_CRSR+3) /* Multimedia keyboard/remote keys */ -#define KEY_MM_BASE (0x100+384) +#define KEY_MM_BASE (KEY_BASE+384) #define KEY_POWER (KEY_MM_BASE+0) #define KEY_MENU (KEY_MM_BASE+1) #define KEY_PLAY (KEY_MM_BASE+2)

1 0

r34357 - trunk/libvo/x11_common.c
by reimar 22 Nov '11

22 Nov '11

Author: reimar Date: Tue Nov 22 21:24:24 2011 New Revision: 34357 Log: Change extended key handling so we will never call mplayer_put_key twice for a single key. Should fix bugzilla #2018. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Tue Nov 22 20:33:29 2011 (r34356) +++ trunk/libvo/x11_common.c Tue Nov 22 21:24:24 2011 (r34357) @@ -550,22 +550,23 @@ void vo_uninit(void) #include "osdep/keycodes.h" #include "wskeys.h" -#ifdef XF86XK_AudioPause static const struct mp_keymap keysym_map[] = { +#ifdef XF86XK_AudioPause {XF86XK_MenuKB, KEY_MENU}, {XF86XK_AudioPlay, KEY_PLAY}, {XF86XK_AudioPause, KEY_PAUSE}, {XF86XK_AudioStop, KEY_STOP}, {XF86XK_AudioPrev, KEY_PREV}, {XF86XK_AudioNext, KEY_NEXT}, {XF86XK_AudioMute, KEY_MUTE}, {XF86XK_AudioLowerVolume, KEY_VOLUME_DOWN}, {XF86XK_AudioRaiseVolume, KEY_VOLUME_UP}, +#endif {0, 0} }; -static void vo_x11_putkey_ext(int keysym) +static int vo_x11_putkey_ext(int keysym) { int mpkey = lookup_keymap_table(keysym_map, keysym); if (mpkey) mplayer_put_key(mpkey); + return mpkey != 0; } -#endif static const struct mp_keymap keymap[] = { // special keys @@ -852,13 +853,12 @@ int vo_x11_check_events(Display * mydisp XLookupString(&Event.xkey, buf, sizeof(buf), &keySym, &stat); -#ifdef XF86XK_AudioPause - vo_x11_putkey_ext(keySym); -#endif - key = - ((keySym & 0xff00) != - 0 ? ((keySym & 0x00ff) + 256) : (keySym)); - vo_x11_putkey(key); + if (!vo_x11_putkey_ext(keySym)) { + key = + ((keySym & 0xff00) != + 0 ? ((keySym & 0x00ff) + 256) : (keySym)); + vo_x11_putkey(key); + } ret |= VO_EVENT_KEYPRESS; } break;

1 0

r34356 - trunk/libmpcodecs/vf_expand.c
by reimar 22 Nov '11

22 Nov '11

Author: reimar Date: Tue Nov 22 20:33:29 2011 New Revision: 34356 Log: Make vf expand more picky: refuse operating on compressed or hwaccel formats and fix up offsets that would cause color corruption for YUV formats with downsampled chroma. Modified: trunk/libmpcodecs/vf_expand.c Modified: trunk/libmpcodecs/vf_expand.c ============================================================================== --- trunk/libmpcodecs/vf_expand.c Tue Nov 22 20:31:29 2011 (r34355) +++ trunk/libmpcodecs/vf_expand.c Tue Nov 22 20:33:29 2011 (r34356) @@ -218,11 +218,13 @@ static void draw_osd(struct vf_instance static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt){ + mp_image_t test_mpi; if(outfmt == IMGFMT_MPEGPES) { vf->priv->passthrough = 1; return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt); } - if (outfmt == IMGFMT_IF09) return 0; + mp_image_setfmt(&test_mpi, outfmt); + if (outfmt == IMGFMT_IF09 || !test_mpi.bpp) return 0; vf->priv->exp_x = vf->priv->cfg_exp_x; vf->priv->exp_y = vf->priv->cfg_exp_y; vf->priv->exp_w = vf->priv->cfg_exp_w; @@ -255,6 +257,23 @@ static int config(struct vf_instance *vf if(vf->priv->exp_x<0 || vf->priv->exp_x+width>vf->priv->exp_w) vf->priv->exp_x=(vf->priv->exp_w-width)/2; if(vf->priv->exp_y<0 || vf->priv->exp_y+height>vf->priv->exp_h) vf->priv->exp_y=(vf->priv->exp_h-height)/2; + if(test_mpi.flags & MP_IMGFLAG_YUV) { + int x_align_mask = (1 << test_mpi.chroma_x_shift) - 1; + int y_align_mask = (1 << test_mpi.chroma_y_shift) - 1; + // For 1-plane format non-aligned offsets will completely + // destroy the colours, for planar it will break the chroma + // sampling position. + if (vf->priv->exp_x & x_align_mask) { + vf->priv->exp_x &= ~x_align_mask; + mp_msg(MSGT_VFILTER, MSGL_ERR, "Specified x offset not supported " + "for YUV, reduced to %i.\n", vf->priv->exp_x); + } + if (vf->priv->exp_y & y_align_mask) { + vf->priv->exp_y &= ~y_align_mask; + mp_msg(MSGT_VFILTER, MSGL_ERR, "Specified y offset not supported " + "for YUV, reduced to %i.\n", vf->priv->exp_y); + } + } vf->priv->fb_ptr=NULL; if(!opt_screen_size_x && !opt_screen_size_y){

1 0

r34355 - trunk/libmpcodecs/mp_image.c
by reimar 22 Nov '11

22 Nov '11

Author: reimar Date: Tue Nov 22 20:31:29 2011 New Revision: 34355 Log: Set chroma_x_shift for 1-plane YUV formats. Modified: trunk/libmpcodecs/mp_image.c Modified: trunk/libmpcodecs/mp_image.c ============================================================================== --- trunk/libmpcodecs/mp_image.c Sat Nov 19 15:04:11 2011 (r34354) +++ trunk/libmpcodecs/mp_image.c Tue Nov 22 20:31:29 2011 (r34355) @@ -174,6 +174,7 @@ void mp_image_setfmt(mp_image_t* mpi,uns case IMGFMT_UYVY: mpi->flags|=MP_IMGFLAG_SWAPPED; case IMGFMT_YUY2: + mpi->chroma_x_shift = 1; mpi->bpp=16; mpi->num_planes=1; return;

1 0

r34323 - in trunk: DOCS/tech/translations.txt DOCS/xml/Makefile DOCS/xml/README Makefile
by diego 22 Nov '11

22 Nov '11

Author: diego Date: Mon Nov 7 20:54:40 2011 New Revision: 34323 Log: build: merge DOCS/xml/Makefile into top-level Makefile Modified: trunk/DOCS/tech/translations.txt trunk/Makefile Changes in other areas also in this revision: Deleted: trunk/DOCS/xml/Makefile Modified: trunk/DOCS/xml/README Modified: trunk/DOCS/tech/translations.txt ============================================================================== --- trunk/DOCS/tech/translations.txt Mon Nov 7 20:54:38 2011 (r34322) +++ trunk/DOCS/tech/translations.txt Mon Nov 7 20:54:40 2011 (r34323) @@ -135,7 +135,7 @@ XML documentation: ~~~~~~~~~~~~~~~~~~ If you make changes to the XML documentation, doublecheck that the -documentation still builds by running 'make' in the DOCS/xml/ subdirectory. +documentation still builds by running 'make doc'. Place XML files in a new subdirectory named after the language code you are translating for. main.xml is autogenerated, do not translate it. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon Nov 7 20:54:38 2011 (r34322) +++ trunk/Makefile Mon Nov 7 20:54:40 2011 (r34323) @@ -826,6 +826,38 @@ checkheaders: $(ALLHEADERS:.h=.ho) +###### XML documentation ###### + +doc: html-chunked html-single + +html-chunked: $(addprefix html-chunked-,$(DOC_LANGS)) +html-single: $(addprefix html-single-,$(DOC_LANGS)) + +xmllint: $(addprefix xmllint-,$(DOC_LANGS)) + +define lang-def +html-chunked-$(lang): DOCS/HTML/$(lang)/dummy.html +html-single-$(lang): DOCS/HTML/$(lang)/MPlayer.html +DOCS/HTML/$(lang)/dummy.html DOCS/HTML/$(lang)/MPlayer.html: DOCS/xml/$(lang)/main.xml $(wildcard DOCS/xml/$(lang)/*.xml) DOCS/xml/html-common.xsl DOCS/HTML/$(lang)/default.css + +DOCS/HTML/$(lang)/default.css: + mkdir -p $$(@D) + cp -f DOCS/xml/default.css $$(@D) + +DOCS/HTML/$(lang)/dummy.html: + SGML_CATALOG_FILES=$(CATALOG) $(XSLT_COMMAND) $$@ DOCS/xml/html-chunk.xsl $$< + +DOCS/HTML/$(lang)/MPlayer.html: + SGML_CATALOG_FILES=$(CATALOG) $(XSLT_COMMAND) $$@ DOCS/xml/html-single.xsl $$< + +xmllint-$(lang): + SGML_CATALOG_FILES=$(CATALOG) $(XMLLINT_COMMAND) DOCS/xml/$(lang)/main.xml +endef + +$(foreach lang, $(DOC_LANG_ALL),$(eval $(lang-def))) + + + ###### dependency declarations / specific CFLAGS ###### # Make sure all generated header files are created. @@ -931,7 +963,8 @@ clean: distclean: clean testsclean toolsclean driversclean dhahelperclean -$(MAKE) -C ffmpeg $@ - -rm -rf DOCS/tech/doxygen + -rm -rf DOCS/tech/doxygen DOCS/HTML + -rm -f DOCS/xml/html-chunk.xsl DOCS/xml/html-single.xsl -rm -f $(call ADD_ALL_DIRS,/*.d) -rm -f config.* codecs.conf.h help_mp.h version.h TAGS tags -rm -f $(VIDIX_PCI_FILES) @@ -1093,6 +1126,7 @@ dhahelperclean: .PHONY: all doxygen *install* *tools drivers dhahelper* .PHONY: checkheaders *clean tests check_checksums +.PHONY: doc html-chunked* html-single* xmllint* # Disable suffix rules. Most of the builtin rules are suffix rules, # so this saves some time on slow systems.

3 2

r34354 - trunk/libvo/vo_direct3d.c
by al 19 Nov '11

19 Nov '11

Author: al Date: Sat Nov 19 15:04:11 2011 New Revision: 34354 Log: vo direct3d: fix crash in osd drawing code The crash occurred when the video window was minimized and the OSD should be drawn. This caused the OSD textures creation to fail and later the OSD drawing code would assume they exist and cause the crash. When the video window is minimized a size change event with the new size 0x0 is reported. This is now handled by deferring the textures recreation. If the OSD should be drawn in the meantime it will be checked if the OSD textures have been allocated. This commit is done with the permission of the vo direct3d maintainer. This is based on patches from Roger Pack (rogerdpack2 (gmail)) and Patrick Dinh (patrickdinh33 (yahoo)). Modified: trunk/libvo/vo_direct3d.c Modified: trunk/libvo/vo_direct3d.c ============================================================================== --- trunk/libvo/vo_direct3d.c Wed Nov 16 12:14:25 2011 (r34353) +++ trunk/libvo/vo_direct3d.c Sat Nov 19 15:04:11 2011 (r34354) @@ -237,6 +237,12 @@ static int create_d3d_surfaces(void) return 0; } + if (!tex_width || !tex_height) { + mp_msg(MSGT_VO, MSGL_V, + "<vo_direct3d>Deferring surface creation because width or height is 0.\n"); + return 0; + } + /* calculate the best size for the OSD depending on the factors from the device */ if (priv->device_caps_power2_only) { tex_width = 1; @@ -1029,7 +1035,8 @@ static void draw_alpha(int x0, int y0, i static void draw_osd(void) { // we can not render OSD if we lost the device e.g. because it was uncooperative - if (!priv->d3d_device) + // or if the OSD textures are not allocated (e.g. the window is minimized) + if (!priv->d3d_device || !priv->d3d_texture_osd) return; if (vo_osd_changed(0)) {

1 0