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

Merge "Remove hard-coded pixel format for recording frames in CameraSource. Retrieve the pixel format from Camera HAL at runtime." into kraken

Browse Source
This commit is contained in:
James Dong
2010-06-07 10:19:58 -07:00
committed by Android (Google) Code Review
parent a8ebe8b3f5 c2f328d0d2
commit 7a68d3686a
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/media/stagefright/CameraSource.h
View File

@@ -51,6 +51,7 @@ private:
friend class CameraSourceListener; friend class CameraSourceListener;
sp<Camera> mCamera; sp<Camera> mCamera;
sp<MetaData> mMeta;
Mutex mLock; Mutex mLock;
Condition mFrameAvailableCondition; Condition mFrameAvailableCondition;
@@ -59,7 +60,6 @@ private:
List<sp<IMemory> > mFramesBeingEncoded; List<sp<IMemory> > mFramesBeingEncoded;
List<int64_t> mFrameTimes; List<int64_t> mFrameTimes;
int mWidth, mHeight;
int64_t mFirstFrameTimeUs; int64_t mFirstFrameTimeUs;
int64_t mLastFrameTimestampUs; int64_t mLastFrameTimestampUs;
int32_t mNumFramesReceived; int32_t mNumFramesReceived;

43
media/libstagefright/CameraSource.cpp
View File

@@ -75,6 +75,26 @@ void CameraSourceListener::postDataTimestamp(
} }
} }
static int32_t getColorFormat(const char* colorFormat) {
if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV422SP)) {
return OMX_COLOR_FormatYUV422SemiPlanar;
}
if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV420SP)) {
return OMX_COLOR_FormatYUV420SemiPlanar;
}
if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_YUV422I)) {
return OMX_COLOR_FormatYCbYCr;
}
if (!strcmp(colorFormat, CameraParameters::PIXEL_FORMAT_RGB565)) {
return OMX_COLOR_Format16bitRGB565;
}
CHECK_EQ(0, "Unknown color format");
}
// static // static
CameraSource *CameraSource::Create() { CameraSource *CameraSource::Create() {
sp<Camera> camera = Camera::connect(0); sp<Camera> camera = Camera::connect(0);
@@ -97,8 +117,6 @@ CameraSource *CameraSource::CreateFromCamera(const sp<Camera> &camera) {
CameraSource::CameraSource(const sp<Camera> &camera) CameraSource::CameraSource(const sp<Camera> &camera)
: mCamera(camera), : mCamera(camera),
mWidth(0),
mHeight(0),
mFirstFrameTimeUs(0), mFirstFrameTimeUs(0),
mLastFrameTimestampUs(0), mLastFrameTimestampUs(0),
mNumFramesReceived(0), mNumFramesReceived(0),
@@ -108,8 +126,19 @@ CameraSource::CameraSource(const sp<Camera> &camera)
String8 s = mCamera->getParameters(); String8 s = mCamera->getParameters();
printf("params: \"%s\"\n", s.string()); printf("params: \"%s\"\n", s.string());
int32_t width, height;
CameraParameters params(s); CameraParameters params(s);
params.getPreviewSize(&mWidth, &mHeight); params.getPreviewSize(&width, &height);
const char *colorFormatStr = params.get(CameraParameters::KEY_VIDEO_FRAME_FORMAT);
CHECK(colorFormatStr != NULL);
int32_t colorFormat = getColorFormat(colorFormatStr);
mMeta = new MetaData;
mMeta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_RAW);
mMeta->setInt32(kKeyColorFormat, colorFormat);
mMeta->setInt32(kKeyWidth, width);
mMeta->setInt32(kKeyHeight, height);
} }
CameraSource::~CameraSource() { CameraSource::~CameraSource() {
@@ -163,13 +192,7 @@ void CameraSource::releaseQueuedFrames() {
} }
sp<MetaData> CameraSource::getFormat() { sp<MetaData> CameraSource::getFormat() {
sp<MetaData> meta = new MetaData; return mMeta;
meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_RAW);
meta->setInt32(kKeyColorFormat, OMX_COLOR_FormatYUV420SemiPlanar);
meta->setInt32(kKeyWidth, mWidth);
meta->setInt32(kKeyHeight, mHeight);
return meta;
} }
void CameraSource::signalBufferReturned(MediaBuffer *buffer) { void CameraSource::signalBufferReturned(MediaBuffer *buffer) {