From 1b5f480d61432ab5aeb090f96823ed59dbc727bc Mon Sep 17 00:00:00 2001
From: Steve Kondik <steve@cyngn.com>
Date: Sat, 26 Dec 2015 16:57:16 -0800
Subject: stagefright: Remove special case for FLAC offload

 * FFMPEG will now handle this automatically. Remove the workaround.

Change-Id: I7007af16ce1fe43358b9c1e3b3b469b717df0100
---
 media/libstagefright/FLACExtractor.cpp | 11 -----------
 1 file changed, 11 deletions(-)

(limited to 'media/libstagefright/FLACExtractor.cpp')

diff --git a/media/libstagefright/FLACExtractor.cpp b/media/libstagefright/FLACExtractor.cpp
index 51a502d..55ce566 100644
--- a/media/libstagefright/FLACExtractor.cpp
+++ b/media/libstagefright/FLACExtractor.cpp
@@ -32,11 +32,6 @@
 #include <media/stagefright/MediaSource.h>
 #include <media/stagefright/MediaBuffer.h>
 
-#ifdef FLAC_OFFLOAD_ENABLED
-#include "QCMediaDefs.h"
-#include "QCMetaData.h"
-#endif
-
 #include <system/audio.h>
 
 namespace android {
@@ -553,12 +548,6 @@ 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");
-- 
cgit v1.1