diff --git a/tools/gplay2/gplay2.c b/tools/gplay2/gplay2.c
index 8919bce..abbc53c 100755
--- a/tools/gplay2/gplay2.c
+++ b/tools/gplay2/gplay2.c
@@ -1528,7 +1528,7 @@
 
   if (!options.video_sink_name) {
     if (gplay_checkfeature (VPU) && gplay_checkfeature (DPU)) {
-      options.video_sink_name = "imxvideoconvert_g2d ! queue ! video/x-raw,format=RGB16 ! waylandsink";
+      options.video_sink_name = "imxvideoconvert_g2d ! queue ! waylandsink";
       g_print ("Set VideoSink %s \n", options.video_sink_name);
       video_sink =
         gst_parse_bin_from_description (options.video_sink_name, TRUE, NULL);
diff --git a/tools/grecorder/recorder_engine.c b/tools/grecorder/recorder_engine.c
index 7236dd1..efa3edd 100644
--- a/tools/grecorder/recorder_engine.c
+++ b/tools/grecorder/recorder_engine.c
@@ -64,6 +64,7 @@
 #endif
 
 // FIXME: g2d has issue to convert RGB to YUV, use SW composition currently
+//#define USE_HW_COMPOSITOR
 #ifdef USE_HW_COMPOSITOR
 #define HW_COMPOSITOR "queue ! imxvideoconvert_g2d composition-meta-enable=true in-place=true !"
 #else
@@ -1691,7 +1692,7 @@
   gRecorderEngine *recorder = (gRecorderEngine *)(h->pData);
 
   if (bAddTimeStamp) {
-      if (IS_IMX8MM()) {
+      if (IS_IMX8MM() || IS_IMX8Q()) {
           recorder->date_time = DATE_TIME TIME_OVERLAY HW_COMPOSITOR "queue";
       }
       else {