Merge "Support "data:" URIs again in mediaplayer..." (faf5c0ea) · Commits · e / os / android_frameworks_av

include/media/stagefright/DataURISource.h

0 → 100644

+49 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef DATA_URI_SOURCE_H_

		#define DATA_URI_SOURCE_H_

		#include <media/stagefright/DataSource.h>
		#include <media/stagefright/foundation/ABase.h>

		namespace android {

		struct ABuffer;

		struct DataURISource : public DataSource {
		static sp<DataURISource> Create(const char *uri);

		virtual status_t initCheck() const;
		virtual ssize_t readAt(off64_t offset, void *data, size_t size);
		virtual status_t getSize(off64_t *size);

		protected:
		virtual ~DataURISource();

		private:
		sp<ABuffer> mBuffer;

		DataURISource(const sp<ABuffer> &buffer);

		DISALLOW_EVIL_CONSTRUCTORS(DataURISource);
		};

		} // namespace android

		#endif // DATA_URI_SOURCE_H_

media/libstagefright/Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@ LOCAL_SRC_FILES:= \
		CameraSource.cpp \
		CameraSourceTimeLapse.cpp \
		DataSource.cpp \
		DataURISource.cpp \
		DRMExtractor.cpp \
		ESDS.cpp \
		FileSource.cpp \

media/libstagefright/DataSource.cpp

+3 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		#include <media/IMediaHTTPService.h>
		#include <media/stagefright/foundation/AMessage.h>
		#include <media/stagefright/DataSource.h>
		#include <media/stagefright/DataURISource.h>
		#include <media/stagefright/FileSource.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/stagefright/MediaHTTP.h>
		@@ -221,6 +222,8 @@ sp<DataSource> DataSource::CreateFromURI(
		// in the widevine:// case.
		source = httpSource;
		}
		} else if (!strncasecmp("data:", uri, 5)) {
		source = DataURISource::Create(uri);
		} else {
		// Assume it's a filename.
		source = new FileSource(uri);

media/libstagefright/DataURISource.cpp

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#include <media/stagefright/DataURISource.h>

		#include <media/stagefright/foundation/ABuffer.h>
		#include <media/stagefright/foundation/AString.h>
		#include <media/stagefright/foundation/base64.h>

		namespace android {

		// static
		sp<DataURISource> DataURISource::Create(const char *uri) {
		if (strncasecmp("data:", uri, 5)) {
		return NULL;
		}

		char *commaPos = strrchr(uri, ',');

		if (commaPos == NULL) {
		return NULL;
		}

		sp<ABuffer> buffer;

		AString tmp(&uri[5], commaPos - &uri[5]);

		if (tmp.endsWith(";base64")) {
		AString encoded(commaPos + 1);

		// Strip CR and LF...
		for (size_t i = encoded.size(); i-- > 0;) {
		if (encoded.c_str()[i] == '\r' \|\| encoded.c_str()[i] == '\n') {
		encoded.erase(i, 1);
		}
		}

		buffer = decodeBase64(encoded);

		if (buffer == NULL) {
		ALOGE("Malformed base64 encoded content found.");
		return NULL;
		}
		} else {
		#if 0
		size_t dataLen = strlen(uri) - tmp.size() - 6;
		buffer = new ABuffer(dataLen);
		memcpy(buffer->data(), commaPos + 1, dataLen);

		// unescape
		#else
		// MediaPlayer doesn't care for this right now as we don't
		// play any text-based media.
		return NULL;
		#endif
		}

		// We don't really care about charset or mime type.

		return new DataURISource(buffer);
		}

		DataURISource::DataURISource(const sp<ABuffer> &buffer)
		: mBuffer(buffer) {
		}

		DataURISource::~DataURISource() {
		}

		status_t DataURISource::initCheck() const {
		return OK;
		}

		ssize_t DataURISource::readAt(off64_t offset, void *data, size_t size) {
		if (offset >= mBuffer->size()) {
		return 0;
		}

		size_t copy = mBuffer->size() - offset;
		if (copy > size) {
		copy = size;
		}

		memcpy(data, mBuffer->data() + offset, copy);

		return copy;
		}

		status_t DataURISource::getSize(off64_t *size) {
		*size = mBuffer->size();

		return OK;
		}

		} // namespace android

media/libstagefright/foundation/base64.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -33,6 +33,10 @@ sp<ABuffer> decodeBase64(const AString &s) {

		if (n >= 2 && s.c_str()[n - 2] == '=') {
		padding = 2;

		if (n >= 3 && s.c_str()[n - 3] == '=') {
		padding = 3;
		}
		}
		}