Changed pixelFormat representation in Image: N_SE-32431

Signed-off-by: rahul varna <rahul.varna@samsung.com>

diff --git a/project/data/config.ini b/project/data/config.ini
index 2754999..965362e 100644 (file)
--- a/project/data/config.ini
+++ b/project/data/config.ini
@@ -70,37 +70,37 @@ count=2
 #ColorConvert
 count=3
 0.srcfile=/Image/YUV/foreman_cif.yuv
-0.srcpixel=yuv420p
+0.srcpixel=YUV420
 0.width=352
 0.height=288
 1.srcfile=/Image/dog_1024_960.gif
-1.srcpixel=rgb565le
+1.srcpixel=RGB16
 2.srcfile=/Image/home_640_432.png
-2.srcpixel=bgra8888
+2.srcpixel=RGB32
 
 #FlipRotate
 count=3
 0.srcfile=/Image/YUV/foreman_cif.yuv
-0.srcpixel=yuv420p
+0.srcpixel=YUV420
 0.width=352
 0.height=288
 1.srcfile=/Image/dog_1024_960.gif
-1.srcpixel=rgb565le
+1.srcpixel=RGB16
 2.srcfile=/Image/giraffe_800_1179.jpg
-2.srcpixel=bgra8888
+2.srcpixel=RGB32
 
 #ImageResize
 count=3
 0.srcfile=/Image/YUV/foreman_cif.yuv
-0.srcpixel=yuv420p
+0.srcpixel=YUV420
 0.width=352
 0.height=288
 0.resize=50
 1.srcfile=/Image/dog_1024_960.gif
-1.srcpixel=rgb565le
+1.srcpixel=RGB16
 1.resize=60
 2.srcfile=/Image/giraffe_800_1179.jpg
-2.srcpixel=bgra8888
+2.srcpixel=RGB32
 2.resize=10
 
 

diff --git a/project/src/Image/ImageColorConvertForm.cpp b/project/src/Image/ImageColorConvertForm.cpp
index 109ad22..4b0b240 100644 (file)
--- a/project/src/Image/ImageColorConvertForm.cpp
+++ b/project/src/Image/ImageColorConvertForm.cpp
@@ -45,9 +45,9 @@ typedef struct
 
 static PixelFormatMap pixelFormatMap[] =
 {
-       { "yuv420p", MEDIA_PIXEL_FORMAT_YUV420P, BITMAP_PIXEL_FORMAT_ARGB8888, 1.5 },
-       { "rgb565le", MEDIA_PIXEL_FORMAT_RGB565LE, BITMAP_PIXEL_FORMAT_RGB565, 2  },
-       { "bgra8888", MEDIA_PIXEL_FORMAT_BGRA8888, BITMAP_PIXEL_FORMAT_ARGB8888, 4 },
+       { "YUV420", MEDIA_PIXEL_FORMAT_YUV420P, BITMAP_PIXEL_FORMAT_ARGB8888, 1.5 },
+       { "RGB16", MEDIA_PIXEL_FORMAT_RGB565LE, BITMAP_PIXEL_FORMAT_RGB565, 2  },
+       { "RGB32", MEDIA_PIXEL_FORMAT_BGRA8888, BITMAP_PIXEL_FORMAT_ARGB8888, 4 },
 };
 
 

diff --git a/project/src/PixelFormatMapper.cpp b/project/src/PixelFormatMapper.cpp
index e3189ab..39b8b41 100644 (file)
--- a/project/src/PixelFormatMapper.cpp
+++ b/project/src/PixelFormatMapper.cpp
@@ -29,9 +29,9 @@ typedef struct
 
 static PixelFormatMap pixelFormatMap[] =
 {
-       { "yuv420p", MEDIA_PIXEL_FORMAT_YUV420P, BITMAP_PIXEL_FORMAT_ARGB8888, OVERLAY_REGION_BUFFER_PIXEL_FORMAT_YCbCr420_PLANAR, 1.5 },
-       { "rgb565le", MEDIA_PIXEL_FORMAT_RGB565LE, BITMAP_PIXEL_FORMAT_RGB565, OVERLAY_REGION_BUFFER_PIXEL_FORMAT_RGB565, 2  },
-       { "bgra8888", MEDIA_PIXEL_FORMAT_BGRA8888, BITMAP_PIXEL_FORMAT_ARGB8888, OVERLAY_REGION_BUFFER_PIXEL_FORMAT_ARGB8888, 4 },
+       { "YUV420", MEDIA_PIXEL_FORMAT_YUV420P, BITMAP_PIXEL_FORMAT_ARGB8888, OVERLAY_REGION_BUFFER_PIXEL_FORMAT_YCbCr420_PLANAR, 1.5 },
+       { "RGB16", MEDIA_PIXEL_FORMAT_RGB565LE, BITMAP_PIXEL_FORMAT_RGB565, OVERLAY_REGION_BUFFER_PIXEL_FORMAT_RGB565, 2  },
+       { "RGB32", MEDIA_PIXEL_FORMAT_BGRA8888, BITMAP_PIXEL_FORMAT_ARGB8888, OVERLAY_REGION_BUFFER_PIXEL_FORMAT_ARGB8888, 4 },
 };