Merge "Special-case .wmv and .wma metadata retrieval and playback to use PV if available." (84a93a56) · Commits · e / os / android_frameworks_base

media/libmediaplayerservice/MediaPlayerService.cpp

+13 −0

Original line number	Diff line number	Diff line
		@@ -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) {