commit ed11fc3e54ff2097241172ed04425061410ed8eb
author Tom Wai-Hong Tam <waihong@chromium.org> Thu Nov 06 09:19:58 2014 +0800
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Nov 06 09:26:21 2014 +0000
tree 5601cf6e8473573ceba2589673a8e39d55d42da7
parent a37729b7b8d4c1c78b50da291096a516b7ae0b8c

Implement WaitVideoOutputStable method for VGA

It tries to probe the resolution from FPGA and waits until the
resolution is valid (no 0 reported) and not floating.

BUG=chromium:429931
TEST=Manually called some APIs, like DetectResolution, work fine.

Change-Id: Ie055ff052a97f95a0d68f051bed035437ddee040
Reviewed-on: https://chromium-review.googlesource.com/227785
Reviewed-by: Hung-ying Tyan <tyanh@chromium.org>
Commit-Queue: Wai-Hong Tam <waihong@chromium.org>
Tested-by: Wai-Hong Tam <waihong@chromium.org>

chameleond/utils/input_flow.py

diff --git a/chameleond/utils/input_flow.py b/chameleond/utils/input_flow.py
index 5f2a057..e8b775d 100644
--- a/chameleond/utils/input_flow.py
+++ b/chameleond/utils/input_flow.py
@@ -190,7 +190,7 @@
     return True
 
   def WaitVideoOutputStable(self, unused_timeout=None):
-    """Waits the video output stable or timeout."""
+    """Waits the video output stable or timeout. Returns success or not."""
     return True
 
   def IsDualPixelMode(self):
@@ -370,7 +370,7 @@
     return True
 
   def WaitVideoOutputStable(self, unused_timeout=None):
-    """Waits the video output stable or timeout."""
+    """Waits the video output stable or timeout. Returns success or not."""
     # TODO(waihong): Implement this method.
     return True
 
@@ -497,7 +497,7 @@
       return False
 
   def WaitVideoOutputStable(self, timeout=None):
-    """Waits the video output stable or timeout."""
+    """Waits the video output stable or timeout. Returns success or not."""
     if timeout is None:
       timeout = self._TIMEOUT_VIDEO_STABLE_PROBE
     try:
@@ -513,8 +513,9 @@
 
   _CONNECTOR_TYPE = 'VGA'
   _IS_DUAL_PIXEL_MODE = False
-  _DELAY_CHECKING_SYNC_PROBE = 0.1
-  _TIMEOUT_CHECKING_SYNC = 5
+  _DELAY_CHECKING_STABLE_PROBE = 0.1
+  _TIMEOUT_CHECKING_STABLE = 5
+  _DELAY_RESOLUTION_PROBE = 0.05
 
   def __init__(self, *args):
     super(VgaInputFlow, self).__init__(*args)
@@ -592,16 +593,30 @@
   def WaitVideoInputStable(self, timeout=None):
     """Waits the video input stable or timeout. Returns success or not."""
     if timeout is None:
-      timeout = self._TIMEOUT_CHECKING_SYNC
+      timeout = self._TIMEOUT_CHECKING_STABLE
     try:
       # Check if H-Sync/V-Sync recevied from the source.
       common.WaitForCondition(self._rx.IsSyncDetected, True,
-          self._DELAY_CHECKING_SYNC_PROBE, timeout)
+          self._DELAY_CHECKING_STABLE_PROBE, timeout)
     except common.TimeoutError:
       return False
     return True
 
-  def WaitVideoOutputStable(self, unused_timeout=None):
-    """Waits the video output stable or timeout."""
-    # TODO(waihong): Implement this method.
+  def _IsResolutionValid(self):
+    """Returns True if the resolution from FPGA is valid and not floating."""
+    resolution1 = self._frame_manager.ComputeResolution()
+    time.sleep(self._DELAY_RESOLUTION_PROBE)
+    resolution2 = self._frame_manager.ComputeResolution()
+    return resolution1 == resolution2 and 0 not in resolution1
+
+  def WaitVideoOutputStable(self, timeout=None):
+    """Waits the video output stable or timeout. Returns success or not."""
+    if timeout is None:
+      timeout = self._TIMEOUT_CHECKING_STABLE
+    try:
+      # Wait a valid resolution and not floating.
+      common.WaitForCondition(self._IsResolutionValid, True,
+          self._DELAY_CHECKING_STABLE_PROBE, timeout)
+    except common.TimeoutError:
+      return False
     return True