Changeset 4904140690f8630d53466a35914f0a37aa5154a4

Timestamp:

08/30/04 03:24:08 (4 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1093829048 +0000

git-parent:

[60349e21f45e7da3341c13d28e4b36ba0913dfd1]

git-author:

Gildas Bazin <gbazin@videolan.org> 1093829048 +0000

Message:

* modules/video_chroma/i420_rgb16.c: take care of width != pitch as well.

Files:

• modules/video_chroma/i420_rgb16.c (modified) (7 diffs)

modules/video_chroma/i420_rgb16.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000 VideoLAN
-: i420_rgb16.c,v 1.5 2003/08/29 18:58:05 fenrir Exp 
+
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -83 +83 @@
-    int *       p_offset;
-
+    const int i_source_margin = p_src->p[0].i_pitch
+                                 - p_src->p[0].i_visible_pitch;
+    const int i_source_margin_c = p_src->p[1].i_pitch
+                                 - p_src->p[1].i_visible_pitch;
+
-    /* The dithering matrices */
-    int dither10[4] = {  0x0,  0x8,  0x2,  0xa };
@@ -173 +178 @@
-        SCALE_WIDTH;
-        SCALE_HEIGHT( 420, 2 );
+
+        p_y += i_source_margin;
+        if( i_y % 2 )
+        {
+            p_u += i_source_margin_c;
+            p_v += i_source_margin_c;
+        }
-    }
-}
@@ -220 +232 @@
-    int *       p_offset;
-
+    const int i_source_margin = p_src->p[0].i_pitch
+                                 - p_src->p[0].i_visible_pitch;
+    const int i_source_margin_c = p_src->p[1].i_pitch
+                                 - p_src->p[1].i_visible_pitch;
+
-    i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
@@ -343 +360 @@
-        SCALE_WIDTH;
-        SCALE_HEIGHT( 420, 2 );
+
+        p_y += i_source_margin;
+        if( i_y % 2 )
+        {
+            p_u += i_source_margin_c;
+            p_v += i_source_margin_c;
+        }
-    }
-}
@@ -389 +413 @@
-    int *       p_offset;
-
+    const int i_source_margin = p_src->p[0].i_pitch
+                                 - p_src->p[0].i_visible_pitch;
+    const int i_source_margin_c = p_src->p[1].i_pitch
+                                 - p_src->p[1].i_visible_pitch;
+
-    i_right_margin = p_dest->p->i_pitch - p_dest->p->i_visible_pitch;
-
@@ -472 +501 @@
-        SCALE_WIDTH;
-        SCALE_HEIGHT( 420, 4 );
+
+        p_y += i_source_margin;
+        if( i_y % 2 )
+        {
+            p_u += i_source_margin_c;
+            p_v += i_source_margin_c;
+        }
-    }
-}