Merge "sde: Set the recommended rotator output format for NV21"
diff --git a/displayengine/libs/core/res_manager.cpp b/displayengine/libs/core/res_manager.cpp
index cdb994f..4101fc8 100644
--- a/displayengine/libs/core/res_manager.cpp
+++ b/displayengine/libs/core/res_manager.cpp
@@ -1158,12 +1158,12 @@
   case kFormatRGBX8888:
     *output_format = kFormatRGB888;
     break;
+  case kFormatYCrCb420SemiPlanar:
   case kFormatYCbCr420SemiPlanar:
   case kFormatYCbCr420SemiPlanarVenus:
     *output_format = kFormatYCbCr420SemiPlanar;
     break;
   default:
-    *output_format = input_format;
     break;
   }
 
@@ -1179,6 +1179,7 @@
   } else {
     if (hw_res_info_.has_ubwc) {
       switch (input_format) {
+      case kFormatYCrCb420SemiPlanar:
       case kFormatYCbCr420SemiPlanar:
       case kFormatYCbCr420SemiPlanarVenus:
         *output_format = kFormatYCbCr420SPVenusUbwc;