Merge tizen patch based on 1.12.2

[platform/upstream/gstreamer.git] / omx / gstomxvideo.c

diff --git a/omx/gstomxvideo.c b/omx/gstomxvideo.c
index 9eb6769..b4b7247 100755 (executable)
--- a/omx/gstomxvideo.c
+++ b/omx/gstomxvideo.c
@@ -45,7 +45,11 @@ gst_omx_video_get_format_from_omx (OMX_COLOR_FORMATTYPE omx_colorformat)
       format = GST_VIDEO_FORMAT_I420;
       break;
     case OMX_COLOR_FormatYUV420SemiPlanar:
+#ifdef TIZEN_FEATURE_OMX
+      format = GST_VIDEO_FORMAT_SN12;
+#else
       format = GST_VIDEO_FORMAT_NV12;
+#endif
       break;
     case OMX_COLOR_FormatYUV422SemiPlanar:
       format = GST_VIDEO_FORMAT_NV16;
@@ -75,10 +79,13 @@ gst_omx_video_get_format_from_omx (OMX_COLOR_FORMATTYPE omx_colorformat)
     case OMX_COLOR_Format16bitBGR565:
       format = GST_VIDEO_FORMAT_BGR16;
       break;
-#ifdef GST_TIZEN_MODIFICATION
-    case OMX_EXT_COLOR_FormatNV12TPhysicalAddress:
+#ifdef TIZEN_FEATURE_OMX
+    case OMX_EXT_COLOR_FormatNV12LPhysicalAddress:
       format = GST_VIDEO_FORMAT_SN12;
       break;
+    case OMX_EXT_COLOR_FormatNV12TPhysicalAddress:
+      format = GST_VIDEO_FORMAT_ST12;
+      break;
 #endif
     default:
       format = GST_VIDEO_FORMAT_UNKNOWN;