Merge branch 'LA.BF64.1.2.2_rb4.6' of git://codeaurora.org/platform/frameworks/av into cm-13.0

Change-Id: Iec8118b9a24fafe47e4006fca8a8e993bacb5ba8

2 files changed, 4 insertions, 1 deletions

diff --git a/include/media/AudioTrack.h b/include/media/AudioTrack.h
index 42883b5..42fa3be 100644
--- a/include/media/AudioTrack.h
+++ b/include/media/AudioTrack.h
@@ -942,6 +942,7 @@ protected:
     // For Device Selection API
     //  a value of AUDIO_PORT_HANDLE_NONE indicated default (AudioPolicyManager) routing.
     audio_port_handle_t     mSelectedDeviceId;
+    bool                    mPlaybackRateSet;
 
 private:
     class DeathNotifier : public IBinder::DeathRecipient {
diff --git a/include/media/stagefright/MediaExtractor.h b/include/media/stagefright/MediaExtractor.h
index d68227c..2f2057f 100644
--- a/include/media/stagefright/MediaExtractor.h
+++ b/include/media/stagefright/MediaExtractor.h
@@ -41,7 +41,8 @@ public:
     }
 
     static sp<MediaExtractor> Create(
-            const sp<DataSource> &source, const char *mime = NULL);
+            const sp<DataSource> &source, const char *mime = NULL,
+            const uint32_t flags = 0);
 
     virtual size_t countTracks() = 0;
     virtual sp<MediaSource> getTrack(size_t index) = 0;
@@ -79,6 +80,7 @@ public:
     }
     virtual void setUID(uid_t uid) {
     }
+    virtual void setExtraFlags(uint32_t flag) {}
 
 protected:
     MediaExtractor() : mIsDrm(false) {}