diff options
| author | Florian Mayer <fmayer@google.com> | 2021-02-22 13:41:44 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-22 13:41:44 +0000 |
| commit | 123981960ed4bc72bde18b7625d98120a8c235a4 (patch) | |
| tree | 4982cee1e7b8328276575d8fbba75028856bafea /cras/src/tests/a2dp_iodev_unittest.cc | |
| parent | de0adafaed3e0f10cd1f7945877818838bd621a7 (diff) | |
| parent | 2e85ce9b2307641e3c1cb4233e7ed9a47c91e6d4 (diff) | |
| download | adhd-123981960ed4bc72bde18b7625d98120a8c235a4.tar.gz | |
Merge "Revert "Merge branch 'upstream-master'"" am: 340c0ad3a4 am: e46060c452 am: 2e85ce9b23
Original change: https://android-review.googlesource.com/c/platform/external/adhd/+/1598216
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: Id5442a1808e4c5dcc3998e7c9cdb4cd1c3fdbc7c
Diffstat (limited to 'cras/src/tests/a2dp_iodev_unittest.cc')
| -rw-r--r-- | cras/src/tests/a2dp_iodev_unittest.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/cras/src/tests/a2dp_iodev_unittest.cc b/cras/src/tests/a2dp_iodev_unittest.cc index 523a62e4..f03a6147 100644 --- a/cras/src/tests/a2dp_iodev_unittest.cc +++ b/cras/src/tests/a2dp_iodev_unittest.cc @@ -44,7 +44,7 @@ static size_t cras_iodev_free_resources_called; static int a2dp_write_return_val[MAX_A2DP_WRITE_CALLS]; static unsigned int a2dp_write_index; static int a2dp_encode_called; -static cras_audio_area* mock_audio_area; +static cras_audio_area* dummy_audio_area; static thread_callback write_callback; static void* write_callback_data; static const char* fake_device_name = "fake device name"; @@ -79,9 +79,9 @@ void ResetStubData() { fake_transport = reinterpret_cast<struct cras_bt_transport*>(0x123); - if (!mock_audio_area) { - mock_audio_area = (cras_audio_area*)calloc( - 1, sizeof(*mock_audio_area) + sizeof(cras_channel_area) * 2); + if (!dummy_audio_area) { + dummy_audio_area = (cras_audio_area*)calloc( + 1, sizeof(*dummy_audio_area) + sizeof(cras_channel_area) * 2); } write_callback = NULL; @@ -108,8 +108,8 @@ class A2dpIodev : public testing::Test { } virtual void TearDown() { - free(mock_audio_area); - mock_audio_area = NULL; + free(dummy_audio_area); + dummy_audio_area = NULL; free(atlog); } }; @@ -899,7 +899,7 @@ int clock_gettime(clockid_t clk_id, struct timespec* tp) { } void cras_iodev_init_audio_area(struct cras_iodev* iodev, int num_channels) { - iodev->area = mock_audio_area; + iodev->area = dummy_audio_area; } void cras_iodev_free_audio_area(struct cras_iodev* iodev) {} @@ -917,15 +917,12 @@ int cras_iodev_fill_odev_zeros(struct cras_iodev* odev, unsigned int frames) { void cras_audio_area_config_buf_pointers(struct cras_audio_area* area, const struct cras_audio_format* fmt, uint8_t* base_buffer) { - mock_audio_area->channels[0].buf = base_buffer; + dummy_audio_area->channels[0].buf = base_buffer; } struct audio_thread* cras_iodev_list_get_audio_thread() { return NULL; } -// From ewma_power -void ewma_power_disable(struct ewma_power* ewma) {} - // From audio_thread struct audio_thread_event_log* atlog; |