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

Commit a240be90 authored by Sungtak Lee's avatar Sungtak Lee Committed by Android (Google) Code Review
Browse files

Merge changes from topic "c2V1_2-impl" into sc-dev 

* changes:
  Implement hardware.interface.media.c2@1.2 HAL
  Codec2: Add classes and interfaces for blocking allocator
  Codec2: Add C2Fence returnable fetch interfaces to C2BlockPool
parents a8464f17 a714f11c

media/codec2/hidl/1.0/utils/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ cc_library { 
    defaults: ["hidl_defaults"],



    srcs: [

        "OutputBufferQueue.cpp",

        "types.cpp",

    ],

media/codec2/hidl/1.1/utils/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ cc_library { 
    defaults: ["hidl_defaults"],



    srcs: [

        "OutputBufferQueue.cpp",

        "types.cpp",

    ],

media/codec2/hidl/1.1/utils/OutputBufferQueue.cpp

deleted100644 → 0
+0 −17
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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.

 */



#include <codec2/hidl/1.1/OutputBufferQueue.h>

media/codec2/hidl/1.1/utils/include/codec2/hidl/1.1/OutputBufferQueue.h

deleted100644 → 0
+0 −39
Original line number Diff line number Diff line 
/*

 * Copyright 2019 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.

 */



#ifndef CODEC2_HIDL_V1_1_UTILS_OUTPUT_BUFFER_QUEUE

#define CODEC2_HIDL_V1_1_UTILS_OUTPUT_BUFFER_QUEUE



#include <codec2/hidl/1.0/OutputBufferQueue.h>

#include <codec2/hidl/1.1/types.h>



namespace android {

namespace hardware {

namespace media {

namespace c2 {

namespace V1_1 {

namespace utils {



using ::android::hardware::media::c2::V1_0::utils::OutputBufferQueue;



} // namespace utils

} // namespace V1_1

} // namespace c2

} // namespace media

} // namespace hardware

} // namespace android



#endif // CODEC2_HIDL_V1_1_UTILS_OUTPUT_BUFFER_QUEUE

media/codec2/hidl/1.2/utils/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ cc_library { 
    defaults: ["hidl_defaults"],



    srcs: [

        "OutputBufferQueue.cpp",

        "types.cpp",

    ],