drgreen/android_frameworks_base
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: I963a3b6f79a7292891973cbeeaf3378b38629f08
This commit is contained in:
James Dong
2012-02-06 23:46:37 -08:00
parent 55ee84154b
commit 8e9d67a135
54 changed files with 129 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmds/stagefright/Android.mk
View File

@ -35,7 +35,7 @@ LOCAL_SRC_FILES:= \
record.cpp
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder
libstagefright liblog libutils libbinder libstagefright_foundation
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
@ -59,7 +59,7 @@ LOCAL_SRC_FILES:= \
recordvideo.cpp
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder
libstagefright liblog libutils libbinder libstagefright_foundation
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \
@ -84,7 +84,7 @@ LOCAL_SRC_FILES:= \
audioloop.cpp
LOCAL_SHARED_LIBRARIES := \
libstagefright liblog libutils libbinder
libstagefright liblog libutils libbinder libstagefright_foundation
LOCAL_C_INCLUDES:= \
$(JNI_H_INCLUDE) \

2
cmds/stagefright/SineSource.cpp
View File

@ -3,7 +3,7 @@
#include <math.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>

8
cmds/stagefright/audioloop.cpp
View File

@ -2,10 +2,10 @@
#include <binder/ProcessState.h>
#include <media/mediarecorder.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/AMRWriter.h>
#include <media/stagefright/AudioPlayer.h>
#include <media/stagefright/AudioSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/OMXClient.h>
@ -24,7 +24,7 @@ int main() {
android::ProcessState::self()->startThreadPool();
OMXClient client;
CHECK_EQ(client.connect(), OK);
CHECK_EQ(client.connect(), (status_t)OK);
#if 0
sp<MediaSource> source = new SineSource(kSampleRate, kNumChannels);
@ -82,7 +82,7 @@ int main() {
delete player;
player = NULL;
#elif 0
CHECK_EQ(decoder->start(), OK);
CHECK_EQ(decoder->start(), (status_t)OK);
MediaBuffer *buffer;
while (decoder->read(&buffer) == OK) {
@ -95,7 +95,7 @@ int main() {
buffer = NULL;
}
CHECK_EQ(decoder->stop(), OK);
CHECK_EQ(decoder->stop(), (status_t)OK);
#endif
#endif

12
cmds/stagefright/record.cpp
View File

@ -17,11 +17,11 @@
#include "SineSource.h"
#include <binder/ProcessState.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/AudioPlayer.h>
#include <media/stagefright/CameraSource.h>
#include <media/stagefright/FileSource.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/MediaExtractor.h>
@ -183,7 +183,7 @@ int main(int argc, char **argv) {
return 1;
}
OMXClient client;
CHECK_EQ(client.connect(), OK);
CHECK_EQ(client.connect(), (status_t)OK);
status_t err = OK;
@ -231,14 +231,14 @@ int main(int argc, char **argv) {
sp<MPEG4Writer> writer = new MPEG4Writer("/sdcard/output.mp4");
writer->addSource(encoder);
writer->setMaxFileDuration(kDurationUs);
CHECK_EQ(OK, writer->start());
CHECK_EQ((status_t)OK, writer->start());
while (!writer->reachedEOS()) {
fprintf(stderr, ".");
usleep(100000);
}
err = writer->stop();
#else
CHECK_EQ(OK, encoder->start());
CHECK_EQ((status_t)OK, encoder->start());
MediaBuffer *buffer;
while (encoder->read(&buffer) == OK) {
@ -272,7 +272,7 @@ int main(int argc, char **argv) {
for (int i = 0; i < 100; ++i) {
MediaBuffer *buffer;
status_t err = source->read(&buffer);
CHECK_EQ(err, OK);
CHECK_EQ(err, (status_t)OK);
printf("got a frame, data=%p, size=%d\n",
buffer->data(), buffer->range_length());
@ -299,7 +299,7 @@ int main(int argc, char **argv) {
android::ProcessState::self()->startThreadPool();
OMXClient client;
CHECK_EQ(client.connect(), OK);
CHECK_EQ(client.connect(), (status_t)OK);
const int32_t kSampleRate = 22050;
const int32_t kNumChannels = 2;

6
cmds/stagefright/recordvideo.cpp
View File

@ -17,9 +17,9 @@
#include "SineSource.h"
#include <binder/ProcessState.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/AudioPlayer.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/MPEG4Writer.h>
@ -243,7 +243,7 @@ int main(int argc, char **argv) {
}
OMXClient client;
CHECK_EQ(client.connect(), OK);
CHECK_EQ(client.connect(), (status_t)OK);
status_t err = OK;
sp<MediaSource> source =
@ -283,7 +283,7 @@ int main(int argc, char **argv) {
sp<MPEG4Writer> writer = new MPEG4Writer(fileName);
writer->addSource(encoder);
int64_t start = systemTime();
CHECK_EQ(OK, writer->start());
CHECK_EQ((status_t)OK, writer->start());
while (!writer->reachedEOS()) {
}
err = writer->stop();

36
include/media/stagefright/MediaDebug.h
View File

@ -1,36 +0,0 @@
/*
* 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 MEDIA_DEBUG_H_
#define MEDIA_DEBUG_H_
#include <cutils/log.h>
#define LITERAL_TO_STRING_INTERNAL(x) #x
#define LITERAL_TO_STRING(x) LITERAL_TO_STRING_INTERNAL(x)
#define CHECK_EQ(x,y) \
LOG_ALWAYS_FATAL_IF( \
(x) != (y), \
__FILE__ ":" LITERAL_TO_STRING(__LINE__) " " #x " != " #y)
#define CHECK(x) \
LOG_ALWAYS_FATAL_IF( \
!(x), \
__FILE__ ":" LITERAL_TO_STRING(__LINE__) " " #x)
#endif // MEDIA_DEBUG_H_

2
media/libmedia/MediaProfiles.cpp
View File

@ -25,7 +25,7 @@
#include <cutils/properties.h>
#include <expat.h>
#include <media/MediaProfiles.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/openmax/OMX_Video.h>
namespace android {

16
media/libmediaplayerservice/StagefrightRecorder.cpp
View File

@ -24,6 +24,7 @@
#include <binder/IServiceManager.h>
#include <media/IMediaPlayerService.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/AudioSource.h>
#include <media/stagefright/AMRWriter.h>
#include <media/stagefright/AACWriter.h>
@ -31,7 +32,6 @@
#include <media/stagefright/CameraSourceTimeLapse.h>
#include <media/stagefright/MPEG2TSWriter.h>
#include <media/stagefright/MPEG4Writer.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/OMXClient.h>
@ -241,8 +241,8 @@ status_t StagefrightRecorder::setOutputFile(const char *path) {
status_t StagefrightRecorder::setOutputFile(int fd, int64_t offset, int64_t length) {
ALOGV("setOutputFile: %d, %lld, %lld", fd, offset, length);
// These don't make any sense, do they?
CHECK_EQ(offset, 0);
CHECK_EQ(length, 0);
CHECK_EQ(offset, 0ll);
CHECK_EQ(length, 0ll);
if (fd < 0) {
ALOGE("Invalid file descriptor: %d", fd);
@ -734,7 +734,7 @@ status_t StagefrightRecorder::prepare() {
}
status_t StagefrightRecorder::start() {
CHECK(mOutputFd >= 0);
CHECK_GE(mOutputFd, 0);
if (mWriter != NULL) {
ALOGE("File writer is not avaialble");
@ -837,7 +837,7 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() {
}
OMXClient client;
CHECK_EQ(client.connect(), OK);
CHECK_EQ(client.connect(), (status_t)OK);
sp<MediaSource> audioEncoder =
OMXCodec::Create(client.interface(), encMeta,
@ -850,9 +850,9 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() {
status_t StagefrightRecorder::startAACRecording() {
// FIXME:
// Add support for OUTPUT_FORMAT_AAC_ADIF
CHECK(mOutputFormat == OUTPUT_FORMAT_AAC_ADTS);
CHECK_EQ(mOutputFormat, OUTPUT_FORMAT_AAC_ADTS);
CHECK(mAudioEncoder == AUDIO_ENCODER_AAC);
CHECK_EQ(mAudioEncoder, AUDIO_ENCODER_AAC);
CHECK(mAudioSource != AUDIO_SOURCE_CNT);
mWriter = new AACWriter(mOutputFd);
@ -1386,7 +1386,7 @@ status_t StagefrightRecorder::setupVideoEncoder(
}
OMXClient client;
CHECK_EQ(client.connect(), OK);
CHECK_EQ(client.connect(), (status_t)OK);
uint32_t encoder_flags = 0;
if (mIsMetaDataStoredInVideoBuffers) {

2
media/libstagefright/AACExtractor.cpp
View File

@ -23,9 +23,9 @@
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaSource.h>

2
media/libstagefright/AMRExtractor.cpp
View File

@ -20,9 +20,9 @@
#include "include/AMRExtractor.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaSource.h>

2
media/libstagefright/AMRWriter.cpp
View File

@ -14,9 +14,9 @@
* limitations under the License.
*/
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/AMRWriter.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaSource.h>

11
media/libstagefright/CameraSource.cpp
View File

@ -20,8 +20,8 @@
#include <OMX_Component.h>
#include <binder/IPCThreadState.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/CameraSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
@ -114,7 +114,7 @@ static int32_t getColorFormat(const char* colorFormat) {
ALOGE("Uknown color format (%s), please add it to "
"CameraSource::getColorFormat", colorFormat);
CHECK_EQ(0, "Unknown color format");
CHECK(!"Unknown color format");
}
CameraSource *CameraSource::Create() {
@ -517,7 +517,7 @@ status_t CameraSource::initWithCameraAccess(
// This CHECK is good, since we just passed the lock/unlock
// check earlier by calling mCamera->setParameters().
CHECK_EQ(OK, mCamera->setPreviewDisplay(mSurface));
CHECK_EQ((status_t)OK, mCamera->setPreviewDisplay(mSurface));
// By default, do not store metadata in video buffers
mIsMetaDataStoredInVideoBuffers = false;
@ -566,7 +566,8 @@ void CameraSource::startCameraRecording() {
if (mCameraFlags & FLAGS_HOT_CAMERA) {
mCamera->unlock();
mCamera.clear();
CHECK_EQ(OK, mCameraRecordingProxy->startRecording(new ProxyListener(this)));
CHECK_EQ((status_t)OK,
mCameraRecordingProxy->startRecording(new ProxyListener(this)));
} else {
mCamera->setListener(new CameraSourceListener(this));
mCamera->startRecording();
@ -718,7 +719,7 @@ void CameraSource::signalBufferReturned(MediaBuffer *buffer) {
return;
}
}
CHECK_EQ(0, "signalBufferReturned: bogus buffer");
CHECK(!"signalBufferReturned: bogus buffer");
}
status_t CameraSource::read(

2
media/libstagefright/CameraSourceTimeLapse.cpp
View File

@ -20,9 +20,9 @@
#include <binder/IPCThreadState.h>
#include <binder/MemoryBase.h>
#include <binder/MemoryHeapBase.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/CameraSource.h>
#include <media/stagefright/CameraSourceTimeLapse.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MetaData.h>
#include <camera/Camera.h>
#include <camera/CameraParameters.h>

2
media/libstagefright/DRMExtractor.cpp
View File

@ -23,6 +23,7 @@
#include <arpa/inet.h>
#include <utils/String8.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/Utils.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaSource.h>
@ -30,7 +31,6 @@
#include <media/stagefright/MetaData.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h>
#include <drm/drm_framework_common.h>
#include <utils/Errors.h>

2
media/libstagefright/FileSource.cpp
View File

@ -14,8 +14,8 @@
* limitations under the License.
*/
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/FileSource.h>
#include <media/stagefright/MediaDebug.h>
#include <sys/types.h>
#include <unistd.h>
#include <sys/types.h>

4
media/libstagefright/JPEGSource.cpp
View File

@ -18,10 +18,10 @@
#define LOG_TAG "JPEGSource"
#include <utils/Log.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/JPEGSource.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
@ -59,7 +59,7 @@ JPEGSource::JPEGSource(const sp<DataSource> &source)
mWidth(0),
mHeight(0),
mOffset(0) {
CHECK_EQ(parseJPEG(), OK);
CHECK_EQ(parseJPEG(), (status_t)OK);
CHECK(mSource->getSize(&mSize) == OK);
}

6
media/libstagefright/MediaBuffer.cpp
View File

@ -22,8 +22,8 @@
#include <stdlib.h>
#include <media/stagefright/foundation/ABuffer.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MetaData.h>
#include <ui/GraphicBuffer.h>
@ -157,7 +157,7 @@ void MediaBuffer::reset() {
}
MediaBuffer::~MediaBuffer() {
CHECK_EQ(mObserver, NULL);
CHECK(mObserver == NULL);
if (mOwnsData && mData != NULL) {
free(mData);
@ -188,7 +188,7 @@ int MediaBuffer::refcount() const {
}
MediaBuffer *MediaBuffer::clone() {
CHECK_EQ(mGraphicBuffer, NULL);
CHECK(mGraphicBuffer == NULL);
MediaBuffer *buffer = new MediaBuffer(mData, mSize);
buffer->set_range(mRangeOffset, mRangeLength);

2
media/libstagefright/MediaBufferGroup.cpp
View File

@ -17,9 +17,9 @@
#define LOG_TAG "MediaBufferGroup"
#include <utils/Log.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
namespace android {

2
media/libstagefright/MediaSourceSplitter.cpp
View File

@ -18,8 +18,8 @@
#define LOG_TAG "MediaSourceSplitter"
#include <utils/Log.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaSourceSplitter.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MetaData.h>

2
media/libstagefright/MetaData.cpp
View File

@ -17,7 +17,7 @@
#include <stdlib.h>
#include <string.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MetaData.h>
namespace android {

2
media/libstagefright/OggExtractor.cpp
View File

@ -21,10 +21,10 @@
#include "include/OggExtractor.h"
#include <cutils/properties.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaSource.h>

2
media/libstagefright/SampleIterator.cpp
View File

@ -22,8 +22,8 @@
#include <arpa/inet.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/Utils.h>
#include "include/SampleTable.h"

6
media/libstagefright/StagefrightMetadataRetriever.cpp
View File

@ -20,10 +20,10 @@
#include "include/StagefrightMetadataRetriever.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/ColorConverter.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/FileSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaExtractor.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/OMXCodec.h>
@ -37,7 +37,7 @@ StagefrightMetadataRetriever::StagefrightMetadataRetriever()
ALOGV("StagefrightMetadataRetriever()");
DataSource::RegisterDefaultSniffers();
CHECK_EQ(mClient.connect(), OK);
CHECK_EQ(mClient.connect(), (status_t)OK);
}
StagefrightMetadataRetriever::~StagefrightMetadataRetriever() {
@ -169,7 +169,7 @@ static VideoFrame *extractVideoFrameWithCodecFlags(
|| (buffer != NULL && buffer->range_length() == 0));
if (err != OK) {
CHECK_EQ(buffer, NULL);
CHECK(buffer == NULL);
ALOGV("decoding frame failed.");
decoder->stop();

6
media/libstagefright/SurfaceMediaSource.cpp
View File

@ -16,14 +16,14 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "SurfaceMediaSource"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/SurfaceMediaSource.h>
#include <ui/GraphicBuffer.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/openmax/OMX_IVCommon.h>
#include <media/stagefright/MetadataBufferType.h>
#include <ui/GraphicBuffer.h>
#include <surfaceflinger/ISurfaceComposer.h>
#include <surfaceflinger/SurfaceComposerClient.h>
#include <surfaceflinger/IGraphicBufferAlloc.h>
@ -855,7 +855,7 @@ void SurfaceMediaSource::signalBufferReturned(MediaBuffer *buffer) {
}
if (!foundBuffer) {
CHECK_EQ(0, "signalBufferReturned: bogus buffer");
CHECK(!"signalBufferReturned: bogus buffer");
}
}

2
media/libstagefright/ThrottledSource.cpp
View File

@ -16,7 +16,7 @@
#include "include/ThrottledSource.h"
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
namespace android {

2
media/libstagefright/TimedEventQueue.cpp
View File

@ -31,7 +31,7 @@
#include <sys/prctl.h>
#include <sys/time.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#ifdef ANDROID_SIMULATOR
#include <jni.h>

2
media/libstagefright/VideoSourceDownSampler.cpp
View File

@ -17,9 +17,9 @@
//#define LOG_NDEBUG 0
#define LOG_TAG "VideoSourceDownSampler"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/VideoSourceDownSampler.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/YUVImage.h>
#include <media/stagefright/YUVCanvas.h>

6
media/libstagefright/WAVExtractor.cpp
View File

@ -20,9 +20,9 @@
#include "include/WAVExtractor.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaSource.h>
@ -217,7 +217,7 @@ status_t WAVExtractor::init() {
kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_G711_ALAW);
break;
default:
CHECK_EQ(mWaveFormat, WAVE_FORMAT_MULAW);
CHECK_EQ(mWaveFormat, (uint16_t)WAVE_FORMAT_MULAW);
mTrackMeta->setCString(
kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_G711_MLAW);
break;
@ -362,7 +362,7 @@ status_t WAVSource::read(
// Convert 8-bit unsigned samples to 16-bit signed.
MediaBuffer *tmp;
CHECK_EQ(mGroup->acquire_buffer(&tmp), OK);
CHECK_EQ(mGroup->acquire_buffer(&tmp), (status_t)OK);
// The new buffer holds the sample number of samples, but each
// one is 2 bytes wide.

2
media/libstagefright/WVMExtractor.cpp
View File

@ -21,6 +21,7 @@
#include <arpa/inet.h>
#include <utils/String8.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/Utils.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaSource.h>
@ -28,7 +29,6 @@
#include <media/stagefright/MetaData.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h>
#include <dlfcn.h>
#include <utils/Errors.h>

14
media/libstagefright/codecs/aacenc/AACEncoder.cpp
View File

@ -22,8 +22,8 @@
#include "voAAC.h"
#include "cmnMemory.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
@ -114,8 +114,8 @@ status_t AACEncoder::setAudioSpecificConfigData() {
ALOGV("setAudioSpecificConfigData: %d hz, %d bps, and %d channels",
mSampleRate, mBitRate, mChannels);
int32_t index;
CHECK_EQ(OK, getSampleRateTableIndex(mSampleRate, index));
int32_t index = 0;
CHECK_EQ((status_t)OK, getSampleRateTableIndex(mSampleRate, index));
if (mChannels > 2 || mChannels <= 0) {
ALOGE("Unsupported number of channels(%d)", mChannels);
return UNKNOWN_ERROR;
@ -142,7 +142,7 @@ status_t AACEncoder::start(MetaData *params) {
mBufferGroup = new MediaBufferGroup;
mBufferGroup->add_buffer(new MediaBuffer(2048));
CHECK_EQ(OK, initCheck());
CHECK_EQ((status_t)OK, initCheck());
mNumInputSamples = 0;
mAnchorTimeUs = 0;
@ -183,7 +183,7 @@ status_t AACEncoder::stop() {
mSource->stop();
if (mEncoderHandle) {
CHECK_EQ(VO_ERR_NONE, mApiHandle->Uninit(mEncoderHandle));
CHECK_EQ((VO_U32)VO_ERR_NONE, mApiHandle->Uninit(mEncoderHandle));
mEncoderHandle = NULL;
}
delete mApiHandle;
@ -223,7 +223,7 @@ status_t AACEncoder::read(
CHECK(options == NULL || !options->getSeekTo(&seekTimeUs, &mode));
MediaBuffer *buffer;
CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), OK);
CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), (status_t)OK);
uint8_t *outPtr = (uint8_t *)buffer->data();
bool readFromSource = false;
int64_t wallClockTimeUs = -1;
@ -255,7 +255,7 @@ status_t AACEncoder::read(
}
size_t align = mInputBuffer->range_length() % sizeof(int16_t);
CHECK_EQ(align, 0);
CHECK_EQ(align, (size_t)0);
int64_t timeUs;
if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) {

4
media/libstagefright/codecs/amrnb/enc/AMRNBEncoder.cpp
View File

@ -18,8 +18,8 @@
#include "gsmamr_enc.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
@ -210,7 +210,7 @@ status_t AMRNBEncoder::read(
}
MediaBuffer *buffer;
CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), OK);
CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), (status_t)OK);
uint8_t *outPtr = (uint8_t *)buffer->data();

10
media/libstagefright/codecs/amrwbenc/AMRWBEncoder.cpp
View File

@ -22,8 +22,8 @@
#include "voAMRWB.h"
#include "cmnMemory.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
@ -134,7 +134,7 @@ status_t AMRWBEncoder::start(MetaData *params) {
// The largest buffer size is header + 477 bits
mBufferGroup->add_buffer(new MediaBuffer(1024));
CHECK_EQ(OK, initCheck());
CHECK_EQ((status_t)OK, initCheck());
mNumFramesOutput = 0;
@ -163,7 +163,7 @@ status_t AMRWBEncoder::stop() {
mBufferGroup = NULL;
CHECK_EQ(VO_ERR_NONE, mApiHandle->Uninit(mEncoderHandle));
CHECK_EQ((VO_U32)VO_ERR_NONE, mApiHandle->Uninit(mEncoderHandle));
mEncoderHandle = NULL;
delete mApiHandle;
@ -222,7 +222,7 @@ status_t AMRWBEncoder::read(
}
size_t align = mInputBuffer->range_length() % sizeof(int16_t);
CHECK_EQ(align, 0);
CHECK_EQ(align, (size_t)0);
int64_t timeUs;
if (mInputBuffer->meta_data()->findInt64(kKeyDriftTime, &timeUs)) {
@ -271,7 +271,7 @@ status_t AMRWBEncoder::read(
CHECK(VO_ERR_NONE == mApiHandle->SetInputData(mEncoderHandle,&inputData));
MediaBuffer *buffer;
CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), OK);
CHECK_EQ(mBufferGroup->acquire_buffer(&buffer), (status_t)OK);
uint8_t *outPtr = (uint8_t *)buffer->data();
VO_CODECBUFFER outputData;

8
media/libstagefright/codecs/avc/enc/AVCEncoder.cpp
View File

@ -24,8 +24,8 @@
#include "avcenc_int.h"
#include "OMX_Video.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
@ -417,7 +417,7 @@ status_t AVCEncoder::read(
*out = NULL;
MediaBuffer *outputBuffer;
CHECK_EQ(OK, mGroup->acquire_buffer(&outputBuffer));
CHECK_EQ((status_t)OK, mGroup->acquire_buffer(&outputBuffer));
uint8_t *outPtr = (uint8_t *) outputBuffer->data();
uint32_t dataLength = outputBuffer->size();
@ -557,9 +557,9 @@ status_t AVCEncoder::read(
encoderStatus = PVAVCEncodeNAL(mHandle, outPtr, &dataLength, &type);
if (encoderStatus == AVCENC_SUCCESS) {
outputBuffer->meta_data()->setInt32(kKeyIsSyncFrame, mIsIDRFrame);
CHECK_EQ(NULL, PVAVCEncGetOverrunBuffer(mHandle));
CHECK(NULL == PVAVCEncGetOverrunBuffer(mHandle));
} else if (encoderStatus == AVCENC_PICTURE_READY) {
CHECK_EQ(NULL, PVAVCEncGetOverrunBuffer(mHandle));
CHECK(NULL == PVAVCEncGetOverrunBuffer(mHandle));
if (mIsIDRFrame) {
outputBuffer->meta_data()->setInt32(kKeyIsSyncFrame, mIsIDRFrame);
mIsIDRFrame = 0;

6
media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp
View File

@ -23,8 +23,8 @@
#include "mp4enc_api.h"
#include "OMX_Video.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaData.h>
@ -379,7 +379,7 @@ status_t M4vH263Encoder::read(
*out = NULL;
MediaBuffer *outputBuffer;
CHECK_EQ(OK, mGroup->acquire_buffer(&outputBuffer));
CHECK_EQ((status_t)OK, mGroup->acquire_buffer(&outputBuffer));
uint8_t *outPtr = (uint8_t *) outputBuffer->data();
int32_t dataLength = outputBuffer->size();
@ -467,7 +467,7 @@ status_t M4vH263Encoder::read(
mInputBuffer = NULL;
return UNKNOWN_ERROR;
}
CHECK_EQ(NULL, PVGetOverrunBuffer(mHandle));
CHECK(NULL == PVGetOverrunBuffer(mHandle));
if (hintTrack.CodeType == 0) { // I-frame serves as sync frame
outputBuffer->meta_data()->setInt32(kKeyIsSyncFrame, 1);
}

2
media/libstagefright/colorconversion/ColorConverter.cpp
View File

@ -18,8 +18,8 @@
#define LOG_TAG "ColorConverter"
#include <utils/Log.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/ColorConverter.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaErrors.h>
namespace android {

2
media/libstagefright/id3/Android.mk
View File

@ -16,7 +16,7 @@ LOCAL_SRC_FILES := \
testid3.cpp
LOCAL_SHARED_LIBRARIES := \
libstagefright libutils libbinder
libstagefright libutils libbinder libstagefright_foundation
LOCAL_STATIC_LIBRARIES := \
libstagefright_id3

2
media/libstagefright/id3/ID3.cpp
View File

@ -20,8 +20,8 @@
#include "../include/ID3.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/Utils.h>
#include <utils/String8.h>
#include <byteswap.h>

4
media/libstagefright/id3/testid3.cpp
View File

@ -23,7 +23,7 @@
#include <binder/ProcessState.h>
#include <media/stagefright/FileSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#define MAXPATHLEN 256
@ -70,7 +70,7 @@ static void hexdump(const void *_data, size_t size) {
void scanFile(const char *path) {
sp<FileSource> file = new FileSource(path);
CHECK_EQ(file->initCheck(), OK);
CHECK_EQ(file->initCheck(), (status_t)OK);
ID3 tag(file);
if (!tag.isValid()) {

2
media/libstagefright/mpeg2ts/MPEG2TSExtractor.cpp
View File

@ -22,8 +22,8 @@
#include "include/LiveSession.h"
#include "include/NuCachedSource2.h"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaSource.h>

4
media/libstagefright/omx/OMX.cpp
View File

@ -25,7 +25,7 @@
#include "../include/OMXNodeInstance.h"
#include <binder/IMemory.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <utils/threads.h>
#include "OMXMaster.h"
@ -102,7 +102,7 @@ OMX::CallbackDispatcher::~CallbackDispatcher() {
if (status != WOULD_BLOCK) {
// Other than join to self, the only other error return codes are
// whatever readyToRun() returns, and we don't override that
CHECK_EQ(status, NO_ERROR);
CHECK_EQ(status, (status_t)NO_ERROR);
}
}

4
media/libstagefright/omx/OMXComponentBase.cpp
View File

@ -18,7 +18,7 @@
#include <stdlib.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
namespace android {
@ -33,7 +33,7 @@ OMXComponentBase::OMXComponentBase(
OMXComponentBase::~OMXComponentBase() {}
void OMXComponentBase::setComponentHandle(OMX_COMPONENTTYPE *handle) {
CHECK_EQ(mComponentHandle, NULL);
CHECK(mComponentHandle == NULL);
mComponentHandle = handle;
}

2
media/libstagefright/omx/OMXMaster.cpp
View File

@ -24,7 +24,7 @@
#include <dlfcn.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
namespace android {

6
media/libstagefright/omx/OMXNodeInstance.cpp
View File

@ -24,8 +24,8 @@
#include <OMX_Component.h>
#include <binder/IMemory.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/HardwareAPI.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaErrors.h>
namespace android {
@ -91,11 +91,11 @@ OMXNodeInstance::OMXNodeInstance(
}
OMXNodeInstance::~OMXNodeInstance() {
CHECK_EQ(mHandle, NULL);
CHECK(mHandle == NULL);
}
void OMXNodeInstance::setHandle(OMX::node_id node_id, OMX_HANDLETYPE handle) {
CHECK_EQ(mHandle, NULL);
CHECK(mHandle == NULL);
mNodeID = node_id;
mHandle = handle;
}

2
media/libstagefright/omx/tests/Android.mk
View File

@ -5,7 +5,7 @@ LOCAL_SRC_FILES = \
OMXHarness.cpp \
LOCAL_SHARED_LIBRARIES := \
libstagefright libbinder libmedia libutils
libstagefright libbinder libmedia libutils libstagefright_foundation
LOCAL_C_INCLUDES := \
$(JNI_H_INCLUDE) \

32
media/libstagefright/omx/tests/OMXHarness.cpp
View File

@ -26,9 +26,9 @@
#include <binder/IServiceManager.h>
#include <binder/MemoryDealer.h>
#include <media/IMediaPlayerService.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/DataSource.h>
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaExtractor.h>
@ -155,7 +155,7 @@ status_t Harness::dequeueMessageForNodeIgnoringBuffers(
if (err == TIMED_OUT) {
return err;
}
CHECK_EQ(err, OK);
CHECK_EQ(err, (status_t)OK);
}
}
@ -317,7 +317,7 @@ status_t Harness::testStateTransitions(
EXPECT_SUCCESS(err, "allocatePortBuffers(input)");
err = dequeueMessageForNode(node, &msg, DEFAULT_TIMEOUT);
CHECK_EQ(err, TIMED_OUT);
CHECK_EQ(err, (status_t)TIMED_OUT);
Vector<Buffer> outputBuffers;
err = allocatePortBuffers(dealer, node, 1, &outputBuffers);
@ -412,7 +412,7 @@ status_t Harness::testStateTransitions(
// Make sure node doesn't just transition to loaded before we are done
// freeing all input and output buffers.
err = dequeueMessageForNode(node, &msg, DEFAULT_TIMEOUT);
CHECK_EQ(err, TIMED_OUT);
CHECK_EQ(err, (status_t)TIMED_OUT);
for (size_t i = 0; i < inputBuffers.size(); ++i) {
err = mOMX->freeBuffer(node, 0, inputBuffers[i].mID);
@ -420,7 +420,7 @@ status_t Harness::testStateTransitions(
}
err = dequeueMessageForNode(node, &msg, DEFAULT_TIMEOUT);
CHECK_EQ(err, TIMED_OUT);
CHECK_EQ(err, (status_t)TIMED_OUT);
for (size_t i = 0; i < outputBuffers.size(); ++i) {
err = mOMX->freeBuffer(node, 1, outputBuffers[i].mID);
@ -584,7 +584,7 @@ status_t Harness::testSeek(
return UNKNOWN_ERROR;
}
CHECK_EQ(seekSource->start(), OK);
CHECK_EQ(seekSource->start(), (status_t)OK);
sp<MediaSource> codec = OMXCodec::Create(
mOMX, source->getFormat(), false /* createEncoder */,
@ -592,7 +592,7 @@ status_t Harness::testSeek(
CHECK(codec != NULL);
CHECK_EQ(codec->start(), OK);
CHECK_EQ(codec->start(), (status_t)OK);
int64_t durationUs;
CHECK(source->getFormat()->findInt64(kKeyDuration, &durationUs));
@ -638,7 +638,7 @@ status_t Harness::testSeek(
requestedSeekTimeUs, MediaSource::ReadOptions::SEEK_NEXT_SYNC);
if (seekSource->read(&buffer, &options) != OK) {
CHECK_EQ(buffer, NULL);
CHECK(buffer == NULL);
actualSeekTimeUs = -1;
} else {
CHECK(buffer != NULL);
@ -659,7 +659,7 @@ status_t Harness::testSeek(
err = codec->read(&buffer, &options);
options.clearSeekTo();
if (err == INFO_FORMAT_CHANGED) {
CHECK_EQ(buffer, NULL);
CHECK(buffer == NULL);
continue;
}
if (err == OK) {
@ -670,7 +670,7 @@ status_t Harness::testSeek(
continue;
}
} else {
CHECK_EQ(buffer, NULL);
CHECK(buffer == NULL);
}
break;
@ -679,7 +679,7 @@ status_t Harness::testSeek(
if (requestedSeekTimeUs < 0) {
// Linear read.
if (err != OK) {
CHECK_EQ(buffer, NULL);
CHECK(buffer == NULL);
} else {
CHECK(buffer != NULL);
buffer->release();
@ -694,8 +694,8 @@ status_t Harness::testSeek(
"We attempted to seek beyond EOS and expected "
"ERROR_END_OF_STREAM to be returned, but instead "
"we found some other error.");
CHECK_EQ(err, ERROR_END_OF_STREAM);
CHECK_EQ(buffer, NULL);
CHECK_EQ(err, (status_t)ERROR_END_OF_STREAM);
CHECK(buffer == NULL);
} else {
EXPECT(err == OK,
"Expected a valid buffer to be returned from "
@ -715,7 +715,7 @@ status_t Harness::testSeek(
buffer->release();
buffer = NULL;
CHECK_EQ(codec->stop(), OK);
CHECK_EQ(codec->stop(), (status_t)OK);
return UNKNOWN_ERROR;
}
@ -725,7 +725,7 @@ status_t Harness::testSeek(
}
}
CHECK_EQ(codec->stop(), OK);
CHECK_EQ(codec->stop(), (status_t)OK);
return OK;
}
@ -841,7 +841,7 @@ int main(int argc, char **argv) {
srand(seed);
sp<Harness> h = new Harness;
CHECK_EQ(h->initCheck(), OK);
CHECK_EQ(h->initCheck(), (status_t)OK);
if (argc == 0) {
h->testAll();

10
media/libstagefright/tests/SurfaceMediaSource_test.cpp
View File

@ -35,7 +35,7 @@
#include <binder/ProcessState.h>
#include <ui/FramebufferNativeWindow.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaBufferGroup.h>
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MetaData.h>
@ -475,7 +475,7 @@ sp<MediaRecorder> SurfaceMediaSourceGLTest::setUpMediaRecorder(int fd, int video
mr->setVideoFrameRate(fps);
mr->prepare();
ALOGV("Starting MediaRecorder...");
CHECK_EQ(OK, mr->start());
CHECK_EQ((status_t)OK, mr->start());
return mr;
}
@ -757,7 +757,7 @@ TEST_F(SurfaceMediaSourceTest, DISABLED_EncodingFromCpuYV12BufferNpotWriteMediaS
ASSERT_EQ(NO_ERROR, native_window_api_disconnect(mANW.get(), NATIVE_WINDOW_API_CPU));
ALOGV("Stopping MediaRecorder...");
CHECK_EQ(OK, mr->stop());
CHECK_EQ((status_t)OK, mr->stop());
mr.clear();
close(fd);
}
@ -886,7 +886,7 @@ TEST_F(SurfaceMediaSourceGLTest, EncodingFromGLRgbaSameImageEachBufNpotWrite) {
mEglSurface = EGL_NO_SURFACE;
ALOGV("Stopping MediaRecorder...");
CHECK_EQ(OK, mr->stop());
CHECK_EQ((status_t)OK, mr->stop());
mr.clear();
close(fd);
}
@ -929,7 +929,7 @@ TEST_F(SurfaceMediaSourceGLTest, EncodingFromGLRgbaDiffImageEachBufNpotWrite) {
mEglSurface = EGL_NO_SURFACE;
ALOGV("Stopping MediaRecorder...");
CHECK_EQ(OK, mr->stop());
CHECK_EQ((status_t)OK, mr->stop());
mr.clear();
close(fd);
}

2
media/libstagefright/timedtext/TimedTextInBandSource.cpp
View File

@ -19,8 +19,8 @@
#include <utils/Log.h>
#include <binder/Parcel.h>
#include <media/stagefright/foundation/ADebug.h> // CHECK_XX macro
#include <media/stagefright/MediaBuffer.h>
#include <media/stagefright/MediaDebug.h> // CHECK_XX macro
#include <media/stagefright/MediaDefs.h> // for MEDIA_MIMETYPE_xxx
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MediaSource.h>

2
media/libstagefright/timedtext/TimedTextPlayer.cpp
View File

@ -18,8 +18,8 @@
#define LOG_TAG "TimedTextPlayer"
#include <utils/Log.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/foundation/AMessage.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/MediaErrors.h>
#include <media/MediaPlayerInterface.h>

2
media/libstagefright/yuv/YUVCanvas.cpp
View File

@ -17,7 +17,7 @@
#define LOG_NDEBUG 0
#define LOG_TAG "YUVCanvas"
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/YUVCanvas.h>
#include <media/stagefright/YUVImage.h>
#include <ui/Rect.h>

2
media/libstagefright/yuv/YUVImage.cpp
View File

@ -17,9 +17,9 @@
#define LOG_NDEBUG 0
#define LOG_TAG "YUVImage"
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/YUVImage.h>
#include <ui/Rect.h>
#include <media/stagefright/MediaDebug.h>
namespace android {

1
media/tests/omxjpegdecoder/Android.mk
View File

@ -26,6 +26,7 @@ LOCAL_SHARED_LIBRARIES := \
libcutils \
libskia \
libstagefright \
libstagefright_foundation \
libbinder \
libutils \
libjpeg

4
media/tests/omxjpegdecoder/SkOmxPixelRef.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <SkBitmap.h>
#include "SkOmxPixelRef.h"
@ -32,7 +32,7 @@ SkOmxPixelRef::SkOmxPixelRef(SkColorTable* ctable, MediaBuffer* buffer,
SkOmxPixelRef::~SkOmxPixelRef() {
mBuffer->release();
CHECK_EQ(mDecoder->stop(), OK);
CHECK_EQ(mDecoder->stop(), (status_t)OK);
SkSafeUnref(mCTable);
}

2
media/tests/omxjpegdecoder/StreamSource.cpp
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include "StreamSource.h"

6
media/tests/omxjpegdecoder/omx_jpeg_decoder.cpp
View File

@ -25,7 +25,7 @@
#include <binder/IServiceManager.h>
#include <binder/ProcessState.h>
#include <media/IMediaPlayerService.h>
#include <media/stagefright/MediaDebug.h>
#include <media/stagefright/foundation/ADebug.h>
#include <media/stagefright/MediaSource.h>
#include <media/stagefright/MetaData.h>
#include <media/stagefright/OMXClient.h>
@ -89,7 +89,7 @@ static int64_t getNowUs() {
OmxJpegImageDecoder::OmxJpegImageDecoder() {
status_t err = mClient.connect();
CHECK_EQ(err, OK);
CHECK_EQ(err, (status_t)OK);
}
OmxJpegImageDecoder::~OmxJpegImageDecoder() {
@ -152,7 +152,7 @@ bool OmxJpegImageDecoder::decodeSource(sp<MediaSource> decoder,
int64_t duration = getNowUs() - startTime;
if (err != OK) {
CHECK_EQ(buffer, NULL);
CHECK(buffer == NULL);
}
printf("Duration in decoder->read(): %.1f (msecs). \n",
duration / 1E3 );