Merge "AIDLize MediaExtractorService" (817fc5bb) · Commits · e / os / android_frameworks_av

include/media/DataSource.h

deleted120000 → 0

+103 −1

Original line number	Diff line number	Diff line
		stagefright/DataSource.h
		No newline at end of file

include/media/DataSource.h

0 → 100644

+103 −1

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

		#define DATA_SOURCE_H_

		#include <sys/types.h>

		#include <android/IDataSource.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/DataSourceBase.h>
		#include <media/MediaExtractorPluginApi.h>
		#include <utils/Errors.h>
		#include <utils/RefBase.h>
		#include <utils/threads.h>


		namespace android {

		class String8;

		class DataSource : public DataSourceBase, public virtual RefBase {
		public:
		DataSource() : mWrapper(NULL) {}

		// returns a pointer to IDataSource if it is wrapped.
		virtual sp<IDataSource> getIDataSource() const {
		return nullptr;
		}

		virtual String8 toString() {
		return String8("<unspecified>");
		}

		virtual status_t reconnectAtOffset(off64_t /offset/) {
		return ERROR_UNSUPPORTED;
		}

		////////////////////////////////////////////////////////////////////////////

		virtual String8 getUri() {
		return String8();
		}

		virtual bool getUri(char *uriString, size_t bufferSize) final {
		int ret = snprintf(uriString, bufferSize, "%s", getUri().c_str());
		return ret >= 0 && static_cast<size_t>(ret) < bufferSize;
		}

		virtual String8 getMIMEType() const {
		return String8("application/octet-stream");
		}

		CDataSource *wrap() {
		if (mWrapper) {
		return mWrapper;
		}
		mWrapper = new CDataSource();
		mWrapper->handle = this;

		mWrapper->readAt = [](void handle, off64_t offset, void data, size_t size) -> ssize_t {
		return ((DataSource*)handle)->readAt(offset, data, size);
		};
		mWrapper->getSize = [](void handle, off64_t size) -> status_t {
		return ((DataSource*)handle)->getSize(size);
		};
		mWrapper->flags = [](void *handle) -> uint32_t {
		return ((DataSource*)handle)->flags();
		};
		mWrapper->getUri = [](void handle, char uriString, size_t bufferSize) -> bool {
		return ((DataSource*)handle)->getUri(uriString, bufferSize);
		};
		return mWrapper;
		}

		protected:
		virtual ~DataSource() {
		delete mWrapper;
		}

		private:
		CDataSource *mWrapper;
		DataSource(const DataSource &);
		DataSource &operator=(const DataSource &);
		};

		} // namespace android

		#endif // DATA_SOURCE_H_

media/libdatasource/include/datasource/HTTPBase.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@
		#include <media/DataSource.h>
		#include <media/stagefright/foundation/ABase.h>
		#include <media/stagefright/MediaErrors.h>
		#include <utils/KeyedVector.h>
		#include <utils/List.h>
		#include <utils/threads.h>

media/libheif/HeifDecoderImpl.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,10 +21,10 @@

		#include <stdio.h>

		#include <android/IDataSource.h>
		#include <binder/IMemory.h>
		#include <binder/MemoryDealer.h>
		#include <drm/drm_framework_common.h>
		#include <media/IDataSource.h>
		#include <media/mediametadataretriever.h>
		#include <media/MediaSource.h>
		#include <media/stagefright/foundation/ADebug.h>

media/libmedia/Android.bp

+9 −1

Original line number	Diff line number	Diff line
		@@ -23,6 +23,14 @@ filegroup {
		path: "aidl",
		}

		filegroup {
		name: "mediaextractorservice_aidl",
		srcs: [
		"aidl/android/IMediaExtractorService.aidl",
		],
		path: "aidl",
		}

		aidl_interface {
		name: "resourcemanager_aidl_interface",
		local_include_dir: "aidl",
		@@ -249,13 +257,13 @@ cc_library {
		name: "libmedia",

		srcs: [
		":mediaextractorservice_aidl",
		"IDataSource.cpp",
		"BufferingSettings.cpp",
		"mediaplayer.cpp",
		"IMediaHTTPConnection.cpp",
		"IMediaHTTPService.cpp",
		"IMediaExtractor.cpp",
		"IMediaExtractorService.cpp",
		"IMediaPlayerService.cpp",
		"IMediaPlayerClient.cpp",
		"IMediaRecorderClient.cpp",