Merge "MediaCodec: add CodecErrorLog" am: 495816d5d1 am: ed06cac797 (037698a4) · Commits · e / os / android_frameworks_av

media/libstagefright/Android.bp

+1 −0

Original line number	Diff line number	Diff line
		@@ -238,6 +238,7 @@ cc_library {
		"CallbackMediaSource.cpp",
		"CameraSource.cpp",
		"CameraSourceTimeLapse.cpp",
		"CodecErrorLog.cpp",
		"FrameDecoder.cpp",
		"HevcUtils.cpp",
		"InterfaceUtils.cpp",

media/libstagefright/CodecErrorLog.cpp

0 → 100644

+47 −0

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

		//#define LOG_NDEBUG 0
		#define LOG_TAG "CodecErrorLog"

		#include <log/log.h>
		#include <media/stagefright/CodecErrorLog.h>

		namespace android {

		void CodecErrorLog::log(const char tag, const char message) {
		std::unique_lock lock(mLock);
		ALOG(LOG_ERROR, tag, "%s", message);
		mStream << message << std::endl;
		}

		void CodecErrorLog::log(const char *tag, const std::string &message) {
		log(tag, message.c_str());
		}

		std::string CodecErrorLog::extract() {
		std::unique_lock lock(mLock);
		std::string msg = mStream.str();
		mStream.str("");
		return msg;
		}

		void CodecErrorLog::clear() {
		std::unique_lock lock(mLock);
		mStream.str("");
		}

		} // namespace android

media/libstagefright/MediaCodec.cpp

+188 −31

File changed.

Preview size limit exceeded, changes collapsed.

media/libstagefright/include/media/stagefright/CodecErrorLog.h

0 → 100644

+64 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2023, 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 CODEC_ERROR_LOG_H_

		#define CODEC_ERROR_LOG_H_

		#include <sstream>
		#include <string>

		#include <android-base/thread_annotations.h>

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

		namespace android {

		/**
		* CodecErrorLog gathers what happened during codec failures, and make them
		* available to clients for debugging purpose.
		*/
		class CodecErrorLog {
		public:
		CodecErrorLog() = default;

		/**
		* Log a line of message.
		*
		* \note the message should be readable to developers who may not be
		* familiar with MediaCodec internals
		*/
		void log(const char tag, const char message);
		void log(const char *tag, const std::string &message);

		/**
		* Extract the accumulated log as string. This operation clears the log.
		*/
		std::string extract();

		/**
		* Clears the previous log.
		*/
		void clear();

		private:
		mutable std::mutex mLock;
		std::stringstream mStream GUARDED_BY(mLock);
		};

		} // namespace android

		#endif // CODEC_ERROR_LOG_H_

media/libstagefright/include/media/stagefright/MediaCodec.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@
		#include <media/MediaMetrics.h>
		#include <media/MediaProfiles.h>
		#include <media/stagefright/foundation/AHandler.h>
		#include <media/stagefright/CodecErrorLog.h>
		#include <media/stagefright/FrameRenderTracker.h>
		#include <utils/Vector.h>

		@@ -297,6 +298,8 @@ struct MediaCodec : public AHandler {
		T value;
		};

		inline CodecErrorLog &getErrorLog() { return mErrorLog; }

		protected:
		virtual ~MediaCodec();
		virtual void onMessageReceived(const sp<AMessage> &msg);
		@@ -321,6 +324,7 @@ private:
		RELEASING,
		};
		std::string stateString(State state);
		std::string apiStateString();

		enum {
		kPortIndexInput = 0,
		@@ -692,6 +696,8 @@ private:
		std::function<status_t(const AString &, sp<MediaCodecInfo> *)> mGetCodecInfo;
		friend class MediaTestHelper;

		CodecErrorLog mErrorLog;

		DISALLOW_EVIL_CONSTRUCTORS(MediaCodec);
		};