small cleanup in prep for 0.9.3

CVS patchset: 901
CVS date: 2001/10/28 14:44:11

2 files changed, 12 insertions, 14 deletions

diff --git a/src/dxr3/dxr3_decoder.c b/src/dxr3/dxr3_decoder.c
index 17124c6de..3a3f6a60a 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.24 2001/10/28 11:43:58 mlampard Exp $
+ * $Id: dxr3_decoder.c,v 1.25 2001/10/28 14:44:11 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.
@@ -320,8 +320,8 @@ static void dxr3_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
 
 	/* Act like other plugins... keeps metronom in check :) */
 	if(buf->type == BUF_VIDEO_FILL) {
-	vo_frame_t *img;
-	    img = this->video_out->get_frame (this->video_out,
+	    	vo_frame_t *img;
+	    	img = this->video_out->get_frame (this->video_out,
                              this->width,
                              this->height,
                              this->aspect,
@@ -329,7 +329,7 @@ static void dxr3_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
                              this->duration,
                              VO_BOTH_FIELDS);
 
-		img->draw(img);
+	        img->draw(img);
 	 	img->free(img);
 		return;
 	}
@@ -354,6 +354,7 @@ static void dxr3_decode_data (video_decoder_t *this_gen, buf_element_t *buf)
 		 strerror(errno));
 		return;
 	}
+	
 	if (written != buf->size)
 		fprintf(stderr, "dxr3: Could only write %d of %d video bytes.\n",
 		 written, buf->size);
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index d8deb8f3f..6d4114021 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.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: video_out_dxr3.c,v 1.16 2001/10/28 11:14:39 mlampard Exp $
+ * $Id: video_out_dxr3.c,v 1.17 2001/10/28 14:44:11 mlampard Exp $
  *
  * Dummy video out plugin for the dxr3. Is responsible for setting
  * tv_mode, bcs values and the aspectratio.
@@ -96,7 +96,6 @@ static void *malloc_aligned (size_t alignment, size_t size, void **mem) {
   return aligned;
 }
 
-
 static int dxr3_set_property (vo_driver_t *this_gen, int property, int value);
 
 static void dxr3_overlay_adapt_area(dxr3_driver_t *this,
@@ -177,25 +176,24 @@ void dxr3_read_config(dxr3_driver_t *this)
 	if (this->tv_mode != EM8300_VIDEOMODE_DEFAULT)
 		if (ioctl(this->fd_control, EM8300_IOCTL_SET_VIDEOMODE, &this->tv_mode))
 			fprintf(stderr, "dxr3_vo: setting video mode failed.");
-
 }
 
 static uint32_t dxr3_get_capabilities (vo_driver_t *this_gen)
 {
 	/* Since we have no vo format, we return dummy values here */
-	return VO_CAP_YV12 | IMGFMT_YUY2 | IMGFMT_RGB |
+	return VO_CAP_YV12 | IMGFMT_YUY2 | 
 		VO_CAP_SATURATION | VO_CAP_BRIGHTNESS | VO_CAP_CONTRAST;
 }
 
 /* This are dummy functions to fill in the frame object */
 static void dummy_frame_copy (vo_frame_t *vo_img, uint8_t **src)
 {
-	fprintf(stderr, "dxr3_vo: dummy_frame_copy called!\n");
+	fprintf(stderr, "dxr3_vo: This plugin doesn't play non-mpeg video!\n");
 }
 
 static void dummy_frame_field (vo_frame_t *vo_img, int which_field)
 {
-	fprintf(stderr, "dxr3_vo: dummy_frame_field called!\n");
+	fprintf(stderr, "dxr3_vo: This plugin doesn't play non-mpeg video!\n");
 }
 
 static void dummy_frame_dispose (vo_frame_t *frame_gen)
@@ -225,7 +223,6 @@ static vo_frame_t *dxr3_alloc_frame (vo_driver_t *this_gen)
 	return (vo_frame_t*) frame;
 }
 
-
 static void dxr3_update_frame_format (vo_driver_t *this_gen,
 				      vo_frame_t *frame_gen,
 				      uint32_t width, uint32_t height,
@@ -278,9 +275,9 @@ static void dxr3_update_frame_format (vo_driver_t *this_gen,
 	   frame->vo_frame.base[2] = malloc_aligned(16,image_size/4, 
 	   		(void**) &frame->mem[2]);
 	}else if (format == IMGFMT_YUY2) {
-	   printf("DXR3_Overlay: this plugin doesn't support AVIs\n");
-	   printf("DXR3_Overlay: Exiting......");
-	   exit(1);
+      	   frame->vo_frame.base[0] = malloc_aligned(16, image_size*2,
+      	   		 (void**)&frame->mem[0]);
+           frame->vo_frame.base[1] = frame->vo_frame.base[2] = 0;
 	}
       }
 }