diff options
author | Jamie Gennis <jgennis@google.com> | 2012-08-30 18:25:35 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-30 18:25:36 -0700 |
commit | 3a24b93d3a48f739188cd30c1906a9a446dbd23d (patch) | |
tree | d17fdda389d0053a8633b1a909d95a7b2c086aa1 /media/libstagefright | |
parent | 18910b47dfaba1b9ef830687ad19b0db764c944e (diff) | |
parent | 56fc8fb5437e08131a84063041183d5ce8a678cc (diff) | |
download | frameworks_av-3a24b93d3a48f739188cd30c1906a9a446dbd23d.zip frameworks_av-3a24b93d3a48f739188cd30c1906a9a446dbd23d.tar.gz frameworks_av-3a24b93d3a48f739188cd30c1906a9a446dbd23d.tar.bz2 |
Merge "Don't hard code the number of buffers for SurfaceMediaSource" into jb-mr1-dev
Diffstat (limited to 'media/libstagefright')
-rw-r--r-- | media/libstagefright/SurfaceMediaSource.cpp | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/media/libstagefright/SurfaceMediaSource.cpp b/media/libstagefright/SurfaceMediaSource.cpp index f5c8c93..c478b28 100644 --- a/media/libstagefright/SurfaceMediaSource.cpp +++ b/media/libstagefright/SurfaceMediaSource.cpp @@ -52,7 +52,7 @@ SurfaceMediaSource::SurfaceMediaSource(uint32_t bufferWidth, uint32_t bufferHeig ALOGE("Invalid dimensions %dx%d", bufferWidth, bufferHeight); } - mBufferQueue = new BufferQueue(true, MIN_UNDEQUEUED_BUFFERS); + mBufferQueue = new BufferQueue(true); mBufferQueue->setDefaultBufferSize(bufferWidth, bufferHeight); mBufferQueue->setSynchronousMode(true); mBufferQueue->setConsumerUsageBits(GRALLOC_USAGE_HW_VIDEO_ENCODER | @@ -136,10 +136,32 @@ status_t SurfaceMediaSource::start(MetaData *params) { ALOGV("start"); + Mutex::Autolock lock(mMutex); + mStartTimeNs = 0; int64_t startTimeUs; - if (params && params->findInt64(kKeyTime, &startTimeUs)) { - mStartTimeNs = startTimeUs * 1000; + int32_t bufferCount = 0; + if (params) { + if (params->findInt64(kKeyTime, &startTimeUs)) { + mStartTimeNs = startTimeUs * 1000; + } + + if (!params->findInt32(kKeyNumBuffers, &bufferCount)) { + ALOGE("Failed to find the advertised buffer count"); + return UNKNOWN_ERROR; + } + + if (bufferCount <= 1) { + ALOGE("bufferCount %d is too small", bufferCount); + return BAD_VALUE; + } + } + + if (bufferCount != 0) { + status_t err = mBufferQueue->setMaxAcquiredBufferCount(bufferCount); + if (err != OK) { + return err; + } } return OK; |