October 2004 - MPlayer-cvslog - lists.mplayerhq.hu

CVS: main/libmpdemux demux_mkv.c,1.26,1.27
by syncmail＠mplayerhq.hu 30 Oct '04

30 Oct '04

CVS change done by Moritz Bunkus CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv14682 Modified Files: demux_mkv.c Log Message: DTS uses the format tag 0x2001. Patch by Joakim Plate (joakim ! plate () ecce ! se) Index: demux_mkv.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mkv.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- demux_mkv.c 28 Sep 2004 13:51:20 -0000 1.26 +++ demux_mkv.c 30 Oct 2004 08:47:04 -0000 1.27 @@ -1690,9 +1690,10 @@ if (!strcmp(track->codec_id, MKV_A_MP3) || !strcmp(track->codec_id, MKV_A_MP2)) track->a_formattag = 0x0055; - else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3)) || - !strcmp(track->codec_id, MKV_A_DTS)) + else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3))) track->a_formattag = 0x2000; + else if (!strcmp(track->codec_id, MKV_A_DTS)) + track->a_formattag = 0x2001; else if (!strcmp(track->codec_id, MKV_A_PCM) || !strcmp(track->codec_id, MKV_A_PCM_BE)) track->a_formattag = 0x0001; @@ -1810,7 +1811,8 @@ sh_a->wf->nAvgBytesPerSec = 16000; sh_a->wf->nBlockAlign = 1152; } - else if (!strncmp(track->codec_id, MKV_A_AC3, strlen(MKV_A_AC3))) + else if ((track->a_formattag == 0x2000) || /* AC3 */ + (track->a_formattag == 0x2001)) /* DTS */ { sh_a->wf->nAvgBytesPerSec = 16000; sh_a->wf->nBlockAlign = 1536;

1 0

CVS: main/libmpdemux demux_ogg.c,1.59,1.60
by syncmail＠mplayerhq.hu 30 Oct '04

30 Oct '04

CVS change done by Moritz Bunkus CVS Update of /cvsroot/mplayer/main/libmpdemux In directory mail:/var2/tmp/cvs-serv5166 Modified Files: demux_ogg.c Log Message: Declare a prototype for the function before it is used. Otherwise some compiler versions will "optimize" them away, and linking will fail. Index: demux_ogg.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_ogg.c,v retrieving revision 1.59 retrieving revision 1.60 diff -u -r1.59 -r1.60 --- demux_ogg.c 14 Oct 2004 15:09:34 -0000 1.59 +++ demux_ogg.c 30 Oct 2004 08:42:25 -0000 1.60 @@ -425,6 +425,8 @@ return 0; } +static int demux_ogg_sub_reverse_id(demuxer_t *demuxer, int id); + /// Try to print out comments and also check for LANGUAGE= tag static void demux_ogg_check_comments(demuxer_t *d, ogg_stream_t *os, int id, vorbis_comment *vc) {

1 0

CVS: main configure,1.926,1.927
by syncmail＠mplayerhq.hu 30 Oct '04

30 Oct '04

CVS change done by Sascha Sommer CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv3388 Modified Files: configure Log Message: fix XVideo misdetection on OSF/1, patch by Gabucino <gabucino at mplayerhq.hu> Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.926 retrieving revision 1.927 diff -u -r1.926 -r1.927 --- configure 28 Oct 2004 23:25:17 -0000 1.926 +++ configure 30 Oct 2004 08:17:48 -0000 1.927 @@ -3394,7 +3394,10 @@ cat > $TMPC <<EOF #include <X11/Xlib.h> #include <X11/extensions/Xvlib.h> -int main(void) { (void) XvGetPortAttribute(0, 0, 0, 0); return 0; } +int main(void) { + (void) XvGetPortAttribute(0, 0, 0, 0); + (void) XvQueryPortAttributes(0, 0, 0); + return 0; } EOF _xv=no cc_check $_inc_x11 -lXv $_ld_x11 && _xv=yes

1 0

CVS: main/TOOLS vivodump.c,1.9,1.10
by syncmail＠mplayerhq.hu 29 Oct '04

29 Oct '04

CVS change done by Alexander Strasser (beastd) Update of /cvsroot/mplayer/main/TOOLS In directory mail:/var2/tmp/cvs-serv19804/TOOLS Modified Files: vivodump.c Log Message: Fixed the assumption user will always give 2+ args to the program. Index: vivodump.c =================================================================== RCS file: /cvsroot/mplayer/main/TOOLS/vivodump.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vivodump.c 28 Oct 2004 01:02:24 -0000 1.9 +++ vivodump.c 29 Oct 2004 22:05:34 -0000 1.10 @@ -151,7 +151,7 @@ int postable[32768]; -int main(int argv,char ** argc){ +int main(int argc,char ** argv){ int c; unsigned int head=-1; int pos=0; @@ -167,13 +167,20 @@ int flag2=0; int prefix=0; +// check if enough args were given +if ( argc < 3 ){ + printf("Too few arguments given!\n" + "Usage: %s <input_file> <output_file>\n", argv[0]); + + return -1; +} // input -if(!(f=fopen(argc[1],"rb"))){ +if(!(f=fopen(argv[1],"rb"))){ printf("Couldn't open input file.\n"); return -1; } // output -if(!(f2=fopen(argc[2],"wb"))){ +if(!(f2=fopen(argv[2],"wb"))){ printf("Couldn't open output file.\n"); return -1; }

1 0

CVS: main/libmpeg2 cpu_state.c,1.4,1.5
by syncmail＠mplayerhq.hu 29 Oct '04

29 Oct '04

CVS change done by Zoltan Ponekker Update of /cvsroot/mplayer/main/libmpeg2 In directory mail:/var2/tmp/cvs-serv4342 Modified Files: cpu_state.c Log Message: compile fix on G3 Index: cpu_state.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpeg2/cpu_state.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- cpu_state.c 2 Aug 2004 11:20:38 -0000 1.4 +++ cpu_state.c 29 Oct 2004 19:03:55 -0000 1.5 @@ -43,7 +43,7 @@ } #endif -#ifdef ARCH_PPC +#if defined( ARCH_PPC ) && defined( HAVE_ALTIVEC ) #ifdef HAVE_ALTIVEC_H /* gnu */ #define LI(a,b) "li " #a "," #b "\n\t" #define STVX0(a,b,c) "stvx " #a ",0," #c "\n\t"

1 0

CVS: main/libvo vo_quartz.c,1.36,1.37
by syncmail＠mplayerhq.hu 29 Oct '04

29 Oct '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv8359/libvo Modified Files: vo_quartz.c Log Message: resize preset now respect movie aspect Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- vo_quartz.c 29 Oct 2004 01:24:14 -0000 1.36 +++ vo_quartz.c 29 Oct 2004 02:16:16 -0000 1.37 @@ -349,7 +349,7 @@ vo_fs = (!(vo_fs)); window_fullscreen(); } - SizeWindow(theWindow, (d_width/2), (d_height/2)+border, 1); + SizeWindow(theWindow, (d_width/2), ((d_width/movie_aspect)/2)+border, 1); RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen); window_resized(); break; @@ -360,7 +360,7 @@ vo_fs = (!(vo_fs)); window_fullscreen(); } - SizeWindow(theWindow, d_width, d_height+border, 1); + SizeWindow(theWindow, d_width, (d_width/movie_aspect)+border, 1); RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen); window_resized(); break; @@ -371,7 +371,7 @@ vo_fs = (!(vo_fs)); window_fullscreen(); } - SizeWindow(theWindow, (d_width*2), (d_height*2)+border, 1); + SizeWindow(theWindow, (d_width*2), ((d_width/movie_aspect)*2)+border, 1); RepositionWindow(theWindow, NULL, kWindowCascadeOnMainScreen); window_resized(); break;

1 0

CVS: main/libvo vo_quartz.c,1.35,1.36
by syncmail＠mplayerhq.hu 29 Oct '04

29 Oct '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv26619/libvo Modified Files: vo_quartz.c Log Message: enable pan-scan + menu option Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -r1.35 -r1.36 --- vo_quartz.c 28 Oct 2004 23:06:35 -0000 1.35 +++ vo_quartz.c 29 Oct 2004 01:24:14 -0000 1.36 @@ -75,6 +75,7 @@ extern int vo_keepaspect; //keep aspect ratio when resizing extern float movie_aspect; static float old_movie_aspect; +extern float vo_panscan; static int winLevel = 1; int levelList[] = @@ -124,7 +125,8 @@ kKeepAspectCmd = 6, kAspectOrgCmd = 7, kAspectFullCmd = 8, - kAspectWideCmd = 9 + kAspectWideCmd = 9, + kPanScanCmd = 10 }; #include "osdep/keycodes.h" @@ -401,6 +403,11 @@ window_resized(); break; + case kPanScanCmd: + vo_panscan = 1; + vo_fs = 1; window_fullscreen(); + break; + default: result = eventNotHandledErr; break; @@ -487,6 +494,7 @@ AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Keep"), 0, kKeepAspectCmd, &index); CheckMenuItem (aspectMenu, 1, vo_keepaspect); + AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Pan-Scan"), 0, kPanScanCmd, &index); AppendMenuItemTextWithCFString(aspectMenu, NULL, kMenuItemAttrSeparator, NULL, &index); AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Original"), 0, kAspectOrgCmd, &index); AppendMenuItemTextWithCFString(aspectMenu, CFSTR("4:3"), 0, kAspectFullCmd, &index); @@ -578,6 +586,7 @@ vo_fs = flags & VOFLAG_FULLSCREEN; //get movie aspect + panscan_init(); aspect_save_orig(width,height); aspect_save_prescale(d_width,d_height); aspect_save_screenres(device_width, device_height); @@ -1099,6 +1108,9 @@ 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)); + case VOCTRL_GET_PANSCAN: return VO_TRUE; + case VOCTRL_SET_PANSCAN: window_resized(); return VO_TRUE; + case VOCTRL_GET_IMAGE: switch (image_format) { @@ -1167,6 +1179,13 @@ { SetRect(&dstRect, 0, 0, winRect.right, winRect.bottom-border); } + + if(vo_fs) + { + panscan_calc(); + MoveWindow(theWindow, 0-(vo_panscan_x >> 1), 0-(vo_panscan_y >> 1), 1); + SizeWindow(theWindow, device_width+vo_panscan_x, device_height+vo_panscan_y,1); + } //Clear Background tmpBounds = CGRectMake( 0, border, winRect.right, winRect.bottom);

1 0

CVS: main mplayer.c, 1.801, 1.802 cfg-mplayer.h, 1.229, 1.230 configure, 1.925, 1.926
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Reimar Döffinger CVS Update of /cvsroot/mplayer/main In directory mail:/var2/tmp/cvs-serv18066 Modified Files: mplayer.c cfg-mplayer.h configure Log Message: Allow attaching gdb on crash automatically. Index: mplayer.c =================================================================== RCS file: /cvsroot/mplayer/main/mplayer.c,v retrieving revision 1.801 retrieving revision 1.802 diff -u -r1.801 -r1.802 --- mplayer.c 26 Oct 2004 21:38:57 -0000 1.801 +++ mplayer.c 28 Oct 2004 23:25:17 -0000 1.802 @@ -504,8 +504,16 @@ } #endif +#ifdef CRASH_DEBUG +static char *prog_path; +static int crash_debug = 0; +#endif + static void exit_sighandler(int x){ static int sig_count=0; +#ifdef CRASH_DEBUG + if (!crash_debug || x != SIGTRAP) +#endif ++sig_count; if(inited_flags==0 && sig_count>1) exit(1); if(sig_count==5) @@ -527,7 +535,7 @@ mp_msg(MSGT_CPLAYER,MSGL_FATAL,"\n" MSGTR_IntBySignal,x, current_module?current_module:mp_gettext("unknown") ); - if(sig_count==1) + if(sig_count<=1) switch(x){ case SIGINT: case SIGQUIT: @@ -545,6 +553,26 @@ mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGSEGV_SIGFPE); default: mp_msg(MSGT_CPLAYER,MSGL_FATAL,MSGTR_Exit_SIGCRASH); +#ifdef CRASH_DEBUG + if (crash_debug) { + int gdb_pid; + char spid[20]; + snprintf(spid, 19, "%i", getpid()); + spid[19] = 0; + mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forking...\n"); + gdb_pid = fork(); + mp_msg(MSGT_CPLAYER, MSGL_INFO, "Forked...\n"); + if (gdb_pid == 0) { // We are the child + if (execlp("gdb", "gdb", prog_path, spid, NULL) == -1) + mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n"); + } else if (gdb_pid < 0) + mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n"); + else { + waitpid(gdb_pid, NULL, 0); + } + if (x == SIGTRAP) return; + } +#endif } exit_player(NULL); } @@ -1202,6 +1230,9 @@ signal(SIGCHLD,child_sighandler); #endif +#ifdef CRASH_DEBUG + prog_path = argv[0]; +#endif //========= Catch terminate signals: ================ // terminate requests: signal(SIGTERM,exit_sighandler); // kill @@ -1217,6 +1248,10 @@ signal(SIGILL,exit_sighandler); // illegal instruction signal(SIGFPE,exit_sighandler); // floating point exc. signal(SIGABRT,exit_sighandler); // abort() +#ifdef CRASH_DEBUG + if (crash_debug) + signal(SIGTRAP,exit_sighandler); +#endif #endif #ifdef HAVE_NEW_GUI Index: cfg-mplayer.h =================================================================== RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v retrieving revision 1.229 retrieving revision 1.230 diff -u -r1.229 -r1.230 --- cfg-mplayer.h 15 Sep 2004 13:37:49 -0000 1.229 +++ cfg-mplayer.h 28 Oct 2004 23:25:17 -0000 1.230 @@ -329,6 +329,10 @@ //---------------------- mplayer-only options ------------------------ +#ifdef CRASH_DEBUG + {"crash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"nocrash-debug", &crash_debug, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, +#endif {"osdlevel", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL}, #ifdef HAVE_MENU {"menu", &use_menu, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.925 retrieving revision 1.926 diff -u -r1.925 -r1.926 --- configure 24 Oct 2004 13:37:35 -0000 1.925 +++ configure 28 Oct 2004 23:25:17 -0000 1.926 @@ -304,6 +304,7 @@ --enable-debug[=1-3] compile debugging information into mplayer [disable] --enable-profile compile profiling information into mplayer [disable] --disable-sighandler disable sighandler for crashes [enable] + --enable-crash-debug enable automatic gdb attach on crash [disable] --enable-i18n _experimental_ gnu gettext() support [autodetect] --enable-dynamic-plugins Enable support for dynamic a/v plugins [disable] @@ -1355,6 +1356,7 @@ _i18n=auto _dynamic_plugins=no _setlocale=auto +_crash_debug=auto _sighandler=yes _libdv=auto _cdparanoia=auto @@ -1698,6 +1700,12 @@ --disable-debug) _debug= ;; + --enable-crash-debug) + _crash_debug=yes + ;; + --disable-crash-debug) + _crash_debug=no + ;; --enable-sighandler) _sighandler=yes ;; @@ -6173,6 +6181,9 @@ # always compile with '-g' if .developer: if test -f ".developer" ; then CFLAGS="-g $CFLAGS" + if (test "$_crash_debug" = auto) && (not mingw32) ; then + _crash_debug=yes + fi _stripbinaries=no fi else @@ -6187,6 +6198,16 @@ EOF fi + +echocheck "automatic gdb attach" +if test "$_crash_debug" = yes ; then + _def_crash_debug='#define CRASH_DEBUG 1' +else + _def_crash_debug='#undef CRASH_DEBUG' + _crash_debug=no +fi +echores "$_crash_debug" + if darwin ; then CFLAGS="$CFLAGS -DSYS_DARWIN" if [ "$_cc_major" = 3 ] && [ "$_cc_minor" -lt 1 ]; then @@ -6581,6 +6602,9 @@ /* enable/disable SIGHANDLER */ $_def_sighandler +/* enable/disable automatic gdb attach on crash, requires SIGHANDLER */ +$_def_crash_debug + /* Toggles debugging informations */ $_def_debug

1 0

CVS: main/libvo vo_quartz.c,1.34,1.35
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv22426/libvo Modified Files: vo_quartz.c Log Message: get proper movie aspect Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- vo_quartz.c 28 Oct 2004 22:03:26 -0000 1.34 +++ vo_quartz.c 28 Oct 2004 23:06:35 -0000 1.35 @@ -581,12 +581,12 @@ aspect_save_orig(width,height); aspect_save_prescale(d_width,d_height); aspect_save_screenres(device_width, device_height); - - movie_aspect = (float)imgRect.right/(float)imgRect.bottom; - old_movie_aspect = movie_aspect; aspect(&d_width,&d_height,A_NOZOOM); + movie_aspect = (float)d_width/(float)d_height; + old_movie_aspect = movie_aspect; + if(image_data) free(image_data);

1 0

CVS: main/libvo vo_quartz.c,1.33,1.34
by syncmail＠mplayerhq.hu 28 Oct '04

28 Oct '04

CVS change done by Nicolas Plourde CVS Update of /cvsroot/mplayer/main/libvo In directory mail:/var2/tmp/cvs-serv18458/libvo Modified Files: vo_quartz.c Log Message: menu option to set desired movie aspect & keep aspect on window resize Index: vo_quartz.c =================================================================== RCS file: /cvsroot/mplayer/main/libvo/vo_quartz.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- vo_quartz.c 28 Oct 2004 21:48:41 -0000 1.33 +++ vo_quartz.c 28 Oct 2004 22:03:26 -0000 1.34 @@ -72,6 +72,9 @@ extern int vo_fs; // user want fullscreen static int vo_quartz_fs; // we are in fullscreen extern float monitor_aspect; +extern int vo_keepaspect; //keep aspect ratio when resizing +extern float movie_aspect; +static float old_movie_aspect; static int winLevel = 1; int levelList[] = @@ -106,6 +109,10 @@ static Rect oldWinRect; // size of the window containg the displayed image (include padding) when NOT in FS mode static Rect deviceRect; // size of the display device +static MenuRef windMenu; +static MenuRef movMenu; +static MenuRef aspectMenu; + static int border = 20; enum { @@ -113,7 +120,11 @@ kHalfScreenCmd = 2, kNormalScreenCmd = 3, kDoubleScreenCmd = 4, - kFullScreenCmd = 5 + kFullScreenCmd = 5, + kKeepAspectCmd = 6, + kAspectOrgCmd = 7, + kAspectFullCmd = 8, + kAspectWideCmd = 9 }; #include "osdep/keycodes.h" @@ -367,6 +378,29 @@ vo_fs = (!(vo_fs)); window_fullscreen(); break; + case kKeepAspectCmd: + vo_keepaspect = (!(vo_keepaspect)); + CheckMenuItem (aspectMenu, 1, vo_keepaspect); + break; + + case kAspectOrgCmd: + movie_aspect = old_movie_aspect; + SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect)+border,1); + window_resized(); + break; + + case kAspectFullCmd: + movie_aspect = 4.0f/3.0f; + SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect)+border,1); + window_resized(); + break; + + case kAspectWideCmd: + movie_aspect = 16.0f/9.0f; + SizeWindow(theWindow, dstRect.right, (dstRect.right/movie_aspect)+border,1); + window_resized(); + break; + default: result = eventNotHandledErr; break; @@ -411,22 +445,24 @@ CFStringRef titleKey; CFStringRef windowTitle; OSStatus result; + + MenuItemIndex index; + CFStringRef movMenuTitle; + CFStringRef aspMenuTitle; SetRect(&winRect, 0, 0, d_width, d_height); SetRect(&oldWinRect, 0, 0, d_width, d_height); SetRect(&dstRect, 0, 0, d_width, d_height); - MenuRef windMenu; + //Create Window Menu CreateStandardWindowMenu(0, &windMenu); InsertMenu(windMenu, 0); - MenuRef movMenu; + //Create Movie Menu CreateNewMenu (1004, 0, &movMenu); - - CFStringRef movMenuTitle = CFSTR("Movie"); + movMenuTitle = CFSTR("Movie"); SetMenuTitleWithCFString(movMenu, movMenuTitle); - MenuItemIndex index; AppendMenuItemTextWithCFString(movMenu, CFSTR("Half Size"), 0, kHalfScreenCmd, &index); SetMenuItemCommandKey(movMenu, index, 0, '0'); @@ -439,6 +475,23 @@ AppendMenuItemTextWithCFString(movMenu, CFSTR("Full Size"), 0, kFullScreenCmd, &index); SetMenuItemCommandKey(movMenu, index, 0, 'F'); + AppendMenuItemTextWithCFString(movMenu, NULL, kMenuItemAttrSeparator, NULL, &index); + + AppendMenuItemTextWithCFString(movMenu, CFSTR("Aspect Ratio"), 0, NULL, &index); + + ////Create Aspect Ratio Sub Menu + CreateNewMenu (0, 0, &aspectMenu); + aspMenuTitle = CFSTR("Aspect Ratio"); + SetMenuTitleWithCFString(aspectMenu, aspMenuTitle); + SetMenuItemHierarchicalMenu(movMenu, 6, aspectMenu); + + AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Keep"), 0, kKeepAspectCmd, &index); + CheckMenuItem (aspectMenu, 1, vo_keepaspect); + AppendMenuItemTextWithCFString(aspectMenu, NULL, kMenuItemAttrSeparator, NULL, &index); + AppendMenuItemTextWithCFString(aspectMenu, CFSTR("Original"), 0, kAspectOrgCmd, &index); + AppendMenuItemTextWithCFString(aspectMenu, CFSTR("4:3"), 0, kAspectFullCmd, &index); + AppendMenuItemTextWithCFString(aspectMenu, CFSTR("16:9"), 0, kAspectWideCmd, &index); + InsertMenu(movMenu, GetMenuID(windMenu)); //insert before Window menu DrawMenuBar(); @@ -529,6 +582,9 @@ aspect_save_prescale(d_width,d_height); aspect_save_screenres(device_width, device_height); + movie_aspect = (float)imgRect.right/(float)imgRect.bottom; + old_movie_aspect = movie_aspect; + aspect(&d_width,&d_height,A_NOZOOM); if(image_data) @@ -1088,7 +1144,10 @@ GetPortBounds( GetWindowPort(theWindow), &winRect ); + if(vo_keepaspect) + { aspect( &d_width, &d_height, A_NOZOOM); + d_height = ((float)d_width/movie_aspect); aspectX = (float)((float)winRect.right/(float)d_width); aspectY = (float)((float)(winRect.bottom-border)/(float)d_height); @@ -1103,6 +1162,11 @@ padding = ((winRect.bottom-border) - d_height*aspectX)/2; SetRect(&dstRect, 0, padding, (d_width*aspectX), d_height*aspectX+padding); } + } + else + { + SetRect(&dstRect, 0, 0, winRect.right, winRect.bottom-border); + } //Clear Background tmpBounds = CGRectMake( 0, border, winRect.right, winRect.bottom);

1 0