diff options
Diffstat (limited to 'media/libavextensions/mediaplayerservice')
-rw-r--r-- | media/libavextensions/mediaplayerservice/AVNuExtensions.h | 7 | ||||
-rw-r--r-- | media/libavextensions/mediaplayerservice/AVNuUtils.cpp | 15 |
2 files changed, 7 insertions, 15 deletions
diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h index d7e29d1..2fe56b8 100644 --- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h +++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h @@ -80,12 +80,17 @@ struct AVNuUtils { virtual void setDecodedPCMFormat(const sp<AMessage> &); virtual status_t convertToSinkFormatIfNeeded(const sp<ABuffer> &, sp<ABuffer> &, audio_format_t sinkFormat, bool isOffload); +#ifndef TARGET_8974 virtual uint32_t getFlags(); virtual bool canUseSetBuffers(const sp<MetaData> &Meta); - +#endif virtual void printFileName(int fd); virtual void checkFormatChange(bool *formatChange, const sp<ABuffer> &accessUnit); +#ifdef TARGET_8974 virtual void addFlagsInMeta(const sp<ABuffer> &buffer, int32_t flags, bool isAudio); + virtual uint32_t getFlags(); + virtual bool canUseSetBuffers(const sp<MetaData> &Meta); +#endif virtual bool dropCorruptFrame(); // ----- NO TRESSPASSING BEYOND THIS LINE ------ diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp index 31d7b32..8d87759 100644 --- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp +++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp @@ -101,20 +101,7 @@ void AVNuUtils::setKeyPCMFormat(const sp<MetaData> &meta, audio_format_t audioFo meta->setInt32('pfmt', audioFormat); } -audio_format_t AVNuUtils::getPCMFormat(const sp<AMessage> &format) { - int32_t pcmFormat = 0; - if (format->findInt32("pcm-format", &pcmFormat)) - return (audio_format_t)pcmFormat; - - int32_t bits = 16; - if (format->findInt32("bits-per-sample", &bits)) { - if (bits == 8) - return AUDIO_FORMAT_PCM_8_BIT; - if (bits == 24) - return AUDIO_FORMAT_PCM_32_BIT; - if (bits == 32) - return AUDIO_FORMAT_PCM_FLOAT; - } +audio_format_t AVNuUtils::getPCMFormat(const sp<AMessage> &/*format*/) { return AUDIO_FORMAT_PCM_16_BIT; } |