diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IResourceManagerClient.h | 2 | ||||
| -rw-r--r-- | include/media/MediaResource.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/ACodec.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MediaCodec.h | 2 |
4 files changed, 6 insertions, 1 deletions
diff --git a/include/media/IResourceManagerClient.h b/include/media/IResourceManagerClient.h index 3587aea..aa0cd88 100644 --- a/include/media/IResourceManagerClient.h +++ b/include/media/IResourceManagerClient.h @@ -18,6 +18,7 @@ #define ANDROID_IRESOURCEMANAGERCLIENT_H #include <utils/RefBase.h> +#include <utils/String8.h> #include <binder/IInterface.h> #include <binder/Parcel.h> @@ -29,6 +30,7 @@ public: DECLARE_META_INTERFACE(ResourceManagerClient); virtual bool reclaimResource() = 0; + virtual String8 getName() = 0; }; // ---------------------------------------------------------------------------- diff --git a/include/media/MediaResource.h b/include/media/MediaResource.h index 0b57c84..20f2cad 100644 --- a/include/media/MediaResource.h +++ b/include/media/MediaResource.h @@ -25,6 +25,8 @@ namespace android { extern const char kResourceSecureCodec[]; extern const char kResourceNonSecureCodec[]; +extern const char kResourceAudioCodec[]; +extern const char kResourceVideoCodec[]; extern const char kResourceGraphicMemory[]; class MediaResource { diff --git a/include/media/stagefright/ACodec.h b/include/media/stagefright/ACodec.h index a8d0fcb..c14e6c0 100644 --- a/include/media/stagefright/ACodec.h +++ b/include/media/stagefright/ACodec.h @@ -192,6 +192,7 @@ private: List<sp<AMessage> > mDeferredQueue; bool mSentFormat; + bool mIsVideo; bool mIsEncoder; bool mUseMetadataOnEncoderOutput; bool mShutdownInProgress; diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index f2b21c9..d89e4c7 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -351,7 +351,7 @@ private: bool isExecuting() const; uint64_t getGraphicBufferSize(); - void addResource(const char *type, uint64_t value); + void addResource(const String8 &type, const String8 &subtype, uint64_t value); /* called to get the last codec error when the sticky flag is set. * if no such codec error is found, returns UNKNOWN_ERROR. |