commit e940215ed38e9ba1417e462dc7e878f774363f9e
author Linux Build Service Account <lnxbuild@localhost> Tue Jun 03 12:09:26 2014 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jun 03 12:09:26 2014 -0700
tree 552481808d37968ab8f358eb3602c035a9581e39
parent ae1c20e2210686baceb17d078c7842ee8d350a3b
parent 44bd917f855eb95199902c75f3eef38f333bc857

Merge "hal: Fix 64 bit compilation errors"

hal/audio_hw.c

diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index b54261e..5793cce 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -382,7 +382,7 @@
 
         /* exit usb capture thread */
         if(SND_DEVICE_IN_USB_HEADSET_MIC == snd_device)
-            audio_extn_usb_stop_capture(adev);
+            audio_extn_usb_stop_capture();
 
         if ((snd_device == SND_DEVICE_OUT_SPEAKER ||
             snd_device == SND_DEVICE_OUT_VOICE_SPEAKER) &&
@@ -979,18 +979,18 @@
         send_callback = false;
         switch(cmd->cmd) {
         case OFFLOAD_CMD_WAIT_FOR_BUFFER:
-            ALOGD("copl(%x):calling compress_wait", (unsigned int)out);
+            ALOGD("copl(%p):calling compress_wait", out);
             compress_wait(out->compr, -1);
-            ALOGD("copl(%x):out of compress_wait", (unsigned int)out);
+            ALOGD("copl(%p):out of compress_wait", out);
             send_callback = true;
             event = STREAM_CBK_EVENT_WRITE_READY;
             break;
         case OFFLOAD_CMD_PARTIAL_DRAIN:
             ret = compress_next_track(out->compr);
             if(ret == 0) {
-                ALOGD("copl(%x):calling compress_partial_drain", (unsigned int)out);
+                ALOGD("copl(%p):calling compress_partial_drain", out);
                 compress_partial_drain(out->compr);
-                ALOGD("copl(%x):out of compress_partial_drain", (unsigned int)out);
+                ALOGD("copl(%p):out of compress_partial_drain", out);
             }
             else if(ret == -ETIMEDOUT)
                 compress_drain(out->compr);
@@ -1000,9 +1000,9 @@
             event = STREAM_CBK_EVENT_DRAIN_READY;
             break;
         case OFFLOAD_CMD_DRAIN:
-            ALOGD("copl(%x):calling compress_drain", (unsigned int)out);
+            ALOGD("copl(%p):calling compress_drain", out);
             compress_drain(out->compr);
-            ALOGD("copl(%x):calling compress_drain", (unsigned int)out);
+            ALOGD("copl(%p):calling compress_drain", out);
             send_callback = true;
             event = STREAM_CBK_EVENT_DRAIN_READY;
             break;
@@ -1402,7 +1402,7 @@
                 out->pcm = NULL;
             }
         } else {
-            ALOGD("copl(%x):standby", (unsigned int)out);
+            ALOGD("copl(%p):standby", out);
             stop_compressed_output_l(out);
             out->gapless_mdata.encoder_delay = 0;
             out->gapless_mdata.encoder_padding = 0;
@@ -1699,9 +1699,9 @@
     }
 
     if (is_offload_usecase(out->usecase)) {
-        ALOGD("copl(%x): writing buffer (%d bytes) to compress device", (unsigned int)out, bytes);
+        ALOGD("copl(%p): writing buffer (%d bytes) to compress device", out, bytes);
         if (out->send_new_metadata) {
-            ALOGD("copl(%x):send new gapless metadata", (unsigned int)out);
+            ALOGD("copl(%p):send new gapless metadata", out);
             compress_set_gapless_metadata(out->compr, &out->gapless_mdata);
             out->send_new_metadata = 0;
         }
@@ -1851,7 +1851,7 @@
     int status = -ENOSYS;
     ALOGV("%s", __func__);
     if (is_offload_usecase(out->usecase)) {
-        ALOGD("copl(%x):pause compress driver", (unsigned int)out);
+        ALOGD("copl(%p):pause compress driver", out);
         pthread_mutex_lock(&out->lock);
         if (out->compr != NULL && out->offload_state == OFFLOAD_STATE_PLAYING) {
             status = compress_pause(out->compr);
@@ -1868,7 +1868,7 @@
     int status = -ENOSYS;
     ALOGV("%s", __func__);
     if (is_offload_usecase(out->usecase)) {
-        ALOGD("copl(%x):resume compress driver", (unsigned int)out);
+        ALOGD("copl(%p):resume compress driver", out);
         status = 0;
         pthread_mutex_lock(&out->lock);
         if (out->compr != NULL && out->offload_state == OFFLOAD_STATE_PAUSED) {
@@ -1901,11 +1901,11 @@
     struct stream_out *out = (struct stream_out *)stream;
     ALOGV("%s", __func__);
     if (is_offload_usecase(out->usecase)) {
-        ALOGD("copl(%x):calling compress flush", (unsigned int)out);
+        ALOGD("copl(%p):calling compress flush", out);
         pthread_mutex_lock(&out->lock);
         stop_compressed_output_l(out);
         pthread_mutex_unlock(&out->lock);
-        ALOGD("copl(%x):out of compress flush", (unsigned int)out);
+        ALOGD("copl(%p):out of compress flush", out);
         return 0;
     }
     return -ENOSYS;

hal/msm8916/platform.c

diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index 6fd0530..81e7c43 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -1912,7 +1912,7 @@
     if (info != NULL && info->has_video && info->is_streaming) {
         fragment_size = COMPRESS_OFFLOAD_FRAGMENT_SIZE_FOR_AV_STREAMING;
         ALOGV("%s: offload fragment size reduced for AV streaming to %d",
-               __func__, out->compr_config.fragment_size);
+               __func__, fragment_size);
     }
 
     fragment_size = ALIGN( fragment_size, 1024);