summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/dxr3/dxr3_decoder.c16
-rw-r--r--src/dxr3/dxr3_video_out.h4
-rw-r--r--src/dxr3/dxr3_vo_core.c22
-rw-r--r--src/dxr3/dxr3_vo_encoder.c8
-rw-r--r--src/dxr3/dxr3_vo_standard.c4
5 files changed, 27 insertions, 27 deletions
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c
index 6d3508496..db2626dbb 100644
--- a/src/dxr3/dxr3_decoder.c
+++ b/src/dxr3/dxr3_decoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_decoder.c,v 1.34 2001/11/18 08:25:46 mlampard Exp $
+ * $Id: dxr3_decoder.c,v 1.35 2001/11/19 15:06:12 mlampard Exp $
*
* dxr3 video and spu decoder plugin. Accepts the video and spu data
* from XINE and sends it directly to the corresponding dxr3 devices.
@@ -43,7 +43,7 @@
#include "buffer.h"
#include "xine-engine/bswap.h"
-#define LOOKUP_DEV "dxr3_devname"
+#define LOOKUP_DEV "codec.dxr3_devname"
#define DEFAULT_DEV "/dev/em8300"
static char *devname;
@@ -326,8 +326,8 @@ static void find_aspect(dxr3_decoder_t *this, uint8_t * buffer)
static void dxr3_flush (video_decoder_t *this_gen)
{
dxr3_decoder_t *this = (dxr3_decoder_t *) this_gen;
- fprintf(stderr,"DXR3 Flushing!!");
-/* dxr3_mvcommand(this->fd_control, 0x10); */
+ fprintf(stderr,"dxr3_decoder: flushing\n");
+ dxr3_mvcommand(this->fd_control, 0x10);
}
@@ -417,7 +417,7 @@ video_decoder_t *init_video_decoder_plugin (int iface_version,
return NULL;
}
- devname = cfg->register_string (cfg, LOOKUP_DEV, DEFAULT_DEV, "Name of the dxr3 device",NULL,NULL,NULL);
+ devname = cfg->register_string (cfg, LOOKUP_DEV, DEFAULT_DEV, "Dxr3: Device Name",NULL,NULL,NULL);
dxr3_presence_test ();
if (!dxr3_ok) return NULL;
@@ -433,9 +433,9 @@ video_decoder_t *init_video_decoder_plugin (int iface_version,
this->video_decoder.flush = dxr3_flush;
this->video_decoder.priority = 10;
- this->scr_prio = cfg->register_num(cfg, "dxr3_scr_prio", 10, "Priority of the Dxr3 SCR plugin",NULL,NULL,NULL);
+ this->scr_prio = cfg->register_num(cfg, "misc.dxr3_scr_prio", 10, "Dxr3: SCR plugin priority",NULL,NULL,NULL);
- this->enhanced_mode = cfg->register_bool(cfg,"dxr3_buffer_mode", 0, "Use alternate Play mode",NULL,NULL,NULL);
+ this->enhanced_mode = cfg->register_bool(cfg,"misc.dxr3_buffer_mode", 0, "Dxr3: use alternate Play mode","Enabling this option will utilise a slightly different play mode",NULL,NULL);
if(this->enhanced_mode)
printf("Dxr3: Using Mode 6 for playback\n");
@@ -637,7 +637,7 @@ spu_decoder_t *init_spu_decoder_plugin (int iface_version, xine_t *xine)
}
cfg = xine->config;
- devname = cfg->register_string (cfg, LOOKUP_DEV, DEFAULT_DEV, "Name of the dxr3 device",NULL,NULL,NULL);
+ devname = cfg->register_string (cfg, LOOKUP_DEV, DEFAULT_DEV, NULL,NULL,NULL,NULL);
dxr3_presence_test ();
if (!dxr3_ok) return NULL;
diff --git a/src/dxr3/dxr3_video_out.h b/src/dxr3/dxr3_video_out.h
index 0a6d65c59..d9263fbc0 100644
--- a/src/dxr3/dxr3_video_out.h
+++ b/src/dxr3/dxr3_video_out.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_video_out.h,v 1.4 2001/11/17 14:26:38 f1rmb Exp $
+ * $Id: dxr3_video_out.h,v 1.5 2001/11/19 15:06:12 mlampard Exp $
*
*/
@@ -51,7 +51,7 @@
#endif
#include "../video_out/video_out_x11.h"
-#define LOOKUP_DEV "dxr3_devname"
+#define LOOKUP_DEV "codec.dxr3_devname"
#define DEFAULT_DEV "/dev/em8300"
struct coeff {
diff --git a/src/dxr3/dxr3_vo_core.c b/src/dxr3/dxr3_vo_core.c
index e030c5569..1cbd201d5 100644
--- a/src/dxr3/dxr3_vo_core.c
+++ b/src/dxr3/dxr3_vo_core.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_vo_core.c,v 1.8 2001/11/18 08:25:46 mlampard Exp $
+ * $Id: dxr3_vo_core.c,v 1.9 2001/11/19 15:06:12 mlampard Exp $
*
*************************************************************************
* core functions common to both Standard and RT-Encoding vo plugins *
@@ -103,14 +103,14 @@ void dxr3_read_config(dxr3_driver_t *this)
fprintf(stderr, "dxr3_vo: cannot read bcs values (%s)\n",
strerror(errno));
- this->bcs.contrast = config->register_range(config, "dxr3_contrast", this->bcs.contrast,100,900,"Dxr3 contrast control",NULL,NULL,NULL);
- this->bcs.saturation = config->register_range(config, "dxr3_saturation", this->bcs.saturation,100,900,"Dxr3 saturation control",NULL,NULL,NULL);
- this->bcs.brightness = config->register_range(config, "dxr3_brightness", this->bcs.brightness,100,900,"Dxr3 brightness control",NULL,NULL,NULL);
+ this->bcs.contrast = config->register_range(config, "video.dxr3_contrast", this->bcs.contrast,100,900,"Dxr3: contrast control",NULL,NULL,NULL);
+ this->bcs.saturation = config->register_range(config, "video.dxr3_saturation", this->bcs.saturation,100,900,"Dxr3: saturation control",NULL,NULL,NULL);
+ this->bcs.brightness = config->register_range(config, "video.dxr3_brightness", this->bcs.brightness,100,900,"Dxr3: brightness control",NULL,NULL,NULL);
this->vo_driver.set_property(&this->vo_driver,
VO_PROP_ASPECT_RATIO, ASPECT_FULL);
- str = config->register_string(config, "dxr3_vomode", "tv", "Dxr3 videoout mode", NULL,NULL,NULL);
+ str = config->register_string(config, "video.dxr3_vomode", "tv", "Dxr3: videoout mode (tv or overlay)", NULL,NULL,NULL);
if (!strcasecmp(str, "tv")) {
this->overlay_enabled=0;
@@ -121,11 +121,11 @@ void dxr3_read_config(dxr3_driver_t *this)
if (dxr3_overlay_read_state(&this->overlay) == 0) {
this->overlay_enabled = 1;
this->tv_switchable=1;
- str = config->register_string(config, "dxr3_keycolor", "0x80a040", "Dxr3 overlay colourkey value",NULL,NULL,NULL);
+ str = config->register_string(config, "video.dxr3_keycolor", "0x80a040", "Dxr3: overlay colourkey value",NULL,NULL,NULL);
sscanf(str, "%x", &this->overlay.colorkey);
- str = config->register_string(config, "dxr3_color_interval", "50.0", "Dxr3 overlay colourkey range",NULL,NULL,NULL);
+ str = config->register_string(config, "video.dxr3_color_interval", "50.0", "Dxr3: overlay colourkey range","A greater value widens the search range for the overlay keycolor",NULL,NULL);
sscanf(str, "%f", &this->overlay.color_interval);
} else {
@@ -134,7 +134,7 @@ void dxr3_read_config(dxr3_driver_t *this)
this->tv_switchable=0;
}
}
- str = config->register_string(config, "dxr3_preferred_tvmode", "default", "Dxr3 preferred tv mode",NULL,NULL,NULL);
+ str = config->register_string(config, "video.dxr3_preferred_tvmode", "default", "Dxr3 preferred tv mode - PAL, PAL60, NTSC or default",NULL,NULL,NULL);
if (!strcasecmp(str, "ntsc")) {
this->tv_mode = EM8300_VIDEOMODE_NTSC;
@@ -350,9 +350,9 @@ int dxr3_set_property (vo_driver_t *this_gen,
if (ioctl(this->fd_control, EM8300_IOCTL_SETBCS, &this->bcs))
fprintf(stderr, "dxr3_vo: bcs set failed (%s)\n",
strerror(errno));
- this->config->update_num(this->config, "dxr3_contrast", this->bcs.contrast);
- this->config->update_num(this->config, "dxr3_saturation", this->bcs.saturation);
- this->config->update_num(this->config, "dxr3_brightness", this->bcs.brightness);
+ this->config->update_num(this->config, "video.dxr3_contrast", this->bcs.contrast);
+ this->config->update_num(this->config, "video.dxr3_saturation", this->bcs.saturation);
+ this->config->update_num(this->config, "video.dxr3_brightness", this->bcs.brightness);
}
return value;
diff --git a/src/dxr3/dxr3_vo_encoder.c b/src/dxr3/dxr3_vo_encoder.c
index 9776d9014..726508b59 100644
--- a/src/dxr3/dxr3_vo_encoder.c
+++ b/src/dxr3/dxr3_vo_encoder.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_vo_encoder.c,v 1.4 2001/11/18 08:25:46 mlampard Exp $
+ * $Id: dxr3_vo_encoder.c,v 1.5 2001/11/19 15:06:12 mlampard Exp $
*
* mpeg1 encoding video out plugin for the dxr3.
*
@@ -302,7 +302,7 @@ static void dxr3_update_frame_format (vo_driver_t *this_gen,
puts ("Couldn't start the FAME library");
buffer = (unsigned char *) malloc (DEFAULT_BUFFER_SIZE);
- fp.quality=this->config->register_range(this->config,"dxr3enc_quality",90, 10,100, "Dxr3enc mpeg encoding quality",NULL,NULL,NULL);
+ fp.quality=this->config->register_range(this->config,"video.dxr3enc_quality",90, 10,100, "Dxr3enc: mpeg encoding quality",NULL,NULL,NULL);
fp.width = width;
fp.height = oheight;
@@ -546,7 +546,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen)
this->config=config;
/* open control device */
- devname = config->register_string (config, LOOKUP_DEV, DEFAULT_DEV,"Dxr3 device name",NULL,NULL,NULL);
+ devname = config->register_string (config, LOOKUP_DEV, DEFAULT_DEV,NULL,NULL,NULL,NULL);
printf("dxr3enc: Entering video init, devname=%s.\n",devname);
if ((this->fd_control = open(devname, O_WRONLY)) < 0) {
@@ -555,7 +555,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen)
return 0;
}
/* output mpeg to file instead of dxr3? */
- file_out = config->register_string(config, "dxr3enc_file", "<none>", "Dxr3enc output file for debugging",NULL,NULL,NULL);
+ file_out = config->register_string(config, "video.dxr3enc_file", "<none>", "Dxr3enc: output file for debugging",NULL,NULL,NULL);
if (file_out && strcmp(file_out, "<none>")) {
this->fd_video = open(file_out, O_WRONLY | O_CREAT);
diff --git a/src/dxr3/dxr3_vo_standard.c b/src/dxr3/dxr3_vo_standard.c
index b27bffb3c..e18a080f3 100644
--- a/src/dxr3/dxr3_vo_standard.c
+++ b/src/dxr3/dxr3_vo_standard.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: dxr3_vo_standard.c,v 1.5 2001/11/18 09:41:32 mlampard Exp $
+ * $Id: dxr3_vo_standard.c,v 1.6 2001/11/19 15:06:12 mlampard Exp $
*
*******************************************************************
* Dummy video out plugin for the dxr3. Is responsible for setting *
@@ -202,7 +202,7 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen)
this->config = config;
/* open control device */
- devname = config->register_string (config, LOOKUP_DEV, DEFAULT_DEV, "Dxr3 device name", NULL,NULL,NULL);
+ devname = config->register_string (config, LOOKUP_DEV, DEFAULT_DEV, NULL,NULL,NULL,NULL);
if ((this->fd_control = open(devname, O_WRONLY)) < 0) {
fprintf(stderr, "dxr3_vo: Failed to open control device %s (%s)\n",
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:26:26 +0000