3 files changed, 0 insertions, 15 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp
index f32bb7e..8b49d18 100644
--- a/media/libstagefright/DataSource.cpp
+++ b/media/libstagefright/DataSource.cpp
@@ -232,9 +232,7 @@ void DataSource::RegisterDefaultSniffers() {
     RegisterSniffer_l(SniffMatroska);
     RegisterSniffer_l(SniffOgg);
     RegisterSniffer_l(SniffWAV);
-#ifndef FLAC_OFFLOAD_ENABLED
     RegisterSniffer_l(SniffFLAC);
-#endif
     RegisterSniffer_l(SniffAMR);
     RegisterSniffer_l(SniffMPEG2TS);
     RegisterSniffer_l(SniffMP3);
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");
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp
index cd0acfa..fc96e2f 100644
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@ -117,10 +117,8 @@ retry:
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_NB)
             || !strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AMR_WB)) {
         ret = new AMRExtractor(source);
-#ifndef FLAC_OFFLOAD_ENABLED
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) {
         ret = new FLACExtractor(source);
-#endif
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WAV)) {
         ret = new WAVExtractor(source);
     } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_OGG)) {