diff options
author | Glenn Kasten <gkasten@google.com> | 2012-11-14 08:32:08 -0800 |
---|---|---|
committer | Glenn Kasten <gkasten@google.com> | 2012-11-14 11:12:07 -0800 |
commit | b26e3e9f2ab0334bff21a4fa4851dbf6e57fba5d (patch) | |
tree | 15c8aca0fbda54b73689628b74c48ebb194a2f75 | |
parent | 2d81f665461409f0c5d0be674a35a0aea63a4fc8 (diff) | |
download | frameworks_av-b26e3e9f2ab0334bff21a4fa4851dbf6e57fba5d.zip frameworks_av-b26e3e9f2ab0334bff21a4fa4851dbf6e57fba5d.tar.gz frameworks_av-b26e3e9f2ab0334bff21a4fa4851dbf6e57fba5d.tar.bz2 |
Fix build warnings
Change-Id: Ic43bcca166a529a6431711b05a7fa21849b6a38b
-rw-r--r-- | media/libmedia/IAudioFlinger.cpp | 2 | ||||
-rw-r--r-- | services/audioflinger/test-resample.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/media/libmedia/IAudioFlinger.cpp b/media/libmedia/IAudioFlinger.cpp index bb936ec..55658db 100644 --- a/media/libmedia/IAudioFlinger.cpp +++ b/media/libmedia/IAudioFlinger.cpp @@ -106,7 +106,7 @@ public: data.writeInt32(format); data.writeInt32(channelMask); data.writeInt32(frameCount); - track_flags_t lFlags = flags != NULL ? *flags : TRACK_DEFAULT; + track_flags_t lFlags = flags != NULL ? *flags : (track_flags_t) TRACK_DEFAULT; data.writeInt32(lFlags); data.writeStrongBinder(sharedBuffer->asBinder()); data.writeInt32((int32_t) output); diff --git a/services/audioflinger/test-resample.cpp b/services/audioflinger/test-resample.cpp index 3b66530..b082e8c 100644 --- a/services/audioflinger/test-resample.cpp +++ b/services/audioflinger/test-resample.cpp @@ -177,7 +177,7 @@ int main(int argc, char* argv[]) { double t = double(i) / input_freq; double y = sin(M_PI * k * t * t); int16_t yi = floor(y * 32767.0 + 0.5); - for (size_t j=0 ; j<channels ; j++) { + for (size_t j=0 ; j<(size_t)channels ; j++) { in[i*channels + j] = yi / (1+j); } } |