diff options
| -rw-r--r-- | media/libmediaplayerservice/Drm.cpp | 1 | ||||
| -rw-r--r-- | media/libmediaplayerservice/Drm.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/matroska/MatroskaExtractor.cpp | 5 |
3 files changed, 6 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/Drm.cpp b/media/libmediaplayerservice/Drm.cpp index 8ca8769..d55482d 100644 --- a/media/libmediaplayerservice/Drm.cpp +++ b/media/libmediaplayerservice/Drm.cpp @@ -52,6 +52,7 @@ static bool checkPermission(const char* permissionString) { KeyedVector<Vector<uint8_t>, String8> Drm::mUUIDToLibraryPathMap; KeyedVector<String8, wp<SharedLibrary> > Drm::mLibraryPathToOpenLibraryMap; Mutex Drm::mMapLock; +Mutex Drm::mLock; static bool operator<(const Vector<uint8_t> &lhs, const Vector<uint8_t> &rhs) { if (lhs.size() < rhs.size()) { diff --git a/media/libmediaplayerservice/Drm.h b/media/libmediaplayerservice/Drm.h index c4013b8..056723c 100644 --- a/media/libmediaplayerservice/Drm.h +++ b/media/libmediaplayerservice/Drm.h @@ -143,7 +143,7 @@ struct Drm : public BnDrm, virtual void binderDied(const wp<IBinder> &the_late_who); private: - mutable Mutex mLock; + static Mutex mLock; status_t mInitCheck; diff --git a/media/libstagefright/matroska/MatroskaExtractor.cpp b/media/libstagefright/matroska/MatroskaExtractor.cpp index 0712bf0..ddca437 100644 --- a/media/libstagefright/matroska/MatroskaExtractor.cpp +++ b/media/libstagefright/matroska/MatroskaExtractor.cpp @@ -941,7 +941,10 @@ void MatroskaExtractor::addTracks() { const mkvparser::VideoTrack *vtrack = static_cast<const mkvparser::VideoTrack *>(track); - if (!strcmp("V_MPEG4/ISO/AVC", codecID)) { + if (codecID == NULL) { + ALOGW("unknown codecID is not supported."); + continue; + } else if (!strcmp("V_MPEG4/ISO/AVC", codecID)) { meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC); meta->setData(kKeyAVCC, 0, codecPrivate, codecPrivateSize); } else if (!strcmp("V_MPEG4/ISO/ASP", codecID)) { |