| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Google Inc. All rights reserved. | 2 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 } | 63 } |
| 64 | 64 |
| 65 HRTFDatabaseLoader::HRTFDatabaseLoader(float sampleRate) | 65 HRTFDatabaseLoader::HRTFDatabaseLoader(float sampleRate) |
| 66 : m_databaseSampleRate(sampleRate) { | 66 : m_databaseSampleRate(sampleRate) { |
| 67 ASSERT(isMainThread()); | 67 ASSERT(isMainThread()); |
| 68 } | 68 } |
| 69 | 69 |
| 70 HRTFDatabaseLoader::~HRTFDatabaseLoader() { | 70 HRTFDatabaseLoader::~HRTFDatabaseLoader() { |
| 71 ASSERT(isMainThread()); | 71 ASSERT(isMainThread()); |
| 72 ASSERT(!m_thread); | 72 ASSERT(!m_thread); |
| 73 getLoaderMap().remove(m_databaseSampleRate); | 73 getLoaderMap().erase(m_databaseSampleRate); |
| 74 } | 74 } |
| 75 | 75 |
| 76 void HRTFDatabaseLoader::loadTask() { | 76 void HRTFDatabaseLoader::loadTask() { |
| 77 DCHECK(!isMainThread()); | 77 DCHECK(!isMainThread()); |
| 78 DCHECK(!m_hrtfDatabase); | 78 DCHECK(!m_hrtfDatabase); |
| 79 | 79 |
| 80 // Protect access to m_hrtfDatabase, which can be accessed from the audio | 80 // Protect access to m_hrtfDatabase, which can be accessed from the audio |
| 81 // thread. | 81 // thread. |
| 82 MutexLocker locker(m_lock); | 82 MutexLocker locker(m_lock); |
| 83 // Load the default HRTF database. | 83 // Load the default HRTF database. |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 // TODO(alexclarke): Should this be posted as a loading task? | 130 // TODO(alexclarke): Should this be posted as a loading task? |
| 131 m_thread->getWebTaskRunner()->postTask( | 131 m_thread->getWebTaskRunner()->postTask( |
| 132 BLINK_FROM_HERE, crossThreadBind(&HRTFDatabaseLoader::cleanupTask, | 132 BLINK_FROM_HERE, crossThreadBind(&HRTFDatabaseLoader::cleanupTask, |
| 133 crossThreadUnretained(this), | 133 crossThreadUnretained(this), |
| 134 crossThreadUnretained(&sync))); | 134 crossThreadUnretained(&sync))); |
| 135 sync.wait(); | 135 sync.wait(); |
| 136 m_thread.reset(); | 136 m_thread.reset(); |
| 137 } | 137 } |
| 138 | 138 |
| 139 } // namespace blink | 139 } // namespace blink |
| OLD | NEW |