diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-12-14 01:24:54 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-12-14 01:24:54 -0800 |
| commit | 0145bf600a8f5fa911170f8bb8c2ff6fec47a599 (patch) | |
| tree | 85075538440df5773184773fd946e507dc35c009 /media/libstagefright/DataSource.cpp | |
| parent | 1512587eb162be68b62161371a4ad1ce81b5377b (diff) | |
| download | frameworks_av-0145bf600a8f5fa911170f8bb8c2ff6fec47a599.zip frameworks_av-0145bf600a8f5fa911170f8bb8c2ff6fec47a599.tar.gz frameworks_av-0145bf600a8f5fa911170f8bb8c2ff6fec47a599.tar.bz2 | |
stagefright: Additional fixes for extended offload support
* Fix compilation with debug enabled
* Allow FLAC offload to be enabled independent of QCOM_HARDWARE,
tested with the Nexus 5X and is working!
* Disable the FLACExtractor if offload is enabled since it can
only output decoded PCM. This will force FFMPEG to be used,
which does everything we need for FLAC offload
Change-Id: I7d71c153a6a6ea7df8e32bc73f5cbe9f51cdcf64
Diffstat (limited to 'media/libstagefright/DataSource.cpp')
| -rw-r--r-- | media/libstagefright/DataSource.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/DataSource.cpp b/media/libstagefright/DataSource.cpp index 8b49d18..f32bb7e 100644 --- a/media/libstagefright/DataSource.cpp +++ b/media/libstagefright/DataSource.cpp @@ -232,7 +232,9 @@ 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); |