diff options
| author | Preetam Singh Ranawat <apranawat@codeaurora.org> | 2015-07-23 08:59:47 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2015-10-06 03:24:28 -0600 |
| commit | fd42e7afbe43eca5ab6835f8b2720b7e0e8302e0 (patch) | |
| tree | 13b03bf4eb20ffbf7740e96078f218c63fe6652a /media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | |
| parent | ab9bb1594982ad1affed948711d6f487e1c90271 (diff) | |
| download | frameworks_av-fd42e7afbe43eca5ab6835f8b2720b7e0e8302e0.zip frameworks_av-fd42e7afbe43eca5ab6835f8b2720b7e0e8302e0.tar.gz frameworks_av-fd42e7afbe43eca5ab6835f8b2720b7e0e8302e0.tar.bz2 | |
AVCustomizations: Enable 16 and 24 bit PCM offload.
-create extended decoder and renderer
-add change to pass bit width and format info to renderer.
-add change for PCM conversions
-add changes for time calucation
Conflicts:
media/libmediaplayerservice/nuplayer/NuPlayer.cpp
Change-Id: I3363140fad441a7746884076c40b46e777f2e06e
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp index 9a33eb5..331e8ac 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp @@ -32,6 +32,8 @@ #include <media/stagefright/VideoFrameScheduler.h> #include <inttypes.h> +#include "mediaplayerservice/AVNuExtensions.h" +#include "stagefright/AVExtensions.h" namespace android { @@ -1659,6 +1661,8 @@ status_t NuPlayer::Renderer::onOpenAudioSink( ALOGV("Mime \"%s\" mapped to audio_format 0x%x", mime.c_str(), audioFormat); + audioFormat = AVUtils::get()->updateAudioFormat(audioFormat, format); + int avgBitRate = -1; format->findInt32("bit-rate", &avgBitRate); @@ -1745,7 +1749,7 @@ status_t NuPlayer::Renderer::onOpenAudioSink( const PcmInfo info = { (audio_channel_mask_t)channelMask, (audio_output_flags_t)pcmFlags, - AUDIO_FORMAT_PCM_16_BIT, // TODO: change to audioFormat + AVNuUtils::get()->getPCMFormat(format), numChannels, sampleRate }; @@ -1774,7 +1778,7 @@ status_t NuPlayer::Renderer::onOpenAudioSink( sampleRate, numChannels, (audio_channel_mask_t)channelMask, - AUDIO_FORMAT_PCM_16_BIT, + AVNuUtils::get()->getPCMFormat(format), 0 /* bufferCount - unused */, mUseAudioCallback ? &NuPlayer::Renderer::AudioSinkCallback : NULL, mUseAudioCallback ? this : NULL, |