Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49f00040 authored Feb 09, 2012 by James Dong Committed by Android (Google) Code Review Feb 09, 2012

Merge "Move away from MediaDebug and use ADebug instead"

parents ff65330b c4689fae

libvideoeditor/lvpp/DummyAudioSource.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,8 +17,8 @@
		// #define LOG_NDEBUG 0
		#define LOG_TAG "DummyAudioSource"
		#include <utils/Log.h>
		#include <media/stagefright/foundation/ADebug.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/stagefright/MediaDebug.h>
		#include <media/stagefright/MediaDefs.h>
		#include <media/stagefright/MediaBufferGroup.h>
		#include <media/stagefright/MetaData.h>

libvideoeditor/lvpp/DummyVideoSource.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,8 +18,8 @@
		#define LOG_TAG "DummyVideoSource"
		#include <stdlib.h>
		#include <utils/Log.h>
		#include <media/stagefright/foundation/ADebug.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/stagefright/MediaDebug.h>
		#include <media/stagefright/MediaDefs.h>
		#include <media/stagefright/MediaBuffer.h>
		#include <media/stagefright/MediaBufferGroup.h>

libvideoeditor/lvpp/NativeWindowRenderer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -22,8 +22,8 @@
		#include <cutils/log.h>
		#include <gui/SurfaceTexture.h>
		#include <gui/SurfaceTextureClient.h>
		#include <stagefright/foundation/ADebug.h>
		#include <stagefright/MediaBuffer.h>
		#include <stagefright/MediaDebug.h>
		#include <stagefright/MetaData.h>
		#include <surfaceflinger/Surface.h>
		#include "VideoEditorTools.h"

libvideoeditor/lvpp/PreviewRenderer.cpp

+1 −1

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

		#include "PreviewRenderer.h"

		#include <media/stagefright/MediaDebug.h>
		#include <media/stagefright/foundation/ADebug.h>
		#include <surfaceflinger/Surface.h>

		namespace android {

libvideoeditor/lvpp/VideoEditorAudioPlayer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		#include <binder/IPCThreadState.h>
		#include <media/AudioTrack.h>
		#include <VideoEditorAudioPlayer.h>
		#include <media/stagefright/MediaDebug.h>
		#include <media/stagefright/foundation/ADebug.h>
		#include <media/stagefright/MediaDefs.h>
		#include <media/stagefright/MediaErrors.h>
		#include <media/stagefright/MediaSource.h>