diff options
author | Gloria Wang <gwang@google.com> | 2010-10-25 15:23:04 -0700 |
---|---|---|
committer | Gloria Wang <gwang@google.com> | 2010-10-25 16:11:18 -0700 |
commit | a9741a9232c81eaf59179acef91f5be46c42264e (patch) | |
tree | 9a66416b42a28ec2ad4fa2ec520c42d976046aec /media/libstagefright/include | |
parent | d8cba5371423841e6a85816ad4a7fd88d3a60b12 (diff) | |
parent | dcd25efb46c41c8d24a0a9cf61fb57f84149709e (diff) | |
download | frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.zip frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.gz frameworks_av-a9741a9232c81eaf59179acef91f5be46c42264e.tar.bz2 |
resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
Diffstat (limited to 'media/libstagefright/include')
-rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 7 | ||||
-rw-r--r-- | media/libstagefright/include/DRMExtractor.h | 61 | ||||
-rw-r--r-- | media/libstagefright/include/MPEG4Extractor.h | 17 |
3 files changed, 85 insertions, 0 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index 3020a09..4526bf1 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -26,6 +26,7 @@ #include <media/stagefright/OMXClient.h> #include <media/stagefright/TimeSource.h> #include <utils/threads.h> +#include <drm/DrmManagerClient.h> namespace android { @@ -41,6 +42,9 @@ struct ARTSPController; struct ARTPSession; struct UDPPusher; +class DrmManagerClinet; +class DecryptHandle; + struct AwesomeRenderer : public RefBase { AwesomeRenderer() {} @@ -215,6 +219,9 @@ private: } } *mSuspensionState; + DrmManagerClient *mDrmManagerClient; + DecryptHandle *mDecryptHandle; + status_t setDataSource_l( const char *uri, const KeyedVector<String8, String8> *headers = NULL); diff --git a/media/libstagefright/include/DRMExtractor.h b/media/libstagefright/include/DRMExtractor.h new file mode 100644 index 0000000..cafc812 --- /dev/null +++ b/media/libstagefright/include/DRMExtractor.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 DRM_EXTRACTOR_H_ + +#define DRM_EXTRACTOR_H_ + +#include <media/stagefright/MediaExtractor.h> +#include <drm/DrmManagerClient.h> + +namespace android { + +struct AMessage; +class DataSource; +class SampleTable; +class String8; +class DecryptHandle; + +class DRMExtractor : public MediaExtractor { +public: + DRMExtractor(const sp<DataSource> &source, const char *mime); + + virtual size_t countTracks(); + virtual sp<MediaSource> getTrack(size_t index); + virtual sp<MetaData> getTrackMetaData(size_t index, uint32_t flags); + virtual sp<MetaData> getMetaData(); + +protected: + virtual ~DRMExtractor(); + +private: + sp<DataSource> mDataSource; + + sp<MediaExtractor> mOriginalExtractor; + DecryptHandle* mDecryptHandle; + + DRMExtractor(const DRMExtractor &); + DRMExtractor &operator=(const DRMExtractor &); +}; + +bool SniffDRM( + const sp<DataSource> &source, String8 *mimeType, float *confidence, + sp<AMessage> *); + +} // namespace android + +#endif // DRM_EXTRACTOR_H_ + diff --git a/media/libstagefright/include/MPEG4Extractor.h b/media/libstagefright/include/MPEG4Extractor.h index 1c9cc7e..4e31059 100644 --- a/media/libstagefright/include/MPEG4Extractor.h +++ b/media/libstagefright/include/MPEG4Extractor.h @@ -39,6 +39,10 @@ public: virtual sp<MetaData> getMetaData(); + // for DRM + virtual void setDrmFlag(bool flag); + virtual char* getDrmTrackInfo(size_t trackID, int *len); + protected: virtual ~MPEG4Extractor(); @@ -71,6 +75,19 @@ private: static status_t verifyTrack(Track *track); + struct SINF { + SINF *next; + uint16_t trackID; + uint8_t IPMPDescriptorID; + ssize_t len; + char *IPMPData; + }; + + SINF *mFirstSINF; + + bool mIsDrm; + status_t parseDrmSINF(off_t *offset, off_t data_offset); + MPEG4Extractor(const MPEG4Extractor &); MPEG4Extractor &operator=(const MPEG4Extractor &); }; |