diff options
Diffstat (limited to 'include/media/stagefright/OMXCodec.h')
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 81350ca..583c3b3 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -98,9 +98,13 @@ struct OMXCodec : public MediaSource, kDecoderLiesAboutNumberOfChannels = 256, kInputBufferSizesAreBogus = 512, kSupportsMultipleFramesPerInputBuffer = 1024, - kAvoidMemcopyInputRecordingFrames = 2048, - kRequiresLargerEncoderOutputBuffer = 4096, - kOutputBuffersAreUnreadable = 8192, + kRequiresLargerEncoderOutputBuffer = 2048, + kOutputBuffersAreUnreadable = 4096, + }; + + struct CodecNameAndQuirks { + String8 mName; + uint32_t mQuirks; }; // for use by ACodec @@ -108,8 +112,7 @@ struct OMXCodec : public MediaSource, const char *mime, bool createEncoder, const char *matchComponentName, uint32_t flags, - Vector<String8> *matchingCodecs, - Vector<uint32_t> *matchingCodecQuirks = NULL); + Vector<CodecNameAndQuirks> *matchingCodecNamesAndQuirks); static uint32_t getComponentQuirks( const MediaCodecList *list, size_t index); @@ -273,7 +276,7 @@ private: CodecProfileLevel& profileLevel); status_t setVideoOutputFormat( - const char *mime, OMX_U32 width, OMX_U32 height); + const char *mime, const sp<MetaData>& meta); void setImageOutputFormat( OMX_COLOR_FORMATTYPE format, OMX_U32 width, OMX_U32 height); @@ -342,8 +345,6 @@ private: status_t configureCodec(const sp<MetaData> &meta); - void restorePatchedDataPointer(BufferInfo *info); - status_t applyRotation(); status_t waitForBufferFilled_l(); @@ -353,6 +354,8 @@ private: const void *data, size_t size, unsigned *profile, unsigned *level); + status_t stopOmxComponent_l(); + OMXCodec(const OMXCodec &); OMXCodec &operator=(const OMXCodec &); }; |