summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-01-19 10:24:58 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-01-19 10:24:58 -0800
commita76e5ddf0bb77c04615db1916c21c1ba315e555b (patch)
tree61605d8cd9b438fe980eb39a0e3f755819a1c909 /media
parent97419ed670a12f48a7609673da8ee5dc0376f075 (diff)
parentab13003c692f25c7c430e6b6c441d88aefdcf9d8 (diff)
downloadframeworks_av-a76e5ddf0bb77c04615db1916c21c1ba315e555b.zip
frameworks_av-a76e5ddf0bb77c04615db1916c21c1ba315e555b.tar.gz
frameworks_av-a76e5ddf0bb77c04615db1916c21c1ba315e555b.tar.bz2
Merge "Make sure the seek test attempts to seek on the very first iteration, as this appears to be a special case that decoders frequently get wrong."
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/omx/tests/OMXHarness.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libstagefright/omx/tests/OMXHarness.cpp b/media/libstagefright/omx/tests/OMXHarness.cpp
index 2e23899..5b45c1c 100644
--- a/media/libstagefright/omx/tests/OMXHarness.cpp
+++ b/media/libstagefright/omx/tests/OMXHarness.cpp
@@ -586,14 +586,14 @@ status_t Harness::testSeek(
double r = uniform_rand();
- if (r < 0.5) {
+ if (i > 0 && r < 0.5) {
// 50% chance of just continuing to decode from last position.
requestedSeekTimeUs = -1;
LOGI("requesting linear read");
} else {
- if (r < 0.55) {
+ if (i > 0 && r < 0.55) {
// 5% chance of seeking beyond end of stream.
requestedSeekTimeUs = durationUs;