[vlc-devel] commit: Moved VOUT_MIN_DIRECT_PICTURES to src/video_output. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Nov  2 17:56:47 2008 +0100| [d28937e87627edb8e65d416aa405d9299dc35ea5] | committer: Laurent Aimar 

Moved VOUT_MIN_DIRECT_PICTURES to src/video_output.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d28937e87627edb8e65d416aa405d9299dc35ea5
---

 include/vlc_config.h            |    4 ----
 src/video_output/video_output.c |    8 ++++++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/include/vlc_config.h b/include/vlc_config.h
index c61b52f..496b883 100644
--- a/include/vlc_config.h
+++ b/include/vlc_config.h
@@ -150,10 +150,6 @@
  * (~1 Mbyte) before using huge values */
 #define VOUT_MAX_PICTURES              16
 
-/* Minimum number of direct pictures the video output will accept without
- * creating additional pictures in system memory */
-#define VOUT_MIN_DIRECT_PICTURES        12
-
 /* Statistics are displayed every n loops (=~ pictures) */
 #define VOUT_STATS_NB_LOOPS             100
 
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 9a8d738..8c58747 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -106,6 +106,14 @@ static void DisplayTitleOnOSD( vout_thread_t *p_vout );
 /* Better be in advance when awakening than late... */
 #define VOUT_MWAIT_TOLERANCE            ((mtime_t)(0.020*CLOCK_FREQ))
 
+/* Minimum number of direct pictures the video output will accept without
+ * creating additional pictures in system memory */
+#ifdef OPTIMIZE_MEMORY
+#   define VOUT_MIN_DIRECT_PICTURES        (VOUT_MAX_PICTURES/2)
+#else
+#   define VOUT_MIN_DIRECT_PICTURES        (3*VOUT_MAX_PICTURES/4)
+#endif
+
 /*****************************************************************************
  * Video Filter2 functions
  *****************************************************************************/