diff --git a/c2_components/src/mfx_c2_decoder_component.cpp b/c2_components/src/mfx_c2_decoder_component.cpp
index 09b62310..d05e4c72 100755
--- a/c2_components/src/mfx_c2_decoder_component.cpp
+++ b/c2_components/src/mfx_c2_decoder_component.cpp
@@ -614,7 +614,7 @@ MfxC2DecoderComponent::MfxC2DecoderComponent(const C2String name, const CreateCo
         .build());
 
     // Pixel format info. Set to NV12 by default
-    m_pixelFormat = std::make_unique<C2StreamPixelFormatInfo::output>(SINGLE_STREAM_ID, HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL);
+    m_pixelFormat = std::make_unique<C2StreamPixelFormatInfo::output>(SINGLE_STREAM_ID, HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL);
 
     // HDR static with BT2020 by default
     m_hdrStaticInfo = std::make_shared<C2StreamHdrStaticInfo::output>();
diff --git a/c2_utils/src/mfx_c2_utils.cpp b/c2_utils/src/mfx_c2_utils.cpp
index 07456486..11b74895 100755
--- a/c2_utils/src/mfx_c2_utils.cpp
+++ b/c2_utils/src/mfx_c2_utils.cpp
@@ -512,7 +512,7 @@ int MfxFourCCToGralloc(mfxU32 fourcc, bool using_video_memory)
     switch (fourcc)
     {
         case MFX_FOURCC_NV12:
-            return using_video_memory ? HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL : HAL_PIXEL_FORMAT_NV12;
+            return using_video_memory ? HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL : HAL_PIXEL_FORMAT_NV12;
         case MFX_FOURCC_P010:
             return HAL_PIXEL_FORMAT_P010_INTEL;
         default:
diff --git a/c2_utils/src/mfx_gralloc_allocator.cpp b/c2_utils/src/mfx_gralloc_allocator.cpp
index 94b38d70..a214610b 100755
--- a/c2_utils/src/mfx_gralloc_allocator.cpp
+++ b/c2_utils/src/mfx_gralloc_allocator.cpp
@@ -218,7 +218,7 @@ c2_status_t MfxGrallocAllocator::Alloc(const uint16_t width, const uint16_t heig
         gr1_err = (*m_grSetDimensionsFunc)(m_gralloc1_dev, descriptor, width, height);
         if (GRALLOC1_ERROR_NONE != gr1_err) break;
 
-        gr1_err = (*m_grSetFormatFunc)(m_gralloc1_dev, descriptor, HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL);
+        gr1_err = (*m_grSetFormatFunc)(m_gralloc1_dev, descriptor, HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL);
         if (GRALLOC1_ERROR_NONE != gr1_err) break;
 
         gr1_err = (*m_grAllocateFunc)(m_gralloc1_dev, 1, &descriptor, handle);
diff --git a/c2_utils/src/mfx_va_allocator.cpp b/c2_utils/src/mfx_va_allocator.cpp
index cb1f79b9..c2f2efdc 100755
--- a/c2_utils/src/mfx_va_allocator.cpp
+++ b/c2_utils/src/mfx_va_allocator.cpp
@@ -76,6 +76,7 @@ static unsigned int ConvertGrallocFourccToVAFormat(int fourcc)
     {
         case HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL:
         case HAL_PIXEL_FORMAT_NV12_LINEAR_CAMERA_INTEL:
+        case HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL:
             return VA_FOURCC_NV12;
         case HAL_PIXEL_FORMAT_P010_INTEL:
             return VA_FOURCC_P010;
@@ -600,6 +601,7 @@ mfxStatus MfxVaFrameAllocator::MapGrallocBufferToSurface(buffer_handle_t gralloc
 
         if (buffer_details.format == HAL_PIXEL_FORMAT_NV12_Y_TILED_INTEL ||
             buffer_details.format == HAL_PIXEL_FORMAT_NV12_LINEAR_CAMERA_INTEL ||
+            buffer_details.format == HAL_PIXEL_FORMAT_NV12_X_TILED_INTEL ||
             buffer_details.format == HAL_PIXEL_FORMAT_P010_INTEL ||
             buffer_details.format == HAL_PIXEL_FORMAT_RGBA_8888 ||
             buffer_details.format == HAL_PIXEL_FORMAT_RGBX_8888 ||