diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/IMediaDeathNotifier.h | 61 | ||||
| -rw-r--r-- | include/media/IOMX.h | 5 | ||||
| -rw-r--r-- | include/media/mediametadataretriever.h | 1 | ||||
| -rw-r--r-- | include/media/mediaplayer.h | 28 | ||||
| -rw-r--r-- | include/media/mediarecorder.h | 5 | ||||
| -rw-r--r-- | include/media/stagefright/MetaData.h | 3 | ||||
| -rw-r--r-- | include/media/stagefright/OMXCodec.h | 1 |
7 files changed, 79 insertions, 25 deletions
diff --git a/include/media/IMediaDeathNotifier.h b/include/media/IMediaDeathNotifier.h new file mode 100644 index 0000000..bb3d0d8 --- /dev/null +++ b/include/media/IMediaDeathNotifier.h @@ -0,0 +1,61 @@ +/* + * Copyright (C) 2010 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef ANDROID_IMEDIADEATHNOTIFIER_H +#define ANDROID_IMEDIADEATHNOTIFIER_H + +#include <utils/threads.h> +#include <media/IMediaPlayerService.h> +#include <utils/SortedVector.h> + +namespace android { + +class IMediaDeathNotifier: virtual public RefBase +{ +public: + IMediaDeathNotifier() { addObitRecipient(this); } + virtual ~IMediaDeathNotifier() { removeObitRecipient(this); } + + virtual void died() = 0; + static const sp<IMediaPlayerService>& getMediaPlayerService(); + +private: + IMediaDeathNotifier &operator=(const IMediaDeathNotifier &); + IMediaDeathNotifier(const IMediaDeathNotifier &); + + static void addObitRecipient(const wp<IMediaDeathNotifier>& recipient); + static void removeObitRecipient(const wp<IMediaDeathNotifier>& recipient); + + class DeathNotifier: public IBinder::DeathRecipient + { + public: + DeathNotifier() {} + virtual ~DeathNotifier(); + + virtual void binderDied(const wp<IBinder>& who); + }; + + friend class DeathNotifier; + + static Mutex sServiceLock; + static sp<IMediaPlayerService> sMediaPlayerService; + static sp<DeathNotifier> sDeathNotifier; + static SortedVector< wp<IMediaDeathNotifier> > sObitRecipients; +}; + +}; // namespace android + +#endif // ANDROID_IMEDIADEATHNOTIFIER_H diff --git a/include/media/IOMX.h b/include/media/IOMX.h index 39bd5b1..d38c177 100644 --- a/include/media/IOMX.h +++ b/include/media/IOMX.h @@ -42,6 +42,11 @@ public: typedef void *buffer_id; typedef void *node_id; + // Given the calling process' pid, returns true iff + // the implementation of the OMX interface lives in the same + // process. + virtual bool livesLocally(pid_t pid) = 0; + struct ComponentInfo { String8 mName; List<String8> mRoles; diff --git a/include/media/mediametadataretriever.h b/include/media/mediametadataretriever.h index cfc205c..113c452 100644 --- a/include/media/mediametadataretriever.h +++ b/include/media/mediametadataretriever.h @@ -53,6 +53,7 @@ enum { METADATA_KEY_VIDEO_HEIGHT = 19, METADATA_KEY_VIDEO_WIDTH = 20, METADATA_KEY_WRITER = 21, + METADATA_KEY_MIMETYPE = 22, // Add more here... }; diff --git a/include/media/mediaplayer.h b/include/media/mediaplayer.h index 7132b18..87d23f6 100644 --- a/include/media/mediaplayer.h +++ b/include/media/mediaplayer.h @@ -21,8 +21,7 @@ #include <ui/Surface.h> #include <media/IMediaPlayerClient.h> #include <media/IMediaPlayer.h> -#include <media/IMediaPlayerService.h> -#include <utils/SortedVector.h> +#include <media/IMediaDeathNotifier.h> namespace android { @@ -123,12 +122,13 @@ public: virtual void notify(int msg, int ext1, int ext2) = 0; }; -class MediaPlayer : public BnMediaPlayerClient +class MediaPlayer : public BnMediaPlayerClient, + public virtual IMediaDeathNotifier { public: MediaPlayer(); ~MediaPlayer(); - void onFirstRef(); + void died(); void disconnect(); status_t setDataSource(const char *url); status_t setDataSource(int fd, int64_t offset, int64_t length); @@ -164,19 +164,6 @@ private: status_t getDuration_l(int *msec); status_t setDataSource(const sp<IMediaPlayer>& player); - static const sp<IMediaPlayerService>& getMediaPlayerService(); - static void addObitRecipient(const wp<MediaPlayer>& recipient); - static void removeObitRecipient(const wp<MediaPlayer>& recipient); - - class DeathNotifier: public IBinder::DeathRecipient - { - public: - DeathNotifier() {} - virtual ~DeathNotifier(); - - virtual void binderDied(const wp<IBinder>& who); - }; - sp<IMediaPlayer> mPlayer; thread_id_t mLockThreadId; Mutex mLock; @@ -196,13 +183,6 @@ private: float mRightVolume; int mVideoWidth; int mVideoHeight; - - friend class DeathNotifier; - - static Mutex sServiceLock; - static sp<IMediaPlayerService> sMediaPlayerService; - static sp<DeathNotifier> sDeathNotifier; - static SortedVector< wp<MediaPlayer> > sObitRecipients; }; }; // namespace android diff --git a/include/media/mediarecorder.h b/include/media/mediarecorder.h index 8c7392b..9ea6c7b 100644 --- a/include/media/mediarecorder.h +++ b/include/media/mediarecorder.h @@ -23,6 +23,7 @@ #include <utils/List.h> #include <utils/Errors.h> #include <media/IMediaPlayerClient.h> +#include <media/IMediaDeathNotifier.h> namespace android { @@ -145,12 +146,14 @@ public: virtual void notify(int msg, int ext1, int ext2) = 0; }; -class MediaRecorder : public BnMediaPlayerClient +class MediaRecorder : public BnMediaPlayerClient, + public virtual IMediaDeathNotifier { public: MediaRecorder(); ~MediaRecorder(); + void died(); status_t initCheck(); status_t setCamera(const sp<ICamera>& camera); status_t setPreviewSurface(const sp<Surface>& surface); diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index ef30b02..2bc2734 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -57,6 +57,9 @@ enum { kKeyYear = 'year', // cstring kKeyAlbumArt = 'albA', // compressed image data kKeyAlbumArtMIME = 'alAM', // cstring + kKeyAuthor = 'auth', // cstring + kKeyCDTrackNumber = 'cdtr', // cstring + kKeyDate = 'date', // cstring }; enum { diff --git a/include/media/stagefright/OMXCodec.h b/include/media/stagefright/OMXCodec.h index 351763c..2c32386 100644 --- a/include/media/stagefright/OMXCodec.h +++ b/include/media/stagefright/OMXCodec.h @@ -109,6 +109,7 @@ private: }; sp<IOMX> mOMX; + bool mOMXLivesLocally; IOMX::node_id mNode; uint32_t mQuirks; bool mIsEncoder; |