summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/dxr3/dxr3_decoder.c8
-rw-r--r--src/dxr3/dxr3_vo_core.c8
2 files changed, 9 insertions, 7 deletions
diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c
index 54d61cb0c..d433bddbf 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.57 2002/01/09 22:33:03 jcdutton Exp $
+ * $Id: dxr3_decoder.c,v 1.58 2002/01/10 21:30:10 jcdutton Exp $
*
* dxr3 video and spu decoder plugin. Accepts the video and spu data
* from XINE and sends it directly to the corresponding dxr3 devices.
@@ -626,13 +626,13 @@ static void dxr3_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
this->last_pts = vpts;
/* SETPTS only if less then one second in the future and
* either buffer has PTS or sync_every_frame is set */
-// if ((delay > 0) && (delay < 90000) &&
-// (this->sync_every_frame || buf->PTS)) {
+ if ((delay > 0) && (delay < 90000) &&
+ (this->sync_every_frame || buf->PTS)) {
/* update the dxr3's current pts value */
if (ioctl(this->fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vpts))
printf("dxr3: set video pts failed (%s)\n",
strerror(errno));
-// }
+ }
if (delay >= 90000) {
/* frame more than 1 sec ahead */
printf("dxr3: WARNING: vpts %d is %.02f seconds ahead of time!\n",
diff --git a/src/dxr3/dxr3_vo_core.c b/src/dxr3/dxr3_vo_core.c
index aa710f687..fc0fd5a89 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.13 2001/12/24 18:40:13 hrm Exp $
+ * $Id: dxr3_vo_core.c,v 1.14 2002/01/10 21:30:10 jcdutton Exp $
*
*************************************************************************
* core functions common to both Standard and RT-Encoding vo plugins *
@@ -42,7 +42,9 @@
#include "dxr3_video_out.h"
#include <locale.h>
-#define OVERLAY_LOG 0
+/*
+#define OVERLAY_LOG 1
+*/
void *malloc_aligned (size_t alignment, size_t size, void **mem) {
char *aligned;
@@ -116,7 +118,7 @@ void dxr3_read_config(dxr3_driver_t *this)
VO_PROP_ASPECT_RATIO, ASPECT_FULL);
str = config->register_string(config, "dxr3.videoout_mode", "tv", "Dxr3: videoout mode (tv or overlay)", NULL,NULL,NULL);
-
+ printf("dxr3:overlaymode=%s\n",str);
if (!strcasecmp(str, "tv")) {
this->overlay_enabled=0;
this->tv_switchable=0; /* don't allow on-the-fly switching */