From 68ec69bc44e7d362a3f88fec3459654b270f86cd Mon Sep 17 00:00:00 2001 From: Shalaj Jain Date: Tue, 21 Jul 2015 20:25:16 -0700 Subject: avextensions: Add support for Codec Extension features Add support for Codec extension features like skype, vqzip, b-frame encoding, prefer adaptive playback etc. Add extensions to support encode batching. Also enable Werror for libavextensions. Change-Id: Ia342d4abe4bb1e21b9ff2b8213fb96421485a333 --- media/libavextensions/mediaplayerservice/AVNuExtensions.h | 2 ++ media/libavextensions/mediaplayerservice/AVNuUtils.cpp | 9 ++++----- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'media/libavextensions/mediaplayerservice') diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h index 6ab790f..4d1421c 100644 --- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h +++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h @@ -81,6 +81,8 @@ struct AVNuUtils { virtual status_t convertToSinkFormatIfNeeded(const sp &, sp &, audio_format_t sinkFormat, bool isOffload); + virtual void printFileName(int fd); + // ----- NO TRESSPASSING BEYOND THIS LINE ------ DECLARE_LOADABLE_SINGLETON(AVNuUtils); }; diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp index 2e2e511..bc07c90 100644 --- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp +++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp @@ -44,7 +44,6 @@ namespace android { - sp AVNuUtils::createPCMMetaFromSource(const sp &sMeta) { return sMeta; } @@ -93,18 +92,18 @@ void AVNuUtils::setSourcePCMFormat(const sp &) { void AVNuUtils::setDecodedPCMFormat(const sp &) { } + status_t AVNuUtils::convertToSinkFormatIfNeeded(const sp &, sp &, audio_format_t /*sinkFormat*/, bool /*isOffload*/) { return INVALID_OPERATION; } +void AVNuUtils::printFileName(int) {} // ----- NO TRESSPASSING BEYOND THIS LINE ------ -AVNuUtils::AVNuUtils() { -} +AVNuUtils::AVNuUtils() {} -AVNuUtils::~AVNuUtils() { -} +AVNuUtils::~AVNuUtils() {} //static AVNuUtils *AVNuUtils::sInst = -- cgit v1.1