diff options
| author | Gloria Wang <gwang@google.com> | 2011-06-27 11:09:00 -0700 |
|---|---|---|
| committer | Gloria Wang <gwang@google.com> | 2011-07-01 16:52:28 -0700 |
| commit | 0d0edfb024f65f7e1097bf1814ae229ce9cb367d (patch) | |
| tree | b8995cf55d54f9f357b414a4b3285ad2d16285d9 /media/libstagefright/MediaExtractor.cpp | |
| parent | 69c2b29eb72396068b9d116c2a54f283025c7d6b (diff) | |
| download | frameworks_av-0d0edfb024f65f7e1097bf1814ae229ce9cb367d.zip frameworks_av-0d0edfb024f65f7e1097bf1814ae229ce9cb367d.tar.gz frameworks_av-0d0edfb024f65f7e1097bf1814ae229ce9cb367d.tar.bz2 | |
- Retrieve is_drm in MediaMetadataRetriever.
- Add one more column in MediaStore to indicate whether a
media file is drm-protected.
- Remove old DRM code from Ringtone
- Use the new DRM code in RingtoneManager
Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
Diffstat (limited to 'media/libstagefright/MediaExtractor.cpp')
| -rw-r--r-- | media/libstagefright/MediaExtractor.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libstagefright/MediaExtractor.cpp b/media/libstagefright/MediaExtractor.cpp index af0131e..a8023df 100644 --- a/media/libstagefright/MediaExtractor.cpp +++ b/media/libstagefright/MediaExtractor.cpp @@ -116,8 +116,13 @@ sp<MediaExtractor> MediaExtractor::Create( } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) { ret = new AACExtractor(source); } - if (ret != NULL && isDrm) { - ret->getMetaData()->setInt32(kKeyIsDRM, 1); + + if (ret != NULL) { + if (isDrm) { + ret->setDrmFlag(true); + } else { + ret->setDrmFlag(false); + } } return ret; |