diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-29 23:08:12 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2015-12-29 23:08:12 +0100 |
| commit | 1c47b26b1ae695c355e4ec0c317716a397588206 (patch) | |
| tree | 525f78a0d8d9fa58360d1c33af7d553aa8968e50 /include/media | |
| parent | b5b73768b74d369f47cafd5371a5eaf2ac3d9373 (diff) | |
| parent | 8ca3dfd881424650951d1d72ee8809367b1c3d96 (diff) | |
| download | frameworks_av-1c47b26b1ae695c355e4ec0c317716a397588206.zip frameworks_av-1c47b26b1ae695c355e4ec0c317716a397588206.tar.gz frameworks_av-1c47b26b1ae695c355e4ec0c317716a397588206.tar.bz2 | |
Merge remote-tracking branch 'cyanogenmod/cm-13.0' into replicant-6.0
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/AudioTrack.h | 2 | ||||
| -rw-r--r-- | include/media/stagefright/FFMPEGSoftCodec.h | 1 | ||||
| -rw-r--r-- | include/media/stagefright/MediaExtractor.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h index 191802d..6f07f98 100644 --- a/include/media/AudioTrack.h +++ b/include/media/AudioTrack.h @@ -624,7 +624,7 @@ private: */ status_t obtainBuffer(Buffer* audioBuffer, const struct timespec *requested, struct timespec *elapsed = NULL, size_t *nonContig = NULL); - friend struct ExtendedMediaUtils; + friend struct AVMediaUtils; public: /* Public API for TRANSFER_OBTAIN mode. diff --git a/include/media/stagefright/FFMPEGSoftCodec.h b/include/media/stagefright/FFMPEGSoftCodec.h index 79ea229..c6b6482 100644 --- a/include/media/stagefright/FFMPEGSoftCodec.h +++ b/include/media/stagefright/FFMPEGSoftCodec.h @@ -60,6 +60,7 @@ struct FFMPEGSoftCodec { sp<IOMX> OMXhandle, IOMX::node_id nodeID); static status_t setVideoFormat( + status_t status, const sp<AMessage> &msg, const char* mime, sp<IOMX> OMXhandle,IOMX::node_id nodeID, bool isEncoder, OMX_VIDEO_CODINGTYPE *compressionFormat, diff --git a/include/media/stagefright/MediaExtractor.h b/include/media/stagefright/MediaExtractor.h index 2f2057f..e83defa 100644 --- a/include/media/stagefright/MediaExtractor.h +++ b/include/media/stagefright/MediaExtractor.h @@ -42,7 +42,7 @@ public: static sp<MediaExtractor> Create( const sp<DataSource> &source, const char *mime = NULL, - const uint32_t flags = 0); + const uint32_t flags = 0, const sp<AMessage> *meta = NULL); virtual size_t countTracks() = 0; virtual sp<MediaSource> getTrack(size_t index) = 0; |