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

Commit f1962e7f authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Update language to comply with Android's inclusive language guidance"... 

Merge "Update language to comply with Android's inclusive language guidance" am: a0fc718c am: 14cfca7b am: ef4acc23 am: 0f0cbc6c

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1380557

Change-Id: Ibaf0e5e859f8f621e7a4389759765259c75cd61f
parents 74f594df 0f0cbc6c

media/libstagefright/ACodec.cpp

+11 −11
Original line number Diff line number Diff line
@@ -887,7 +887,7 @@ status_t ACodec::allocateBuffersOnPort(OMX_U32 portIndex) { 


            sp<DataConverter> converter = mConverter[portIndex];

            if (converter != NULL) {

                // here we assume sane conversions of max 4:1, so result fits in int32

                // here we assume conversions of max 4:1, so result fits in int32

                if (portIndex == kPortIndexInput) {

                    conversionBufferSize = converter->sourceSize(bufSize);

                } else {
@@ -2602,15 +2602,15 @@ status_t ACodec::configureTemporalLayers( 
    unsigned int numLayers = 0;

    unsigned int numBLayers = 0;

    int tags;

    char dummy;

    char tmp;

    OMX_VIDEO_ANDROID_TEMPORALLAYERINGPATTERNTYPE pattern =

        OMX_VIDEO_AndroidTemporalLayeringPatternNone;

    if (sscanf(tsSchema.c_str(), "webrtc.vp8.%u-layer%c", &numLayers, &dummy) == 1

    if (sscanf(tsSchema.c_str(), "webrtc.vp8.%u-layer%c", &numLayers, &tmp) == 1

            && numLayers > 0) {

        pattern = OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC;

    } else if ((tags = sscanf(tsSchema.c_str(), "android.generic.%u%c%u%c",

                    &numLayers, &dummy, &numBLayers, &dummy))

            && (tags == 1 || (tags == 3 && dummy == '+'))

                    &numLayers, &tmp, &numBLayers, &tmp))

            && (tags == 1 || (tags == 3 && tmp == '+'))

            && numLayers > 0 && numLayers < UINT32_MAX - numBLayers) {

        numLayers += numBLayers;

        pattern = OMX_VIDEO_AndroidTemporalLayeringPatternAndroid;
@@ -4757,15 +4757,15 @@ status_t ACodec::setupVPXEncoderParameters(const sp<AMessage> &msg, sp<AMessage> 
        unsigned int numLayers = 0;

        unsigned int numBLayers = 0;

        int tags;

        char dummy;

        if (sscanf(tsSchema.c_str(), "webrtc.vp8.%u-layer%c", &numLayers, &dummy) == 1

        char tmp;

        if (sscanf(tsSchema.c_str(), "webrtc.vp8.%u-layer%c", &numLayers, &tmp) == 1

                && numLayers > 0) {

            pattern = OMX_VIDEO_VPXTemporalLayerPatternWebRTC;

            tsType = OMX_VIDEO_AndroidTemporalLayeringPatternWebRTC;

            tsLayers = numLayers;

        } else if ((tags = sscanf(tsSchema.c_str(), "android.generic.%u%c%u%c",

                        &numLayers, &dummy, &numBLayers, &dummy))

                && (tags == 1 || (tags == 3 && dummy == '+'))

                        &numLayers, &tmp, &numBLayers, &tmp))

                && (tags == 1 || (tags == 3 && tmp == '+'))

                && numLayers > 0 && numLayers < UINT32_MAX - numBLayers) {

            pattern = OMX_VIDEO_VPXTemporalLayerPatternWebRTC;

            // VPX does not have a concept of B-frames, so just count all layers
@@ -7631,8 +7631,8 @@ status_t ACodec::setParameters(const sp<AMessage> &params) { 
        mInputFormat->setInt64("android._stop-time-offset-us", stopTimeOffsetUs);

    }



    int32_t dummy;

    if (params->findInt32("request-sync", &dummy)) {

    int32_t tmp;

    if (params->findInt32("request-sync", &tmp)) {

        status_t err = requestIDRFrame();



        if (err != OK) {

media/libstagefright/codecs/aacdec/DrcPresModeWrap.cpp

+2 −2
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ CDrcPresModeWrapper::update() 
        }

        else { // handle other used encoder target levels



            // Sanity check: DRC presentation mode is only specified for max. 5.1 channels

            // Validation check: DRC presentation mode is only specified for max. 5.1 channels

            if (mStreamNrAACChan > 6) {

                drcPresMode = 0;

            }
@@ -308,7 +308,7 @@ CDrcPresModeWrapper::update() 
            } // switch()

        } // if (mEncoderTarget  == GPM_ENCODER_TARGET_LEVEL)



        // sanity again

        // validation check again

        if (newHeavy == 1) {

            newBoostFactor=127; // not really needed as the same would be done by the decoder anyway

            newAttFactor = 127;

media/libstagefright/codecs/amrnb/enc/src/qgain475.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1106,7 +1106,7 @@ MR475_gain_quant( // o : index of quantization. 
    // the real, quantized gains)

    gc_pred(pred_st, MR475, sf1_code_nosharp,

            &sf1_exp_gcode0, &sf1_frac_gcode0,

            &sf0_exp_gcode0, &sf0_gcode0); // last two args are dummy

            &sf0_exp_gcode0, &sf0_gcode0); // last two args are unused

    sf1_gcode0 = extract_l(Pow2(14, sf1_frac_gcode0));



    tmp = add (tmp, 2);
@@ -1426,7 +1426,7 @@ Word16 MR475_gain_quant( /* o : index of quantization. */ 
       the real, quantized gains)                                   */

    gc_pred(pred_st, MR475, sf1_code_nosharp,

            &sf1_exp_gcode0, &sf1_frac_gcode0,

            &sf0_exp_gcode0, &sf0_gcode0, /* dummy args */

            &sf0_exp_gcode0, &sf0_gcode0, /* unused args */

            pOverflow);



    sf1_gcode0 = (Word16)(Pow2(14, sf1_frac_gcode0, pOverflow));

media/libstagefright/foundation/tests/TypeTraits_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ protected: 
    enum IA : int32_t { };

};



// =========== basic sanity tests for type-support templates

// =========== basic tests for type-support templates

TEST_F(TypeTraitsTest, StaticTests) {



    // ============ is_integral_or_enum