[HDMI Audio HAL] Fixes for changed Audio HAL APIandroid-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release

BZ: 212712

Minor fixes needed to accomodate these changes to the API:
(1) audio_stream_frame_size is deprecated. Use
    audio_stream_out_frame_size instead
(2) Additional parameters added to open_input_stream and
    open_output_stream. Ignore these extra parameters for
    now
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

1 files changed, 14 insertions, 6 deletions

diff --git a/hdmi/tinyaudio_hw.c b/hdmi/tinyaudio_hw.c
index 9c8fc1b..23b71cb 100644
--- a/hdmi/tinyaudio_hw.c
+++ b/hdmi/tinyaudio_hw.c
@@ -313,12 +313,12 @@ static size_t out_get_buffer_size(const struct audio_stream *stream)
 
     if(out->channel_mask > 2){
        buf_size = out->pcm_config.period_size *
-                  audio_stream_frame_size((struct audio_stream *)stream);
+                  audio_stream_out_frame_size((struct audio_stream_out *)stream);
     }
     else{
        buf_size = out->pcm_config.period_size *
                   out->pcm_config.period_count *
-                  audio_stream_frame_size((struct audio_stream *)stream);
+                  audio_stream_out_frame_size((struct audio_stream_out *)stream);
 
        /*latency of audio flinger is based on this
          buffer size. modifying the buffer size to avoid
@@ -330,7 +330,7 @@ static size_t out_get_buffer_size(const struct audio_stream *stream)
         __func__,
         buf_size,
         out->pcm_config.period_size,
-        audio_stream_frame_size((struct audio_stream *)stream));
+        audio_stream_out_frame_size((struct audio_stream_out *)stream));
 
     return buf_size;
 
@@ -642,7 +642,7 @@ err:
 
    if(ret !=0){
     uint64_t duration_ms = ((bytes * 1000)/
-                            (audio_stream_frame_size(&stream->common)) /
+                            (audio_stream_out_frame_size(stream)) /
                             (out_get_sample_rate(&stream->common)));
     ALOGV("%s : silence written", __func__);
     usleep(duration_ms * 1000);
@@ -691,10 +691,12 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
                                    audio_devices_t devices,
                                    audio_output_flags_t flags,
                                    struct audio_config *config,
-                                   struct audio_stream_out **stream_out)
+                                   struct audio_stream_out **stream_out,
+                                   const char *address)
 {
     UNUSED_PARAMETER(devices);
     UNUSED_PARAMETER(handle);
+    UNUSED_PARAMETER(address);
 
     struct audio_device *adev = (struct audio_device *)dev;
     struct stream_out *out;
@@ -887,13 +889,19 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
                                   audio_io_handle_t handle,
                                   audio_devices_t devices,
                                   struct audio_config *config,
-                                  struct audio_stream_in **stream_in)
+                                  struct audio_stream_in **stream_in,
+                                  audio_input_flags_t flags,
+                                  const char *address,
+                                  audio_source_t source)
 {
     UNUSED_PARAMETER(dev);
     UNUSED_PARAMETER(handle);
     UNUSED_PARAMETER(devices);
     UNUSED_PARAMETER(config);
     UNUSED_PARAMETER(stream_in);
+    UNUSED_PARAMETER(flags);
+    UNUSED_PARAMETER(address);
+    UNUSED_PARAMETER(source);
 
     return -ENOSYS;
 }