Mercurial > mplayer.hg

changeset 5460:acf7acfa7acc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix I420 handling, though still don't know why divx4 codec queries for I420 not YUY2!
author atmos4
date Mon, 01 Apr 2002 18:16:27 +0000
parents 779ef929e227
children 3aec1d7ce8ba
files libvo/vo_sdl.c
diffstat 1 files changed, 45 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_sdl.c	Mon Apr 01 17:59:16 2002 +0000
+++ b/libvo/vo_sdl.c	Mon Apr 01 18:16:27 2002 +0000
@@ -1125,22 +1125,46 @@
         
         x/=2;y/=2;w/=2;h/=2;
 
-    dst = priv->overlay->pixels[2] + priv->overlay->pitches[2]*y + x;
-    src = image[1];
+    switch(priv->format) {
+    case IMGFMT_YV12:
+        dst = priv->overlay->pixels[2] + priv->overlay->pitches[2]*y + x;
+        src = image[1];
         for(i=0;i<h;i++){
             memcpy(dst,src,w);
             src+=stride[2];
-        dst += priv->overlay->pitches[2];
+            dst += priv->overlay->pitches[2];
         }
         
-    dst = priv->overlay->pixels[1] + priv->overlay->pitches[1]*y + x;
-    src = image[2];
+        dst = priv->overlay->pixels[1] + priv->overlay->pitches[1]*y + x;
+        src = image[2];
         for(i=0;i<h;i++){
             memcpy(dst,src,w);
             src+=stride[1];
-        dst += priv->overlay->pitches[1];
+            dst += priv->overlay->pitches[1];
+        }
+    break;
+    case IMGFMT_IYUV:
+        dst = priv->overlay->pixels[1] + priv->overlay->pitches[1]*y + x;
+        src = image[1];
+        for(i=0;i<h;i++){
+            memcpy(dst,src,w);
+            src+=stride[1];
+            dst += priv->overlay->pitches[1];
         }
 
+        dst = priv->overlay->pixels[2] + priv->overlay->pitches[2]*y + x;
+        src = image[2];
+        for(i=0;i<h;i++){
+            memcpy(dst,src,w);
+            src+=stride[2];
+            dst += priv->overlay->pitches[2];
+        }
+        
+    break;
+    default:
+    printf("SDL: unsupported image format in draw_slice, contact MPlayer developers!\n");
+    }
+
 	SDL_OVR_UNLOCK
 
 	return 0;
@@ -1610,17 +1634,24 @@
 
 static uint32_t get_image(mp_image_t *mpi)
 {
-	struct sdl_priv_s *priv = &sdl_priv;
+    struct sdl_priv_s *priv = &sdl_priv;
 
     if(priv->format != mpi->imgfmt) return VO_FALSE;
     if(mpi->type == MP_IMGTYPE_STATIC || mpi->type == MP_IMGTYPE_TEMP) {
-        if(priv->format == IMGFMT_YV12 || priv->format == SDL_IYUV_OVERLAY) {
-            mpi->planes[0] = priv->overlay->pixels[0] + priv->y*priv->overlay->pitches[0];
-            mpi->planes[2] = priv->overlay->pixels[1] + priv->y*priv->overlay->pitches[1]/2;
-            mpi->planes[1] = priv->overlay->pixels[2] + priv->y*priv->overlay->pitches[2]/2;
-            mpi->stride[0] = priv->overlay->pitches[0];
-            mpi->stride[2] = priv->overlay->pitches[1];
-            mpi->stride[1] = priv->overlay->pitches[2];
+        if(mpi->flags&MP_IMGFLAG_PLANAR) {
+	    mpi->planes[0] = priv->overlay->pixels[0] + priv->y*priv->overlay->pitches[0];
+	    mpi->stride[0] = priv->overlay->pitches[0];
+	    if(mpi->flags&MP_IMGFLAG_SWAPPED) {
+		mpi->planes[1] = priv->overlay->pixels[1] + priv->y*priv->overlay->pitches[1]/2;
+		mpi->stride[1] = priv->overlay->pitches[1];
+		mpi->planes[2] = priv->overlay->pixels[2] + priv->y*priv->overlay->pitches[2]/2;
+		mpi->stride[2] = priv->overlay->pitches[2];
+	    } else {
+		mpi->planes[2] = priv->overlay->pixels[1] + priv->y*priv->overlay->pitches[1]/2;
+		mpi->stride[2] = priv->overlay->pitches[1];
+		mpi->planes[1] = priv->overlay->pixels[2] + priv->y*priv->overlay->pitches[2]/2;
+		mpi->stride[1] = priv->overlay->pitches[2];
+	    }
         }
         else if(IMGFMT_IS_RGB(priv->format) || IMGFMT_IS_BGR(priv->format)) {
             if(priv->dblit) {