widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move away from MediaDebug and use ADebug instead

Browse Source 
Change-Id: Id904857259a5de0b77f09716315ceb8f665af4e0
This commit is contained in:
James Dong
2012-02-08 14:01:09 -08:00
parent beb9b7b603
commit bab8ed4582
4 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
proprietary/wvm/Android.mk
View File

@@ -17,6 +17,10 @@ LOCAL_SRC_FILES:= \
WVMMediaSource.cpp \ WVMMediaSource.cpp \
WVMInfoListener.cpp WVMInfoListener.cpp
LOCAL_SHARED_LIBRARIES := \
libstagefright \
libstagefright_foundation
LOCAL_MODULE := libwvmcommon LOCAL_MODULE := libwvmcommon
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional

1
proprietary/wvm/WVMFileSource.cpp
View File

@@ -8,7 +8,6 @@
#include "WVMFileSource.h" #include "WVMFileSource.h"
#include "media/stagefright/MediaErrors.h" #include "media/stagefright/MediaErrors.h"
#include "media/stagefright/MediaDefs.h" #include "media/stagefright/MediaDefs.h"
#include "media/stagefright/MediaDebug.h"
namespace android { namespace android {

4
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -9,9 +9,9 @@
#include "WVMFileSource.h" #include "WVMFileSource.h"
#include "WVMExtractorImpl.h" #include "WVMExtractorImpl.h"
#include "WVMErrorCodes.h" #include "WVMErrorCodes.h"
#include "media/stagefright/foundation/ADebug.h"
#include "media/stagefright/MediaErrors.h" #include "media/stagefright/MediaErrors.h"
#include "media/stagefright/MediaDefs.h" #include "media/stagefright/MediaDefs.h"
#include "media/stagefright/MediaDebug.h"
#include "AndroidHooks.h" #include "AndroidHooks.h"
namespace android { namespace android {
@@ -235,7 +235,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
status_t err = mGroup->acquire_buffer(&mediaBuf); status_t err = mGroup->acquire_buffer(&mediaBuf);
if (err != OK) { if (err != OK) {
CHECK_EQ(mediaBuf, NULL); CHECK(mediaBuf == NULL);
return err; return err;
} }

1
proprietary/wvm/test/Testlibwvm.cpp
View File

@@ -14,7 +14,6 @@
#include <media/stagefright/MetaData.h> #include <media/stagefright/MetaData.h>
#include <media/stagefright/MediaErrors.h> #include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaBuffer.h> #include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h>
using namespace android; using namespace android;
using namespace std; using namespace std;