Merge "Fix a bug in MediaPlayer's addExternalSource()." (daf59be4) · Commits · e / os / android_frameworks_base

media/libstagefright/AwesomePlayer.cpp

+3 −16

Original line number	Diff line number	Diff line
		@@ -2280,16 +2280,8 @@ status_t AwesomePlayer::invoke(const Parcel &request, Parcel *reply) {
		mTextDriver = new TimedTextDriver(mListener);
		}
		// String values written in Parcel are UTF-16 values.
		String16 uri16 = request.readString16();
		const char *uri = NULL;
		if (uri16 != NULL) {
		uri = String8(uri16).string();
		}
		String16 mimeType16 = request.readString16();
		const char *mimeType = NULL;
		if (mimeType16 != NULL) {
		mimeType = String8(mimeType16).string();
		}
		String8 uri(request.readString16());
		String8 mimeType(request.readString16());
		return mTextDriver->addOutOfBandTextSource(uri, mimeType);
		}
		case INVOKE_ID_ADD_EXTERNAL_SOURCE_FD:
		@@ -2301,12 +2293,7 @@ status_t AwesomePlayer::invoke(const Parcel &request, Parcel *reply) {
		int fd = request.readFileDescriptor();
		off64_t offset = request.readInt64();
		size_t length = request.readInt64();
		String16 mimeType16 = request.readString16();
		const char *mimeType = NULL;
		if (mimeType16 != NULL) {
		mimeType = String8(mimeType16).string();
		}

		String8 mimeType(request.readString16());
		return mTextDriver->addOutOfBandTextSource(
		fd, offset, length, mimeType);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ status_t TimedTextDriver::addOutOfBandTextSource(
		}

		sp<TimedTextSource> source;
		if (strcasecmp(mimeType, MEDIA_MIMETYPE_TEXT_SUBRIP)) {
		if (strcasecmp(mimeType, MEDIA_MIMETYPE_TEXT_SUBRIP) == 0) {
		source = TimedTextSource::CreateTimedTextSource(
		dataSource, TimedTextSource::OUT_OF_BAND_FILE_SRT);
		}