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

Commit 61909fb9 authored by Pawit Pornkitprasan's avatar Pawit Pornkitprasan
Browse files

StagefrightRecorder: move WAVE out off ENABLE_AV_ENHANCEMENTS 

- This can be used by all devices
- .wav recording in our Sound Recorder needs this

Change-Id: I8c19164de5c2a5dc8991bc148448d3516d3b6c49
parent 70832569

media/libmediaplayerservice/StagefrightRecorder.cpp

+13 −13
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <media/stagefright/MediaCodecSource.h>

#include <media/stagefright/OMXClient.h>

#include <media/stagefright/OMXCodec.h>

#include <media/stagefright/WAVEWriter.h>

#include <media/MediaProfiles.h>

#include <camera/ICamera.h>

#include <camera/CameraParameters.h>
@@ -61,7 +62,6 @@ 
#include <ExtendedUtils.h>

#include <media/stagefright/ExtendedWriter.h>

#include <media/stagefright/FMA2DPWriter.h>

#include <media/stagefright/WAVEWriter.h>

#include <QCMediaDefs.h>

#endif
@@ -846,11 +846,11 @@ status_t StagefrightRecorder::prepareInternal() { 
        case OUTPUT_FORMAT_QCP:

            status = setupExtendedRecording();

            break;

#endif



        case OUTPUT_FORMAT_WAVE:

            status = setupWAVERecording();

            break;

#endif



        default:

            ALOGE("Unsupported output file format: %d", mOutputFormat);
@@ -944,8 +944,8 @@ status_t StagefrightRecorder::start() { 
        case OUTPUT_FORMAT_MPEG2TS:

#ifdef ENABLE_AV_ENHANCEMENTS

        case OUTPUT_FORMAT_QCP:

        case OUTPUT_FORMAT_WAVE:

#endif

        case OUTPUT_FORMAT_WAVE:

        {

            status = mWriter->start();

            break;
@@ -1043,10 +1043,10 @@ sp<MediaSource> StagefrightRecorder::createAudioSource() { 
            format->setString("mime", MEDIA_MIMETYPE_AUDIO_AAC);

            format->setInt32("aac-profile", OMX_AUDIO_AACObjectELD);

            break;

#ifdef ENABLE_AV_ENHANCEMENTS

        case AUDIO_ENCODER_LPCM:

            format->setString("mime", MEDIA_MIMETYPE_AUDIO_RAW);

            break;

#ifdef ENABLE_AV_ENHANCEMENTS

        case AUDIO_ENCODER_EVRC:

            format->setString("mime", MEDIA_MIMETYPE_AUDIO_EVRC);

            break;
@@ -2126,15 +2126,6 @@ status_t StagefrightRecorder::setupFMA2DPWriter() { 
    return setupRawAudioRecording();

}



status_t StagefrightRecorder::setupWAVERecording() {

    CHECK(mOutputFormat == OUTPUT_FORMAT_WAVE);

    CHECK(mAudioEncoder == AUDIO_ENCODER_LPCM);

    CHECK(mAudioSource != AUDIO_SOURCE_CNT);



    mWriter = new WAVEWriter(mOutputFd);

    return setupRawAudioRecording();

}



status_t StagefrightRecorder::setupExtendedRecording() {

    CHECK(mOutputFormat == OUTPUT_FORMAT_QCP);
@@ -2159,6 +2150,15 @@ status_t StagefrightRecorder::setupExtendedRecording() { 
}

#endif



status_t StagefrightRecorder::setupWAVERecording() {

    CHECK(mOutputFormat == OUTPUT_FORMAT_WAVE);

    CHECK(mAudioEncoder == AUDIO_ENCODER_LPCM);

    CHECK(mAudioSource != AUDIO_SOURCE_CNT);



    mWriter = new WAVEWriter(mOutputFd);

    return setupRawAudioRecording();

}



status_t StagefrightRecorder::setSourcePause(bool pause) {

    status_t err = OK;

    if (pause) {

media/libmediaplayerservice/StagefrightRecorder.h

+1 −1
Original line number Diff line number Diff line
@@ -205,9 +205,9 @@ private: 
    /* extension */

#ifdef ENABLE_AV_ENHANCEMENTS

    status_t setupFMA2DPWriter();

    status_t setupWAVERecording();

    status_t setupExtendedRecording();

#endif

    status_t setupWAVERecording();

};



}  // namespace android