diff options
| -rw-r--r-- | camera/BufferSourceAdapter.cpp | 6 | ||||
| -rw-r--r-- | camera/CameraHal.cpp | 12 | ||||
| -rw-r--r-- | camera/OMXCameraAdapter/OMXReprocess.cpp | 8 | ||||
| -rw-r--r-- | camera/inc/CameraHal.h | 3 |
4 files changed, 27 insertions, 2 deletions
diff --git a/camera/BufferSourceAdapter.cpp b/camera/BufferSourceAdapter.cpp index 67fb339..a595b4b 100644 --- a/camera/BufferSourceAdapter.cpp +++ b/camera/BufferSourceAdapter.cpp @@ -653,6 +653,10 @@ CameraBuffer* BufferSourceAdapter::getBufferList(int *num) { err = extendedOps()->get_buffer_dimension(mBufferSource, &mBuffers[0].width, &mBuffers[0].height); err = extendedOps()->get_buffer_format(mBufferSource, &formatSource); + int t, l, r, b, w, h; + err = extendedOps()->get_crop(mBufferSource, &l, &t, &r, &b); + err = extendedOps()->get_current_size(mBufferSource, &w, &h); + // lock buffer { void *y_uv[2]; @@ -666,6 +670,8 @@ CameraBuffer* BufferSourceAdapter::getBufferList(int *num) { mPixelFormat = getFormatFromANW(formatSource); mBuffers[0].format = mPixelFormat; + mBuffers[0].actual_size = CameraHal::calculateBufferSize(mPixelFormat, w, h); + mBuffers[0].offset = t * w + l * CameraHal::getBPP(mPixelFormat); mBufferSourceDirection = BUFFER_SOURCE_TAP_IN; return mBuffers; diff --git a/camera/CameraHal.cpp b/camera/CameraHal.cpp index 0be515a..53f4963 100644 --- a/camera/CameraHal.cpp +++ b/camera/CameraHal.cpp @@ -91,6 +91,16 @@ static int dummy_get_id(preview_stream_ops_t*, char *data, unsigned int dataSize static int dummy_get_buffer_count(preview_stream_ops_t*, int *count) { return INVALID_OPERATION; } + +static int dummy_get_crop(preview_stream_ops_t*, + int *, int *, int *, int *) { + return INVALID_OPERATION; +} + +static int dummy_get_current_size(preview_stream_ops_t*, + int *, int *) { + return INVALID_OPERATION; +} #endif #ifdef OMAP_ENHANCEMENT @@ -102,6 +112,8 @@ static preview_stream_extended_ops_t dummyPreviewStreamExtendedOps = { dummy_set_metadata, dummy_get_id, dummy_get_buffer_count, + dummy_get_crop, + dummy_get_current_size, #endif }; #endif diff --git a/camera/OMXCameraAdapter/OMXReprocess.cpp b/camera/OMXCameraAdapter/OMXReprocess.cpp index c720c2b..9057c1c 100644 --- a/camera/OMXCameraAdapter/OMXReprocess.cpp +++ b/camera/OMXCameraAdapter/OMXReprocess.cpp @@ -109,8 +109,10 @@ status_t OMXCameraAdapter::startReprocess() android::AutoMutex lock(mBurstLock); for ( int index = 0 ; index < portData->mMaxQueueable ; index++ ) { - CAMHAL_LOGDB("Queuing buffer on video input port - %p", - portData->mBufferHeader[index]->pBuffer); + CAMHAL_LOGDB("Queuing buffer on video input port - %p, offset: %d, length: %d", + portData->mBufferHeader[index]->pBuffer, + portData->mBufferHeader[index]->nOffset, + portData->mBufferHeader[index]->nFilledLen); portData->mStatus[index] = OMXCameraPortParameters::FILL; eError = OMX_EmptyThisBuffer(mCameraAdapterParameters.mHandleComp, (OMX_BUFFERHEADERTYPE*)portData->mBufferHeader[index]); @@ -323,6 +325,8 @@ status_t OMXCameraAdapter::UseBuffersReprocess(CameraBuffer *bufArr, int num) pBufferHdr->nVersion.s.nVersionMinor = 1 ; pBufferHdr->nVersion.s.nRevision = 0; pBufferHdr->nVersion.s.nStep = 0; + pBufferHdr->nOffset = bufArr[index].offset; + pBufferHdr->nFilledLen = bufArr[index].actual_size; portData->mBufferHeader[index] = pBufferHdr; } diff --git a/camera/inc/CameraHal.h b/camera/inc/CameraHal.h index 253db42..f1119fc 100644 --- a/camera/inc/CameraHal.h +++ b/camera/inc/CameraHal.h @@ -355,6 +355,9 @@ typedef struct _CameraBuffer { #endif + /* These are for buffers which include borders */ + int offset; // where valid data starts + int actual_size; // size of the entire buffer with borders } CameraBuffer; void * camera_buffer_get_omx_ptr (CameraBuffer *buffer); |