diff options
author | Andreas Huber <andih@google.com> | 2012-11-26 14:39:20 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-26 14:39:20 -0800 |
commit | 53f6244746342f06a028702a6b850af2d93f20ac (patch) | |
tree | a72d80b18afe409b3a09f52a15eaa8e5b72a42f7 /include | |
parent | 66034f8bb3147ef1d35f92c0960379d2b4828204 (diff) | |
parent | 5bc5bf39120ae27ef46a8b13f85bf44ea19c7d5e (diff) | |
download | frameworks_av-53f6244746342f06a028702a6b850af2d93f20ac.zip frameworks_av-53f6244746342f06a028702a6b850af2d93f20ac.tar.gz frameworks_av-53f6244746342f06a028702a6b850af2d93f20ac.tar.bz2 |
am 5bc5bf39: am 79fd6853: Merge "MediaCodec: Add a method for getting the component name"
* commit '5bc5bf39120ae27ef46a8b13f85bf44ea19c7d5e':
MediaCodec: Add a method for getting the component name
Diffstat (limited to 'include')
-rw-r--r-- | include/media/stagefright/MediaCodec.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/media/stagefright/MediaCodec.h b/include/media/stagefright/MediaCodec.h index cacfa54..b1e57cf 100644 --- a/include/media/stagefright/MediaCodec.h +++ b/include/media/stagefright/MediaCodec.h @@ -113,6 +113,8 @@ struct MediaCodec : public AHandler { // pending, an error is pending. void requestActivityNotification(const sp<AMessage> ¬ify); + status_t getName(AString *componentName) const; + protected: virtual ~MediaCodec(); virtual void onMessageReceived(const sp<AMessage> &msg); @@ -154,6 +156,7 @@ private: kWhatCodecNotify = 'codc', kWhatRequestIDRFrame = 'ridr', kWhatRequestActivityNotification = 'racN', + kWhatGetName = 'getN', }; enum { @@ -178,6 +181,7 @@ private: sp<ALooper> mLooper; sp<ALooper> mCodecLooper; sp<ACodec> mCodec; + AString mComponentName; uint32_t mReplyID; uint32_t mFlags; sp<SurfaceTextureClient> mNativeWindow; |