July 2010 - MPlayer-cvslog - lists.mplayerhq.hu

r31827 - trunk/spudec.c
by reimar 26 Jul '10

26 Jul '10

Author: reimar Date: Mon Jul 26 19:15:56 2010 New Revision: 31827 Log: Remove useless end_col/end_row variables. Modified: trunk/spudec.c Modified: trunk/spudec.c ============================================================================== --- trunk/spudec.c Sun Jul 25 19:43:22 2010 (r31826) +++ trunk/spudec.c Mon Jul 26 19:15:56 2010 (r31827) @@ -69,8 +69,8 @@ struct packet_t { processed (for RLE decoding) for even and odd lines */ int deinterlace_oddness; /* 0 or 1, index into current_nibble */ - unsigned int start_col, end_col; - unsigned int start_row, end_row; + unsigned int start_col; + unsigned int start_row; unsigned int width, height, stride; unsigned int start_pts, end_pts; packet_t *next; @@ -92,8 +92,8 @@ typedef struct { unsigned int custom; unsigned int now_pts; unsigned int start_pts, end_pts; - unsigned int start_col, end_col; - unsigned int start_row, end_row; + unsigned int start_col; + unsigned int start_row; unsigned int width, height, stride; size_t image_size; /* Size of the image buffer */ unsigned char *image; /* Grayscale value */ @@ -263,9 +263,7 @@ static void spudec_process_data(spudec_h this->scaled_frame_width = 0; this->scaled_frame_height = 0; this->start_col = packet->start_col; - this->end_col = packet->end_col; this->start_row = packet->start_row; - this->end_row = packet->end_row; this->height = packet->height; this->width = packet->width; this->stride = packet->stride; @@ -495,9 +493,7 @@ static void spudec_process_control(spude packet->current_nibble[0] = current_nibble[0]; packet->current_nibble[1] = current_nibble[1]; packet->start_row = start_row; - packet->end_row = end_row; packet->start_col = start_col; - packet->end_col = end_col; packet->width = width; packet->height = height; packet->stride = stride;

1 0

r31630 - in trunk: Makefile osdep/mplayer.exe.manifest osdep/mplayer.rc
by reimar 26 Jul '10

26 Jul '10

Author: reimar Date: Sun Jul 4 09:13:18 2010 New Revision: 31630 Log: Add a manifest file to disable file and registry "virtualization" on Windows. Added: trunk/osdep/mplayer.exe.manifest Modified: trunk/Makefile trunk/osdep/mplayer.rc Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sat Jul 3 22:54:54 2010 (r31629) +++ trunk/Makefile Sun Jul 4 09:13:18 2010 (r31630) @@ -885,6 +885,8 @@ codec-cfg.d codec-cfg.o: codecs.conf.h $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h $(call ADDSUFFIXES,.d .o,mpcommon osdep/mplayer.rc): version.h +osdep/mplayer-rc.o: osdep/mplayer.exe.manifest + gui/%: CFLAGS += -Wno-strict-prototypes libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) Added: trunk/osdep/mplayer.exe.manifest ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/osdep/mplayer.exe.manifest Sun Jul 4 09:13:18 2010 (r31630) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> + <assemblyIdentity + version="0.0.9.0" + processorArchitecture="*" + name="MPlayer - The Movie Player" + type="win32" + /> + <description>MPlayer - The Movie Player</description> + <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2"> + <security> + <requestedPrivileges> + <requestedExecutionLevel + level="asInvoker" + /> + </requestedPrivileges> + </security> + </trustInfo> +</assembly> Modified: trunk/osdep/mplayer.rc ============================================================================== --- trunk/osdep/mplayer.rc Sat Jul 3 22:54:54 2010 (r31629) +++ trunk/osdep/mplayer.rc Sun Jul 4 09:13:18 2010 (r31630) @@ -51,3 +51,6 @@ FILETYPE VFT_APP } IDI_ICON1 ICON DISCARDABLE "etc/mplayer.ico" + +// for some reason RT_MANIFEST does not work +1 24 "mplayer.exe.manifest"

3 3

r31826 - in trunk/libvo: vo_corevideo.h vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 19:43:22 2010 New Revision: 31826 Log: Move variable into the only function where it is used. Modified: trunk/libvo/vo_corevideo.h trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.h ============================================================================== --- trunk/libvo/vo_corevideo.h Sun Jul 25 19:40:44 2010 (r31825) +++ trunk/libvo/vo_corevideo.h Sun Jul 25 19:43:22 2010 (r31826) @@ -40,7 +40,6 @@ { //Cocoa NSWindow *window; - NSEvent *event; //CoreVideo CVPixelBufferRef frameBuffers[2]; Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 19:40:44 2010 (r31825) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 19:43:22 2010 (r31826) @@ -878,6 +878,7 @@ static int control(uint32_t request, voi */ - (void) check_events { + NSEvent *event; int curTime = TickCount()/60; //automatically hide mouse cursor (and future on-screen control?)

1 0

r31825 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 19:40:44 2010 New Revision: 31825 Log: Move mouse hiding code to check_events, this allows mouse hiding to continue to work with -idle -fixed-vo, after the video has finished but the last frame is still displayed. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 19:06:41 2010 (r31824) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 19:40:44 2010 (r31825) @@ -717,8 +717,6 @@ static int control(uint32_t request, voi */ - (void) render { - int curTime; - glClear(GL_COLOR_BUFFER_BIT); glEnable(CVOpenGLTextureGetTarget(texture)); @@ -757,27 +755,6 @@ static int control(uint32_t request, voi } glFlush(); - - curTime = TickCount()/60; - - //automatically hide mouse cursor (and future on-screen control?) - if(isFullscreen && !mouseHide && !isRootwin) - { - if(curTime - lastMouseHide >= 5 || lastMouseHide == 0) - { - CGDisplayHideCursor(kCGDirectMainDisplay); - mouseHide = TRUE; - lastMouseHide = curTime; - } - } - - //update activity every 30 seconds to prevent - //screensaver from starting up. - if(curTime - lastScreensaverUpdate >= 30 || lastScreensaverUpdate == 0) - { - UpdateSystemActivity(UsrActivity); - lastScreensaverUpdate = curTime; - } } /* @@ -901,6 +878,27 @@ static int control(uint32_t request, voi */ - (void) check_events { + int curTime = TickCount()/60; + + //automatically hide mouse cursor (and future on-screen control?) + if(isFullscreen && !mouseHide && !isRootwin) + { + if(curTime - lastMouseHide >= 5 || lastMouseHide == 0) + { + CGDisplayHideCursor(kCGDirectMainDisplay); + mouseHide = TRUE; + lastMouseHide = curTime; + } + } + + //update activity every 30 seconds to prevent + //screensaver from starting up. + if(curTime - lastScreensaverUpdate >= 30 || lastScreensaverUpdate == 0) + { + UpdateSystemActivity(UsrActivity); + lastScreensaverUpdate = curTime; + } + event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSEventTrackingRunLoopMode dequeue:YES]; if (event == nil) return;

1 0

r31824 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 19:06:41 2010 New Revision: 31824 Log: Make the Quit menu entry work. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 19:00:04 2010 (r31823) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 19:06:41 2010 (r31824) @@ -401,6 +401,15 @@ static int preinit(const char *arg) mpGLView = [[MPlayerOpenGLView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) pixelFormat:[MPlayerOpenGLView defaultPixelFormat]]; [mpGLView autorelease]; } + // Install an event handler so the Quit menu entry works + // The proper way using NSApp setDelegate: and + // applicationShouldTerminate: does not work, + // probably NSApplication never installs its handler. + [[NSAppleEventManager sharedAppleEventManager] + setEventHandler:mpGLView + andSelector:@selector(handleQuitEvent:withReplyEvent:) + forEventClass:kCoreEventClass + andEventID:kAEQuitApplication]; [mpGLView display]; [mpGLView preinit]; @@ -1040,4 +1049,9 @@ static int control(uint32_t request, voi // KEY_CLOSE_WIN handler is disabled return NO; } + +- (void)handleQuitEvent:(NSAppleEventDescriptor*)e withReplyEvent:(NSAppleEventDescriptor*)r +{ + mplayer_put_key(KEY_CLOSE_WIN); +} @end

1 0

r31823 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 19:00:04 2010 New Revision: 31823 Log: Simplify check_events: avoid seemingly pointless untilDate argument. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 16:40:58 2010 (r31822) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 19:00:04 2010 (r31823) @@ -892,7 +892,7 @@ static int control(uint32_t request, voi */ - (void) check_events { - event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:[NSDate dateWithTimeIntervalSinceNow:0.0001] inMode:NSEventTrackingRunLoopMode dequeue:YES]; + event = [NSApp nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSEventTrackingRunLoopMode dequeue:YES]; if (event == nil) return; [NSApp sendEvent:event];

1 0

r31822 - trunk/libvo/vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 16:40:58 2010 New Revision: 31822 Log: Change window-closing handling so it works properly if the KEY_CLOSE_WIN is rebound to e.g. skip to next file or not bound at all. Modified: trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 15:53:21 2010 (r31821) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 16:40:58 2010 (r31822) @@ -1032,9 +1032,12 @@ static int control(uint32_t request, voi return YES; } -- (void)windowWillClose:(NSNotification *)aNotification +- (BOOL)windowShouldClose:(id)sender { - mpGLView = NULL; mplayer_put_key(KEY_CLOSE_WIN); + // We have to wait for MPlayer to handle this, + // otherwise we are in trouble if the + // KEY_CLOSE_WIN handler is disabled + return NO; } @end

1 0

r31811 - in trunk/libvo: vo_corevideo.h vo_corevideo.m
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 14:25:05 2010 New Revision: 31811 Log: Remove kQuitCmd, it has no purpose or effect at all. Modified: trunk/libvo/vo_corevideo.h trunk/libvo/vo_corevideo.m Modified: trunk/libvo/vo_corevideo.h ============================================================================== --- trunk/libvo/vo_corevideo.h Sun Jul 25 14:22:02 2010 (r31810) +++ trunk/libvo/vo_corevideo.h Sun Jul 25 14:25:05 2010 (r31811) @@ -56,7 +56,6 @@ BOOL mouseHide; //menu command id - NSMenuItem *kQuitCmd; NSMenuItem *kHalfScreenCmd; NSMenuItem *kNormalScreenCmd; NSMenuItem *kDoubleScreenCmd; Modified: trunk/libvo/vo_corevideo.m ============================================================================== --- trunk/libvo/vo_corevideo.m Sun Jul 25 14:22:02 2010 (r31810) +++ trunk/libvo/vo_corevideo.m Sun Jul 25 14:25:05 2010 (r31811) @@ -616,11 +616,6 @@ static int control(uint32_t request, voi */ - (void)menuAction:(id)sender { - if(sender == kQuitCmd) - { - mplayer_put_key(KEY_CLOSE_WIN); - } - if(sender == kHalfScreenCmd) [self set_winSizeMult: 0.5]; if(sender == kNormalScreenCmd)

2 1

r31812 - trunk/libvo/vo_quartz.c
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 14:28:23 2010 New Revision: 31812 Log: Remove unused kQuitCmd from vo_quartz. While just as useless as for corevideo, the "Quit" menu item at least works through kHICommandQuit here. Modified: trunk/libvo/vo_quartz.c Modified: trunk/libvo/vo_quartz.c ============================================================================== --- trunk/libvo/vo_quartz.c Sun Jul 25 14:25:05 2010 (r31811) +++ trunk/libvo/vo_quartz.c Sun Jul 25 14:28:23 2010 (r31812) @@ -130,7 +130,6 @@ static int lastMouseHide = 0; enum { - kQuitCmd = 1, kHalfScreenCmd = 2, kNormalScreenCmd = 3, kDoubleScreenCmd = 4,

1 0

r31810 - trunk/libvo/vo_corevideo.h
by reimar 25 Jul '10

25 Jul '10

Author: reimar Date: Sun Jul 25 14:22:02 2010 New Revision: 31810 Log: Fix indentation. Modified: trunk/libvo/vo_corevideo.h Modified: trunk/libvo/vo_corevideo.h ============================================================================== --- trunk/libvo/vo_corevideo.h Sun Jul 25 13:53:44 2010 (r31809) +++ trunk/libvo/vo_corevideo.h Sun Jul 25 14:22:02 2010 (r31810) @@ -48,10 +48,10 @@ CVOpenGLTextureRef texture; NSRect textureFrame; - GLfloat lowerLeft[2]; - GLfloat lowerRight[2]; - GLfloat upperRight[2]; - GLfloat upperLeft[2]; + GLfloat lowerLeft[2]; + GLfloat lowerRight[2]; + GLfloat upperRight[2]; + GLfloat upperLeft[2]; BOOL mouseHide;

1 0