commit 0d521d91154fe0199181c845b6dc70faf38ca8fb
author Glenn Kasten <gkasten@google.com> Tue Apr 08 19:16:11 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 08 19:16:11 2014 +0000
tree aa82d7bf0dffdf6d04323067dae8795931b68ab3
parent d27368f7d28813f7dad37fc31940c822df80e68e
parent 1e4e4f40b4e2c655ca377adbba53df897545c3ae

Merge "Fix 64-bit build warnings"

cmds/stagefright/stagefright.cpp

diff --git a/cmds/stagefright/stagefright.cpp b/cmds/stagefright/stagefright.cpp
index daaea27..6b41fd4 100644
--- a/cmds/stagefright/stagefright.cpp
+++ b/cmds/stagefright/stagefright.cpp
@@ -941,9 +941,11 @@
         } else {
             CHECK(useSurfaceTexAlloc);
 
-            sp<BufferQueue> bq = new BufferQueue();
-            sp<GLConsumer> texture = new GLConsumer(bq, 0 /* tex */);
-            gSurface = new Surface(bq);
+            sp<IGraphicBufferProducer> producer;
+            sp<IGraphicBufferConsumer> consumer;
+            BufferQueue::createBufferQueue(&producer, &consumer);
+            sp<GLConsumer> texture = new GLConsumer(consumer, 0 /* tex */);
+            gSurface = new Surface(producer);
         }
 
         CHECK_EQ((status_t)OK,

services/audioflinger/FastMixer.cpp

diff --git a/services/audioflinger/FastMixer.cpp b/services/audioflinger/FastMixer.cpp
index adb4aca..ca0d65e 100644
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@@ -236,6 +236,7 @@
                     sampleRate = Format_sampleRate(format);
                     ALOG_ASSERT(Format_channelCount(format) == FCC_2);
                 }
+                dumpState->mSampleRate = sampleRate;
             }
 
             if ((!Format_isEqual(format, previousFormat)) || (frameCount != previous->mFrameCount)) {