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

Commit 393410a4 authored by James Dong's avatar James Dong
Browse files

Separate the key for audio sampling rate and video frame rate in MetaData.h 

Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
parent 54f5501a

include/media/stagefright/MetaData.h

+2 −1
Original line number Original line Diff line number Diff line
@@ -37,7 +37,8 @@ enum { 
    kKeyStride            = 'strd',  // int32_t

    kKeyStride            = 'strd',  // int32_t

    kKeySliceHeight       = 'slht',  // int32_t

    kKeySliceHeight       = 'slht',  // int32_t

    kKeyChannelCount      = '#chn',  // int32_t

    kKeyChannelCount      = '#chn',  // int32_t

    kKeySampleRate        = 'srte',  // int32_t (also video frame rate)

    kKeySampleRate        = 'srte',  // int32_t (audio sampling rate Hz)

    kKeyFrameRate         = 'frmR',  // int32_t (video frame rate fps)

    kKeyBitRate           = 'brte',  // int32_t (bps)

    kKeyBitRate           = 'brte',  // int32_t (bps)

    kKeyESDS              = 'esds',  // raw data

    kKeyESDS              = 'esds',  // raw data

    kKeyAVCC              = 'avcc',  // raw data

    kKeyAVCC              = 'avcc',  // raw data

media/libmediaplayerservice/StagefrightRecorder.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -1078,7 +1078,7 @@ status_t StagefrightRecorder::setupCameraSource( 
    if (mFrameRate == -1) {

    if (mFrameRate == -1) {

        int32_t frameRate = 0;

        int32_t frameRate = 0;

        CHECK ((*cameraSource)->getFormat()->findInt32(

        CHECK ((*cameraSource)->getFormat()->findInt32(

                    kKeySampleRate, &frameRate));

                    kKeyFrameRate, &frameRate));

        LOGI("Frame rate is not explicitly set. Use the current frame "

        LOGI("Frame rate is not explicitly set. Use the current frame "

             "rate (%d fps)", frameRate);

             "rate (%d fps)", frameRate);

        mFrameRate = frameRate;

        mFrameRate = frameRate;
@@ -1100,7 +1100,7 @@ status_t StagefrightRecorder::setupVideoEncoder( 




    sp<MetaData> enc_meta = new MetaData;

    sp<MetaData> enc_meta = new MetaData;

    enc_meta->setInt32(kKeyBitRate, videoBitRate);

    enc_meta->setInt32(kKeyBitRate, videoBitRate);

    enc_meta->setInt32(kKeySampleRate, mFrameRate);

    enc_meta->setInt32(kKeyFrameRate, mFrameRate);





    switch (mVideoEncoder) {

    switch (mVideoEncoder) {

        case VIDEO_ENCODER_H263:

        case VIDEO_ENCODER_H263:

media/libstagefright/CameraSource.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -531,7 +531,7 @@ status_t CameraSource::init( 
    mMeta->setInt32(kKeyHeight,      mVideoSize.height);

    mMeta->setInt32(kKeyHeight,      mVideoSize.height);

    mMeta->setInt32(kKeyStride,      mVideoSize.width);

    mMeta->setInt32(kKeyStride,      mVideoSize.width);

    mMeta->setInt32(kKeySliceHeight, mVideoSize.height);

    mMeta->setInt32(kKeySliceHeight, mVideoSize.height);

    mMeta->setInt32(kKeySampleRate,  mVideoFrameRate);

    mMeta->setInt32(kKeyFrameRate,   mVideoFrameRate);

    return OK;

    return OK;

}

}

media/libstagefright/OMXCodec.cpp

+4 −4
Original line number Original line Diff line number Diff line
@@ -935,7 +935,7 @@ void OMXCodec::setVideoInputFormat( 
    int32_t width, height, frameRate, bitRate, stride, sliceHeight;

    int32_t width, height, frameRate, bitRate, stride, sliceHeight;

    bool success = meta->findInt32(kKeyWidth, &width);

    bool success = meta->findInt32(kKeyWidth, &width);

    success = success && meta->findInt32(kKeyHeight, &height);

    success = success && meta->findInt32(kKeyHeight, &height);

    success = success && meta->findInt32(kKeySampleRate, &frameRate);

    success = success && meta->findInt32(kKeyFrameRate, &frameRate);

    success = success && meta->findInt32(kKeyBitRate, &bitRate);

    success = success && meta->findInt32(kKeyBitRate, &bitRate);

    success = success && meta->findInt32(kKeyStride, &stride);

    success = success && meta->findInt32(kKeyStride, &stride);

    success = success && meta->findInt32(kKeySliceHeight, &sliceHeight);

    success = success && meta->findInt32(kKeySliceHeight, &sliceHeight);
@@ -1155,7 +1155,7 @@ status_t OMXCodec::getVideoProfileLevel( 
status_t OMXCodec::setupH263EncoderParameters(const sp<MetaData>& meta) {

status_t OMXCodec::setupH263EncoderParameters(const sp<MetaData>& meta) {

    int32_t iFramesInterval, frameRate, bitRate;

    int32_t iFramesInterval, frameRate, bitRate;

    bool success = meta->findInt32(kKeyBitRate, &bitRate);

    bool success = meta->findInt32(kKeyBitRate, &bitRate);

    success = success && meta->findInt32(kKeySampleRate, &frameRate);

    success = success && meta->findInt32(kKeyFrameRate, &frameRate);

    success = success && meta->findInt32(kKeyIFramesInterval, &iFramesInterval);

    success = success && meta->findInt32(kKeyIFramesInterval, &iFramesInterval);

    CHECK(success);

    CHECK(success);

    OMX_VIDEO_PARAM_H263TYPE h263type;

    OMX_VIDEO_PARAM_H263TYPE h263type;
@@ -1202,7 +1202,7 @@ status_t OMXCodec::setupH263EncoderParameters(const sp<MetaData>& meta) { 
status_t OMXCodec::setupMPEG4EncoderParameters(const sp<MetaData>& meta) {

status_t OMXCodec::setupMPEG4EncoderParameters(const sp<MetaData>& meta) {

    int32_t iFramesInterval, frameRate, bitRate;

    int32_t iFramesInterval, frameRate, bitRate;

    bool success = meta->findInt32(kKeyBitRate, &bitRate);

    bool success = meta->findInt32(kKeyBitRate, &bitRate);

    success = success && meta->findInt32(kKeySampleRate, &frameRate);

    success = success && meta->findInt32(kKeyFrameRate, &frameRate);

    success = success && meta->findInt32(kKeyIFramesInterval, &iFramesInterval);

    success = success && meta->findInt32(kKeyIFramesInterval, &iFramesInterval);

    CHECK(success);

    CHECK(success);

    OMX_VIDEO_PARAM_MPEG4TYPE mpeg4type;

    OMX_VIDEO_PARAM_MPEG4TYPE mpeg4type;
@@ -1254,7 +1254,7 @@ status_t OMXCodec::setupMPEG4EncoderParameters(const sp<MetaData>& meta) { 
status_t OMXCodec::setupAVCEncoderParameters(const sp<MetaData>& meta) {

status_t OMXCodec::setupAVCEncoderParameters(const sp<MetaData>& meta) {

    int32_t iFramesInterval, frameRate, bitRate;

    int32_t iFramesInterval, frameRate, bitRate;

    bool success = meta->findInt32(kKeyBitRate, &bitRate);

    bool success = meta->findInt32(kKeyBitRate, &bitRate);

    success = success && meta->findInt32(kKeySampleRate, &frameRate);

    success = success && meta->findInt32(kKeyFrameRate, &frameRate);

    success = success && meta->findInt32(kKeyIFramesInterval, &iFramesInterval);

    success = success && meta->findInt32(kKeyIFramesInterval, &iFramesInterval);

    CHECK(success);

    CHECK(success);

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -207,7 +207,7 @@ status_t AVCEncoder::initCheck(const sp<MetaData>& meta) { 
    LOGV("initCheck");

    LOGV("initCheck");

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

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

    CHECK(meta->findInt32(kKeyHeight, &mVideoHeight));

    CHECK(meta->findInt32(kKeyHeight, &mVideoHeight));

    CHECK(meta->findInt32(kKeySampleRate, &mVideoFrameRate));

    CHECK(meta->findInt32(kKeyFrameRate, &mVideoFrameRate));

    CHECK(meta->findInt32(kKeyBitRate, &mVideoBitRate));

    CHECK(meta->findInt32(kKeyBitRate, &mVideoBitRate));





    // XXX: Add more color format support

    // XXX: Add more color format support
@@ -322,7 +322,7 @@ status_t AVCEncoder::initCheck(const sp<MetaData>& meta) { 
    mFormat->setInt32(kKeyWidth, mVideoWidth);

    mFormat->setInt32(kKeyWidth, mVideoWidth);

    mFormat->setInt32(kKeyHeight, mVideoHeight);

    mFormat->setInt32(kKeyHeight, mVideoHeight);

    mFormat->setInt32(kKeyBitRate, mVideoBitRate);

    mFormat->setInt32(kKeyBitRate, mVideoBitRate);

    mFormat->setInt32(kKeySampleRate, mVideoFrameRate);

    mFormat->setInt32(kKeyFrameRate, mVideoFrameRate);

    mFormat->setInt32(kKeyColorFormat, mVideoColorFormat);

    mFormat->setInt32(kKeyColorFormat, mVideoColorFormat);

    mFormat->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC);

    mFormat->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC);

    mFormat->setCString(kKeyDecoderComponent, "AVCEncoder");

    mFormat->setCString(kKeyDecoderComponent, "AVCEncoder");