diff options
| author | Andreas Huber <andih@google.com> | 2010-01-20 16:11:15 -0800 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2010-01-21 10:31:05 -0800 |
| commit | 2cb5c9c633c7f8ffea10360fc029bc3e88172ca1 (patch) | |
| tree | 470d9201906176377eb55f88821b5e900dc9fc05 /media/libmediaplayerservice | |
| parent | 703f0614f3111957c0bda4e3595c10c413255894 (diff) | |
| download | frameworks_base-2cb5c9c633c7f8ffea10360fc029bc3e88172ca1.zip frameworks_base-2cb5c9c633c7f8ffea10360fc029bc3e88172ca1.tar.gz frameworks_base-2cb5c9c633c7f8ffea10360fc029bc3e88172ca1.tar.bz2 | |
Special-case .wmv and .wma metadata retrieval and playback to use PV if available.
related-to-bug: 2381874
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index 6563caa..af8d1b5 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -199,6 +199,11 @@ extmap FILE_EXTS [] = { {".ota", SONIVOX_PLAYER}, {".ogg", VORBIS_PLAYER}, {".oga", VORBIS_PLAYER}, +#ifndef NO_OPENCORE + {".wma", PV_PLAYER}, + {".wmv", PV_PLAYER}, + {".asf", PV_PLAYER}, +#endif }; // TODO: Find real cause of Audio/Video delay in PV framework and remove this workaround @@ -682,6 +687,14 @@ player_type getPlayerType(int fd, int64_t offset, int64_t length) if (ident == 0x5367674f) // 'OggS' return VORBIS_PLAYER; +#ifndef NO_OPENCORE + if (ident == 0x75b22630) { + // The magic number for .asf files, i.e. wmv and wma content. + // These are not currently supported through stagefright. + return PV_PLAYER; + } +#endif + // Some kind of MIDI? EAS_DATA_HANDLE easdata; if (EAS_Init(&easdata) == EAS_SUCCESS) { |