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

Commit 5ab530c5 authored by Lajos Molnar's avatar Lajos Molnar
Browse files

Codec2/AUtils: rename nom to num for 'numerator' 

Change-Id: Ic357384ad35826fb668f43ad761365c8bc349587
parent 6766df4e

media/libstagefright/codec2/include/C2Param.h

+3 −3
Original line number Diff line number Diff line
@@ -1308,7 +1308,7 @@ struct C2FieldSupportedValues { 
        Primitive min;

        Primitive max;

        Primitive step;

        Primitive nom;

        Primitive num;

        Primitive denom;

    } range;

    std::vector<Primitive> values;
@@ -1323,9 +1323,9 @@ struct C2FieldSupportedValues { 
          range{min, max, step, (T)1, (T)1} { }



    template<typename T>

    C2FieldSupportedValues(T min, T max, T nom, T den) :

    C2FieldSupportedValues(T min, T max, T num, T den) :

        type(RANGE),

        range{min, max, (T)0, nom, den} { }

        range{min, max, (T)0, num, den} { }



    template<typename T>

    C2FieldSupportedValues(bool flags, std::initializer_list<T> list)

media/libstagefright/codec2/tests/C2ComponentInterface_test.cpp

+6 −6
Original line number Diff line number Diff line
@@ -410,17 +410,17 @@ void C2CompIntfTest::getTestValues( 
            // 1. integer geometric case

            // 2. float geometric case



            auto nom = prim2Value(range.nom);

            auto num = prim2Value(range.num);

            auto denom = prim2Value(range.denom);



            // If both range.nom and range.denom are 1 and step is 0, we should use

            // If both range.num and range.denom are 1 and step is 0, we should use

            // VALUES, shouldn't we?

            ASSERT_FALSE(nom == 1 && denom == 1);

            ASSERT_FALSE(num == 1 && denom == 1);



            // (nom / denom) is not less than 1.

            // (num / denom) is not less than 1.

            ASSERT_FALSE(denom == 0);

            ASSERT_LE(denom, nom);

            for (auto v = rmin; v <= rmax; v = v * nom / denom) {

            ASSERT_LE(denom, num);

            for (auto v = rmin; v <= rmax; v = v * num / denom) {

                validValues->emplace_back(v);

            }

media/libstagefright/codec2/tests/C2Param_test.cpp

+3 −3
Original line number Diff line number Diff line
@@ -2622,8 +2622,8 @@ void dumpFSV(const C2FieldSupportedValues &sv, T*t) { 
        if (get(sv.range.step, t) != std::is_integral<T>::value) {

            cout << ":" << get(sv.range.step, t);

        }

        if (get(sv.range.nom, t) != 1 || get(sv.range.denom, t) != 1) {

            cout << ":" << get(sv.range.nom, t) << "/" << get(sv.range.denom, t);

        if (get(sv.range.num, t) != 1 || get(sv.range.denom, t) != 1) {

            cout << ":" << get(sv.range.num, t) << "/" << get(sv.range.denom, t);

        }

        cout << get(sv.range.max, t) << ")";

    }
@@ -2769,7 +2769,7 @@ TEST_F(C2ParamTest, FieldSupportedValuesTest) { 
    Uint32TestInfo t;

    std::vector<C2FieldSupportedValues> values;

    values.push_back(C2FieldSupportedValues(0, 10, 1));  // min, max, step

    values.push_back(C2FieldSupportedValues(1, 64, 2, 1));  // min, max, nom, den

    values.push_back(C2FieldSupportedValues(1, 64, 2, 1));  // min, max, num, den

    values.push_back(C2FieldSupportedValues(false, {1, 2, 3}));  // flags, std::initializer_list

    uint32_t val[] = {1, 3, 5, 7};

    std::vector<uint32_t> v(std::begin(val), std::end(val));

media/libstagefright/codecs/avcdec/C2SoftAvcDec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct ValidateParam { 
            }

        case C2FieldSupportedValues::RANGE:

            {

                // TODO: handle step, nom, denom

                // TODO: handle step, num, denom

                return Getter<T>::get(supportedValues.range.min) <= value

                        && value <= Getter<T>::get(supportedValues.range.max);

            }

media/libstagefright/foundation/include/media/stagefright/foundation/AUtils.h

+11 −11
Original line number Diff line number Diff line
@@ -22,28 +22,28 @@ 


/* T must be integer type, den must not be 0 */

template<class T>

inline static const T divRound(const T &nom, const T &den) {

    if ((nom >= 0) ^ (den >= 0)) {

        return (nom - den / 2) / den;

inline static const T divRound(const T &num, const T &den) {

    if ((num >= 0) ^ (den >= 0)) {

        return (num - den / 2) / den;

    } else {

        return (nom + den / 2) / den;

        return (num + den / 2) / den;

    }

}



/* == ceil(nom / den). T must be integer type, den must not be 0 */

/* == ceil(num / den). T must be integer type, den must not be 0 */

template<class T>

inline static const T divUp(const T &nom, const T &den) {

inline static const T divUp(const T &num, const T &den) {

    if (den < 0) {

        return (nom < 0 ? nom + den + 1 : nom) / den;

        return (num < 0 ? num + den + 1 : num) / den;

    } else {

        return (nom < 0 ? nom : nom + den - 1) / den;

        return (num < 0 ? num : num + den - 1) / den;

    }

}



/* == ceil(nom / den) * den. T must be integer type, alignment must be positive power of 2 */

/* == ceil(num / den) * den. T must be integer type, alignment must be positive power of 2 */

template<class T, class U>

inline static const T align(const T &nom, const U &den) {

    return (nom + (T)(den - 1)) & (T)~(den - 1);

inline static const T align(const T &num, const U &den) {

    return (num + (T)(den - 1)) & (T)~(den - 1);

}



template<class T>