diff options
| author | Elliott Hughes <enh@google.com> | 2013-05-14 15:02:33 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-14 15:02:33 -0700 |
| commit | e974c7df1c4a87ced27a773430690a20d208d40e (patch) | |
| tree | e54dacfb7d8a9ce76746c119bc43a50c9675cdf5 /services | |
| parent | 76d1490ad74fc8a682d9534a2e03f3e864cb1702 (diff) | |
| parent | d60867b24a8f8906aeb751de22b8f2df044b132b (diff) | |
| download | frameworks_av-e974c7df1c4a87ced27a773430690a20d208d40e.zip frameworks_av-e974c7df1c4a87ced27a773430690a20d208d40e.tar.gz frameworks_av-e974c7df1c4a87ced27a773430690a20d208d40e.tar.bz2 | |
am effc08ed: Merge "Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC"
* commit 'effc08ed1eb1d55ca13997ec96f72e40a0866394':
Replace obsolete CLOCK_MONOTONIC_HR by CLOCK_MONOTONIC
Diffstat (limited to 'services')
| -rw-r--r-- | services/audioflinger/test-resample.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/test-resample.cpp b/services/audioflinger/test-resample.cpp index b082e8c..7a314cf 100644 --- a/services/audioflinger/test-resample.cpp +++ b/services/audioflinger/test-resample.cpp @@ -219,12 +219,12 @@ int main(int argc, char* argv[]) { memset(output_vaddr, 0, output_size); timespec start, end; - clock_gettime(CLOCK_MONOTONIC_HR, &start); + clock_gettime(CLOCK_MONOTONIC, &start); resampler->resample((int*) output_vaddr, out_frames, &provider); resampler->resample((int*) output_vaddr, out_frames, &provider); resampler->resample((int*) output_vaddr, out_frames, &provider); resampler->resample((int*) output_vaddr, out_frames, &provider); - clock_gettime(CLOCK_MONOTONIC_HR, &end); + clock_gettime(CLOCK_MONOTONIC, &end); int64_t start_ns = start.tv_sec * 1000000000LL + start.tv_nsec; int64_t end_ns = end.tv_sec * 1000000000LL + end.tv_nsec; int64_t time = (end_ns - start_ns)/4; |