diff options
author | Pannag Sanketi <psanketi@google.com> | 2011-08-18 21:53:02 -0700 |
---|---|---|
committer | Pannag Sanketi <psanketi@google.com> | 2011-08-24 13:57:46 -0700 |
commit | 0c5c7d2b119d2350c186ae9902919bcf28c3e277 (patch) | |
tree | c9d61e6ca1f259cb873289ed92d838b9d335d6b5 /include | |
parent | ed422aa0dfab77312d25d52e7f204744ba16dc27 (diff) | |
download | frameworks_av-0c5c7d2b119d2350c186ae9902919bcf28c3e277.zip frameworks_av-0c5c7d2b119d2350c186ae9902919bcf28c3e277.tar.gz frameworks_av-0c5c7d2b119d2350c186ae9902919bcf28c3e277.tar.bz2 |
Testing the GL/ CPU encoding w/ Gralloc buffers
This is the test for Gralloc buffers based encoding.
contains a combination of two main changes:
1. GL based encoding tests added to SurfaceMediaSource_test
2. SurfaceMediaSource ::read() colorformat
The SurfaceMediaSource::getformat() sets it to OMX_COLOR_FormatAndroidOpaque.
The omx encoder needs to interpret that colorformat and reads the format
from the Gralloc buffers directly
Change-Id: Iee2fe8901384109a4952e1d6c528c59eb01eb5b1
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/SurfaceMediaSource.h | 15 | ||||
-rw-r--r-- | include/media/stagefright/openmax/OMX_IVCommon.h | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/include/media/stagefright/SurfaceMediaSource.h b/include/media/stagefright/SurfaceMediaSource.h index 1affb8a..74d54d1 100644 --- a/include/media/stagefright/SurfaceMediaSource.h +++ b/include/media/stagefright/SurfaceMediaSource.h @@ -182,9 +182,9 @@ public: protected: - // freeAllBuffers frees the resources (both GraphicBuffer and EGLImage) for + // freeAllBuffersLocked frees the resources (both GraphicBuffer and EGLImage) for // all slots. - void freeAllBuffers(); + void freeAllBuffersLocked(); static bool isExternalFormat(uint32_t format); private: @@ -337,8 +337,15 @@ private: // Set to a default of 30 fps if not specified by the client side int32_t mFrameRate; - // mStarted is a flag to check if the recording has started - bool mStarted; + // mStopped is a flag to check if the recording is going on + bool mStopped; + + // mNumFramesReceived indicates the number of frames recieved from + // the client side + int mNumFramesReceived; + // mNumFramesEncoded indicates the number of frames passed on to the + // encoder + int mNumFramesEncoded; // mFrameAvailableCondition condition used to indicate whether there // is a frame available for dequeuing diff --git a/include/media/stagefright/openmax/OMX_IVCommon.h b/include/media/stagefright/openmax/OMX_IVCommon.h index 97170d7..65b6339 100644 --- a/include/media/stagefright/openmax/OMX_IVCommon.h +++ b/include/media/stagefright/openmax/OMX_IVCommon.h @@ -154,7 +154,8 @@ typedef enum OMX_COLOR_FORMATTYPE { * Gralloc Buffers. * FIXME: In the process of reserving some enum values for * Android-specific OMX IL colorformats. Change this enum to - * an acceptable range once that is done.*/ + * an acceptable range once that is done. + * */ OMX_COLOR_FormatAndroidOpaque = 0x7F000001, OMX_TI_COLOR_FormatYUV420PackedSemiPlanar = 0x7F000100, OMX_QCOM_COLOR_FormatYVU420SemiPlanar = 0x7FA30C00, |