Squashed commit of updates from CodeAurora

libstagefright: Add support for VC1 clips

- configure decoder in frame-by-frame or arbitrary mode
  based on the codec type.

Change-Id: I6404e5b7ee217045e6456f51f914dbd8a651d98a
CRs-Fixed: 432847

stagefright: Miscellaneous fixes for LPA and Tunnel playback

1. Fix for AV sync issue with Tunnel playback
APIs for returning correct timestamps were implemented
2. Crash while exiting TunnelPlayer
Check whether sink is open before flushing or closing it.
Check for mIsAudioRouted is good to know if we are closing it
3. Seekbar freezes after seek and pause
Check pause status before writing

Change-Id: Id8ab7b258e9c05b20e121bdf3c4dc30d519f6c15

frameworks/av: Add support for surround sound recording

- Add 5.1 channel as supported input channel

Change-Id: I50fcd87245c5c855ede8f09ea1a7c5be2e684640

stagefright: Add tunnel decode for amr-wb/wb+

When tunnel.decode is true, playback of AMR-WB
and AMR-WB+ uses tunnel decode.

Change-Id: Ic06cb3faaac18f605402c98a27cb4dfa4b7faee2

stagefright: Skip LPA if #channels > 2

Skip LPA for Multi channel playback

Change-Id: I5b97471ef55aea260d1c02db672eb4bd64c3edef

3 files changed, 6 insertions, 3 deletions

diff --git a/include/media/stagefright/MediaDefs.h b/include/media/stagefright/MediaDefs.h
index 457d5d7..f63926c 100644
--- a/include/media/stagefright/MediaDefs.h
+++ b/include/media/stagefright/MediaDefs.h
@@ -31,6 +31,7 @@ extern const char *MEDIA_MIMETYPE_VIDEO_RAW;
 
 extern const char *MEDIA_MIMETYPE_AUDIO_AMR_NB;
 extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB;
+extern const char *MEDIA_MIMETYPE_AUDIO_AMR_WB_PLUS;
 extern const char *MEDIA_MIMETYPE_AUDIO_MPEG;           // layer III
 extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_I;
 extern const char *MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II;
diff --git a/include/media/stagefright/QCOMXCodec.h b/include/media/stagefright/QCOMXCodec.h
index 7259af9..485c187 100644
--- a/include/media/stagefright/QCOMXCodec.h
+++ b/include/media/stagefright/QCOMXCodec.h
@@ -91,6 +91,9 @@ struct QCOMXCodec {
     static void     checkQCRole(const sp<IOMX> &omx, IOMX::node_id node,
                                         bool isEncoder,const char *mime);
 
+    static void     setQCSpecificVideoFormat(const sp<MetaData> &meta, sp<IOMX> OMXhandle,
+                                               IOMX::node_id nodeID, char* componentName );
+
 };
 
 }
diff --git a/include/media/stagefright/TunnelPlayer.h b/include/media/stagefright/TunnelPlayer.h
index 71c4f10..04cc750 100644
--- a/include/media/stagefright/TunnelPlayer.h
+++ b/include/media/stagefright/TunnelPlayer.h
@@ -212,12 +212,11 @@ private:
         A2DP_DISCONNECT
     };
 
-    int64_t getTimeStamp(A2DPState state);
+    void getPlayedTimeFromDSP_l(int64_t *timeStamp);
+    void getOffsetRealTime_l(int64_t *offsetTime);
 
     size_t fillBuffer(void *data, size_t size);
 
-    int64_t getRealTimeUsLocked();
-
     void reset();
 
     TunnelPlayer(const TunnelPlayer &);