Merge "Ndk utilities to transate between status_t & media_status_t" (5e0659c8) · Commits · e / os / android_frameworks_av

media/ndk/Android.bp

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -39,6 +39,7 @@ cc_library_shared {
	"NdkMediaCrypto.cpp",		"NdkMediaCrypto.cpp",
	"NdkMediaDataSource.cpp",		"NdkMediaDataSource.cpp",
	"NdkMediaExtractor.cpp",		"NdkMediaExtractor.cpp",
			"NdkMediaError.cpp",
	"NdkMediaFormat.cpp",		"NdkMediaFormat.cpp",
	"NdkMediaMuxer.cpp",		"NdkMediaMuxer.cpp",
	"NdkMediaDrm.cpp",		"NdkMediaDrm.cpp",
	@@ -106,6 +107,7 @@ cc_library {

	srcs: [		srcs: [
	"NdkMediaDataSourceCallbacks.cpp",		"NdkMediaDataSourceCallbacks.cpp",
			"NdkMediaError.cpp",
	],		],

	include_dirs: [		include_dirs: [

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -17,6 +17,7 @@
	//#define LOG_NDEBUG 0		//#define LOG_NDEBUG 0
	#define LOG_TAG "NdkMediaDataSourceCallbacks"		#define LOG_TAG "NdkMediaDataSourceCallbacks"

			#include "NdkMediaErrorPriv.h"
	#include "NdkMediaDataSourceCallbacksPriv.h"		#include "NdkMediaDataSourceCallbacksPriv.h"
	#include <media/DataSource.h>		#include <media/DataSource.h>

0 → 100644

+50 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2018 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/NdkMediaError.h>
			#include <media/stagefright/MediaErrors.h>
			#include <utils/Errors.h>
			#include <utils/Log.h>

			using namespace android;

			media_status_t translate_error(status_t err) {

			if (err == OK) {
			return AMEDIA_OK;
			} else if (err == ERROR_END_OF_STREAM) {
			return AMEDIA_ERROR_END_OF_STREAM;
			} else if (err == ERROR_IO) {
			return AMEDIA_ERROR_IO;
			}

			ALOGE("sf error code: %d", err);
			return AMEDIA_ERROR_UNKNOWN;
			}

			status_t reverse_translate_error(media_status_t err) {

			if (err == AMEDIA_OK) {
			return OK;
			} else if (err == AMEDIA_ERROR_END_OF_STREAM) {
			return ERROR_END_OF_STREAM;
			} else if (err == AMEDIA_ERROR_IO) {
			return ERROR_IO;
			}

			ALOGE("ndk error code: %d", err);
			return UNKNOWN_ERROR;
			}

0 → 100644

+29 −0

Original line number	Original line	Diff line number	Diff line
			/*
			* Copyright (C) 2018 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 _NDK_MEDIA_ERROR_PRIV_H
			#define _NDK_MEDIA_ERROR_PRIV_H

			#include <media/NdkMediaError.h>
			#include <utils/Errors.h>

			using namespace android;

			media_status_t translate_error(status_t);

			status_t reverse_translate_error(media_status_t);

			#endif // _NDK_MEDIA_ERROR_PRIV_H

+1 −13

Original line number	Original line	Diff line number	Diff line
	@@ -21,6 +21,7 @@
	#include <media/NdkMediaError.h>		#include <media/NdkMediaError.h>
	#include <media/NdkMediaExtractor.h>		#include <media/NdkMediaExtractor.h>
	#include <media/NdkMediaFormatPriv.h>		#include <media/NdkMediaFormatPriv.h>
			#include "NdkMediaErrorPriv.h"
	#include "NdkMediaDataSourcePriv.h"		#include "NdkMediaDataSourcePriv.h"


	@@ -40,19 +41,6 @@

	using namespace android;		using namespace android;

	static media_status_t translate_error(status_t err) {
	if (err == OK) {
	return AMEDIA_OK;
	} else if (err == ERROR_END_OF_STREAM) {
	return AMEDIA_ERROR_END_OF_STREAM;
	} else if (err == ERROR_IO) {
	return AMEDIA_ERROR_IO;
	}

	ALOGE("sf error code: %d", err);
	return AMEDIA_ERROR_UNKNOWN;
	}

	struct AMediaExtractor {		struct AMediaExtractor {
	sp<NuMediaExtractor> mImpl;		sp<NuMediaExtractor> mImpl;
	sp<ABuffer> mPsshBuf;		sp<ABuffer> mPsshBuf;