[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[341] mplayerxp

[<nic...@us...>]

Revision: 341
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=341&view=rev
Author:   nickols_k
Date:     2012-11-12 11:15:50 +0000 (Mon, 12 Nov 2012)
Log Message:
-----------
use configurable value for max-trace

Modified Paths:
--------------
    mplayerxp/cfg-mplayerxp.h
    mplayerxp/mplayerxp.c
    mplayerxp/mplayerxp.h
    mplayerxp/xmpcore/xmp_vdecoder.c

Modified: mplayerxp/cfg-mplayerxp.h
===================================================================
--- mplayerxp/cfg-mplayerxp.h	2012-11-12 10:34:29 UTC (rev 340)
+++ mplayerxp/cfg-mplayerxp.h	2012-11-12 11:15:50 UTC (rev 341)
@@ -48,7 +48,8 @@
 	{"speed", &mp_conf.playbackspeed_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.01, 100.0, "sets playback speed factor"},
 	{"benchmark", &mp_conf.benchmark, CONF_TYPE_FLAG, 0, 0, 1, "performs benchmarking to estimate performance of MPlayerXP"},
 	{"test-av", &mp_conf.test_av, CONF_TYPE_FLAG, 0, 0, 1, "test antiviral protection of MPlayerXP"},
-	{"malloc-debug", &mp_conf.malloc_debug, CONF_TYPE_FLAG, 0, 1, 0, "debugs malloc() calls in MPlayerXP"},
+	{"malloc-debug", &mp_conf.malloc_debug, CONF_TYPE_FLAG, 0, 0, 1, "debugs malloc() calls in MPlayerXP"},
+	{"max-trace", &mp_conf.max_trace, CONF_TYPE_INT, CONF_RANGE, 1, 1024, "maximal number of backtrace stack"},
 	{NULL, NULL, 0, 0, 0, 0, NULL},
 };
 

Modified: mplayerxp/mplayerxp.c
===================================================================
--- mplayerxp/mplayerxp.c	2012-11-12 10:34:29 UTC (rev 340)
+++ mplayerxp/mplayerxp.c	2012-11-12 11:15:50 UTC (rev 341)
@@ -233,6 +233,7 @@
     mp_conf.ao_channels=2;
     mp_conf.monitor_pixel_aspect=1;
     mp_conf.msg_filter=0xFFFFFFFF;
+    mp_conf.max_trace=10;
 }
 
 static void mpxp_uninit_structs(void) {

Modified: mplayerxp/mplayerxp.h
===================================================================
--- mplayerxp/mplayerxp.h	2012-11-12 10:34:29 UTC (rev 340)
+++ mplayerxp/mplayerxp.h	2012-11-12 11:15:50 UTC (rev 341)
@@ -13,6 +13,7 @@
     uint32_t	msg_filter;
     int		test_av;
     int		malloc_debug;
+    unsigned	max_trace;
 // XP-core
     int		xp;   /* XP-mode */
     int		gomp; /* currently it's experimental feature */

Modified: mplayerxp/xmpcore/xmp_vdecoder.c
===================================================================
--- mplayerxp/xmpcore/xmp_vdecoder.c	2012-11-12 10:34:29 UTC (rev 340)
+++ mplayerxp/xmpcore/xmp_vdecoder.c	2012-11-12 11:15:50 UTC (rev 341)
@@ -188,7 +188,7 @@
 	if(cur_time - mp_data->seek_time > (xp_core->num_v_buffs/sh_video->fps)*100) xp_n_frame_to_drop=compute_frame_dropping(sh_video,frame->pts,drop_barrier);
     } /* if( mp_conf.frame_dropping ) */
     if(!finite(frame->pts)) MSG_WARN("Bug of demuxer! Value of video pts=%f\n",frame->pts);
-    if(frame->type!=VideoFrame) escape_player("VideoDecoder doesn't parse non video frames",10);
+    if(frame->type!=VideoFrame) escape_player("VideoDecoder doesn't parse non video frames",mp_conf.max_trace);
 #if 0
 /*
     We can't seriously examine question of too slow machines

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.