stagefright: Add support for FLAC offloading

 * New Qualcomm DSPs support FLAC decoding, but the offload code is
   stubbed out in M. Unstub it from what used to be open source.

Change-Id: I03c129c42ebc6909a3392e42a7f96791c8fabd28

1 files changed, 16 insertions, 1 deletions

diff --git a/media/libstagefright/FLACExtractor.cpp b/media/libstagefright/FLACExtractor.cpp
index 91f0e65..51a502d 100644
--- a/media/libstagefright/FLACExtractor.cpp
+++ b/media/libstagefright/FLACExtractor.cpp
@@ -32,7 +32,7 @@
 #include <media/stagefright/MediaSource.h>
 #include <media/stagefright/MediaBuffer.h>
 
-#ifdef ENABLE_AV_ENHANCEMENTS
+#ifdef FLAC_OFFLOAD_ENABLED
 #include "QCMediaDefs.h"
 #include "QCMetaData.h"
 #endif
@@ -93,9 +93,18 @@ public:
     }
 
     // stream properties
+    unsigned getMinBlockSize() const {
+        return mStreamInfo.min_blocksize;
+    }
     unsigned getMaxBlockSize() const {
         return mStreamInfo.max_blocksize;
     }
+    unsigned getMinFrameSize() const {
+        return mStreamInfo.min_framesize;
+    }
+    unsigned getMaxFrameSize() const {
+        return mStreamInfo.max_framesize;
+    }
     unsigned getSampleRate() const {
         return mStreamInfo.sample_rate;
     }
@@ -544,6 +553,12 @@ status_t FLACParser::init()
             mTrackMetadata->setInt64(kKeyDuration,
                     (getTotalSamples() * 1000000LL) / getSampleRate());
             mTrackMetadata->setInt32(kKeyBitsPerSample, getBitsPerSample());
+#ifdef FLAC_OFFLOAD_ENABLED
+            mTrackMetadata->setInt32(kKeyMinBlkSize, getMinBlockSize());
+            mTrackMetadata->setInt32(kKeyMaxBlkSize, getMaxBlockSize());
+            mTrackMetadata->setInt32(kKeyMinFrmSize, getMinFrameSize());
+            mTrackMetadata->setInt32(kKeyMaxFrmSize, getMaxFrameSize());
+#endif
         }
     } else {
         ALOGE("missing STREAMINFO");