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

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

Merge "If camera source uses the metadata, we must use HW encoder Software... 

Merge "If camera source uses the metadata, we must use HW encoder  Software video encoders are not able to deal with non-YUV metadata in the video buffer sent from camera"
parents f3332a1d 6312dd6d

media/libmediaplayerservice/StagefrightRecorder.cpp

+10 −2
Original line number Diff line number Diff line
@@ -1164,8 +1164,11 @@ status_t StagefrightRecorder::setupVideoEncoder( 
    CHECK_EQ(client.connect(), OK);



    // Use software codec for time lapse

    uint32_t encoder_flags = (mCaptureTimeLapse) ? OMXCodec::kPreferSoftwareCodecs : 0;

    if (mIsMetaDataStoredInVideoBuffers) {

    uint32_t encoder_flags = 0;

    if (mCaptureTimeLapse) {

        encoder_flags |= OMXCodec::kPreferSoftwareCodecs;

    } else if (mIsMetaDataStoredInVideoBuffers) {

        encoder_flags |= OMXCodec::kHardwareCodecsOnly;

        encoder_flags |= OMXCodec::kStoreMetaDataInVideoBuffers;

    }

    sp<MediaSource> encoder = OMXCodec::Create(
@@ -1173,6 +1176,11 @@ status_t StagefrightRecorder::setupVideoEncoder( 
            true /* createEncoder */, cameraSource,

            NULL, encoder_flags);

    if (encoder == NULL) {

        LOGW("Failed to create the encoder");

        // When the encoder fails to be created, we need

        // release the camera source due to the camera's lock

        // and unlock mechanism.

        cameraSource->stop();

        return UNKNOWN_ERROR;

    }

media/libstagefright/codecs/avc/enc/AVCEncoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ AVCEncoder::AVCEncoder( 
      mInputFrameData(NULL),

      mGroup(NULL) {



    LOGV("Construct software AVCEncoder");

    LOGI("Construct software AVCEncoder");



    mHandle = new tagAVCHandle;

    memset(mHandle, 0, sizeof(tagAVCHandle));

media/libstagefright/codecs/m4v_h263/enc/M4vH263Encoder.cpp

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ M4vH263Encoder::M4vH263Encoder( 
      mInputFrameData(NULL),

      mGroup(NULL) {



    LOGV("Construct software M4vH263Encoder");

    LOGI("Construct software M4vH263Encoder");



    mHandle = new tagvideoEncControls;

    memset(mHandle, 0, sizeof(tagvideoEncControls));