Commit graph

415 commits

Author SHA1 Message Date
Sungtak Lee
dcc85601eb Merge "media.c2 aidl: do not throw status, return instead" into main am: 3c548fc475 am: 1cccdf5c1c am: 4c76bdb635
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2893421

Change-Id: I01b9e7454acb3b9ad9f7079071e016773103792a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-01-04 02:37:12 +00:00
Sungtak Lee
3c548fc475 Merge "media.c2 aidl: do not throw status, return instead" into main 2024-01-04 00:35:37 +00:00
Sungtak Lee
5e517c39ec media.c2 aidl: do not throw status, return instead
config(),query() and querySupportedValues() can return values as a
partial failure when status was thrown. So return the status instead of
throwing(For the compatibility with HIDL interface).

Bug: 254050314
Change-Id: Iece35ff11049e1b3fccb3b72a4d438621138e21e
2024-01-03 07:16:52 +00:00
Steven Moreland
f2a3ada309 Merge "BufferPoolClient: avoid dereference null accessor" into main am: 85333361c1 am: 71d3a7ccbc am: 20c1948aa5
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2889801

Change-Id: I5d3228265cc964c0bc13164bcb40bf22e0290bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-28 04:53:03 +00:00
Steven Moreland
483e69f4eb BufferPoolClient: avoid dereference null accessor
Bug: 308739058
Test: N/A
Change-Id: I568e9d82976a1f7d7278748f347a17eb6f93fc79
2023-12-27 22:55:36 +00:00
Treehugger Robot
7107992809 Merge "Disable the rust backend of android.hardware.media.c2" into main am: 12e8aba235 am: 9cbc36cb4a am: 842b48f0cf
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2880987

Change-Id: I4cd2afd4d792592bc6b79f2edb36f760489d0719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-19 01:09:39 +00:00
Devin Moore
763909c378 Disable the rust backend of android.hardware.media.c2
There are currently no users of it. Enabling it will require adding rust
support for the android.os.Surface type that uses ANativeWindow
underneath.

Test: m
Bug: 315556623
Change-Id: Ib9954b1bf476b391919db994bc2dc1483d972670
2023-12-18 19:28:10 +00:00
Sungtak Lee
1dba27e319 Merge "media.c2 aidl: handle the case of fence being invalid" into main am: cf5c2cf45a am: e12f4b7664 am: 7b8f40ad23
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2845122

Change-Id: I2c7b33f0db1b4d5364dda046dee0e843c3a44821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-27 19:45:44 +00:00
Sungtak Lee
80345e908e media.c2 aidl: handle the case of fence being invalid
Bug: 254050314
Test: m
Change-Id: I6eed49119de96326324f901fd99d20ab605b92a0
2023-11-26 22:55:09 +00:00
Treehugger Robot
ff87f29cd9 Merge "media.c2 aidl: provide a waitable fd for blockpool creation" into main am: a9050e3ac0 am: 42655cc0d8 am: b7a7088042
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2805373

Change-Id: Ib29cffb5bcab11bd8c057c0194592f84a9c95daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28 08:09:06 +00:00
Sungtak Lee
eec87d9081 media.c2 aidl: provide a waitable fd for blockpool creation
Provide a waitable fd as a param for IComponent::createBlockPool()
along with IGraphicBufferAllocator interface. This will remove one IPC
call from HAL to client to get a waitable fd during blockpool creation.

Test: m
Bug: 254050314
Change-Id: I38d9bde987793e352299385fb141e484c758f89d
2023-10-26 22:25:32 +00:00
Andrew Walbran
fa483fbf7c Merge "Support android.hardware.media.c2 in Rust." into main am: 41041d6d9c am: 1433c78a7d am: a93658b9aa
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2735631

Change-Id: Ic58e7198ed48f2faabf1f3c1b40c75be8620c184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-20 02:47:33 +00:00
Andrew Walbran
3a91d2b31f Support android.hardware.media.c2 in Rust.
Bug: 295245772
Test: m android.hardware.media.c2
Change-Id: I395783980ee12658fb0a246084c4d078840c6574
2023-10-17 15:31:23 +01:00
Treehugger Robot
8a4bab7ee8 Merge "Update media OWNERS file" into main am: 9c93cbe987 am: 049ca157b4 am: 681a1f6668 am: 526b46444a am: 1d9eff22fe
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2784709

Change-Id: Ia50b588e624f1986d86f2ef7918e3e6615f7c00a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-12 02:32:35 +00:00
Devin Moore
d2f5f95f51 Update media OWNERS file
Test: none
Bug: none
Change-Id: Idf00ac904a3358d56e002650d0ef519e123f5678
2023-10-11 22:14:42 +00:00
Xin Li
a737141254 Merge "Merge Android 14" into main 2023-10-06 05:34:12 +00:00
Treehugger Robot
59ae2a6038 Merge "media.c2 aidl: change minSdk to 30" into main am: df7f1d5f60 am: 1c08343ac8 am: 2cf98348de am: 2ee0a72411 am: 6f784a0fd8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2768517

Change-Id: I4dde1aecfdba598b0cfb8f7d0910a728e7eb3630
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 04:16:05 +00:00
Treehugger Robot
1c08343ac8 Merge "media.c2 aidl: change minSdk to 30" into main am: df7f1d5f60
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2768517

Change-Id: Ied225b6b8ccd0a08a42632be713922a24e9cb54f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 02:23:01 +00:00
Sungtak Lee
007122be1d media.c2 aidl: change minSdk to 30
Test: m
Bug:254050314
Change-Id: I62613e59146599b49ae69c84d033eca39fcfdb18
2023-10-04 17:26:20 +00:00
Treehugger Robot
744f83507a Merge "media.c2 : Change waitable object to be based on single fd" into main am: c43c449c79 am: 90e403f2f6 am: 5eaab1d0d8 am: 8addf6a2c1 am: f90057231a
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2753410

Change-Id: Ia9f756a873cc783f4c21e140740e11f0cebdfe15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 08:06:54 +00:00
Treehugger Robot
90e403f2f6 Merge "media.c2 : Change waitable object to be based on single fd" into main am: c43c449c79
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2753410

Change-Id: I55051d80f1c8b5e7a099825c1d6887da500dbe99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-28 03:58:18 +00:00
Treehugger Robot
c43c449c79 Merge "media.c2 : Change waitable object to be based on single fd" into main 2023-09-28 02:58:22 +00:00
Treehugger Robot
6b3f886f2f Merge "Support Rust builds of some AIDL interfaces." into main 2023-09-27 09:59:26 +00:00
Andrew Walbran
c643a062fa Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future am: ddd2d2457f am: 33344f4236 am: 095c32d0ed am: 9c02d068d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24760773

Change-Id: Icf77ea235f5f9a45ce167b13b6afc1526911d09f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-26 20:39:43 +00:00
Andrew Walbran
ddd2d2457f Merge "Enable Rust build of android.hardware.media.bufferpool2." into aosp-main-future 2023-09-26 16:39:05 +00:00
Wonsik Kim
8826e9a0ad Merge "media.c2: add apex_available and set minsdk to 31" into main am: bea101032f am: 6590f39160 am: 0dac42e170 am: acf6a65e2b am: ff888f8d07
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2734633

Change-Id: I7a5d586cf73d5aee1f2ad4b7c323169666971e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 00:36:23 +00:00
Wonsik Kim
6590f39160 Merge "media.c2: add apex_available and set minsdk to 31" into main am: bea101032f
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2734633

Change-Id: I9fc9ae4eff412e71b4f4914ab22a1ece8b7a46c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 22:39:24 +00:00
Wonsik Kim
98faf55896 media.c2: add apex_available and set minsdk to 31
Test: m
Change-Id: Id5c266823f99a810cc69b31fff8e8be727c74031
2023-09-20 16:36:18 -07:00
Sungtak Lee
b34b1633ff media.c2 : Change waitable object to be based on single fd
Currently watiable object is based on two file descriptors created by
eventfd(). Change waitable object to be based on signle fd created by
pipe2().

Bug: 254050314
Test: m
Change-Id: I6771868a93c9bfb767c904d89a3a523e370b3e7e
2023-09-18 17:28:18 +00:00
Andrew Walbran
fcb6c4118b Enable Rust build of android.hardware.media.bufferpool2.
This is a prerequisite for android.hardware.media.c2, which I'm
splitting out to a separate CL to simplify merging.

Bug: 295245772
Change-Id: I1ab9ed45b0b500065c0f18b810c3aa266878b80f
2023-09-15 15:24:05 +01:00
Treehugger Robot
1f299c753e Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main am: 02b33df6b8 am: e20ecbd8a5 am: 2e61cf62f5 am: 1504e60961 am: 08441a4b0e
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751284

Change-Id: I57c711ed88613c1120f4231b1ab9b92400b3adc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 22:33:07 +00:00
Treehugger Robot
e20ecbd8a5 Merge "media.c2: Enable BaseBlock to parcel AHardwareBuffer" into main am: 02b33df6b8
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2751284

Change-Id: Ib0312240d25d3a4683429181949457535249657e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 18:57:55 +00:00
Andrew Walbran
2d425674b5 Support Rust builds of some AIDL interfaces.
For now android.hardware.common, android.hardware.common.fmq and
android.hardware.media.bufferpool2. These are prerequisites for
android.hardware.media.c2, which I'm splitting out to a separate CL to
simplify merging.

Bug: 295245772
Test: m android.hardware.common android.hardware.common.fmq android.hardware.media.bufferpool2
Change-Id: I23018cf198ae126ced8358d562fd8e8a7c6e78ad
Merged-In: I1ab9ed45b0b500065c0f18b810c3aa266878b80f
2023-09-14 16:46:00 +01:00
Sungtak Lee
22c2ea079b media.c2: Enable BaseBlock to parcel AHardwareBuffer
Enable c2 interface to send/receive AHardwareBuffer.

Test: m
Bug: 254050314
Change-Id: I3289d891fb0eae49652e3e88b77070f6762fc5b1
2023-09-14 03:04:47 +00:00
Sungtak Lee
736fbba931 Merge "media.c2 aidl: Use IGraphicBufferAllocator for createBlockPool()" into main am: 6e053ee395 am: 8f2ffb4d1b am: 0691e0b9fe am: d60d4f2cf4 am: 295d1da3c4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2721919

Change-Id: I29250642071ff94a07fb1706d5b99ea86a47cc1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-30 00:02:28 +00:00
Sungtak Lee
8f2ffb4d1b Merge "media.c2 aidl: Use IGraphicBufferAllocator for createBlockPool()" into main am: 6e053ee395
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2721919

Change-Id: I8b51374652717832e1ea6cad314de60dd0a1d52e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29 20:50:29 +00:00
Sungtak Lee
ee148fe88e media.c2 aidl: Use IGraphicBufferAllocator for createBlockPool()
Add IGraphicBufferAllocator interface as an alternate param for
IComponent::createBlockPool().

Bug: 254050314
Test: m
Change-Id: Iab3f1eb35287a8ed7c887ceb70c70d936d5bcfa8
2023-08-22 22:13:16 +00:00
Sungtak Lee
8878a13271 AIDL BufferPool implementation (HIDL -> AIDL)
Bug: 254050250
Test: m
Merged-In: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
Change-Id: I0d7bae2c01bd480d1e99f4b39c4a9013a2828897
2023-08-01 19:32:45 +00:00
Sungtak Lee
97e1dfb99d AIDL bufferpool implementation (just copy from HIDL impl)
Bug: 254050250
Test: no impact to build
Merged-In: I48841189a8743dcd6533a9e61581e48f0f1717f1
Change-Id: I48841189a8743dcd6533a9e61581e48f0f1717f1
2023-08-01 19:32:34 +00:00
Sungtak Lee
e3d399b3ac bufferpool2: Support mainline s/w codec
Bug: 254050250
Test: m
Merged-In: Id602b1a84880546ee726f36c247fabd2e4f2127c
Change-Id: Id602b1a84880546ee726f36c247fabd2e4f2127c
2023-08-01 19:32:15 +00:00
Sungtak Lee
72b2b38c7f bufferpool2: add sync() method and etc
Add sync() method to IConnection interface.
Add existing connection flag to return parcelable of
IClientManager::registerSender().
Use plain integer for returning fetch result status.

Bug: 254050250
Merged-In: Ifebd4b16e9b8c37e074e7126f39264a18fed5de8
Change-Id: Ifebd4b16e9b8c37e074e7126f39264a18fed5de8
2023-08-01 19:31:27 +00:00
Treehugger Robot
16a5725b68 Merge "media.c2 aidl: Add decoder output allocator interface" am: 3c4de3af67 am: a2147b121e am: 1c0c72e72b
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2613750

Change-Id: I01abf77bb3fa539090be72034d3f61c99dd34131
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-09 19:18:36 +00:00
Sungtak Lee
e739e842ba Revert "android.hardware.media.c2: Move to staging/"
This reverts commit a8c9aa3173.

Bug: 254050314
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7afc209eb8b1f1d54208c601cb458f95712b1e2f)
Merged-In: Ia85af4e013529e104c84bc48f84a5daa89a5d9bf
Change-Id: Ia85af4e013529e104c84bc48f84a5daa89a5d9bf
2023-06-02 21:53:01 +00:00
Sungtak Lee
a2600caba4 media.c2 aidl: Add decoder output allocator interface
Bug: 254050314
Test: m
Merged-In: Ia0a63c29bb1fceabf290647003865c2a788980ef
Change-Id: Ia0a63c29bb1fceabf290647003865c2a788980ef
2023-06-02 14:18:47 -07:00
Sungtak Lee
10e5329325 android.hardware.media.c2: sync with internal
Bug: 254050314
Test: m
Merged-In: Ia85af4e013529e104c84bc48f84a5daa89a5d9bf
Change-Id: Ia85af4e013529e104c84bc48f84a5daa89a5d9bf
2023-06-02 14:18:47 -07:00
Wonsik Kim
c14558df40 Mark media.bufferpool2 and media.c2 as double-loadable
LL-NDK(libmediandk) has the dependency on
"android.hardware.media.bufferpool2" and "android.hardware.media.c2".

Dependencies:
libmediandk -> libstagefright -> libsfplugin_ccodec
-> android.hardware.media.c2-V1-ndk
libmediandk -> libstagefright -> libsfplugin_ccodec
-> libcodec2_client -> libstagefright_bufferpool@
-> android.hardware.media.bufferpool2-V1-ndk

Bug: 251850069
Test: builds
Merged-In: I89aa17b8f1db9393d506edd9f242112cd11a05ec
Change-Id: I89aa17b8f1db9393d506edd9f242112cd11a05ec
2023-06-02 14:18:36 -07:00
Sungtak Lee
bc785c6347 media.c2 aidl: Add decoder output allocator interface
Bug: 254050314
Test: m
Change-Id: Ia0a63c29bb1fceabf290647003865c2a788980ef
2023-05-01 21:35:28 +00:00
Sungtak Lee
7afc209eb8 Revert "android.hardware.media.c2: Move to staging/"
This reverts commit a8c9aa3173.

Bug: 254050314
Change-Id: Ia85af4e013529e104c84bc48f84a5daa89a5d9bf
2023-04-19 22:29:53 +00:00
Alex Buynytskyy
ec1198d941 UpsideDownCake is now 34
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: build
Change-Id: I832ab7a8b5445ba85e27bbcf5be64906bfa0e5be
2023-04-07 23:41:20 +00:00
Treehugger Robot
4a619462af Merge "VtsHalMediaOmx: fix OmxCodecAllowedTest to match requirement" am: 28d4f75dd0 am: 7d9873d019 am: 64da566f72
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2243207

Change-Id: I5d267e871c14292c0de71ec1d63825b995027f9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:43:21 +00:00