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

Commit b93626c4 authored by Wonsik Kim's avatar Wonsik Kim Committed by Gerrit Code Review
Browse files

Merge changes from topic "cherrypicker-L17700000962261813:N11400001392188571" into main 

* changes:
  Support mainline s/w codec
  AIDL BufferPool implementation (HIDL -> AIDL)
  AIDL bufferpool implementation (just copy from HIDL impl)
  bufferpool2: Support mainline s/w codec
  bufferpool2: add sync() method and etc
parents 4b64af21 4c790885

common/fmq/aidl/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ aidl_interface { 
            apex_available: [

                "//apex_available:platform",

                "com.android.btservices",

                "com.android.media.swcodec",

            ],

            min_sdk_version: "29",

        },

media/bufferpool/aidl/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -40,6 +40,11 @@ aidl_interface { 
        },

        ndk: {

            enabled: true,

            apex_available: [

                "//apex_available:platform",

                "com.android.media.swcodec",

            ],

            min_sdk_version: "29",

        },

    },

}

media/bufferpool/aidl/aidl_api/android.hardware.media.bufferpool2/current/android/hardware/media/bufferpool2/IClientManager.aidl

+6 −1
Original line number Diff line number Diff line
@@ -34,5 +34,10 @@ 
package android.hardware.media.bufferpool2;

@VintfStability

interface IClientManager {

  long registerSender(in android.hardware.media.bufferpool2.IAccessor bufferPool);

  android.hardware.media.bufferpool2.IClientManager.Registration registerSender(in android.hardware.media.bufferpool2.IAccessor bufferPool);

  @VintfStability

  parcelable Registration {

    long connectionId;

    boolean isNew = true;

  }

}

media/bufferpool/aidl/aidl_api/android.hardware.media.bufferpool2/current/android/hardware/media/bufferpool2/IConnection.aidl

+2 −1
Original line number Diff line number Diff line
@@ -35,12 +35,13 @@ package android.hardware.media.bufferpool2; 
@VintfStability

interface IConnection {

  android.hardware.media.bufferpool2.IConnection.FetchResult[] fetch(in android.hardware.media.bufferpool2.IConnection.FetchInfo[] fetchInfos);

  void sync();

  parcelable FetchInfo {

    long transactionId;

    int bufferId;

  }

  union FetchResult {

    android.hardware.media.bufferpool2.Buffer buffer;

    android.hardware.media.bufferpool2.ResultStatus failure;

    int failure;

  }

}

media/bufferpool/aidl/aidl_api/android.hardware.media.bufferpool2/current/android/hardware/media/bufferpool2/ResultStatus.aidl

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
package android.hardware.media.bufferpool2;

@VintfStability

parcelable ResultStatus {

  int resultStatus;

  const int OK = 0;

  const int NO_MEMORY = 1;

  const int ALREADY_EXISTS = 2;