Merge from trunk

1 files changed, 75 insertions, 29 deletions

diff --git a/config.h b/config.h
index 0fcb7977..bd3f4011 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'xineliboutput.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h,v 1.46.2.2 2009-06-06 13:18:11 phintuka Exp $
+ * $Id: config.h,v 1.46.2.3 2009-06-07 23:40:38 phintuka Exp $
  *
  */
 
@@ -16,6 +16,9 @@
 
 #include <vdr/config.h>
 
+// Max number of remote clients
+#define MAXCLIENTS     10
+
 // Decoder buffer size
 #define PES_BUFFERS_CUSTOM      0
 #define PES_BUFFERS_TINY_50     1
@@ -132,6 +135,8 @@
 #define SPEAKERS_A52_PASSTHRU  12 
 #define SPEAKERS_count         13 
 
+#define SUBTITLESIZE_count     7
+
 // OSD blending methods
 #define OSD_BLENDING_SOFTWARE   0  // xine-lib "normal" osd
 #define OSD_BLENDING_HARDWARE   1  // xine-lib "unscaled osd"
@@ -151,10 +156,34 @@
 #define OSD_SCALING_BILINEAR    2
 #define OSD_SCALING_count       3
 
-#define SUBTITLESIZE_count     7
 #if VDRVERSNUM >= 10510
 # define DEVICE_SUPPORTS_IBP_TRICKSPEED
 #endif
+ 
+// Video decoder
+#define DECODER_MPEG2_auto       0 /* use value from frontend config_xineliboutput */
+#define DECODER_MPEG2_LIBMPEG2   1
+#define DECODER_MPEG2_FFMPEG     2
+#define DECODER_MPEG2_count      3
+
+#define DECODER_H264_auto        0 /* use value from frontend config_xineliboutput */
+#define DECODER_H264_FFMPEG      1
+#define DECODER_H264_COREAVC     2
+#define DECODER_H264_count       3
+
+#define FF_H264_SKIP_LOOPFILTER_auto    0 /* use value from frontend config_xineliboutput */
+#define FF_H264_SKIP_LOOPFILTER_DEFAULT 1
+#define FF_H264_SKIP_LOOPFILTER_NONE    2
+#define FF_H264_SKIP_LOOPFILTER_NONREF  3
+#define FF_H264_SKIP_LOOPFILTER_BIDIR   4
+#define FF_H264_SKIP_LOOPFILTER_NONKEY  5
+#define FF_H264_SKIP_LOOPFILTER_ALL     6
+#define FF_H264_SKIP_LOOPFILTER_count   7
+
+#define FF_H264_SPEED_OVER_ACCURACY_auto  0  /* use value from frontend config_xineliboutput */
+#define FF_H264_SPEED_OVER_ACCURACY_no    1
+#define FF_H264_SPEED_OVER_ACCURACY_yes   2
+#define FF_H264_SPEED_OVER_ACCURACY_count 3
 
 #define HIDDEN_OPTION(opt) \
   (xc.IsOptionHidden(xc.opt))
@@ -174,31 +203,36 @@ typedef enum {
 
 class config_t {
   public:
-    static const char * const s_bufferSize[];
-    static const int          i_pesBufferSize[];
-    static const char * const s_aspects[];
-    static const char * const s_deinterlaceMethods[];
-    static const char * const s_deinterlaceMethodNames[];
-    static const char * const s_fieldOrder[];
-    static const char * const s_audioDriverNames[];
-    static const char * const s_audioDrivers[];
-    static const char * const s_videoDriverNamesX11[];
-    static const char * const s_videoDriversX11[];
-    static const char * const s_videoDriverNamesFB[];
-    static const char * const s_videoDriversFB[];
-    static const char * const s_frontendNames[];
-    static const char * const s_frontends[];
-    static const char * const s_frontend_files[];
-    static const char * const s_audioEqNames[];
-    static const char * const s_audioVisualizations[];
-    static const char * const s_audioVisualizationNames[];
-    static const char * const s_speakerArrangements[];
-    static const char * const s_subtitleSizes[];
+    static const char * const s_bufferSize             [PES_BUFFERS_count   + 1];
+    static const int          i_pesBufferSize          [PES_BUFFERS_count   + 1];
+    static const char * const s_aspects                [ASPECT_count        + 1];
+    static const char * const s_vo_aspects             [VO_ASPECT_count     + 1];
+    static const char * const s_deinterlaceMethods     [DEINTERLACE_count   + 1];
+    static const char * const s_deinterlaceMethodNames [DEINTERLACE_count   + 1];
+    static const char * const s_fieldOrder             [FIELD_ORDER_count   + 1];
+    static const char * const s_audioDriverNames       [AUDIO_DRIVER_count  + 1];
+    static const char * const s_audioDrivers           [AUDIO_DRIVER_count  + 1];
+    static const char * const s_videoDriverNamesX11    [X11_DRIVER_count    + 1];
+    static const char * const s_videoDriversX11        [X11_DRIVER_count    + 1];
+    static const char * const s_videoDriverNamesFB     [FB_DRIVER_count     + 1];
+    static const char * const s_videoDriversFB         [FB_DRIVER_count     + 1];
+    static const char * const s_frontendNames          [FRONTEND_count      + 1];
+    static const char * const s_frontends              [FRONTEND_count      + 1];
+    static const char * const s_frontend_files         [FRONTEND_count      + 1];
+    static const char * const s_audioEqNames           [AUDIO_EQ_count      + 1];
+    static const char * const s_audioVisualizations    [AUDIO_VIS_count     + 1];
+    static const char * const s_audioVisualizationNames[AUDIO_VIS_count     + 1];
+    static const char * const s_speakerArrangements    [SPEAKERS_count      + 1];
+    static const char * const s_subtitleSizes          [SUBTITLESIZE_count  + 1];
+    static const char * const s_osdBlendingMethods     [OSD_BLENDING_count  + 1];
+    static const char * const s_osdMixers              [OSD_MIXER_count     + 1];
+    static const char * const s_osdScalings            [OSD_SCALING_count   + 1];
+    static const char * const s_decoders_MPEG2         [DECODER_MPEG2_count + 1];
+    static const char * const s_decoders_H264          [DECODER_H264_count  + 1];
+    static const char * const s_ff_skip_loop_filters   [FF_H264_SKIP_LOOPFILTER_count + 1];
+    static const char * const s_ff_speed_over_accuracy [FF_H264_SPEED_OVER_ACCURACY_count + 1];
+
     static const char * const s_subExts[];
-    static const char * const s_osdBlendingMethods[];
-    static const char * const s_osdMixers[];
-    static const char * const s_osdScalings[];
-    static const char * const s_vo_aspects[];
 
   public:
 
@@ -212,6 +246,7 @@ class config_t {
     char audio_driver[32];
     char audio_port[64];
     char *post_plugins;      // static post plugins from command line options
+    char *config_file;       // config file from command line options
     int  pes_buffers;
 
     char modeline[64];
@@ -243,6 +278,8 @@ class config_t {
     int  saturation;          // 0...0xffff, -1 == off
     int  contrast;            // 0...0xffff, -1 == off
     int  brightness;          // 0...0xffff, -1 == off
+    int  sharpness;           // 0...0xffff, -1 == off
+    int  noise_reduction;     // 0...0xffff, -1 == off
     int  vo_aspect_ratio;
 
     // OSD settings 
@@ -255,7 +292,8 @@ class config_t {
     int  osd_blending_lowresvideo; // Use hardware blending for low-resolution video
     int  alpha_correction;
     int  alpha_correction_abs;
-    int  extsub_size; /* size of separate subtitles ( -1 = xine default ; 0...6 = { tiny  small  normal  large  very large  huge } */
+    int  extsub_size;              // size of separate subtitles ( -1 = xine default ; 0...6 = { tiny  small  normal  large  very large  huge }
+    int  dvb_subtitles;            // send DVB subtitles in data stream (decode+display using xine-lib or external media player)
 
     // Media player
 #if VDRVERSNUM < 10515
@@ -270,7 +308,8 @@ class config_t {
     int  subtitle_vpos;            // used in media player. Not saved !
     int  playlist_tracknumber;
     int  playlist_artist;
-    int  playlist_album;   
+    int  playlist_album;
+    int  dvd_arrow_keys_control_playback;
 
     // Audio visualization
     char audio_visualization[64];
@@ -323,8 +362,9 @@ class config_t {
     char remote_local_if[32]; // Listen only on this interface
     char remote_local_ip[32]; // Bind locally to this IP
     int  remote_keyboard;     // Allow remote client to control VDR with keyboard, LIRC, etc.
+    int  remote_max_clients;  // Max. number of clients
 
-    int  remote_usebcast;     // Use proadcasts to find servers automatically
+    int  remote_usebcast;     // Use broadcasts to find servers automatically
     int  remote_usepipe;      // enable local pipes for video transport
     int  remote_usertp;       // enable RTP multicast for video transport
     int  remote_useudp;       // enable UDP unicast for video transport
@@ -349,6 +389,11 @@ class config_t {
     int scr_tunning;      /* Fine-tune xine egine SCR (to sync video to graphics output) */
     int scr_hz;           /* Current SCR speed (Hz), default is 90000 */
 
+    int decoder_mpeg2;    /* DECODER_MPEG2_... */
+    int decoder_h264;     /* DECODER_H264_...  */
+    int ff_h264_speed_over_accurancy;
+    int ff_h264_skip_loop_filter; /* FF_H264_SKIP_LOOPFILTER_* */
+
     config_t();
 
     bool SetupParse(const char *Name, const char *Value);
@@ -358,6 +403,7 @@ class config_t {
     bool IsAudioFile(const char *);
     bool IsVideoFile(const char *);
     bool IsPlaylistFile(const char *);
+    bool IsDvdFolder(const char *);
     bool IsDvdImage(const char *);
 
     cString AutocropOptions(void);