From: James Dong <jdong@google.com>
Date: Mon, 12 Dec 2011 23:29:46 +0000 (-0800)
Subject: am 406dd5d1: am aadbd80b: Fixed the false drm recognition.
X-Git-Tag: android-x86-4.4-r1~1579^2~376
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f2d86c8afe5e80bc178c1758d41b7bf154960318;p=android-x86%2Fframeworks-av.git

am 406dd5d1: am aadbd80b: Fixed the false drm recognition.

* commit '406dd5d1e48752177753666867403542e1f400ca':
  Fixed the false drm recognition.
---

f2d86c8afe5e80bc178c1758d41b7bf154960318
diff --cc media/libstagefright/MediaExtractor.cpp
index 2171492624,9eee6aac83..d65dc51114
--- a/media/libstagefright/MediaExtractor.cpp
+++ b/media/libstagefright/MediaExtractor.cpp
@@@ -110,12 -109,13 +110,15 @@@ sp<MediaExtractor> MediaExtractor::Crea
          ret = new MatroskaExtractor(source);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2TS)) {
          ret = new MPEG2TSExtractor(source);
 +    } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_AVI)) {
 +        ret = new AVIExtractor(source);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_WVM)) {
          ret = new WVMExtractor(source);
+         if (ret != NULL) {
+             isDrm = true;
+         }
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC_ADTS)) {
 -        ret = new AACExtractor(source);
 +        ret = new AACExtractor(source, meta);
      } else if (!strcasecmp(mime, MEDIA_MIMETYPE_CONTAINER_MPEG2PS)) {
          ret = new MPEG2PSExtractor(source);
      }