summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice
diff options
context:
space:
mode:
authorJames Dong <jdong@google.com>2010-05-14 11:48:00 -0700
committerJames Dong <jdong@google.com>2010-05-14 11:48:00 -0700
commitf0ce2fb0c7bf3a414279e5aba61105f3d9025c0e (patch)
tree4fea53e0f6cd8068d0342828c267fe734925f2f8 /media/libmediaplayerservice
parent3c0131f02b6f008321608044c53bccce2ac5f6dd (diff)
downloadframeworks_av-f0ce2fb0c7bf3a414279e5aba61105f3d9025c0e.zip
frameworks_av-f0ce2fb0c7bf3a414279e5aba61105f3d9025c0e.tar.gz
frameworks_av-f0ce2fb0c7bf3a414279e5aba61105f3d9025c0e.tar.bz2
Detect and handle premature termination of a recording session
Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
Diffstat (limited to 'media/libmediaplayerservice')
-rw-r--r--media/libmediaplayerservice/StagefrightRecorder.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index cb08100..8404779 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -269,7 +269,7 @@ status_t StagefrightRecorder::setParamVideoEncodingBitRate(int32_t bitRate) {
status_t StagefrightRecorder::setParamMaxDurationOrFileSize(int64_t limit,
bool limit_is_duration) {
- LOGV("setParamMaxDurationOrFileSize: limit (%d) for %s",
+ LOGV("setParamMaxDurationOrFileSize: limit (%lld) for %s",
limit, limit_is_duration?"duration":"size");
if (limit_is_duration) { // limit is in ms
if (limit <= 1000) { // XXX: 1 second
@@ -563,11 +563,6 @@ status_t StagefrightRecorder::startMPEG4Recording() {
|| mVideoSource == VIDEO_SOURCE_CAMERA) {
CHECK(mCamera != NULL);
- if (mCamera == 0) {
- mCamera = Camera::connect(0);
- }
- CHECK(mCamera != NULL);
-
// Set the actual video recording frame size
CameraParameters params(mCamera->getParameters());
params.setPreviewSize(mVideoWidth, mVideoHeight);