Update ffmpeg support for testsuite 54/139354/2
authorTae-Young Chung <ty83.chung@samsung.com>
Tue, 18 Jul 2017 11:51:47 +0000 (20:51 +0900)
committerhj kim <backto.kim@samsung.com>
Mon, 21 Aug 2017 04:31:53 +0000 (04:31 +0000)
Change-Id: I7812ff09233bc0c1eba4c449bfd50aafc74f846f
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
test/testsuites/barcode/barcode_test_suite.c

index b2a5f19..bd7a7c7 100644 (file)
@@ -55,41 +55,41 @@ int convert_rgb_to(unsigned char *src_buffer, unsigned char **dst_buffer,
                image_data_s image_data, mv_colorspace_e dst_colorspace,
                unsigned long *cvt_buffer_size)
 {
-       enum PixelFormat pixel_format = PIX_FMT_NONE;
+       enum AVPixelFormat pixel_format = AV_PIX_FMT_NONE;
 
        MEDIA_VISION_FUNCTION_ENTER();
 
        switch (dst_colorspace) {
        case MEDIA_VISION_COLORSPACE_Y800:
-               pixel_format = PIX_FMT_GRAY8;
+               pixel_format = AV_PIX_FMT_GRAY8;
                break;
        case MEDIA_VISION_COLORSPACE_I420:
-               pixel_format = PIX_FMT_YUV420P;
+               pixel_format = AV_PIX_FMT_YUV420P;
                break;
        case MEDIA_VISION_COLORSPACE_NV12:
-               pixel_format = PIX_FMT_NV12;
+               pixel_format = AV_PIX_FMT_NV12;
                break;
        case MEDIA_VISION_COLORSPACE_YV12:
                /* the same as I420 with inversed U and V */
-               pixel_format = PIX_FMT_YUV420P;
+               pixel_format = AV_PIX_FMT_YUV420P;
                break;
        case MEDIA_VISION_COLORSPACE_NV21:
-               pixel_format = PIX_FMT_NV21;
+               pixel_format = AV_PIX_FMT_NV21;
                break;
        case MEDIA_VISION_COLORSPACE_YUYV:
-               pixel_format = PIX_FMT_YUYV422;
+               pixel_format = AV_PIX_FMT_YUYV422;
                break;
        case MEDIA_VISION_COLORSPACE_UYVY:
-               pixel_format = PIX_FMT_UYVY422;
+               pixel_format = AV_PIX_FMT_UYVY422;
                break;
        case MEDIA_VISION_COLORSPACE_422P:
-               pixel_format = PIX_FMT_YUV422P;
+               pixel_format = AV_PIX_FMT_YUV422P;
                break;
        case MEDIA_VISION_COLORSPACE_RGB565:
-               pixel_format = PIX_FMT_RGB565BE;
+               pixel_format = AV_PIX_FMT_RGB565BE;
                break;
        case MEDIA_VISION_COLORSPACE_RGBA:
-               pixel_format = PIX_FMT_RGBA;
+               pixel_format = AV_PIX_FMT_RGBA;
                break;
        case MEDIA_VISION_COLORSPACE_RGB888:
                *cvt_buffer_size = image_data.image_width * image_data.image_height * 3;
@@ -106,14 +106,14 @@ int convert_rgb_to(unsigned char *src_buffer, unsigned char **dst_buffer,
        AVPicture src_picture;
        AVPicture dst_picture;
 
-       avpicture_fill(&src_picture, (uint8_t*)src_buffer, PIX_FMT_RGB24,
+       avpicture_fill(&src_picture, (uint8_t*)src_buffer, AV_PIX_FMT_RGB24,
                        image_data.image_width, image_data.image_height);
 
        avpicture_alloc(&dst_picture, pixel_format,
                        image_data.image_width, image_data.image_height);
 
        struct SwsContext *context = sws_getContext(
-                       image_data.image_width, image_data.image_height, PIX_FMT_RGB24,
+                       image_data.image_width, image_data.image_height, AV_PIX_FMT_RGB24,
                        image_data.image_width, image_data.image_height, pixel_format,
                        SWS_FAST_BILINEAR, 0, 0, 0);