diff options
| author | Andreas Huber <andih@google.com> | 2012-04-25 14:24:30 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-04-25 14:28:29 -0700 |
| commit | e370bb62b89d2f2980f519392010ea08a24c558e (patch) | |
| tree | 1b6f05a3447497841b259f00f03af2150e165c61 /media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | |
| parent | e4f70a7ea72c2a9fca60e6b64a258604e9333580 (diff) | |
| download | frameworks_av-e370bb62b89d2f2980f519392010ea08a24c558e.zip frameworks_av-e370bb62b89d2f2980f519392010ea08a24c558e.tar.gz frameworks_av-e370bb62b89d2f2980f519392010ea08a24c558e.tar.bz2 | |
Bump up the max number of items in an AMessage, remove overly stringent
CHECK() limiting us to just audio/* or video/* tracks.
related-to-bug: 6399405
Change-Id: I9bdaf7e709665ecc22da8839c8b16c081dbf4535
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp index 5733229..25974b6 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp @@ -116,9 +116,7 @@ sp<AMessage> NuPlayer::Decoder::makeFormat(const sp<MetaData> &meta) { msg->setInt32("width", width); msg->setInt32("height", height); - } else { - CHECK(!strncasecmp("audio/", mime, 6)); - + } else if (!strncasecmp("audio/", mime, 6)) { int32_t numChannels, sampleRate; CHECK(meta->findInt32(kKeyChannelCount, &numChannels)); CHECK(meta->findInt32(kKeySampleRate, &sampleRate)); |