Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d95266c6: Merge "Detect and handle premature termination of a recording session" into kraken

Browse Source
This commit is contained in:
James Dong
2010-05-14 12:21:03 -07:00
committed by Android Git Automerger
parent 9efc829e61 d95266c6a8
commit ce3d8b316b
4 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/media/mediarecorder.h
View File

@@ -135,7 +135,8 @@ enum media_recorder_error_type {
enum media_recorder_info_type { enum media_recorder_info_type {
MEDIA_RECORDER_INFO_UNKNOWN = 1, MEDIA_RECORDER_INFO_UNKNOWN = 1,
MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800, MEDIA_RECORDER_INFO_MAX_DURATION_REACHED = 800,
MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED = 801 MEDIA_RECORDER_INFO_MAX_FILESIZE_REACHED = 801,
MEDIA_RECORDER_INFO_STOP_PREMATURELY = 802
}; };
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

7
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@@ -269,7 +269,7 @@ status_t StagefrightRecorder::setParamVideoEncodingBitRate(int32_t bitRate) {
status_t StagefrightRecorder::setParamMaxDurationOrFileSize(int64_t limit, status_t StagefrightRecorder::setParamMaxDurationOrFileSize(int64_t limit,
bool limit_is_duration) { bool limit_is_duration) {
LOGV("setParamMaxDurationOrFileSize: limit (%d) for %s", LOGV("setParamMaxDurationOrFileSize: limit (%lld) for %s",
limit, limit_is_duration?"duration":"size"); limit, limit_is_duration?"duration":"size");
if (limit_is_duration) { // limit is in ms if (limit_is_duration) { // limit is in ms
if (limit <= 1000) { // XXX: 1 second if (limit <= 1000) { // XXX: 1 second
@@ -563,11 +563,6 @@ status_t StagefrightRecorder::startMPEG4Recording() {
|| mVideoSource == VIDEO_SOURCE_CAMERA) { || mVideoSource == VIDEO_SOURCE_CAMERA) {
CHECK(mCamera != NULL); CHECK(mCamera != NULL);
if (mCamera == 0) {
mCamera = Camera::connect(0);
}
CHECK(mCamera != NULL);
// Set the actual video recording frame size // Set the actual video recording frame size
CameraParameters params(mCamera->getParameters()); CameraParameters params(mCamera->getParameters());
params.setPreviewSize(mVideoWidth, mVideoHeight); params.setPreviewSize(mVideoWidth, mVideoHeight);

13
media/libstagefright/AMRWriter.cpp
View File

@@ -162,6 +162,7 @@ void *AMRWriter::ThreadWrapper(void *me) {
void AMRWriter::threadFunc() { void AMRWriter::threadFunc() {
mEstimatedDurationUs = 0; mEstimatedDurationUs = 0;
mEstimatedSizeBytes = 0; mEstimatedSizeBytes = 0;
bool stoppedPrematurely = true;
while (!mDone) { while (!mDone) {
MediaBuffer *buffer; MediaBuffer *buffer;
status_t err = mSource->read(&buffer); status_t err = mSource->read(&buffer);
@@ -202,10 +203,22 @@ void AMRWriter::threadFunc() {
break; break;
} }
// XXX: How to tell it is stopped prematurely?
if (stoppedPrematurely) {
stoppedPrematurely = false;
}
buffer->release(); buffer->release();
buffer = NULL; buffer = NULL;
} }
if (stoppedPrematurely) {
notify(MEDIA_RECORDER_EVENT_INFO, MEDIA_RECORDER_INFO_STOP_PREMATURELY, 0);
}
fflush(mFile);
fclose(mFile);
mFile = NULL;
mReachedEOS = true; mReachedEOS = true;
} }

4
media/libstagefright/MPEG4Writer.cpp
View File

@@ -924,7 +924,9 @@ void MPEG4Writer::Track::threadEntry() {
buffer = NULL; buffer = NULL;
} }
CHECK(!mSampleInfos.empty()); if (mSampleInfos.empty()) {
mOwner->notify(MEDIA_RECORDER_EVENT_INFO, MEDIA_RECORDER_INFO_STOP_PREMATURELY, 0);
}
// Last chunk // Last chunk
if (!mChunkSamples.empty()) { if (!mChunkSamples.empty()) {