summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2012-12-26 14:43:16 -0800
committerGlenn Kasten <gkasten@google.com>2013-05-30 13:40:56 -0700
commit7c027248e1a4ccd5b22bc4deafb03e2d87ac8f38 (patch)
treeed6b92a79faa533f7c1156836f00b9dcaec8834d /media
parent8bae43ae86b9942892980c3c01bff5c812b1db7f (diff)
downloadframeworks_av-7c027248e1a4ccd5b22bc4deafb03e2d87ac8f38.zip
frameworks_av-7c027248e1a4ccd5b22bc4deafb03e2d87ac8f38.tar.gz
frameworks_av-7c027248e1a4ccd5b22bc4deafb03e2d87ac8f38.tar.bz2
Consistent whitespace
Change-Id: I118cce68d3b777f9ec9b6bfb70367496422a40f2
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/AudioRecord.cpp2
-rw-r--r--media/libmedia/AudioTrack.cpp4
-rw-r--r--media/libmedia/IMediaDeathNotifier.cpp8
3 files changed, 8 insertions, 6 deletions
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
index 40ff1bf..a2b8ae2 100644
--- a/media/libmedia/AudioRecord.cpp
+++ b/media/libmedia/AudioRecord.cpp
@@ -563,7 +563,7 @@ create_new_record:
}
}
// read the server count again
- start_loop_here:
+start_loop_here:
framesReady = mProxy->framesReady();
}
cblk->lock.unlock();
diff --git a/media/libmedia/AudioTrack.cpp b/media/libmedia/AudioTrack.cpp
index 5ed8e3b..ff52b28 100644
--- a/media/libmedia/AudioTrack.cpp
+++ b/media/libmedia/AudioTrack.cpp
@@ -861,7 +861,9 @@ status_t AudioTrack::createTrack_l(
// Ensure that buffer depth covers at least audio hardware latency
uint32_t minBufCount = afLatency / ((1000 * afFrameCount)/afSampleRate);
- if (minBufCount < 2) minBufCount = 2;
+ if (minBufCount < 2) {
+ minBufCount = 2;
+ }
size_t minFrameCount = (afFrameCount*sampleRate*minBufCount)/afSampleRate;
ALOGV("minFrameCount: %u, afFrameCount=%d, minBufCount=%d, sampleRate=%u, afSampleRate=%u"
diff --git a/media/libmedia/IMediaDeathNotifier.cpp b/media/libmedia/IMediaDeathNotifier.cpp
index 9199db6..9db5b1b 100644
--- a/media/libmedia/IMediaDeathNotifier.cpp
+++ b/media/libmedia/IMediaDeathNotifier.cpp
@@ -49,10 +49,10 @@ IMediaDeathNotifier::getMediaPlayerService()
} while (true);
if (sDeathNotifier == NULL) {
- sDeathNotifier = new DeathNotifier();
- }
- binder->linkToDeath(sDeathNotifier);
- sMediaPlayerService = interface_cast<IMediaPlayerService>(binder);
+ sDeathNotifier = new DeathNotifier();
+ }
+ binder->linkToDeath(sDeathNotifier);
+ sMediaPlayerService = interface_cast<IMediaPlayerService>(binder);
}
ALOGE_IF(sMediaPlayerService == 0, "no media player service!?");
return sMediaPlayerService;