diff options
| author | Insun Kang <insun@google.com> | 2012-02-23 14:03:23 +0900 |
|---|---|---|
| committer | Insun Kang <insun@google.com> | 2012-02-23 15:13:24 +0900 |
| commit | 25eefbedf4b0ba6aea38605f4ba19c75a40810d1 (patch) | |
| tree | 6d85adf5f9b2ad8f5d3b29a15e72279fa0fcd16c /media/libstagefright/timedtext/TimedTextSource.cpp | |
| parent | 3b81acab52b7140c1b8b20be2d67be3e221637e7 (diff) | |
| download | frameworks_av-25eefbedf4b0ba6aea38605f4ba19c75a40810d1.zip frameworks_av-25eefbedf4b0ba6aea38605f4ba19c75a40810d1.tar.gz frameworks_av-25eefbedf4b0ba6aea38605f4ba19c75a40810d1.tar.bz2 | |
Changed TimedTextInBandSource to TimedText3GPPSource.
Change-Id: I820adffbf9b4012f25ab45e9624ae2c35fc5af94
Diffstat (limited to 'media/libstagefright/timedtext/TimedTextSource.cpp')
| -rw-r--r-- | media/libstagefright/timedtext/TimedTextSource.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/media/libstagefright/timedtext/TimedTextSource.cpp b/media/libstagefright/timedtext/TimedTextSource.cpp index 9efe67c..ffbe1c3 100644 --- a/media/libstagefright/timedtext/TimedTextSource.cpp +++ b/media/libstagefright/timedtext/TimedTextSource.cpp @@ -18,12 +18,15 @@ #define LOG_TAG "TimedTextSource" #include <utils/Log.h> +#include <media/stagefright/foundation/ADebug.h> // CHECK_XX macro #include <media/stagefright/DataSource.h> +#include <media/stagefright/MediaDefs.h> // for MEDIA_MIMETYPE_xxx #include <media/stagefright/MediaSource.h> +#include <media/stagefright/MetaData.h> #include "TimedTextSource.h" -#include "TimedTextInBandSource.h" +#include "TimedText3GPPSource.h" #include "TimedTextSRTSource.h" namespace android { @@ -31,7 +34,13 @@ namespace android { // static sp<TimedTextSource> TimedTextSource::CreateTimedTextSource( const sp<MediaSource>& mediaSource) { - return new TimedTextInBandSource(mediaSource); + const char *mime; + CHECK(mediaSource->getFormat()->findCString(kKeyMIMEType, &mime)); + if (strcasecmp(mime, MEDIA_MIMETYPE_TEXT_3GPP) == 0) { + return new TimedText3GPPSource(mediaSource); + } + ALOGE("Unsupported mime type for subtitle. : %s", mime); + return NULL; } // static |