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

Commit 3b9817ff authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 4667902 from 14dc815c to pi-release 

Change-Id: I070c8b4c8749316eb2874d3832ff8bdc3e517e9c
parents 3ba9e93b 14dc815c

audio/common/4.0/types.hal

+14 −6
Original line number Diff line number Diff line
@@ -373,21 +373,21 @@ enum AudioChannelMask : uint32_t { 
    OUT_TOP_BACK_LEFT         = 0x8000,

    OUT_TOP_BACK_CENTER       = 0x10000,

    OUT_TOP_BACK_RIGHT        = 0x20000,

    OUT_TOP_CENTER_LEFT       = 0x40000,

    OUT_TOP_CENTER_RIGHT      = 0x80000,

    OUT_TOP_SIDE_LEFT         = 0x40000,

    OUT_TOP_SIDE_RIGHT        = 0x80000,



    OUT_MONO     = OUT_FRONT_LEFT,

    OUT_STEREO   = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT),

    OUT_2POINT1  = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT | OUT_LOW_FREQUENCY),

    OUT_2POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

                         OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT),

                         OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_2POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

                         OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT |

                         OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT |

                         OUT_LOW_FREQUENCY),

    OUT_3POINT0POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT |

                         OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT),

                         OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_3POINT1POINT2 = (OUT_FRONT_LEFT | OUT_FRONT_CENTER | OUT_FRONT_RIGHT |

                        OUT_TOP_CENTER_LEFT | OUT_TOP_CENTER_RIGHT |

                        OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT |

                        OUT_LOW_FREQUENCY),

    OUT_QUAD     = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

            OUT_BACK_LEFT | OUT_BACK_RIGHT),
@@ -406,6 +406,10 @@ enum AudioChannelMask : uint32_t { 
    OUT_5POINT1_SIDE = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_SIDE_LEFT | OUT_SIDE_RIGHT),

    OUT_5POINT1POINT2  = (OUT_5POINT1 | OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_5POINT1POINT4  = (OUT_5POINT1 |

            OUT_TOP_FRONT_LEFT | OUT_TOP_FRONT_RIGHT |

            OUT_TOP_BACK_LEFT | OUT_TOP_BACK_RIGHT),

    OUT_6POINT1 = (OUT_FRONT_LEFT | OUT_FRONT_RIGHT |

            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_BACK_LEFT | OUT_BACK_RIGHT |
@@ -415,6 +419,10 @@ enum AudioChannelMask : uint32_t { 
            OUT_FRONT_CENTER | OUT_LOW_FREQUENCY |

            OUT_BACK_LEFT | OUT_BACK_RIGHT |

            OUT_SIDE_LEFT | OUT_SIDE_RIGHT),

    OUT_7POINT1POINT2  = (OUT_7POINT1 | OUT_TOP_SIDE_LEFT | OUT_TOP_SIDE_RIGHT),

    OUT_7POINT1POINT4  = (OUT_7POINT1 |

            OUT_TOP_FRONT_LEFT | OUT_TOP_FRONT_RIGHT |

            OUT_TOP_BACK_LEFT | OUT_TOP_BACK_RIGHT),

    // Note that the 2.0 OUT_ALL* have been moved to helper functions



    /* These are bits only, not complete values */

audio/common/all-versions/test/utility/include/utility/ReturnIn.h

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ class ReturnIn { 
    template <class Head, class... Tail>

    void set(Head&& head, Tail&&... tail) {

        std::get<sizeof...(ResultStore) - sizeof...(Tail) - 1>(results) = std::forward<Head>(head);

        set(tail...);

        set(std::forward<Tail>(tail)...);

    }

    // Trivial case

    void set() {}
@@ -56,7 +56,7 @@ class ReturnIn { 
}  // namespace detail



// Generate the HIDL synchronous callback with a copy policy

// Input: the variables (lvalue reference) where to save the return values

// Input: the variables (lvalue references) where to copy the return values

// Output: the callback to provide to a HIDL call with a synchronous callback

// The output parameters *will be copied* do not use this function if you have

// a zero copy policy

audio/common/all-versions/util/include/common/all-versions/VersionUtils.h

+6 −0
Original line number Diff line number Diff line
@@ -52,6 +52,12 @@ auto mkEnumConverter(Source source) { 
    return EnumConverter<Source, Destination>{source};

}



/** Allows converting an enum to its bitfield or itself. */

template <class Enum>

EnumConverter<Enum> mkBitfield(Enum value) {

    return EnumConverter<Enum>{value};

}



}  // namespace utils

}  // namespace common

}  // namespace audio

audio/core/4.0/vts/OWNERS

0 → 100644
+5 −0
Original line number Diff line number Diff line 
elaurent@google.com

krocard@google.com

mnaganov@google.com

yim@google.com

zhuoyao@google.com
 
 No newline at end of file

audio/core/4.0/vts/functional/Android.bp

0 → 100644
+36 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2017 The Android Open Source Project

//

// Licensed under the Apache License, Version 2.0 (the "License");

// you may not use this file except in compliance with the License.

// You may obtain a copy of the License at

//

//      http://www.apache.org/licenses/LICENSE-2.0

//

// Unless required by applicable law or agreed to in writing, software

// distributed under the License is distributed on an "AS IS" BASIS,

// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

// See the License for the specific language governing permissions and

// limitations under the License.

//



cc_test {

    name: "VtsHalAudioV4_0TargetTest",

    defaults: ["VtsHalTargetTestDefaults"],

    srcs: [

        "AudioPrimaryHidlHalTest.cpp",

        "ValidateAudioConfiguration.cpp"

    ],

    static_libs: [

        "android.hardware.audio.common.test.utility",

        "android.hardware.audio@4.0",

        "android.hardware.audio.common@4.0",

        "libxml2",

    ],

    shared_libs: [

        "libicuuc",

    ],

    header_libs: [

        "android.hardware.audio.common.util@all-versions",

    ],

}