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

Commit 6ce6ad3f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Use @2.0::IGraphicBufferProducer in media.c2"

parents f3283809 d9dcc175

current.txt

+3 −3
Original line number Diff line number Diff line
@@ -494,13 +494,13 @@ dd1ec219f5d2e2b33c6c0bcb92e63bbedb36f7c716413462848f6b6ae74fc864 android.hardwar 
aee53b2865b4f7939fb3df6fae758d9750c14f93dd454b479fc74aa7978fda4f android.hardware.media.bufferpool@2.0::IConnection

0bf3758eeeb05767830ea87041214be80968c4679fb73577ac5b3091841ee71f android.hardware.media.bufferpool@2.0::IObserver

82255e252ae215382473ad2e5ac7a2814a439a24f0092551aad7a2f89c6e9546 android.hardware.media.bufferpool@2.0::types

277161ea99236a0858e9fcc021c357db03be2de500acf5701d125e73e3e8071a android.hardware.media.c2@1.0::IComponent

7faa207e2507c6a2617e5ec2554b83383ebe392b6e627dddf2e3b0eae5715ba8 android.hardware.media.c2@1.0::IComponent

389d06e4a4ecf60f828a260045b0c327a5ae883ee0856a3c054556dd22b1f450 android.hardware.media.c2@1.0::IComponentInterface

5ee0c02265c5505ade189796bef46697df4e0563e3544bb0c934855b34694b07 android.hardware.media.c2@1.0::IComponentListener

43d70bcdc63b3d042bac3c3297f5d941dfabbd08f3ceb96b6016cc14f6e34ba3 android.hardware.media.c2@1.0::IComponentStore

d36f747f9c9a8f2f21db2f8323c2d755dd08b34ce813932d7339979f7d490dab android.hardware.media.c2@1.0::IConfigurable

cd2bd9f424515aeb0c2b91f3bb879797defb5b846b8660784b68d225285bcdff android.hardware.media.c2@1.0::IInputSink

c3dfaa1fcd452c6cfc26d8dcbb67b71b08a1fe6dad5f87427e93d11a95372b05 android.hardware.media.c2@1.0::IInputSurface

21aa259585caaa27b6470ebcd8509aabde0ef5d039160aa6425d589cb787488b android.hardware.media.c2@1.0::IInputSink

b9422a9aca84df1ff9623dc12c0562abce97716e28d63a965f2bfb88f9ad9607 android.hardware.media.c2@1.0::IInputSurface

0a786a19e6753f9774a7ca7781c2a2edfe5c0b5fa112355dfa0e50ebedeb08b9 android.hardware.media.c2@1.0::IInputSurfaceConnection

4cb139f729c29d8d6f4ecdab149c4feb571dad8a06e56cd57fcb52e70208bab4 android.hardware.media.c2@1.0::types

4880af120fc1640225abdc2c60bda6d79617d73484d5124913c7278af3b11e2d android.hardware.neuralnetworks@1.2::IBurstCallback

media/c2/1.0/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -19,7 +19,10 @@ hidl_interface { 
    ],

    interfaces: [

        "android.hardware.graphics.bufferqueue@1.0",

        "android.hardware.graphics.bufferqueue@2.0",

        "android.hardware.graphics.common@1.0",

        "android.hardware.graphics.common@1.1",

        "android.hardware.graphics.common@1.2",

        "android.hardware.media.bufferpool@2.0",

        "android.hardware.media.omx@1.0",

        "android.hardware.media@1.0",

media/c2/1.0/IComponent.hal

+3 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package android.hardware.media.c2@1.0;



import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;

import android.hardware.graphics.bufferqueue@2.0::IGraphicBufferProducer;

import android.hardware.media.omx@1.0::IGraphicBufferSource;



import IConfigurable;
@@ -128,7 +129,7 @@ interface IComponent { 
     */

    setOutputSurface(

            uint64_t blockPoolId,

            IGraphicBufferProducer surface

            @2.0::IGraphicBufferProducer surface

        ) generates (

            Status status

        );
@@ -184,7 +185,7 @@ interface IComponent { 
     *     null.

     */

    connectToOmxInputSurface(

            IGraphicBufferProducer producer,

            @1.0::IGraphicBufferProducer producer,

            IGraphicBufferSource source

        ) generates (

            Status status,

media/c2/1.0/IInputSink.hal

+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@ 


package android.hardware.media.c2@1.0;



import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;



import IConfigurable;



/**

media/c2/1.0/IInputSurface.hal

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package android.hardware.media.c2@1.0;



import android.hardware.graphics.bufferqueue@1.0::IGraphicBufferProducer;

import android.hardware.graphics.bufferqueue@2.0::IGraphicBufferProducer;



import IConfigurable;

import IInputSink;