1. ffmpeg
  2. Commit 5e9f85925c6fd98b97883fae5457dc5a7c24097d
Browse code

avfilter/vf_vectorscope: improve green graticule visibility

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Paul B Mahol authored on 2016/03/04 05:03:23
Showing 1 changed files
libavfilter/vf_vectorscope.c
History View file @ 5e9f859
... ... 
@@ -930,9 +930,9 @@ static void green_graticule16(VectorscopeContext *s, AVFrame *out, int X, int Y,
930 930 
         int x = positions[P][i][X];
931 931 
         int y = positions[P][i][Y];
932 932
933 
-        draw_dots16((uint16_t *)(out->data[D] + y * out->linesize[D] + x * 2), out->linesize[D] / 2, 128 * m, o);
934 
-        draw_dots16((uint16_t *)(out->data[X] + y * out->linesize[X] + x * 2), out->linesize[X] / 2, 0, o);
935 
-        draw_dots16((uint16_t *)(out->data[Y] + y * out->linesize[Y] + x * 2), out->linesize[Y] / 2, 0, o);
933 
+        draw_dots16((uint16_t *)(out->data[0] + y * out->linesize[0] + x * 2), out->linesize[0] / 2, 128 * m, o);
934 
+        draw_dots16((uint16_t *)(out->data[1] + y * out->linesize[1] + x * 2), out->linesize[1] / 2, 0, o);
935 
+        draw_dots16((uint16_t *)(out->data[2] + y * out->linesize[2] + x * 2), out->linesize[2] / 2, 0, o);
936 936 
         if (out->data[3])
937 937 
             draw_dots16((uint16_t *)(out->data[3] + y * out->linesize[3] + x * 2), out->linesize[3] / 2, max, o);
938 938 
     }
... ... 
@@ -941,9 +941,9 @@ static void green_graticule16(VectorscopeContext *s, AVFrame *out, int X, int Y,
941 941 
         int x = positions[P][12][X];
942 942 
         int y = positions[P][12][Y];
943 943
944 
-        draw_dots16((uint16_t *)(out->data[D] + y * out->linesize[D] + x * 2), out->linesize[D] / 2, 128 * m, o);
945 
-        draw_dots16((uint16_t *)(out->data[X] + y * out->linesize[X] + x * 2), out->linesize[X] / 2, 0, o);
946 
-        draw_dots16((uint16_t *)(out->data[Y] + y * out->linesize[Y] + x * 2), out->linesize[Y] / 2, 0, o);
944 
+        draw_dots16((uint16_t *)(out->data[0] + y * out->linesize[0] + x * 2), out->linesize[0] / 2, 128 * m, o);
945 
+        draw_dots16((uint16_t *)(out->data[1] + y * out->linesize[1] + x * 2), out->linesize[1] / 2, 0, o);
946 
+        draw_dots16((uint16_t *)(out->data[2] + y * out->linesize[2] + x * 2), out->linesize[2] / 2, 0, o);
947 947 
         if (out->data[3])
948 948 
             draw_dots16((uint16_t *)(out->data[3] + y * out->linesize[3] + x * 2), out->linesize[3] / 2, max, o);
949 949 
     }
... ... 
@@ -952,9 +952,9 @@ static void green_graticule16(VectorscopeContext *s, AVFrame *out, int X, int Y,
952 952 
         int x = positions[P][13][X];
953 953 
         int y = positions[P][13][Y];
954 954
955 
-        draw_dots16((uint16_t *)(out->data[D] + y * out->linesize[D] + x * 2), out->linesize[D] / 2, 128 * m, o);
956 
-        draw_dots16((uint16_t *)(out->data[X] + y * out->linesize[X] + x * 2), out->linesize[X] / 2, 0, o);
957 
-        draw_dots16((uint16_t *)(out->data[Y] + y * out->linesize[Y] + x * 2), out->linesize[Y] / 2, 0, o);
955 
+        draw_dots16((uint16_t *)(out->data[0] + y * out->linesize[0] + x * 2), out->linesize[0] / 2, 128 * m, o);
956 
+        draw_dots16((uint16_t *)(out->data[1] + y * out->linesize[1] + x * 2), out->linesize[1] / 2, 0, o);
957 
+        draw_dots16((uint16_t *)(out->data[2] + y * out->linesize[2] + x * 2), out->linesize[2] / 2, 0, o);
958 958 
         if (out->data[3])
959 959 
             draw_dots16((uint16_t *)(out->data[3] + y * out->linesize[3] + x * 2), out->linesize[3] / 2, max, o);
960 960 
     }
... ... 
@@ -969,9 +969,9 @@ static void green_graticule(VectorscopeContext *s, AVFrame *out, int X, int Y, i
969 969 
         int x = positions[P][i][X];
970 970 
         int y = positions[P][i][Y];
971 971
972 
-        draw_dots(out->data[D] + y * out->linesize[D] + x, out->linesize[D], 128, o);
973 
-        draw_dots(out->data[X] + y * out->linesize[X] + x, out->linesize[X], 0, o);
974 
-        draw_dots(out->data[Y] + y * out->linesize[Y] + x, out->linesize[Y], 0, o);
972 
+        draw_dots(out->data[0] + y * out->linesize[0] + x, out->linesize[0], 128, o);
973 
+        draw_dots(out->data[1] + y * out->linesize[1] + x, out->linesize[1], 0, o);
974 
+        draw_dots(out->data[2] + y * out->linesize[2] + x, out->linesize[2], 0, o);
975 975 
         if (out->data[3])
976 976 
             draw_dots(out->data[3] + y * out->linesize[3] + x, out->linesize[3], 255, o);
977 977 
     }
... ... 
@@ -980,9 +980,9 @@ static void green_graticule(VectorscopeContext *s, AVFrame *out, int X, int Y, i
980 980 
         int x = positions[P][12][X];
981 981 
         int y = positions[P][12][Y];
982 982
983 
-        draw_dots(out->data[D] + y * out->linesize[D] + x, out->linesize[D], 128, o);
984 
-        draw_dots(out->data[X] + y * out->linesize[X] + x, out->linesize[X], 0, o);
985 
-        draw_dots(out->data[Y] + y * out->linesize[Y] + x, out->linesize[Y], 0, o);
983 
+        draw_dots(out->data[0] + y * out->linesize[0] + x, out->linesize[0], 128, o);
984 
+        draw_dots(out->data[1] + y * out->linesize[1] + x, out->linesize[1], 0, o);
985 
+        draw_dots(out->data[2] + y * out->linesize[2] + x, out->linesize[2], 0, o);
986 986 
         if (out->data[3])
987 987 
             draw_dots(out->data[3] + y * out->linesize[3] + x, out->linesize[3], 255, o);
988 988 
     }
... ... 
@@ -991,9 +991,9 @@ static void green_graticule(VectorscopeContext *s, AVFrame *out, int X, int Y, i
991 991 
         int x = positions[P][13][X];
992 992 
         int y = positions[P][13][Y];
993 993
994 
-        draw_dots(out->data[D] + y * out->linesize[D] + x, out->linesize[D], 128, o);
995 
-        draw_dots(out->data[X] + y * out->linesize[X] + x, out->linesize[X], 0, o);
996 
-        draw_dots(out->data[Y] + y * out->linesize[Y] + x, out->linesize[Y], 0, o);
994 
+        draw_dots(out->data[0] + y * out->linesize[0] + x, out->linesize[0], 128, o);
995 
+        draw_dots(out->data[1] + y * out->linesize[1] + x, out->linesize[1], 0, o);
996 
+        draw_dots(out->data[2] + y * out->linesize[2] + x, out->linesize[2], 0, o);
997 997 
         if (out->data[3])
998 998 
             draw_dots(out->data[3] + y * out->linesize[3] + x, out->linesize[3], 255, o);
999 999 
     }