From 128ff990e990be2ec70bc2bfc27e874d3793ea8f Mon Sep 17 00:00:00 2001 From: voroshil Date: Sun, 8 Jul 2007 13:30:33 +0000 Subject: Remove unnecessary flip for RGB in v4l1. Patch was provided and tested by Trent Piepho xyzzy at speakeasy dot org. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23744 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/tvi_v4l.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) (limited to 'stream/tvi_v4l.c') diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index 63c4fac471..aaf3aab1dc 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -1397,13 +1397,9 @@ static int set_mute(priv_t* priv,int value) } // copies a video frame -// for RGB (i.e. BGR in mplayer) flips the image upside down // for YV12 swaps the 2nd and 3rd plane static inline void copy_frame(priv_t *priv, unsigned char *dest, unsigned char *source) { - int i; - unsigned char *sptr; - if(tv_param_automute>0){ if (ioctl(priv->video_fd, VIDIOCGTUNER, &priv->tuner) >= 0) { if(tv_param_automute<<8>priv->tuner.signal){ @@ -1422,24 +1418,7 @@ static inline void copy_frame(priv_t *priv, unsigned char *dest, unsigned char * return; } - switch (priv->picture.palette) { - case VIDEO_PALETTE_RGB24: - case VIDEO_PALETTE_RGB32: - case VIDEO_PALETTE_RGB555: - case VIDEO_PALETTE_RGB565: - sptr = source + (priv->height-1)*priv->bytesperline; - for (i = 0; i < priv->height; i++) { - fast_memcpy(dest, sptr, priv->bytesperline); - dest += priv->bytesperline; - sptr -= priv->bytesperline; - } - break; - case VIDEO_PALETTE_UYVY: - case VIDEO_PALETTE_YUV420P: - default: - fast_memcpy(dest, source, priv->bytesperline * priv->height); - } - + fast_memcpy(dest, source, priv->bytesperline * priv->height); } // maximum skew change, in frames -- cgit v1.2.3