diff options
| author | 2011-06-01 11:04:15 -0700 | |
|---|---|---|
| committer | 2011-06-01 11:04:15 -0700 | |
| commit | d0bbdb02b2c56b0227d82751a29ccd99d11ea12f (patch) | |
| tree | 5504cd8f97c06c46d0772a065173355b1ca460d8 /media/libmediaplayerservice/MediaPlayerService.cpp | |
| parent | 829de65b9aa8d59cff7d8b4acd6c89682a1952a5 (diff) | |
| parent | 5439223b5633679edcc255651e7062046004d75d (diff) | |
Merge "Use channel mask instead of channel count for track creation"
Diffstat (limited to 'media/libmediaplayerservice/MediaPlayerService.cpp')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index d51c946d7011..eae93ff00bf1 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -1164,7 +1164,7 @@ sp<IMemory> MediaPlayerService::decode(const char* url, uint32_t *pSampleRate, i mem = new MemoryBase(cache->getHeap(), 0, cache->size()); *pSampleRate = cache->sampleRate(); *pNumChannels = cache->channelCount(); - *pFormat = cache->format(); + *pFormat = (int)cache->format(); LOGV("return memory @ %p, sampleRate=%u, channelCount = %d, format = %d", mem->pointer(), *pSampleRate, *pNumChannels, *pFormat); Exit: |