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

r36262 - trunk/libvo/x11_common.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 16:06:17 2013 New Revision: 36262 Log: Handle X events even while waiting for a map event. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Thu May 9 16:06:16 2013 (r36261) +++ trunk/libvo/x11_common.c Thu May 9 16:06:17 2013 (r36262) @@ -826,44 +826,28 @@ err: return 0; } -int vo_x11_check_events(Display * mydisplay) +static int handle_x11_event(Display *mydisplay, XEvent *event) { - int ret = 0; - XEvent Event; uint8_t buf[16] = {0}; KeySym keySym; static XComposeStatus stat; static int ctrl_state; - - if (vo_mouse_autohide && mouse_waiting_hide && - (GetTimerMS() - mouse_timer >= 1000)) { - vo_hidecursor(mydisplay, vo_window); - mouse_waiting_hide = 0; - } - - if (WinID > 0) - ret |= check_resize(); - while (XPending(mydisplay)) - { - XNextEvent(mydisplay, &Event); #ifdef CONFIG_GUI if (use_gui) { - gui(GUI_HANDLE_X_EVENT, &Event); - if (vo_window != Event.xany.window) - continue; + gui(GUI_HANDLE_X_EVENT, event); + if (vo_window != event->xany.window) + return 0; } #endif - switch (Event.type) + switch (event->type) { case Expose: - ret |= VO_EVENT_EXPOSE; - break; + return VO_EVENT_EXPOSE; case ConfigureNotify: if (vo_window == None) break; - ret |= check_resize(); - break; + return check_resize(); case KeyPress: case KeyRelease: { @@ -873,7 +857,7 @@ int vo_x11_check_events(Display * mydisp if ( use_gui ) { break; } #endif - XLookupString(&Event.xkey, buf, sizeof(buf), &keySym, + XLookupString(&event->xkey, buf, sizeof(buf), &keySym, &stat); key = ((keySym & 0xff00) != @@ -881,18 +865,18 @@ int vo_x11_check_events(Display * mydisp utf8 = buf[0] > 0xc0 ? to_utf8(buf) : 0; if (utf8) key = 0; if (key == wsLeftCtrl || key == wsRightCtrl) { - ctrl_state = Event.type == KeyPress; + ctrl_state = event->type == KeyPress; mplayer_put_key(KEY_CTRL | (ctrl_state ? MP_KEY_DOWN : 0)); - } else if (Event.type == KeyRelease) { + } else if (event->type == KeyRelease) { break; } // Attempt to fix if somehow our state got out of // sync with reality. // This usually happens when a shortcut involving CTRL // was used to switch to a different window/workspace. - if (ctrl_state != !!(Event.xkey.state & 4)) { - ctrl_state = !!(Event.xkey.state & 4); + if (ctrl_state != !!(event->xkey.state & 4)) { + ctrl_state = !!(event->xkey.state & 4); mplayer_put_key(KEY_CTRL | (ctrl_state ? MP_KEY_DOWN : 0)); } @@ -900,11 +884,11 @@ int vo_x11_check_events(Display * mydisp if (utf8) mplayer_put_key(utf8); else vo_x11_putkey(key); } - ret |= VO_EVENT_KEYPRESS; + return VO_EVENT_KEYPRESS; } break; case MotionNotify: - vo_mouse_movement(Event.xmotion.x, Event.xmotion.y); + vo_mouse_movement(event->xmotion.x, event->xmotion.y); if (vo_mouse_autohide) { @@ -922,11 +906,11 @@ int vo_x11_check_events(Display * mydisp } #ifdef CONFIG_GUI // Ignore mouse button 1-3 under GUI. - if (use_gui && (Event.xbutton.button >= 1) - && (Event.xbutton.button <= 3)) + if (use_gui && (event->xbutton.button >= 1) + && (event->xbutton.button <= 3)) break; #endif - mplayer_put_key((MOUSE_BTN0 + Event.xbutton.button - + mplayer_put_key((MOUSE_BTN0 + event->xbutton.button - 1) | MP_KEY_DOWN); break; case ButtonRelease: @@ -938,16 +922,16 @@ int vo_x11_check_events(Display * mydisp } #ifdef CONFIG_GUI // Ignore mouse button 1-3 under GUI. - if (use_gui && (Event.xbutton.button >= 1) - && (Event.xbutton.button <= 3)) + if (use_gui && (event->xbutton.button >= 1) + && (event->xbutton.button <= 3)) break; #endif - mplayer_put_key(MOUSE_BTN0 + Event.xbutton.button - 1); + mplayer_put_key(MOUSE_BTN0 + event->xbutton.button - 1); break; case PropertyNotify: { char *name = - XGetAtomName(mydisplay, Event.xproperty.atom); + XGetAtomName(mydisplay, event->xproperty.atom); if (!name) break; @@ -967,11 +951,31 @@ int vo_x11_check_events(Display * mydisp mplayer_put_key(KEY_CLOSE_WIN); break; case ClientMessage: - if (Event.xclient.message_type == XAWM_PROTOCOLS && - Event.xclient.data.l[0] == XAWM_DELETE_WINDOW) + if (event->xclient.message_type == XAWM_PROTOCOLS && + event->xclient.data.l[0] == XAWM_DELETE_WINDOW) mplayer_put_key(KEY_CLOSE_WIN); break; } + return 0; +} + +int vo_x11_check_events(Display * mydisplay) +{ + int ret = 0; + XEvent Event; + + if (vo_mouse_autohide && mouse_waiting_hide && + (GetTimerMS() - mouse_timer >= 1000)) { + vo_hidecursor(mydisplay, vo_window); + mouse_waiting_hide = 0; + } + + if (WinID > 0) + ret |= check_resize(); + while (XPending(mydisplay)) + { + XNextEvent(mydisplay, &Event); + ret |= handle_x11_event(mydisplay, &Event); } return ret; } @@ -1176,6 +1180,7 @@ void vo_x11_create_vo_window(XVisualInfo // wait for map do { XNextEvent(mDisplay, &xev); + handle_x11_event(mDisplay, &xev); } while (xev.type != MapNotify || xev.xmap.event != vo_window); vo_x11_clearwindow(mDisplay, vo_window); vo_x11_selectinput_witherr(mDisplay, vo_window,

1 0

r36261 - trunk/libvo/x11_common.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 16:06:16 2013 New Revision: 36261 Log: Remove debug printfs that have not been used in ages. Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Thu May 9 16:06:15 2013 (r36260) +++ trunk/libvo/x11_common.c Thu May 9 16:06:16 2013 (r36261) @@ -854,7 +854,6 @@ int vo_x11_check_events(Display * mydisp continue; } #endif -// printf("\rEvent.type=%X \n",Event.type); switch (Event.type) { case Expose: @@ -953,8 +952,6 @@ int vo_x11_check_events(Display * mydisp if (!name) break; -// fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom ); - XFree(name); } break;

1 0

r36260 - trunk/libvo/x11_common.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 16:06:15 2013 New Revision: 36260 Log: Remove XSelectInput and XSync call that do not seem to serve any purpose. They existed since the first version of vo_gl and simply ended up being carried on. This could cause events to be lost. Part of a patch by Jens Stimpfle [debian jstimpfle de] Modified: trunk/libvo/x11_common.c Modified: trunk/libvo/x11_common.c ============================================================================== --- trunk/libvo/x11_common.c Thu May 9 12:53:20 2013 (r36259) +++ trunk/libvo/x11_common.c Thu May 9 16:06:15 2013 (r36260) @@ -1181,8 +1181,6 @@ void vo_x11_create_vo_window(XVisualInfo XNextEvent(mDisplay, &xev); } while (xev.type != MapNotify || xev.xmap.event != vo_window); vo_x11_clearwindow(mDisplay, vo_window); - XSelectInput(mDisplay, vo_window, NoEventMask); - XSync(mDisplay, False); vo_x11_selectinput_witherr(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | KeyReleaseMask | PointerMotionMask | ButtonPressMask | ButtonReleaseMask | ExposureMask);

1 0

r36259 - trunk/libmpcodecs/ad_hwac3.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 12:53:20 2013 New Revision: 36259 Log: Avoid using swab() This is the only place where it is used and it is not available universally (missing e.g. on Android). Modified: trunk/libmpcodecs/ad_hwac3.c Modified: trunk/libmpcodecs/ad_hwac3.c ============================================================================== --- trunk/libmpcodecs/ad_hwac3.c Thu May 9 12:53:18 2013 (r36258) +++ trunk/libmpcodecs/ad_hwac3.c Thu May 9 12:53:20 2013 (r36259) @@ -20,11 +20,9 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _XOPEN_SOURCE 600 #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <unistd.h> #include "config.h" #include "mp_msg.h" @@ -556,10 +554,16 @@ static int decode_audio_dts(unsigned cha memcpy(&buf[8], indata_ptr, fsize); else { - swab(indata_ptr, &buf[8], fsize); + int i = fsize >> 1; + uint16_t *d = buf16 + 4; + uint8_t *s = indata_ptr; + while (i--) { + *d++ = HAVE_BIGENDIAN ? AV_RL16(s) : AV_RB16(s); + s += 2; + } if (fsize & 1) { - buf[8+fsize-1] = 0; - buf[8+fsize] = indata_ptr[fsize-1]; + // treat as if there was an additional 0 + *d++ = HAVE_BIGENDIAN ? *s : *s << 8; fsize++; } }

1 0

r36258 - trunk/libmpcodecs/ad_hwac3.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 12:53:18 2013 New Revision: 36258 Log: Fix indentation. Modified: trunk/libmpcodecs/ad_hwac3.c Modified: trunk/libmpcodecs/ad_hwac3.c ============================================================================== --- trunk/libmpcodecs/ad_hwac3.c Thu May 9 12:53:17 2013 (r36257) +++ trunk/libmpcodecs/ad_hwac3.c Thu May 9 12:53:18 2013 (r36258) @@ -551,18 +551,18 @@ static int decode_audio_dts(unsigned cha buf16[3] = fsize << 3; if (!convert_16bits) { - int be_stream = indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f; - if (be_stream == HAVE_BIGENDIAN) - memcpy(&buf[8], indata_ptr, fsize); - else - { - swab(indata_ptr, &buf[8], fsize); - if (fsize & 1) { - buf[8+fsize-1] = 0; - buf[8+fsize] = indata_ptr[fsize-1]; - fsize++; - } - } + int be_stream = indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f; + if (be_stream == HAVE_BIGENDIAN) + memcpy(&buf[8], indata_ptr, fsize); + else + { + swab(indata_ptr, &buf[8], fsize); + if (fsize & 1) { + buf[8+fsize-1] = 0; + buf[8+fsize] = indata_ptr[fsize-1]; + fsize++; + } + } } memset(&buf[fsize + 8], 0, nr_samples * 2 * 2 - (fsize + 8));

1 0

r36257 - trunk/libmpcodecs/ad_hwac3.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 12:53:17 2013 New Revision: 36257 Log: Simplify check whether byte swapping is necessary. Modified: trunk/libmpcodecs/ad_hwac3.c Modified: trunk/libmpcodecs/ad_hwac3.c ============================================================================== --- trunk/libmpcodecs/ad_hwac3.c Thu May 9 12:53:16 2013 (r36256) +++ trunk/libmpcodecs/ad_hwac3.c Thu May 9 12:53:17 2013 (r36257) @@ -551,13 +551,8 @@ static int decode_audio_dts(unsigned cha buf16[3] = fsize << 3; if (!convert_16bits) { -#if HAVE_BIGENDIAN - /* BE stream */ - if (indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f) -#else - /* LE stream */ - if (indata_ptr[0] == 0xff || indata_ptr[0] == 0xfe) -#endif + int be_stream = indata_ptr[0] == 0x1f || indata_ptr[0] == 0x7f; + if (be_stream == HAVE_BIGENDIAN) memcpy(&buf[8], indata_ptr, fsize); else {

1 0

r36256 - trunk/Changelog
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 12:53:16 2013 New Revision: 36256 Log: Add comment about -wid on Android to Changelog. Modified: trunk/Changelog Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Thu May 9 10:07:30 2013 (r36255) +++ trunk/Changelog Thu May 9 12:53:16 2013 (r36256) @@ -25,6 +25,8 @@ MPlayer via OpenGL ES. Note that just a bit of seeking etc. would cause reproducible system reboots after just a few seconds on my Galaxy S2. + * Android: -wid is supported. This should allow using MPlayer in slave + mode, a native window pointer needs to be passed as -wid. Untested. 1.1: "We gave up on 1.0"

1 0

r36255 - in trunk: Makefile TOOLS/coverity.sh
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 10:07:30 2013 New Revision: 36255 Log: Add script that submits a Coverity scan in an automated way. Added: trunk/TOOLS/coverity.sh (contents, props changed) Modified: trunk/Makefile Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Thu May 9 09:24:34 2013 (r36254) +++ trunk/Makefile Thu May 9 10:07:30 2013 (r36255) @@ -766,6 +766,8 @@ all: $(ALL_PRG-yes) %-rc.o: %.rc $(WINDRES) -I. $< -o $@ +ffmpeglibs: $(FFMPEGLIBS) + $(FFMPEGLIBS): $(FFMPEGFILES) config.h $(MAKE) -C ffmpeg $(@:ffmpeg/%=%) Added: trunk/TOOLS/coverity.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/TOOLS/coverity.sh Thu May 9 10:07:30 2013 (r36255) @@ -0,0 +1,8 @@ +rm -rf cov-int MPlayer.tgz +make distclean +svn up +./configure $MPLAYER_COV_OPTS && make -j5 ffmpeglibs +"$MPLAYER_COV_PATH"/bin/cov-build --dir cov-int make -j5 +tar -czf MPlayer.tgz cov-int +curl --form file=(a)MPlayer.tgz --form project=MPlayer --form password="$MPLAYER_COV_PWD" --form email="$MPLAYER_COV_EMAIL" --form version=2.5 --form description="automated run" http://scan5.coverity.com/cgi-bin/upload.py +

1 0

r36254 - trunk/libmpdemux/demuxer.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 09:24:34 2013 New Revision: 36254 Log: Make parser allocation work if a codec was forced. Modified: trunk/libmpdemux/demuxer.c Modified: trunk/libmpdemux/demuxer.c ============================================================================== --- trunk/libmpdemux/demuxer.c Thu May 9 09:18:48 2013 (r36253) +++ trunk/libmpdemux/demuxer.c Thu May 9 09:24:34 2013 (r36254) @@ -32,6 +32,7 @@ #include "help_mp.h" #include "m_config.h" #include "mpcommon.h" +#include "codec-cfg.h" #include "libvo/fastmemcpy.h" @@ -561,6 +562,8 @@ static void get_parser(sh_common_t *sh, return; allocate_parser(avctx, parser, sh->format); + if (!*parser && sh->codec) // fallback to support forcing a codec + allocate_parser(avctx, parser, sh->codec->fourcc[0]); sh->avctx = *avctx; sh->parser = *parser; }

1 0

r36253 - trunk/libvo/gl_common.c
by reimar 09 May '13

09 May '13

Author: reimar Date: Thu May 9 09:18:48 2013 New Revision: 36253 Log: Support -wid on Android. Modified: trunk/libvo/gl_common.c Modified: trunk/libvo/gl_common.c ============================================================================== --- trunk/libvo/gl_common.c Thu May 9 09:18:47 2013 (r36252) +++ trunk/libvo/gl_common.c Thu May 9 09:18:48 2013 (r36253) @@ -2433,6 +2433,8 @@ static int setGlWindow_egl(MPGLContext * vo_screenheight = vo_dheight = h; return SET_WINDOW_OK; } + if (WinID != -1) + vo_window = (EGLNativeWindowType)(intptr_t)WinID; if (!vo_window) vo_window = android_createDisplaySurface(); if (!vo_window)

1 0