From 1a8074b548ea350eede9d5a09386810690fb5209 Mon Sep 17 00:00:00 2001 From: Chinyue Chen Date: Fri, 12 May 2017 11:00:06 +0800 Subject: CRAS: alsa_io - Remove unneeded update_supported_formats call. The update_supported_formats is called when a device is being opened (as part of cras_iodev_set_format) so we don't need to call it when a device is created. BUG=b:719812 TEST=make check && tested on reef. Change-Id: I6b901aff4a2d1b6a07bd3c40b1014d5b828e7dfb Reviewed-on: https://chromium-review.googlesource.com/503947 Commit-Ready: Chinyue Chen Tested-by: Chinyue Chen Reviewed-by: Dylan Reid --- cras/src/server/cras_alsa_io.c | 10 ---------- cras/src/tests/alsa_io_unittest.cc | 8 ++++---- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/cras/src/server/cras_alsa_io.c b/cras/src/server/cras_alsa_io.c index a57e22db..80a8c3b3 100644 --- a/cras/src/server/cras_alsa_io.c +++ b/cras/src/server/cras_alsa_io.c @@ -1814,7 +1814,6 @@ struct cras_iodev *alsa_iodev_create(size_t card_index, { struct alsa_io *aio; struct cras_iodev *iodev; - int err; if (direction != CRAS_STREAM_INPUT && direction != CRAS_STREAM_OUTPUT) return NULL; @@ -1917,15 +1916,6 @@ struct cras_iodev *alsa_iodev_create(size_t card_index, ucm_get_enable_htimestamp_flag(ucm); } - err = update_supported_formats(iodev); - if (err < 0 || iodev->supported_rates[0] == 0 || - iodev->supported_channel_counts[0] == 0 || - iodev->supported_formats[0] == 0) { - syslog(LOG_ERR, "Updating formats: %s", strerror(err)); - goto cleanup_iodev; - } - - set_iodev_name(iodev, card_name, dev_name, card_index, device_index, card_type, usb_vid, usb_pid, usb_serial_number); diff --git a/cras/src/tests/alsa_io_unittest.cc b/cras/src/tests/alsa_io_unittest.cc index 5a0d0e86..dc58cd75 100644 --- a/cras/src/tests/alsa_io_unittest.cc +++ b/cras/src/tests/alsa_io_unittest.cc @@ -282,7 +282,7 @@ TEST(AlsaIoInit, InitializePlayback) { /* Get volume curve twice for iodev, and default node. */ EXPECT_EQ(2, cras_card_config_get_volume_curve_for_control_called); EXPECT_EQ(SND_PCM_STREAM_PLAYBACK, aio->alsa_stream); - EXPECT_EQ(1, cras_alsa_fill_properties_called); + EXPECT_EQ(0, cras_alsa_fill_properties_called); EXPECT_EQ(1, cras_alsa_mixer_list_outputs_called); EXPECT_EQ(0, strncmp(test_card_name, aio->base.info.name, @@ -568,7 +568,7 @@ TEST(AlsaIoInit, RouteBasedOnJackCallback) { ASSERT_EQ(0, alsa_iodev_legacy_complete_init((struct cras_iodev *)aio)); EXPECT_EQ(2, cras_card_config_get_volume_curve_for_control_called); EXPECT_EQ(SND_PCM_STREAM_PLAYBACK, aio->alsa_stream); - EXPECT_EQ(1, cras_alsa_fill_properties_called); + EXPECT_EQ(0, cras_alsa_fill_properties_called); EXPECT_EQ(1, cras_alsa_mixer_list_outputs_called); EXPECT_EQ(1, cras_alsa_jack_list_create_called); EXPECT_EQ(1, cras_alsa_jack_list_find_jacks_by_name_matching_called); @@ -599,7 +599,7 @@ TEST(AlsaIoInit, RouteBasedOnInputJackCallback) { ASSERT_EQ(0, alsa_iodev_legacy_complete_init((struct cras_iodev *)aio)); EXPECT_EQ(SND_PCM_STREAM_CAPTURE, aio->alsa_stream); - EXPECT_EQ(1, cras_alsa_fill_properties_called); + EXPECT_EQ(0, cras_alsa_fill_properties_called); EXPECT_EQ(1, cras_alsa_jack_list_create_called); EXPECT_EQ(1, cras_alsa_jack_list_find_jacks_by_name_matching_called); EXPECT_EQ(0, cras_alsa_jack_list_add_jack_for_section_called); @@ -628,7 +628,7 @@ TEST(AlsaIoInit, InitializeCapture) { ASSERT_EQ(0, alsa_iodev_legacy_complete_init((struct cras_iodev *)aio)); EXPECT_EQ(SND_PCM_STREAM_CAPTURE, aio->alsa_stream); - EXPECT_EQ(1, cras_alsa_fill_properties_called); + EXPECT_EQ(0, cras_alsa_fill_properties_called); EXPECT_EQ(1, cras_alsa_mixer_list_inputs_called); alsa_iodev_destroy((struct cras_iodev *)aio); -- cgit v1.2.3