From: Wim Taymans <wim.taymans@collabora.co.uk>
Date: Tue, 29 May 2012 15:47:54 +0000 (+0200)
Subject: video: update for removed formats
X-Git-Tag: 1.19.3~511^2~6417
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=059a6ca673e11ff3914ee557ec6fcdc5f227fef4;p=platform%2Fupstream%2Fgstreamer.git

video: update for removed formats
---

diff --git a/gst/videoconvert/videoconvert.c b/gst/videoconvert/videoconvert.c
index 8799985..888b046 100644
--- a/gst/videoconvert/videoconvert.c
+++ b/gst/videoconvert/videoconvert.c
@@ -702,29 +702,29 @@ putline_Y444 (VideoConvert * convert, GstVideoFrame * dest, const guint8 * src,
 }
 
 static void
-getline_Y800 (VideoConvert * convert, guint8 * dest, const GstVideoFrame * src,
+getline_GRAY8 (VideoConvert * convert, guint8 * dest, const GstVideoFrame * src,
     int j)
 {
   cogorc_getline_Y800 (dest, FRAME_GET_LINE (src, j), convert->width);
 }
 
 static void
-putline_Y800 (VideoConvert * convert, GstVideoFrame * dest, const guint8 * src,
+putline_GRAY8 (VideoConvert * convert, GstVideoFrame * dest, const guint8 * src,
     int j)
 {
   cogorc_putline_Y800 (FRAME_GET_LINE (dest, j), src, convert->width);
 }
 
 static void
-getline_Y16 (VideoConvert * convert, guint8 * dest, const GstVideoFrame * src,
-    int j)
+getline_GRAY16_LE (VideoConvert * convert, guint8 * dest,
+    const GstVideoFrame * src, int j)
 {
   cogorc_getline_Y16 (dest, FRAME_GET_LINE (src, j), convert->width);
 }
 
 static void
-putline_Y16 (VideoConvert * convert, GstVideoFrame * dest, const guint8 * src,
-    int j)
+putline_GRAY16_LE (VideoConvert * convert, GstVideoFrame * dest,
+    const guint8 * src, int j)
 {
   cogorc_putline_Y16 (FRAME_GET_LINE (dest, j), src, convert->width);
 }
@@ -1581,12 +1581,10 @@ static const VideoLine lines[] = {
       getline16_v216, putline16_v216},
   {GST_VIDEO_FORMAT_NV12, getline_NV12, putline_NV12},
   {GST_VIDEO_FORMAT_NV21, getline_NV21, putline_NV21},
-  //{GST_VIDEO_FORMAT_GRAY8, getline_GRAY8, putline_GRAY8},
-  //{GST_VIDEO_FORMAT_GRAY16_BE, getline_GRAY16_BE, putline_GRAY16_BE},
-  //{GST_VIDEO_FORMAT_GRAY16_LE, getline_GRAY16_LE, putline_GRAY16_LE},
   {GST_VIDEO_FORMAT_v308, getline_v308, putline_v308},
-  {GST_VIDEO_FORMAT_Y800, getline_Y800, putline_Y800},
-  {GST_VIDEO_FORMAT_Y16, getline_Y16, putline_Y16},
+  {GST_VIDEO_FORMAT_GRAY8, getline_GRAY8, putline_GRAY8},
+  {GST_VIDEO_FORMAT_GRAY16_LE, getline_GRAY16_LE, putline_GRAY16_LE},
+  //{GST_VIDEO_FORMAT_GRAY16_BE, getline_GRAY16_BE, putline_GRAY16_BE},
   {GST_VIDEO_FORMAT_RGB16, getline_RGB16, putline_RGB16},
   {GST_VIDEO_FORMAT_BGR16, getline_BGR16, putline_BGR16},
   {GST_VIDEO_FORMAT_RGB15, getline_RGB15, putline_RGB15},
diff --git a/gst/videoscale/gstvideoscale.c b/gst/videoscale/gstvideoscale.c
index 6f53473..ae29309 100644
--- a/gst/videoscale/gstvideoscale.c
+++ b/gst/videoscale/gstvideoscale.c
@@ -1071,12 +1071,10 @@ _get_black_for_format (GstVideoFormat format)
       return black[5];
     case GST_VIDEO_FORMAT_UYVY:
       return black[6];
-    case GST_VIDEO_FORMAT_Y800:
     case GST_VIDEO_FORMAT_GRAY8:
       return black[7];
     case GST_VIDEO_FORMAT_GRAY16_LE:
     case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_Y16:
       return NULL;              /* Handled by the caller */
     case GST_VIDEO_FORMAT_I420:
     case GST_VIDEO_FORMAT_YV12:
@@ -1241,7 +1239,6 @@ gst_video_scale_transform_frame (GstVideoFilter * filter,
           goto unknown_mode;
       }
       break;
-    case GST_VIDEO_FORMAT_Y800:
     case GST_VIDEO_FORMAT_GRAY8:
       if (add_borders)
         vs_fill_borders_Y (&dest[0], black);
@@ -1261,7 +1258,6 @@ gst_video_scale_transform_frame (GstVideoFilter * filter,
       break;
     case GST_VIDEO_FORMAT_GRAY16_LE:
     case GST_VIDEO_FORMAT_GRAY16_BE:
-    case GST_VIDEO_FORMAT_Y16:
       if (add_borders)
         vs_fill_borders_Y16 (&dest[0], 0);
       switch (method) {