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

Commit 84efcdcc authored by Satish Yalla's avatar Satish Yalla Committed by Automerger Merge Worker
Browse files

Merge "Revert "Use the global default cpp_std."" into main am: c6311523 am: b799e9d5 

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



Change-Id: Ie9eebd0cf660cbae614e27514203e2f5abf617f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7117e8d8 b799e9d5

media/codec2/components/avc/C2SoftAvcDec.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ private: 
        VuiColorAspects()

            : primaries(2), transfer(2), coeffs(2), fullRange(0) { }



        bool operator==(const VuiColorAspects &o) const {

        bool operator==(const VuiColorAspects &o) {

            return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs

                    && fullRange == o.fullRange;

        }

media/codec2/components/dav1d/C2SoftDav1dDec.h

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ struct C2SoftDav1dDec : public SimpleC2Component { 
              coeffs(C2Color::MATRIX_UNSPECIFIED),

              fullRange(C2Color::RANGE_UNSPECIFIED) {}



        bool operator==(const VuiColorAspects& o) const {

        bool operator==(const VuiColorAspects& o) {

            return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs &&

                   fullRange == o.fullRange;

        }

media/codec2/components/gav1/C2SoftGav1Dec.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct C2SoftGav1Dec : public SimpleC2Component { 
            coeffs(C2Color::MATRIX_UNSPECIFIED),

            fullRange(C2Color::RANGE_UNSPECIFIED) { }



      bool operator==(const VuiColorAspects &o) const {

      bool operator==(const VuiColorAspects &o) {

          return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs

                  && fullRange == o.fullRange;

      }

media/codec2/components/hevc/C2SoftHevcDec.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ struct C2SoftHevcDec : public SimpleC2Component { 
        VuiColorAspects()

            : primaries(2), transfer(2), coeffs(2), fullRange(0) { }



        bool operator==(const VuiColorAspects &o) const {

        bool operator==(const VuiColorAspects &o) {

            return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs

                    && fullRange == o.fullRange;

        }

media/codec2/components/mpeg2/C2SoftMpeg2Dec.h

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ struct C2SoftMpeg2Dec : public SimpleC2Component { 
        VuiColorAspects()

            : primaries(2), transfer(2), coeffs(2), fullRange(0) { }



        bool operator==(const VuiColorAspects &o) const {

        bool operator==(const VuiColorAspects &o) {

            return primaries == o.primaries && transfer == o.transfer && coeffs == o.coeffs

                    && fullRange == o.fullRange;

        }