summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/FLACExtractor.cpp
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-12-26 16:57:16 -0800
committerSteve Kondik <steve@cyngn.com>2015-12-26 20:51:40 -0800
commit1b5f480d61432ab5aeb090f96823ed59dbc727bc (patch)
tree4a34b507f5497b341d25d75eabaaf04bf1fb9958 /media/libstagefright/FLACExtractor.cpp
parent5712d5ca0b263b8884a68896b1294a294fd4708e (diff)
downloadframeworks_av-1b5f480d61432ab5aeb090f96823ed59dbc727bc.zip
frameworks_av-1b5f480d61432ab5aeb090f96823ed59dbc727bc.tar.gz
frameworks_av-1b5f480d61432ab5aeb090f96823ed59dbc727bc.tar.bz2
stagefright: Remove special case for FLAC offload
* FFMPEG will now handle this automatically. Remove the workaround. Change-Id: I7007af16ce1fe43358b9c1e3b3b469b717df0100
Diffstat (limited to 'media/libstagefright/FLACExtractor.cpp')
-rw-r--r--media/libstagefright/FLACExtractor.cpp11
1 files changed, 0 insertions, 11 deletions
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");