diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2015-10-16 04:42:09 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-10-16 04:42:09 -0700 |
| commit | 804b4bfb9b9f991a3a74c21210f93573d13eab3d (patch) | |
| tree | 477ae042a92a7f5aa056e74e6b464782b93fa943 /media | |
| parent | df0b7b8e5638048946a5b3cc603fabf9aa34179a (diff) | |
| parent | 6d1bfe5b18dbb745da83540c6011e1c557996f5c (diff) | |
| download | frameworks_av-804b4bfb9b9f991a3a74c21210f93573d13eab3d.zip frameworks_av-804b4bfb9b9f991a3a74c21210f93573d13eab3d.tar.gz frameworks_av-804b4bfb9b9f991a3a74c21210f93573d13eab3d.tar.bz2 | |
Merge "audio: use QTI flac decoder based on flag"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/ACodec.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/ACodec.cpp b/media/libstagefright/ACodec.cpp index a132637..18d221b 100644 --- a/media/libstagefright/ACodec.cpp +++ b/media/libstagefright/ACodec.cpp @@ -2073,7 +2073,11 @@ status_t ACodec::configureCodec( } err = setupG711Codec(encoder, sampleRate, numChannels); } +#ifdef QTI_FLAC_DECODER } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC) && encoder) { +#else + } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_FLAC)) { +#endif int32_t numChannels = 0, sampleRate = 0, compressionLevel = -1; if (encoder && (!msg->findInt32("channel-count", &numChannels) |