summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-08-24 11:20:40 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-08-24 11:20:40 -0700
commit7741ecc907d98b07c53b6ab1c0b5a20a51d18058 (patch)
treecc1129208f1c500d196ae35a4097602bebff6ec0 /media/libmediaplayerservice
parent3f6855ba6c87a6f364daed6cb03aec5d735847ae (diff)
parent28a92120a702289533a9c9d004bd60f83b2fd98b (diff)
downloadframeworks_base-7741ecc907d98b07c53b6ab1c0b5a20a51d18058.zip
frameworks_base-7741ecc907d98b07c53b6ab1c0b5a20a51d18058.tar.gz
frameworks_base-7741ecc907d98b07c53b6ab1c0b5a20a51d18058.tar.bz2
am 28a92120: am 3f51fa78: Runtime dump support for MediaWriter
Merge commit '28a92120a702289533a9c9d004bd60f83b2fd98b' * commit '28a92120a702289533a9c9d004bd60f83b2fd98b': Runtime dump support for MediaWriter
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index c88a65e..a24e56c 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -1239,11 +1239,19 @@ status_t StagefrightRecorder::getMaxAmplitude(int *max) {
return OK;
}
-status_t StagefrightRecorder::dump(int fd, const Vector<String16>& args) const {
+status_t StagefrightRecorder::dump(
+ int fd, const Vector<String16>& args) const {
+ LOGV("dump");
const size_t SIZE = 256;
char buffer[SIZE];
String8 result;
- snprintf(buffer, SIZE, " Recorder: %p", this);
+ if (mWriter != 0) {
+ mWriter->dump(fd, args);
+ } else {
+ snprintf(buffer, SIZE, " No file writer\n");
+ result.append(buffer);
+ }
+ snprintf(buffer, SIZE, " Recorder: %p\n", this);
snprintf(buffer, SIZE, " Output file (fd %d):\n", mOutputFd);
result.append(buffer);
snprintf(buffer, SIZE, " File format: %d\n", mOutputFormat);