commit c75d97f20843388b9084561635996a01a53d0c0f
author Phil Burk <philburk@google.com> Fri Sep 08 15:48:36 2017 -0700
committer Phil Burk <philburk@google.com> Sat Sep 09 04:17:53 2017 +0000
tree 2830ecc2de864ef496f7bbbc507a5f144839732a
parent e0de1cdc1ebe4f43ac5ba4273d51b368901c87de

aaudio: fix return code from getTimestamp()

Should be AAUDIO_ERROR_INVALID_STATE if no timestamp available.

Bug: 65447871
Test: test_timestamps.cpp should only print AAUDIO_ERROR_INVALID_STATE
Change-Id: Id9e211ef8fce078514f4348a434e0c003372369c

media/libaaudio/tests/test_timestamps.cpp

diff --git a/media/libaaudio/tests/test_timestamps.cpp b/media/libaaudio/tests/test_timestamps.cpp
index 49de05a..fb363e7 100644
--- a/media/libaaudio/tests/test_timestamps.cpp
+++ b/media/libaaudio/tests/test_timestamps.cpp
@@ -295,37 +295,45 @@
     // in a buffer if we hang or crash.
     setvbuf(stdout, nullptr, _IONBF, (size_t) 0);
 
-    printf("Test Timestamps V0.1.2\n");
+    printf("Test Timestamps V0.1.3\n");
+
     // Legacy
-//    result = testTimeStamps(AAUDIO_POLICY_NEVER,
-//                            AAUDIO_SHARING_MODE_SHARED,
-//                            AAUDIO_PERFORMANCE_MODE_NONE,
-//                            AAUDIO_DIRECTION_INPUT);
-//    result = testTimeStamps(AAUDIO_POLICY_NEVER,
-//                            AAUDIO_SHARING_MODE_SHARED,
-//                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
-//                            AAUDIO_DIRECTION_INPUT);
-//    result = testTimeStamps(AAUDIO_POLICY_NEVER, AAUDIO_SHARING_MODE_SHARED,
-//                            AAUDIO_PERFORMANCE_MODE_NONE,
-//                            AAUDIO_DIRECTION_OUTPUT);
-    result = testTimeStamps(AAUDIO_POLICY_NEVER, AAUDIO_SHARING_MODE_SHARED,
+    aaudio_policy_t policy = AAUDIO_POLICY_NEVER;
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_SHARED,
+                            AAUDIO_PERFORMANCE_MODE_NONE,
+                            AAUDIO_DIRECTION_INPUT);
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_SHARED,
+                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                            AAUDIO_DIRECTION_INPUT);
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_SHARED,
+                            AAUDIO_PERFORMANCE_MODE_NONE,
+                            AAUDIO_DIRECTION_OUTPUT);
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_SHARED,
                             AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
                             AAUDIO_DIRECTION_OUTPUT);
-   // MMAP
-//    result = testTimeStamps(AAUDIO_POLICY_ALWAYS,
-//                            AAUDIO_SHARING_MODE_EXCLUSIVE,
-//                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
-//                            AAUDIO_DIRECTION_INPUT);
-//    result = testTimeStamps(AAUDIO_POLICY_ALWAYS,
-//                            AAUDIO_SHARING_MODE_EXCLUSIVE,
-//                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
-//                            AAUDIO_DIRECTION_OUTPUT);
-//    result = testTimeStamps(AAUDIO_POLICY_ALWAYS, AAUDIO_SHARING_MODE_SHARED,
-//                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
-//                            AAUDIO_DIRECTION_INPUT);
-//    result = testTimeStamps(AAUDIO_POLICY_ALWAYS, AAUDIO_SHARING_MODE_SHARED,
-//                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
-//                            AAUDIO_DIRECTION_OUTPUT);
+
+    // MMAP
+    policy = AAUDIO_POLICY_ALWAYS;
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_EXCLUSIVE,
+                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                            AAUDIO_DIRECTION_INPUT);
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_EXCLUSIVE,
+                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                            AAUDIO_DIRECTION_OUTPUT);
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_SHARED,
+                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                            AAUDIO_DIRECTION_INPUT);
+    result = testTimeStamps(policy,
+                            AAUDIO_SHARING_MODE_SHARED,
+                            AAUDIO_PERFORMANCE_MODE_LOW_LATENCY,
+                            AAUDIO_DIRECTION_OUTPUT);
 
     return (result == AAUDIO_OK) ? EXIT_SUCCESS : EXIT_FAILURE;
 }