summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/ExtendedMediaDefs.cpp
diff options
context:
space:
mode:
authorSatya Krishna Pindiproli <satyak@codeaurora.org>2014-01-10 16:41:51 +0530
committerSteve Kondik <shade@chemlab.org>2014-11-01 15:17:41 -0700
commita604d504b155655ddf209a522b18cee051f959f7 (patch)
tree2a64c94265560115fc50e183a6f5a7f8881dc67f /media/libstagefright/ExtendedMediaDefs.cpp
parent6c52b69f9194288354cd6668baacc5af94b37b7d (diff)
downloadframeworks_av-a604d504b155655ddf209a522b18cee051f959f7.tar.gz
frameworks_av-a604d504b155655ddf209a522b18cee051f959f7.tar.bz2
frameworks_av-a604d504b155655ddf209a522b18cee051f959f7.zip
libstagefright: Wrapper for FLAC CSIM decoder
A new FLAC decoder is being used to decode 24 bit clips with very high sample rate (192kHz) and this code is a wrapper to that decoder. The decoder will be used only if the extended extractor is invoked. CRs-Fixed: 609395 Change-Id: I59a33e0e00fd2fc6e88318d0e597519579aa56e9 libstagefright: Optimize the wrapper for FLAC CSIM decoder Move dlsym calls to constructor and do all memory allocations only once to avoid fragmentation of heap. Also add support to handle multichannel PCM from the decoder. Change-Id: I7feace450d692528eb00c39df4bffff2c5528ada libstagefright: Modify the path of FLAC headers The location of the headers of the FLAC CSIM library has changed. Modify the include path to reflect the right location. Change-Id: I13630a089716d8c1b35bfc5451d83ba3f3ade6a7 libstagefright: Add support for FLAC superset clips Memory requirements for FLAC superset content are high as each channel can contain upto 64k bytes. Redefine the macros to meet these requirements. Also initialize the decoder to give data in configurable bitWidth. Currently, only 16 bit output is supported though. Change-Id: I60b7b329bb3c0653f7a7c0fbe55229aaf5d62918 libstagefright: Enable ACodec path for QTI FLAC solution Use the OMX component of Google's RAW decoder for FLAC codec and setup NuMediaExtractor to extract PCM samples from FLACDecoder. CRs-Fixed: 643618 Change-Id: Iaa7594e4d882b52157f49e7c9b2da1861ba49568 libstagefright: Improve logging for QTI FLAC Decoder Edit logs to print relevant messages when QTI FLAC Decoder is used to decode FLAC content. CRs-Fixed: 648845 Change-Id: I1fb5c4f5757dc54c37ac255fda83cb1f96f8504d libstagefright: Add FLAC format in compress offload path - Add mime type mapping for FLAC - Add flac codec specific params in offload metadata - Set bit width based on kKeySampleBits Change-Id: I8781edd352346355d6f9a4274d29b85d6f2e4b55 audio: remove key definitions for FLAC meta data - Remove FLAC meta data specific keys in metaData.h - Define the same keys in QCMetaData.h Change-Id: I7249c223d321d59923e970898ae2f4d112ed8ea5 audio: update QTI resampler feature flag - update QTI resampler feature flag to AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER Change-Id: I79d8323911464dc6777d26b11b4c500782d7a548 audio: update QTI FLAC decoder feature flag - update QTI FLAC decoder feature flag to AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER Change-Id: Id4737f4bc31eb2b8f3c9dc36ca2bdac91e327adc
Diffstat (limited to 'media/libstagefright/ExtendedMediaDefs.cpp')
-rw-r--r--media/libstagefright/ExtendedMediaDefs.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/libstagefright/ExtendedMediaDefs.cpp b/media/libstagefright/ExtendedMediaDefs.cpp
index 92b8e581f5..4ddb8d387d 100644
--- a/media/libstagefright/ExtendedMediaDefs.cpp
+++ b/media/libstagefright/ExtendedMediaDefs.cpp
@@ -52,6 +52,10 @@ const char *MEDIA_MIMETYPE_CONTAINER_QCMATROSKA = "video/qc-matroska";
const char *MEDIA_MIMETYPE_CONTAINER_QCOGG = "video/qc-ogg";
const char *MEDIA_MIMETYPE_CONTAINER_QCFLV = "video/qc-flv";
const char *MEDIA_MIMETYPE_VIDEO_VPX = "video/x-vnd.on2.vp8"; //backward compatibility
+#ifdef QTI_FLAC_DECODER
const char *MEDIA_MIMETYPE_CONTAINER_QTIFLAC = "audio/qti-flac";
+#else
+const char *MEDIA_MIMETYPE_CONTAINER_QTIFLAC = "audio/flac";
+#endif
} // namespace android