commit 0c7168146fbb8a4294a791a8fdae294bd470ce77
author Linux Build Service Account <lnxbuild@localhost> Tue Dec 16 20:23:52 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Dec 16 20:23:52 2014 -0800
tree 455cfbf8132c1ca19115303785d8fef6903c547d
parent 48917271180e15e62a5563e47aead6ffaef0ebe3
parent 0ceca2a92a1a892021dec218ec07c3b0237e45a1

Merge "hal: Add support for parsing hdmi edid information for msm8992"

hal/msm8974/platform.h

diff --git a/hal/msm8974/platform.h b/hal/msm8974/platform.h
index 9c944ff..8d49424 100644
--- a/hal/msm8974/platform.h
+++ b/hal/msm8974/platform.h
@@ -172,7 +172,7 @@
  * the buffer size of an input/output stream
  */
 #define DEEP_BUFFER_OUTPUT_PERIOD_SIZE 960
-#define DEEP_BUFFER_OUTPUT_PERIOD_COUNT 4
+#define DEEP_BUFFER_OUTPUT_PERIOD_COUNT 5
 #define LOW_LATENCY_OUTPUT_PERIOD_SIZE 240
 #define LOW_LATENCY_OUTPUT_PERIOD_COUNT 2
 

mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h

diff --git a/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h b/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h
index 2e2abbf..a87717b 100644
--- a/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h
+++ b/mm-audio/aenc-aac/qdsp6/inc/omx_aac_aenc.h
@@ -457,7 +457,7 @@
     unsigned int                   m_flags;      //encapsulate the waiting states.
     OMX_U64                        nTimestamp;
     OMX_U64                        ts;
-    uint32_t                       m_frame_count;
+    OMX_U64                        m_frame_count;
     unsigned int                   frameduration;
     unsigned int                   pcm_input; //tunnel or non-tunnel
     unsigned int                   m_inp_act_buf_count;    // Num of Input Buffers