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

Commit 385f1caf authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Move away from MediaDebug and use ADebug instead"

parents cb66aec0 8e9d67a1

cmds/stagefright/Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -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) \

cmds/stagefright/SineSource.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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>

cmds/stagefright/audioloop.cpp

+4 −4
Original line number Diff line number Diff line
@@ -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

cmds/stagefright/record.cpp

+6 −6
Original line number Diff line number Diff line
@@ -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;

cmds/stagefright/recordvideo.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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();