| Revision | 0ce92df294da2b05fd06c7da49ac5324e68c7a14 (tree) |
|---|---|
| Time | 2014-08-02 04:23:33 |
| Author | Guilhem IMBERTON <guilhem.imberton@inte...> |
| Commiter | Ion Alberdi |
[HDMI Audio HAL] Fixes for changed Audio HAL API
BZ: 212712
Minor fixes needed to accomodate these changes to the API:
(1) audio_stream_frame_size is deprecated. Use
(2) Additional parameters added to open_input_stream and
Change-Id: If8585d879c7d5783622468c96e828e8641e6bcae
Signed-off-by: Rajat S Gupta <rajat.s.gupta@intel.com>
Signed-off-by: Guilhem IMBERTON <guilhem.imberton@intel.com>
Reviewed-on: https://android.intel.com/223663
hdmi/tinyaudio_hw.c (diff)| @@ -313,12 +313,12 @@ static size_t out_get_buffer_size(const struct audio_stream *stream) | ||
| 313 | 313 | |
| 314 | 314 | if(out->channel_mask > 2){ |
| 315 | 315 | buf_size = out->pcm_config.period_size * |
| 316 | - audio_stream_frame_size((struct audio_stream *)stream); | |
| 316 | + audio_stream_out_frame_size((struct audio_stream_out *)stream); | |
| 317 | 317 | } |
| 318 | 318 | else{ |
| 319 | 319 | buf_size = out->pcm_config.period_size * |
| 320 | 320 | out->pcm_config.period_count * |
| 321 | - audio_stream_frame_size((struct audio_stream *)stream); | |
| 321 | + audio_stream_out_frame_size((struct audio_stream_out *)stream); | |
| 322 | 322 | |
| 323 | 323 | /*latency of audio flinger is based on this |
| 324 | 324 | buffer size. modifying the buffer size to avoid |
| @@ -330,7 +330,7 @@ static size_t out_get_buffer_size(const struct audio_stream *stream) | ||
| 330 | 330 | __func__, |
| 331 | 331 | buf_size, |
| 332 | 332 | out->pcm_config.period_size, |
| 333 | - audio_stream_frame_size((struct audio_stream *)stream)); | |
| 333 | + audio_stream_out_frame_size((struct audio_stream_out *)stream)); | |
| 334 | 334 | |
| 335 | 335 | return buf_size; |
| 336 | 336 |
| @@ -642,7 +642,7 @@ err: | ||
| 642 | 642 | |
| 643 | 643 | if(ret !=0){ |
| 644 | 644 | uint64_t duration_ms = ((bytes * 1000)/ |
| 645 | - (audio_stream_frame_size(&stream->common)) / | |
| 645 | + (audio_stream_out_frame_size(stream)) / | |
| 646 | 646 | (out_get_sample_rate(&stream->common))); |
| 647 | 647 | ALOGV("%s : silence written", __func__); |
| 648 | 648 | usleep(duration_ms * 1000); |
| @@ -691,10 +691,12 @@ static int adev_open_output_stream(struct audio_hw_device *dev, | ||
| 691 | 691 | audio_devices_t devices, |
| 692 | 692 | audio_output_flags_t flags, |
| 693 | 693 | struct audio_config *config, |
| 694 | - struct audio_stream_out **stream_out) | |
| 694 | + struct audio_stream_out **stream_out, | |
| 695 | + const char *address) | |
| 695 | 696 | { |
| 696 | 697 | UNUSED_PARAMETER(devices); |
| 697 | 698 | UNUSED_PARAMETER(handle); |
| 699 | + UNUSED_PARAMETER(address); | |
| 698 | 700 | |
| 699 | 701 | struct audio_device *adev = (struct audio_device *)dev; |
| 700 | 702 | struct stream_out *out; |
| @@ -887,13 +889,19 @@ static int adev_open_input_stream(struct audio_hw_device *dev, | ||
| 887 | 889 | audio_io_handle_t handle, |
| 888 | 890 | audio_devices_t devices, |
| 889 | 891 | struct audio_config *config, |
| 890 | - struct audio_stream_in **stream_in) | |
| 892 | + struct audio_stream_in **stream_in, | |
| 893 | + audio_input_flags_t flags, | |
| 894 | + const char *address, | |
| 895 | + audio_source_t source) | |
| 891 | 896 | { |
| 892 | 897 | UNUSED_PARAMETER(dev); |
| 893 | 898 | UNUSED_PARAMETER(handle); |
| 894 | 899 | UNUSED_PARAMETER(devices); |
| 895 | 900 | UNUSED_PARAMETER(config); |
| 896 | 901 | UNUSED_PARAMETER(stream_in); |
| 902 | + UNUSED_PARAMETER(flags); | |
| 903 | + UNUSED_PARAMETER(address); | |
| 904 | + UNUSED_PARAMETER(source); | |
| 897 | 905 | |
| 898 | 906 | return -ENOSYS; |
| 899 | 907 | } |
Android-x86
Fork