diff options
| author | James Dong <jdong@google.com> | 2010-05-20 02:44:49 -0700 |
|---|---|---|
| committer | James Dong <jdong@google.com> | 2010-05-26 16:54:18 -0700 |
| commit | aed15e785607b90b4819773650cdb164fa9a7f59 (patch) | |
| tree | ae5d4a1b36d2dc3298b3b7258ea1c4574f2213e5 | |
| parent | 6c537e53cef1b0177a1734e2a5f302d80c0a26f8 (diff) | |
| download | frameworks_base-aed15e785607b90b4819773650cdb164fa9a7f59.zip frameworks_base-aed15e785607b90b4819773650cdb164fa9a7f59.tar.gz frameworks_base-aed15e785607b90b4819773650cdb164fa9a7f59.tar.bz2 | |
Avoid repeatedly allocating and freeing memory in CameraSource
Change-Id: Ia3760820da0559e4e908dedae1f1df05f9a6a242
| -rw-r--r-- | include/media/stagefright/CameraSource.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/CameraSource.cpp | 28 |
2 files changed, 29 insertions, 1 deletions
diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h index 42d6634..9d6b01d 100644 --- a/include/media/stagefright/CameraSource.h +++ b/include/media/stagefright/CameraSource.h @@ -19,6 +19,7 @@ #define CAMERA_SOURCE_H_ #include <media/stagefright/MediaBuffer.h> +#include <media/stagefright/MediaBufferGroup.h> #include <media/stagefright/MediaSource.h> #include <utils/List.h> #include <utils/RefBase.h> @@ -61,6 +62,7 @@ private: int32_t mNumFramesReceived; int32_t mNumFramesEncoded; int32_t mNumFramesDropped; + MediaBufferGroup *mBufferGroup; bool mStarted; CameraSource(const sp<Camera> &camera); diff --git a/media/libstagefright/CameraSource.cpp b/media/libstagefright/CameraSource.cpp index cd26e6b..87d7ebb 100644 --- a/media/libstagefright/CameraSource.cpp +++ b/media/libstagefright/CameraSource.cpp @@ -104,6 +104,7 @@ CameraSource::CameraSource(const sp<Camera> &camera) mNumFramesReceived(0), mNumFramesEncoded(0), mNumFramesDropped(0), + mBufferGroup(NULL), mStarted(false) { String8 s = mCamera->getParameters(); printf("params: \"%s\"\n", s.string()); @@ -118,6 +119,23 @@ CameraSource::~CameraSource() { } } +static int bytesPerPixelTimes10(const char *colorFormat) { + LOGI("color format: %s", colorFormat); + return 20; +#if 0 + // XXX: Fix Camera Hal bug? + // On sholes, it returns CameraParameters::PIXEL_FORMAT_YUV420SP??? + if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV422SP) || + !strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV422I) || + !strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_RGB565)) { + return 20; + } else if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV420SP)) { + return 15; + } + CHECK_EQ(0, "Unknown color format"); +#endif +} + status_t CameraSource::start(MetaData *) { LOGV("start"); CHECK(!mStarted); @@ -126,6 +144,12 @@ status_t CameraSource::start(MetaData *) { CHECK_EQ(OK, mCamera->startRecording()); mStarted = true; + mBufferGroup = new MediaBufferGroup(); + String8 s = mCamera->getParameters(); + CameraParameters params(s); + const char *colorFormat = params.getPreviewFormat(); + const int size = (mWidth * mHeight * bytesPerPixelTimes10(colorFormat))/10; + mBufferGroup->add_buffer(new MediaBuffer(size)); return OK; } @@ -139,6 +163,8 @@ status_t CameraSource::stop() { mCamera->stopRecording(); releaseQueuedFrames(); + delete mBufferGroup; + mBufferGroup = NULL; LOGI("Frames received/encoded/dropped: %d/%d/%d, timestamp (us) last/first: %lld/%lld", mNumFramesReceived, mNumFramesEncoded, mNumFramesDropped, mLastFrameTimestampUs, mFirstFrameTimeUs); @@ -197,7 +223,7 @@ status_t CameraSource::read( ++mNumFramesEncoded; } - *buffer = new MediaBuffer(frame->size()); + mBufferGroup->acquire_buffer(buffer); memcpy((*buffer)->data(), frame->pointer(), frame->size()); (*buffer)->set_range(0, frame->size()); mCamera->releaseRecordingFrame(frame); |