Merge "Renaming SurfaceEncoder to SurfaceMediaSource"

 * limitations under the License.

 */

#ifndef ANDROID_GUI_SURFACEENCODER_H

#define ANDROID_GUI_SURFACEENCODER_H

#ifndef ANDROID_GUI_SURFACEMEDIASOURCE_H

#define ANDROID_GUI_SURFACEMEDIASOURCE_H

#include <gui/ISurfaceTexture.h>

class String8;

class GraphicBuffer;

class SurfaceEncoder : public BnSurfaceTexture, public MediaSource,

class SurfaceMediaSource : public BnSurfaceTexture, public MediaSource,

                                            public MediaBufferObserver {

public:

    enum { MIN_UNDEQUEUED_BUFFERS = 3 };

    struct FrameAvailableListener : public virtual RefBase {

        // onFrameAvailable() is called from queueBuffer() is the FIFO is

        // empty. You can use SurfaceEncoder::getQueuedCount() to

        // empty. You can use SurfaceMediaSource::getQueuedCount() to

        // figure out if there are more frames waiting.

        // This is called without any lock held can be called concurrently by

        // multiple threads.

        virtual void onFrameAvailable() = 0;

    };

    SurfaceEncoder(uint32_t bufW, uint32_t bufH);

    SurfaceMediaSource(uint32_t bufW, uint32_t bufH);

    virtual ~SurfaceEncoder();

    virtual ~SurfaceMediaSource();

    // For the MediaSource interface for use by StageFrightRecorder:

    // setBufferCount updates the number of available buffer slots.  After

    // calling this all buffer slots are both unallocated and owned by the

    // SurfaceEncoder object (i.e. they are not owned by the client).

    // SurfaceMediaSource object (i.e. they are not owned by the client).

    virtual status_t setBufferCount(int bufferCount);

    virtual sp<GraphicBuffer> requestBuffer(int buf);

    virtual status_t dequeueBuffer(int *buf, uint32_t w, uint32_t h,

            uint32_t format, uint32_t usage);

    // queueBuffer returns a filled buffer to the SurfaceEncoder. In addition, a

    // queueBuffer returns a filled buffer to the SurfaceMediaSource. In addition, a

    // timestamp must be provided for the buffer. The timestamp is in

    // nanoseconds, and must be monotonically increasing. Its other semantics

    // (zero point, etc) are client-dependent and should be documented by the

    // modes (S.Encoder vis-a-vis SurfaceTexture)

    virtual status_t setSynchronousMode(bool enabled);

    // connect attempts to connect a client API to the SurfaceEncoder.  This

    // connect attempts to connect a client API to the SurfaceMediaSource.  This

    // must be called before any other ISurfaceTexture methods are called except

    // for getAllocator.

    //

    // This method will fail if the connect was previously called on the

    // SurfaceEncoder and no corresponding disconnect call was made.

    // SurfaceMediaSource and no corresponding disconnect call was made.

    virtual status_t connect(int api);

    // disconnect attempts to disconnect a client API from the SurfaceEncoder.

    // disconnect attempts to disconnect a client API from the SurfaceMediaSource.

    // Calling this method will cause any subsequent calls to other

    // ISurfaceTexture methods to fail except for getAllocator and connect.

    // Successfully calling connect after this will allow the other methods to

    // succeed again.

    //

    // This method will fail if the the SurfaceEncoder is not currently

    // This method will fail if the the SurfaceMediaSource is not currently

    // connected to the specified client API.

    virtual status_t disconnect(int api);

    void setFrameAvailableListener(const sp<FrameAvailableListener>& listener);

    // getAllocator retrieves the binder object that must be referenced as long

    // as the GraphicBuffers dequeued from this SurfaceEncoder are referenced.

    // as the GraphicBuffers dequeued from this SurfaceMediaSource are referenced.

    // Holding this binder reference prevents SurfaceFlinger from freeing the

    // buffers before the client is done with them.

    sp<IBinder> getAllocator();

    // mCurrentSlot is the buffer slot index of the buffer that is currently

    // being used by buffer consumer

    // (e.g. StageFrightRecorder in the case of SurfaceEncoder or GLTexture

    // (e.g. StageFrightRecorder in the case of SurfaceMediaSource or GLTexture

    // in the case of SurfaceTexture).

    // It is initialized to INVALID_BUFFER_SLOT,

    // indicating that no buffer slot is currently bound to the texture. Note,

    Fifo mQueue;

    // mMutex is the mutex used to prevent concurrent access to the member

    // variables of SurfaceEncoder objects. It must be locked whenever the

    // variables of SurfaceMediaSource objects. It must be locked whenever the

    // member variables are accessed.

    mutable Mutex mMutex;

    Condition mFrameCompleteCondition;

    // Avoid copying and equating and default constructor

    DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceEncoder);

    DISALLOW_IMPLICIT_CONSTRUCTORS(SurfaceMediaSource);

};

// ----------------------------------------------------------------------------

}; // namespace android

#endif // ANDROID_GUI_SURFACETEXTURE_H

#endif // ANDROID_GUI_SURFACEMEDIASOURCE_H

        SampleTable.cpp                   \

        StagefrightMediaScanner.cpp       \

        StagefrightMetadataRetriever.cpp  \

        SurfaceEncoder.cpp                \

        SurfaceMediaSource.cpp            \

        ThrottledSource.cpp               \

        TimeSource.cpp                    \

        TimedEventQueue.cpp               \

 */

// #define LOG_NDEBUG 0

#define LOG_TAG "SurfaceEncoder"

#define LOG_TAG "SurfaceMediaSource"

#include <media/stagefright/SurfaceEncoder.h>

#include <media/stagefright/SurfaceMediaSource.h>

#include <ui/GraphicBuffer.h>

#include <media/stagefright/MetaData.h>

#include <media/stagefright/MediaDefs.h>

namespace android {

SurfaceEncoder::SurfaceEncoder(uint32_t bufW, uint32_t bufH) :

SurfaceMediaSource::SurfaceMediaSource(uint32_t bufW, uint32_t bufH) :

    mDefaultWidth(bufW),

    mDefaultHeight(bufH),

    mPixelFormat(0),

    mConnectedApi(NO_CONNECTED_API),

    mFrameRate(30),

    mStarted(false)     {

    LOGV("SurfaceEncoder::SurfaceEncoder");

    LOGV("SurfaceMediaSource::SurfaceMediaSource");

    sp<ISurfaceComposer> composer(ComposerService::getComposerService());

    mGraphicBufferAlloc = composer->createGraphicBufferAlloc();

}

SurfaceEncoder::~SurfaceEncoder() {

    LOGV("SurfaceEncoder::~SurfaceEncoder");

SurfaceMediaSource::~SurfaceMediaSource() {

    LOGV("SurfaceMediaSource::~SurfaceMediaSource");

    if (mStarted) {

        stop();

    }

    freeAllBuffers();

}

size_t SurfaceEncoder::getQueuedCount() const {

size_t SurfaceMediaSource::getQueuedCount() const {

    Mutex::Autolock lock(mMutex);

    return mQueue.size();

}

status_t SurfaceEncoder::setBufferCountServerLocked(int bufferCount) {

status_t SurfaceMediaSource::setBufferCountServerLocked(int bufferCount) {

    if (bufferCount > NUM_BUFFER_SLOTS)

        return BAD_VALUE;

}

// Called from the consumer side

status_t SurfaceEncoder::setBufferCountServer(int bufferCount) {

status_t SurfaceMediaSource::setBufferCountServer(int bufferCount) {

    Mutex::Autolock lock(mMutex);

    return setBufferCountServerLocked(bufferCount);

}

status_t SurfaceEncoder::setBufferCount(int bufferCount) {

    LOGV("SurfaceEncoder::setBufferCount");

status_t SurfaceMediaSource::setBufferCount(int bufferCount) {

    LOGV("SurfaceMediaSource::setBufferCount");

    if (bufferCount > NUM_BUFFER_SLOTS) {

        LOGE("setBufferCount: bufferCount is larger than the number of buffer slots");

        return BAD_VALUE;

    return OK;

}

sp<GraphicBuffer> SurfaceEncoder::requestBuffer(int buf) {

    LOGV("SurfaceEncoder::requestBuffer");

sp<GraphicBuffer> SurfaceMediaSource::requestBuffer(int buf) {

    LOGV("SurfaceMediaSource::requestBuffer");

    Mutex::Autolock lock(mMutex);

    if (buf < 0 || mBufferCount <= buf) {

        LOGE("requestBuffer: slot index out of range [0, %d]: %d",

    return mSlots[buf].mGraphicBuffer;

}

status_t SurfaceEncoder::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,

status_t SurfaceMediaSource::dequeueBuffer(int *outBuf, uint32_t w, uint32_t h,

                                            uint32_t format, uint32_t usage) {

    LOGV("dequeueBuffer");

    return returnFlags;

}

status_t SurfaceEncoder::setSynchronousMode(bool enabled) {

status_t SurfaceMediaSource::setSynchronousMode(bool enabled) {

    Mutex::Autolock lock(mMutex);

    status_t err = OK;

    return err;

}

status_t SurfaceEncoder::connect(int api) {

    LOGV("SurfaceEncoder::connect");

status_t SurfaceMediaSource::connect(int api) {

    LOGV("SurfaceMediaSource::connect");

    Mutex::Autolock lock(mMutex);

    int err = NO_ERROR;

    switch (api) {

    return err;

}

status_t SurfaceEncoder::disconnect(int api) {

    LOGV("SurfaceEncoder::disconnect");

status_t SurfaceMediaSource::disconnect(int api) {

    LOGV("SurfaceMediaSource::disconnect");

    Mutex::Autolock lock(mMutex);

    int err = NO_ERROR;

    switch (api) {

    return err;

}

status_t SurfaceEncoder::queueBuffer(int buf, int64_t timestamp,

status_t SurfaceMediaSource::queueBuffer(int buf, int64_t timestamp,

        uint32_t* outWidth, uint32_t* outHeight, uint32_t* outTransform) {

    LOGV("queueBuffer");

// The buffer is NOT made available for dequeueing immediately. We need to

// wait to hear from StageFrightRecorder to set the buffer FREE

// Make sure this is called when the mutex is locked

status_t SurfaceEncoder::onFrameReceivedLocked() {

status_t SurfaceMediaSource::onFrameReceivedLocked() {

    LOGV("On Frame Received");

    // Signal the encoder that a new frame has arrived

    mFrameAvailableCondition.signal();

    // call back the listener

    // TODO: The listener may not be needed in SurfaceEncoder at all.

    // TODO: The listener may not be needed in SurfaceMediaSource at all.

    // This can be made a SurfaceTexture specific thing

    sp<FrameAvailableListener> listener;

    if (mSynchronousMode || mQueue.empty()) {

}

void SurfaceEncoder::cancelBuffer(int buf) {

    LOGV("SurfaceEncoder::cancelBuffer");

void SurfaceMediaSource::cancelBuffer(int buf) {

    LOGV("SurfaceMediaSource::cancelBuffer");

    Mutex::Autolock lock(mMutex);

    if (buf < 0 || buf >= mBufferCount) {

        LOGE("cancelBuffer: slot index out of range [0, %d]: %d",

    mDequeueCondition.signal();

}

nsecs_t SurfaceEncoder::getTimestamp() {

    LOGV("SurfaceEncoder::getTimestamp");

nsecs_t SurfaceMediaSource::getTimestamp() {

    LOGV("SurfaceMediaSource::getTimestamp");

    Mutex::Autolock lock(mMutex);

    return mCurrentTimestamp;

}

void SurfaceEncoder::setFrameAvailableListener(

void SurfaceMediaSource::setFrameAvailableListener(

        const sp<FrameAvailableListener>& listener) {

    LOGV("SurfaceEncoder::setFrameAvailableListener");

    LOGV("SurfaceMediaSource::setFrameAvailableListener");

    Mutex::Autolock lock(mMutex);

    mFrameAvailableListener = listener;

}

sp<IBinder> SurfaceEncoder::getAllocator() {

sp<IBinder> SurfaceMediaSource::getAllocator() {

    LOGV("getAllocator");

    return mGraphicBufferAlloc->asBinder();

}

void SurfaceEncoder::freeAllBuffers() {

void SurfaceMediaSource::freeAllBuffers() {

    LOGV("freeAllBuffers");

    for (int i = 0; i < NUM_BUFFER_SLOTS; i++) {

        mSlots[i].mGraphicBuffer = 0;

    }

}

sp<GraphicBuffer> SurfaceEncoder::getCurrentBuffer() const {

sp<GraphicBuffer> SurfaceMediaSource::getCurrentBuffer() const {

    Mutex::Autolock lock(mMutex);

    return mCurrentBuf;

}

int SurfaceEncoder::query(int what, int* outValue)

int SurfaceMediaSource::query(int what, int* outValue)

{

    LOGV("query");

    Mutex::Autolock lock(mMutex);

    return NO_ERROR;

}

void SurfaceEncoder::dump(String8& result) const

void SurfaceMediaSource::dump(String8& result) const

{

    char buffer[1024];

    dump(result, "", buffer, 1024);

}

void SurfaceEncoder::dump(String8& result, const char* prefix,

void SurfaceMediaSource::dump(String8& result, const char* prefix,

        char* buffer, size_t SIZE) const

{

    Mutex::Autolock _l(mMutex);

    }

}

void SurfaceEncoder::setFrameRate(uint32_t fps)

void SurfaceMediaSource::setFrameRate(uint32_t fps)

{

    Mutex::Autolock lock(mMutex);

    mFrameRate = fps;

}

uint32_t SurfaceEncoder::getFrameRate( ) const {

uint32_t SurfaceMediaSource::getFrameRate( ) const {

    Mutex::Autolock lock(mMutex);

    return mFrameRate;

}

status_t SurfaceEncoder::start(MetaData *params)

status_t SurfaceMediaSource::start(MetaData *params)

{

    LOGV("start");

    Mutex::Autolock lock(mMutex);

}

status_t SurfaceEncoder::stop()

status_t SurfaceMediaSource::stop()

{

    LOGV("Stop");

    return OK;

}

sp<MetaData> SurfaceEncoder::getFormat()

sp<MetaData> SurfaceMediaSource::getFormat()

{

    LOGV("getFormat");

    Mutex::Autolock autoLock(mMutex);

    return meta;

}

status_t SurfaceEncoder::read( MediaBuffer **buffer,

status_t SurfaceMediaSource::read( MediaBuffer **buffer,

                                const ReadOptions *options)

{

    LOGV("Read. Size of queued buffer: %d", mQueue.size());

    return OK;

}

void SurfaceEncoder::signalBufferReturned(MediaBuffer *buffer) {

void SurfaceMediaSource::signalBufferReturned(MediaBuffer *buffer) {

    LOGV("signalBufferReturned");

    bool foundBuffer = false;

ifneq ($(TARGET_SIMULATOR),true)

LOCAL_MODULE := SurfaceEncoder_test

LOCAL_MODULE := SurfaceMediaSource_test

LOCAL_MODULE_TAGS := tests

LOCAL_SRC_FILES := \

    SurfaceEncoder_test.cpp \

    SurfaceMediaSource_test.cpp \

	DummyRecorder.cpp \

LOCAL_SHARED_LIBRARIES := \

 * limitations under the License.

 */

#define LOG_TAG "SurfaceEncoder_test"

#define LOG_TAG "SurfaceMediaSource_test"

// #define LOG_NDEBUG 0

#include <gtest/gtest.h>

#include <utils/String8.h>

#include <utils/Errors.h>

#include <media/stagefright/SurfaceEncoder.h>

#include <media/stagefright/SurfaceMediaSource.h>

#include <gui/SurfaceTextureClient.h>

#include <ui/GraphicBuffer.h>

namespace android {

class SurfaceEncoderTest : public ::testing::Test {

class SurfaceMediaSourceTest : public ::testing::Test {

public:

    SurfaceEncoderTest( ): mYuvTexWidth(64), mYuvTexHeight(66) { }

    SurfaceMediaSourceTest( ): mYuvTexWidth(64), mYuvTexHeight(66) { }

    sp<MPEG4Writer>  setUpWriter(OMXClient &client );

    void oneBufferPass(int width, int height );

    static void fillYV12Buffer(uint8_t* buf, int w, int h, int stride) ;

protected:

    virtual void SetUp() {

        mSE = new SurfaceEncoder(mYuvTexWidth, mYuvTexHeight);

        mSE->setSynchronousMode(true);

        mSTC = new SurfaceTextureClient(mSE);

        mSMS = new SurfaceMediaSource(mYuvTexWidth, mYuvTexHeight);

        mSMS->setSynchronousMode(true);

        mSTC = new SurfaceTextureClient(mSMS);

        mANW = mSTC;

    }

    virtual void TearDown() {

        mSE.clear();

        mSMS.clear();

        mSTC.clear();

        mANW.clear();

    }

    const int mYuvTexWidth;//  = 64;

    const int mYuvTexHeight;// = 66;

    sp<SurfaceEncoder> mSE;

    sp<SurfaceMediaSource> mSMS;

    sp<SurfaceTextureClient> mSTC;

    sp<ANativeWindow> mANW;

};

void SurfaceEncoderTest::oneBufferPass(int width, int height ) {

void SurfaceMediaSourceTest::oneBufferPass(int width, int height ) {

    LOGV("One Buffer Pass");

    ANativeWindowBuffer* anb;

    ASSERT_EQ(NO_ERROR, mANW->dequeueBuffer(mANW.get(), &anb));

    // Fill the buffer with the a checkerboard pattern

    uint8_t* img = NULL;

    buf->lock(GRALLOC_USAGE_SW_WRITE_OFTEN, (void**)(&img));

    SurfaceEncoderTest::fillYV12Buffer(img, width, height, buf->getStride());

    SurfaceMediaSourceTest::fillYV12Buffer(img, width, height, buf->getStride());

    buf->unlock();

    ASSERT_EQ(NO_ERROR, mANW->queueBuffer(mANW.get(), buf->getNativeBuffer()));

}

sp<MPEG4Writer> SurfaceEncoderTest::setUpWriter(OMXClient &client ) {

sp<MPEG4Writer> SurfaceMediaSourceTest::setUpWriter(OMXClient &client ) {

    // Writing to a file

    const char *fileName = "/sdcard/outputSurfEnc.mp4";

    sp<MetaData> enc_meta = new MetaData;

    enc_meta->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_MPEG4);

    sp<MetaData> meta = mSE->getFormat();

    sp<MetaData> meta = mSMS->getFormat();

    int32_t width, height, stride, sliceHeight, colorFormat;

    CHECK(meta->findInt32(kKeyWidth, &width));

    sp<MediaSource> encoder =

        OMXCodec::Create(

                client.interface(), enc_meta, true /* createEncoder */, mSE);

                client.interface(), enc_meta, true /* createEncoder */, mSMS);

    sp<MPEG4Writer> writer = new MPEG4Writer(fileName);

    writer->addSource(encoder);

}

// Fill a YV12 buffer with a multi-colored checkerboard pattern

void SurfaceEncoderTest::fillYV12Buffer(uint8_t* buf, int w, int h, int stride) {

void SurfaceMediaSourceTest::fillYV12Buffer(uint8_t* buf, int w, int h, int stride) {

    const int blockWidth = w > 16 ? w / 16 : 1;

    const int blockHeight = h > 16 ? h / 16 : 1;

    const int yuvTexOffsetY = 0;

}

// Fill a YV12 buffer with red outside a given rectangle and green inside it.

void SurfaceEncoderTest::fillYV12BufferRect(uint8_t* buf, int w,

void SurfaceMediaSourceTest::fillYV12BufferRect(uint8_t* buf, int w,

                  int h, int stride, const android_native_rect_t& rect) {

    const int yuvTexOffsetY = 0;

    int yuvTexStrideY = stride;

            }

        }

    }

}  ///////// End of class SurfaceEncoderTest

}  ///////// End of class SurfaceMediaSourceTest

///////////////////////////////////////////////////////////////////

// Class to imitate the recording     /////////////////////////////

///////////////////////////////////////////////////////////////////

//           TESTS

// Just pass one buffer from the native_window to the SurfaceEncoder

TEST_F(SurfaceEncoderTest, EncodingFromCpuFilledYV12BufferNpotOneBufferPass) {

// Just pass one buffer from the native_window to the SurfaceMediaSource

TEST_F(SurfaceMediaSourceTest, EncodingFromCpuFilledYV12BufferNpotOneBufferPass) {

    LOGV("Testing OneBufferPass ******************************");

    ASSERT_EQ(NO_ERROR, native_window_set_buffers_geometry(mANW.get(),

}

// Pass the buffer with the wrong height and weight and should not be accepted

TEST_F(SurfaceEncoderTest, EncodingFromCpuFilledYV12BufferNpotWrongSizeBufferPass) {

TEST_F(SurfaceMediaSourceTest, EncodingFromCpuFilledYV12BufferNpotWrongSizeBufferPass) {

    LOGV("Testing Wrong size BufferPass ******************************");

    // setting the client side buffer size different than the server size

}

// pass multiple buffers from the native_window the SurfaceEncoder

// pass multiple buffers from the native_window the SurfaceMediaSource

// A dummy writer is used to simulate actual MPEG4Writer

TEST_F(SurfaceEncoderTest,  EncodingFromCpuFilledYV12BufferNpotMultiBufferPass) {

TEST_F(SurfaceMediaSourceTest,  EncodingFromCpuFilledYV12BufferNpotMultiBufferPass) {

    LOGV("Testing MultiBufferPass, Dummy Recorder *********************");

    ASSERT_EQ(NO_ERROR, native_window_set_buffers_geometry(mANW.get(),

            0, 0, HAL_PIXEL_FORMAT_YV12));

    ASSERT_EQ(NO_ERROR, native_window_set_usage(mANW.get(),

            GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN));

    SimpleDummyRecorder writer(mSE);

    SimpleDummyRecorder writer(mSMS);

    writer.start();

    int32_t nFramesCount = 0;

    writer.stop();

}

// Delayed pass of multiple buffers from the native_window the SurfaceEncoder

// Delayed pass of multiple buffers from the native_window the SurfaceMediaSource

// A dummy writer is used to simulate actual MPEG4Writer

TEST_F(SurfaceEncoderTest,  EncodingFromCpuFilledYV12BufferNpotMultiBufferPassLag) {

TEST_F(SurfaceMediaSourceTest,  EncodingFromCpuFilledYV12BufferNpotMultiBufferPassLag) {

    LOGV("Testing MultiBufferPass, Dummy Recorder Lagging **************");

    ASSERT_EQ(NO_ERROR, native_window_set_buffers_geometry(mANW.get(),

            0, 0, HAL_PIXEL_FORMAT_YV12));

    ASSERT_EQ(NO_ERROR, native_window_set_usage(mANW.get(),

            GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN));

    SimpleDummyRecorder writer(mSE);

    SimpleDummyRecorder writer(mSMS);

    writer.start();

    int32_t nFramesCount = 1;

    const int FRAMES_LAG = mSE->getBufferCount() - 1;

    const int FRAMES_LAG = mSMS->getBufferCount() - 1;

    while (nFramesCount <= 300) {

        oneBufferPass(mYuvTexWidth, mYuvTexHeight);

        // Forcing the writer to lag behind a few frames

    writer.stop();

}

// pass multiple buffers from the native_window the SurfaceEncoder

// pass multiple buffers from the native_window the SurfaceMediaSource

// A dummy writer (MULTITHREADED) is used to simulate actual MPEG4Writer

TEST_F(SurfaceEncoderTest, EncodingFromCpuFilledYV12BufferNpotMultiBufferPassThreaded) {

TEST_F(SurfaceMediaSourceTest, EncodingFromCpuFilledYV12BufferNpotMultiBufferPassThreaded) {

    LOGV("Testing MultiBufferPass, Dummy Recorder Multi-Threaded **********");

    ASSERT_EQ(NO_ERROR, native_window_set_buffers_geometry(mANW.get(),

            0, 0, HAL_PIXEL_FORMAT_YV12));

    ASSERT_EQ(NO_ERROR, native_window_set_usage(mANW.get(),

            GRALLOC_USAGE_SW_READ_OFTEN | GRALLOC_USAGE_SW_WRITE_OFTEN));

    DummyRecorder writer(mSE);

    DummyRecorder writer(mSMS);

    writer.start();

    int32_t nFramesCount = 0;

// Test to examine the actual encoding. Temporarily disabled till the

// colorformat and encoding from GRAlloc data is resolved