diff options
| author | James Dong <jdong@google.com> | 2010-11-12 15:33:41 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-12 15:33:41 -0800 |
| commit | 2d71233de5450f1b128c8149fdbdf39b937f3cb8 (patch) | |
| tree | 98e5b32b69e582be0720c8d2a4d5748ff07e4a83 /media/libmediaplayerservice | |
| parent | 56ecd20263d7f63476f756fc5d8b043b325c7bfb (diff) | |
| parent | 393410a441b6d06daf286ed496470e9d6b2b6ca8 (diff) | |
| download | frameworks_av-2d71233de5450f1b128c8149fdbdf39b937f3cb8.zip frameworks_av-2d71233de5450f1b128c8149fdbdf39b937f3cb8.tar.gz frameworks_av-2d71233de5450f1b128c8149fdbdf39b937f3cb8.tar.bz2 | |
Merge "Separate the key for audio sampling rate and video frame rate in MetaData.h"
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 5f9b6e6..dadd1db 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -1078,7 +1078,7 @@ status_t StagefrightRecorder::setupCameraSource( if (mFrameRate == -1) { int32_t frameRate = 0; CHECK ((*cameraSource)->getFormat()->findInt32( - kKeySampleRate, &frameRate)); + kKeyFrameRate, &frameRate)); LOGI("Frame rate is not explicitly set. Use the current frame " "rate (%d fps)", frameRate); mFrameRate = frameRate; @@ -1100,7 +1100,7 @@ status_t StagefrightRecorder::setupVideoEncoder( sp<MetaData> enc_meta = new MetaData; enc_meta->setInt32(kKeyBitRate, videoBitRate); - enc_meta->setInt32(kKeySampleRate, mFrameRate); + enc_meta->setInt32(kKeyFrameRate, mFrameRate); switch (mVideoEncoder) { case VIDEO_ENCODER_H263: |