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

Commit 0c891997 authored by Andreas Huber's avatar Andreas Huber
Browse files

assert => CHECK in stagefright.

parent 355edcea

include/media/stagefright/MediaDebug.h

+2 −0
Original line number Diff line number Diff line
@@ -2,6 +2,8 @@ 


#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)

media/libstagefright/AudioPlayer.cpp

+16 −18
Original line number Diff line number Diff line
@@ -14,14 +14,12 @@ 
 * limitations under the License.

 */



#undef NDEBUG

#include <assert.h>



#define LOG_TAG "AudioPlayer"

#include <utils/Log.h>



#include <media/AudioTrack.h>

#include <media/stagefright/AudioPlayer.h>

#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaSource.h>

#include <media/stagefright/MetaData.h>
@@ -48,36 +46,36 @@ AudioPlayer::~AudioPlayer() { 
}



void AudioPlayer::setSource(const sp<MediaSource> &source) {

    assert(mSource == NULL);

    CHECK_EQ(mSource, NULL);

    mSource = source;

}



void AudioPlayer::start() {

    assert(!mStarted);

    assert(mSource != NULL);

    CHECK(!mStarted);

    CHECK(mSource != NULL);



    status_t err = mSource->start();

    assert(err == OK);

    CHECK_EQ(err, OK);



    sp<MetaData> format = mSource->getFormat();

    const char *mime;

    bool success = format->findCString(kKeyMIMEType, &mime);

    assert(success);

    assert(!strcasecmp(mime, "audio/raw"));

    CHECK(success);

    CHECK(!strcasecmp(mime, "audio/raw"));



    success = format->findInt32(kKeySampleRate, &mSampleRate);

    assert(success);

    CHECK(success);



    int32_t numChannels;

    success = format->findInt32(kKeyChannelCount, &numChannels);

    assert(success);

    CHECK(success);



    if (mAudioSink.get() != NULL) {

        status_t err = mAudioSink->open(

                mSampleRate, numChannels, AudioSystem::PCM_16_BIT,

                DEFAULT_AUDIOSINK_BUFFERCOUNT,

                &AudioPlayer::AudioSinkCallback, this);

        assert(err == OK);

        CHECK_EQ(err, OK);



        mLatencyUs = (int64_t)mAudioSink->latency() * 1000;

        mFrameSize = mAudioSink->frameSize();
@@ -91,7 +89,7 @@ void AudioPlayer::start() { 
                    : AudioSystem::CHANNEL_OUT_MONO,

                8192, 0, &AudioCallback, this, 0);



        assert(mAudioTrack->initCheck() == OK);

        CHECK_EQ(mAudioTrack->initCheck(), OK);



        mLatencyUs = (int64_t)mAudioTrack->latency() * 1000;

        mFrameSize = mAudioTrack->frameSize();
@@ -103,7 +101,7 @@ void AudioPlayer::start() { 
}



void AudioPlayer::pause() {

    assert(mStarted);

    CHECK(mStarted);



    if (mAudioSink.get() != NULL) {

        mAudioSink->pause();
@@ -113,7 +111,7 @@ void AudioPlayer::pause() { 
}



void AudioPlayer::resume() {

    assert(mStarted);

    CHECK(mStarted);



    if (mAudioSink.get() != NULL) {

        mAudioSink->start();
@@ -123,7 +121,7 @@ void AudioPlayer::resume() { 
}



void AudioPlayer::stop() {

    assert(mStarted);

    CHECK(mStarted);



    if (mAudioSink.get() != NULL) {

        mAudioSink->stop();
@@ -202,7 +200,7 @@ void AudioPlayer::fillBuffer(void *data, size_t size) { 
        if (mInputBuffer == NULL) {

            status_t err = mSource->read(&mInputBuffer, &options);



            assert((err == OK && mInputBuffer != NULL)

            CHECK((err == OK && mInputBuffer != NULL)

                   || (err != OK && mInputBuffer == NULL));



            if (err != OK) {
@@ -215,7 +213,7 @@ void AudioPlayer::fillBuffer(void *data, size_t size) { 
                mInputBuffer->meta_data()->findInt32(kKeyTimeUnits, &units);

            success = success &&

                mInputBuffer->meta_data()->findInt32(kKeyTimeScale, &scale);

            assert(success);

            CHECK(success);



            Mutex::Autolock autoLock(mLock);

            mPositionTimeMediaUs = (int64_t)units * 1000000 / scale;

media/libstagefright/CachingDataSource.cpp

+3 −5
Original line number Diff line number Diff line
@@ -14,14 +14,12 @@ 
 * limitations under the License.

 */



#include <media/stagefright/CachingDataSource.h>



#undef NDEBUG

#include <assert.h>



#include <stdlib.h>

#include <string.h>



#include <media/stagefright/CachingDataSource.h>

#include <media/stagefright/MediaDebug.h>



namespace android {



CachingDataSource::CachingDataSource(

media/libstagefright/CameraSource.cpp

+9 −11
Original line number Diff line number Diff line
@@ -16,13 +16,11 @@ 


#include <sys/time.h>



#undef NDEBUG

#include <assert.h>



#include <OMX_Component.h>



#include <binder/IServiceManager.h>

#include <media/stagefright/CameraSource.h>

#include <media/stagefright/MediaDebug.h>

#include <media/stagefright/MediaErrors.h>

#include <media/stagefright/MetaData.h>

#include <ui/ICameraClient.h>
@@ -56,12 +54,12 @@ public: 
    }



    virtual void notifyCallback(int32_t msgType, int32_t ext1, int32_t ext2) {

        assert(mSource != NULL);

        CHECK(mSource != NULL);

        mSource->notifyCallback(msgType, ext1, ext2);

    }



    virtual void dataCallback(int32_t msgType, const sp<IMemory> &data) {

        assert(mSource != NULL);

        CHECK(mSource != NULL);

        mSource->dataCallback(msgType, data);

    }
@@ -128,16 +126,16 @@ CameraSource::~CameraSource() { 
}



status_t CameraSource::start(MetaData *) {

    assert(!mStarted);

    CHECK(!mStarted);



    status_t err = mCamera->lock();

    assert(err == OK);

    CHECK_EQ(err, OK);



    err = mCamera->setPreviewDisplay(new DummySurface);

    assert(err == OK);

    CHECK_EQ(err, OK);

    mCamera->setPreviewCallbackFlag(1);

    mCamera->startPreview();

    assert(err == OK);

    CHECK_EQ(err, OK);



    mStarted = true;
@@ -145,7 +143,7 @@ status_t CameraSource::start(MetaData *) { 
}



status_t CameraSource::stop() {

    assert(mStarted);

    CHECK(mStarted);



    mCamera->stopPreview();

    mCamera->unlock();
@@ -167,7 +165,7 @@ sp<MetaData> CameraSource::getFormat() { 


status_t CameraSource::read(

        MediaBuffer **buffer, const ReadOptions *options) {

    assert(mStarted);

    CHECK(mStarted);



    *buffer = NULL;

media/libstagefright/FileSource.cpp

+2 −4
Original line number Diff line number Diff line
@@ -15,9 +15,7 @@ 
 */



#include <media/stagefright/FileSource.h>



#undef NDEBUG

#include <assert.h>

#include <media/stagefright/MediaDebug.h>



namespace android {
@@ -40,7 +38,7 @@ ssize_t FileSource::read_at(off_t offset, void *data, size_t size) { 
    Mutex::Autolock autoLock(mLock);



    int err = fseeko(mFile, offset, SEEK_SET);

    assert(err != -1);

    CHECK(err != -1);



    ssize_t result = fread(data, 1, size, mFile);