diff --git a/base/src/componentbase.cpp b/base/src/componentbase.cpp
index 10db2c8..56ce5ed 100644
--- a/base/src/componentbase.cpp
+++ b/base/src/componentbase.cpp
@@ -651,6 +651,15 @@
                         kMaxAdaptiveStreamingWidth, kMaxAdaptiveStreamingHeight);
                 return OMX_ErrorBadParameter;
             }
+
+            if (GetWorkingRole() != NULL &&
+                        !strcmp (GetWorkingRole(),"video_decoder.vp9")) {
+                if (p->nMaxFrameWidth < 640 && p->nMaxFrameHeight < 480) {
+                    p->nMaxFrameHeight = kMaxAdaptiveStreamingHeight;
+                    p->nMaxFrameWidth = kMaxAdaptiveStreamingWidth;
+                }
+            }
+
             mEnableAdaptivePlayback = p->bEnable;
             if (mEnableAdaptivePlayback != OMX_TRUE)
                 return OMX_ErrorBadParameter;