Merge "FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code" (cb1b23b5) · Commits · e / os / android_frameworks_base

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,8 @@ LOCAL_SRC_FILES += \
		media/java/android/media/IAudioService.aidl \
		media/java/android/media/IAudioFocusDispatcher.aidl \
		media/java/android/media/IAudioRoutesObserver.aidl \
		media/java/android/media/IMediaHTTPConnection.aidl \
		media/java/android/media/IMediaHTTPService.aidl \
		media/java/android/media/IMediaRouterClient.aidl \
		media/java/android/media/IMediaRouterService.aidl \
		media/java/android/media/IMediaScannerListener.aidl \

media/java/android/media/IMediaHTTPConnection.aidl

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 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.
		*/

		package android.media;

		import android.os.IBinder;

		/** MUST STAY IN SYNC WITH NATIVE CODE at libmedia/IMediaHTTPConnection.{cpp,h} */

		/** @hide */
		interface IMediaHTTPConnection
		{
		IBinder connect(in String uri, in String headers);
		void disconnect();

		int readAt(long offset, int size);
		long getSize();
		String getMIMEType();
		}

media/java/android/media/IMediaHTTPService.aidl

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 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.
		*/

		package android.media;

		import android.media.IMediaHTTPConnection;

		/** MUST STAY IN SYNC WITH NATIVE CODE at libmedia/IMediaHTTPService.{cpp,h} */

		/** @hide */
		interface IMediaHTTPService
		{
		IMediaHTTPConnection makeHTTPConnection();
		}

media/java/android/media/MediaExtractor.java

+18 −4

Original line number	Diff line number	Diff line
		@@ -21,7 +21,9 @@ import android.content.Context;
		import android.content.res.AssetFileDescriptor;
		import android.media.MediaCodec;
		import android.media.MediaFormat;
		import android.media.MediaHTTPService;
		import android.net.Uri;
		import android.os.IBinder;

		import java.io.FileDescriptor;
		import java.io.IOException;
		@@ -137,11 +139,19 @@ final public class MediaExtractor {
		++i;
		}
		}
		setDataSource(path, keys, values);

		nativeSetDataSource(
		MediaHTTPService.createHttpServiceBinderIfNecessary(path),
		path,
		keys,
		values);
		}

		private native final void setDataSource(
		String path, String[] keys, String[] values) throws IOException;
		private native final void nativeSetDataSource(
		IBinder httpServiceBinder,
		String path,
		String[] keys,
		String[] values) throws IOException;

		/**
		* Sets the data source (file-path or http URL) to use.
		@@ -156,7 +166,11 @@ final public class MediaExtractor {
		* and then use the file descriptor form {@link #setDataSource(FileDescriptor)}.
		*/
		public final void setDataSource(String path) throws IOException {
		setDataSource(path, null, null);
		nativeSetDataSource(
		MediaHTTPService.createHttpServiceBinderIfNecessary(path),
		path,
		null,
		null);
		}

		/**

media/java/android/media/MediaHTTPConnection.java

0 → 100644

+263 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2013 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.
		*/

		package android.media;

		import android.net.Uri;
		import android.os.IBinder;
		import android.os.StrictMode;
		import android.util.Log;

		import java.io.BufferedInputStream;
		import java.io.InputStream;
		import java.io.IOException;
		import java.net.CookieHandler;
		import java.net.CookieManager;
		import java.net.URL;
		import java.net.HttpURLConnection;
		import java.net.MalformedURLException;
		import java.util.HashMap;
		import java.util.Map;

		/** @hide */
		public class MediaHTTPConnection extends IMediaHTTPConnection.Stub {
		private static final String TAG = "MediaHTTPConnection";
		private static final boolean VERBOSE = false;

		private long mCurrentOffset = -1;
		private URL mURL = null;
		private Map<String, String> mHeaders = null;
		private HttpURLConnection mConnection = null;
		private long mTotalSize = -1;
		private InputStream mInputStream = null;

		public MediaHTTPConnection() {
		if (CookieHandler.getDefault() == null) {
		CookieHandler.setDefault(new CookieManager());
		}

		native_setup();
		}

		public IBinder connect(String uri, String headers) {
		if (VERBOSE) {
		Log.d(TAG, "connect: uri=" + uri + ", headers=" + headers);
		}

		try {
		disconnect();
		mURL = new URL(uri);
		mHeaders = convertHeaderStringToMap(headers);
		} catch (MalformedURLException e) {
		return null;
		}

		return native_getIMemory();
		}

		private Map<String, String> convertHeaderStringToMap(String headers) {
		HashMap<String, String> map = new HashMap<String, String>();

		String[] pairs = headers.split("\r\n");
		for (String pair : pairs) {
		int colonPos = pair.indexOf(":");
		if (colonPos >= 0) {
		String key = pair.substring(0, colonPos);
		String val = pair.substring(colonPos + 1);

		map.put(key, val);
		}
		}

		return map;
		}

		public void disconnect() {
		teardownConnection();
		mHeaders = null;
		mURL = null;
		}

		private void teardownConnection() {
		if (mConnection != null) {
		mInputStream = null;

		mConnection.disconnect();
		mConnection = null;

		mCurrentOffset = -1;
		}
		}

		private void seekTo(long offset) throws IOException {
		teardownConnection();

		try {
		mConnection = (HttpURLConnection)mURL.openConnection();

		if (mHeaders != null) {
		for (Map.Entry<String, String> entry : mHeaders.entrySet()) {
		mConnection.setRequestProperty(
		entry.getKey(), entry.getValue());
		}
		}

		if (offset > 0) {
		mConnection.setRequestProperty(
		"Range", "bytes=" + offset + "-");
		}

		if (mConnection.getResponseCode() == HttpURLConnection.HTTP_PARTIAL) {
		// Partial content, we cannot just use getContentLength
		// because what we want is not just the length of the range
		// returned but the size of the full content if available.

		String contentRange =
		mConnection.getHeaderField("Content-Range");

		mTotalSize = -1;
		if (contentRange != null) {
		// format is "bytes xxx-yyy/zzz
		// where "zzz" is the total number of bytes of the
		// content or '*' if unknown.

		int lastSlashPos = contentRange.lastIndexOf('/');
		if (lastSlashPos >= 0) {
		String total =
		contentRange.substring(lastSlashPos + 1);

		try {
		mTotalSize = Long.parseLong(total);
		} catch (NumberFormatException e) {
		}
		}
		}
		} else if (mConnection.getResponseCode()
		!= HttpURLConnection.HTTP_OK) {
		throw new IOException();
		} else {
		mTotalSize = mConnection.getContentLength();
		}

		if (offset > 0
		&& mConnection.getResponseCode()
		!= HttpURLConnection.HTTP_PARTIAL) {
		// Some servers simply ignore "Range" requests and serve
		// data from the start of the content.
		throw new IOException();
		}

		mInputStream =
		new BufferedInputStream(mConnection.getInputStream());

		mCurrentOffset = offset;
		} catch (IOException e) {
		mTotalSize = -1;
		mInputStream = null;
		mConnection = null;
		mCurrentOffset = -1;

		throw e;
		}
		}

		public int readAt(long offset, int size) {
		return native_readAt(offset, size);
		}

		private int readAt(long offset, byte[] data, int size) {
		StrictMode.ThreadPolicy policy =
		new StrictMode.ThreadPolicy.Builder().permitAll().build();

		StrictMode.setThreadPolicy(policy);

		try {
		if (offset != mCurrentOffset) {
		seekTo(offset);
		}

		int n = mInputStream.read(data, 0, size);

		if (n == -1) {
		// InputStream signals EOS using a -1 result, our semantics
		// are to return a 0-length read.
		n = 0;
		}

		mCurrentOffset += n;

		if (VERBOSE) {
		Log.d(TAG, "readAt " + offset + " / " + size + " => " + n);
		}

		return n;
		} catch (IOException e) {
		if (VERBOSE) {
		Log.d(TAG, "readAt " + offset + " / " + size + " => -1");
		}
		return -1;
		} catch (Exception e) {
		if (VERBOSE) {
		Log.d(TAG, "unknown exception " + e);
		Log.d(TAG, "readAt " + offset + " / " + size + " => -1");
		}
		return -1;
		}
		}

		public long getSize() {
		if (mConnection == null) {
		try {
		seekTo(0);
		} catch (IOException e) {
		return -1;
		}
		}

		return mTotalSize;
		}

		public String getMIMEType() {
		if (mConnection == null) {
		try {
		seekTo(0);
		} catch (IOException e) {
		return "application/octet-stream";
		}
		}

		return mConnection.getContentType();
		}

		@Override
		protected void finalize() {
		native_finalize();
		}

		private static native final void native_init();
		private native final void native_setup();
		private native final void native_finalize();

		private native final IBinder native_getIMemory();
		private native final int native_readAt(long offset, int size);

		static {
		System.loadLibrary("media_jni");
		native_init();
		}

		private int mNativeContext;
		}