Commit graph

292 commits

Author SHA1 Message Date
Pawin Vongmasa
d9dcc1752e Use @2.0::IGraphicBufferProducer in media.c2
Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 33350696
Bug: 112362730
Change-Id: I561b96b4a416a92649bd1de174d55c6317d9b40a
2019-03-19 07:48:15 -07:00
Manisha Jajoo
70de321e05 omx:component: add support for tunneled components in ComponentTest am: 4609857ee4 am: f31fd7f8cb
am: 880ef39899

Change-Id: I268104aa25c7ed3305d607e71e9ba66dc268f489
2019-03-11 13:22:09 -07:00
Manisha Jajoo
880ef39899 omx:component: add support for tunneled components in ComponentTest am: 4609857ee4
am: f31fd7f8cb

Change-Id: I114e154d9d912094d06fe1785aff20c77c3cb7fd
2019-03-11 12:45:32 -07:00
Steven Moreland
87f43604b9 Merge "Update makefies: no 'types' internal" 2019-03-05 17:40:03 +00:00
Steven Moreland
7f4e21adda Merge "Update makefies: no 'types'" am: 4ee5ec1469 am: bab622f6a6
am: 7224bc9bcf

Change-Id: I434939e0770afa436c532a945542fce30a71ef7d
2019-03-04 16:05:59 -08:00
Steven Moreland
b91ac5c6a0 Update makefies: no 'types' internal
Bug: 123976090
Test: N/A
Change-Id: I84b659b163b63d39535b462a3df8a9c19f680976
2019-03-04 14:09:25 -08:00
Steven Moreland
a878aee9ab Update makefies: no 'types'
Bug: 123976090
Test: N/A
Change-Id: I30fb04c81889b62775e1b764b965fdb0f893de17
2019-03-04 11:27:17 -08:00
Pawin Vongmasa
b58b311ac7 Add asInputSink() to IComponent
By making IComponent present itself as an IInputSink, the wrapper code
can be made to execute in the same process as the IComponent instance,
hence reducing an IPC hop in the case where an InputSurface comes from a
different process.

Test: make cts -j123 && cts-tradefed run cts-dev -m \
CtsMediaTestCases --compatibility:module-arg \
CtsMediaTestCases:include-annotation:\
android.platform.test.annotations.RequiresDevice

Bug: 126296132
Change-Id: I61409ccfa9a9d6b152e2c9363ff119302ce8ae1a
2019-03-02 02:18:59 -08:00
Manisha Jajoo
4609857ee4 omx:component: add support for tunneled components in ComponentTest
Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Host \
-l INFO

bug: 70933963

Change-Id: I5695820b225041f5b764506cdafacf7c95d836aa
2019-02-04 18:58:12 -08:00
Pawin Vongmasa
6c9e784822 Revert to new Codec2 HAL
This includes the following changes:
1. Revert commit 7570e3cd4b.
2. Revert commit 2a40d309b7eefe36d2f78bbff42aafad24eb65b0.
3. Use the new bufferpool (@2.0).
4. Use the old bufferqueue (@1.0).
5. Add IInputSink to eliminate downcasting from IBase.

Test: Builds
Bug: 112362730
Change-Id: I2b5f2e2821c62cbb7166320e1e128d883e278480
2019-01-23 22:33:40 -08:00
Sungtak Lee
b1d28b751b Use bufferpool@2.0
Use bufferpool@2.0 instead of bufferpool@1.0 from Codec2 HIDL

Change-Id: I55044f367a4ff3facb8bc81929350eb78df067a8
2018-12-11 17:36:56 -08:00
Keun Soo YIM
68ae05dd2d pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Merged-In: I363450d205868f900e4925ccff1430e2a569f2a4
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-12-07 10:49:56 -08:00
Keun Soo YIM
ff84c37bc1 pack VTS cc_test binaries as general-tests
Test: make general-tests
Bug: 120093339
Change-Id: I363450d205868f900e4925ccff1430e2a569f2a4
2018-11-27 16:11:41 -08:00
Pawin Vongmasa
9d1cf2ab29 Copy from the old version of Codec2 HAL
This CL makes transitioning of Codec2 HAL from private to public
smoother. The CL will be reverted later.

Test: Builds
Bug: 112362730
Change-Id: Id0e199112e968e35ed3b27413baae810f1ecb2df
2018-11-14 23:53:36 -08:00
Pawin Vongmasa
7570e3cd4b Use old version of IGBP and bufferpool
The purpose of this CL is to make transitioning smoother. This CL
will be reverted later.

Test: Builds
Bug: 112362730
Change-Id: I65bf589facd0dda7a9af8b552eb795153dc1bd87
2018-11-12 16:30:22 -08:00
TreeHugger Robot
6ee1cb1d68 Merge "Add message id to interface" 2018-11-05 18:27:38 +00:00
Pawin Vongmasa
92147164f3 Use new version of IGraphicBufferProducer
Test: Builds

Bug: 112362730
Change-Id: I986d5633d51a7088ea7a818ed4845b9494bccdeb
2018-10-31 03:23:13 -07:00
Chih-Hung Hsieh
85d87d6b43 Merge "Fix implicit-fallthrough warnings." am: ad9708f570 am: dc607bc28e
am: 5a77ac200b

Change-Id: I663cb317bef106d9d3e09f8bf305783c41b2bf39
2018-10-20 01:23:08 -07:00
Chih-Hung Hsieh
eb1be49ae1 Fix implicit-fallthrough warnings.
Test: make checkbuild
Bug: 112564944
Change-Id: Ib93559a5c1512861f9746cd28d8b19073ce92aa8
2018-10-19 14:26:01 -07:00
Sungtak Lee
1ae877d04a Add message id to interface
In order to synchronize message id when a new connection is made,
message Id is added as a return value. Also the last posted message Id
is given as paramter, when observer is notfied of new messages.

Bug: 112203066
Change-Id: Ic3921fd176aec1abc7de3ea88c730ad46182d28f
2018-10-18 13:34:14 -07:00
TreeHugger Robot
b54cc22ab1 Merge "Initial commit of public Codec2 HIDL interfaces" 2018-10-17 23:35:16 +00:00
Pawin Vongmasa
c80bf21356 Initial commit of public Codec2 HIDL interfaces
Test: Builds

Bug: 112362730
Bug: 115717053
Change-Id: I8ad7fe965a90d56b5bbfd23998d4585f6e634bd6
2018-10-16 05:16:39 -07:00
Sungtak Lee
38235ee931 Add observer to bufferpool clients
Bufferpool clients are notified bufferpool events via FMQ messages.
Usually the messages are processed by pipeline via piggybacking. To
ensure process FMQ messages even if the process is in idle state,
Observer hidl interface is added. Buffer invalidation caused by
pipleline completion uses Observer interface in order to invalidate
buffers after all normal operations are finished.

Bug: 112203066
Change-Id: I2a4a172d78c6bcedcc809c559321929ebc91c30d
2018-10-05 15:04:38 -07:00
Sungtak Lee
5c8e455d73 Change buffer invalidataion FMQ to unsync
Buffer Invalidation FMQ is designed as a shared FMQ between clients in
order to minimize memory consumption. In that case, regarding FMQ is
unsync FMQ in order to not to block writer in any situation.

Bug: 112203066
Change-Id: I58989ccd332ba790193007f43dd66ecbd617f484
2018-09-18 17:45:36 -07:00
Sungtak Lee
c40c77ef0d Update android.hardware.media.bufferpool@2.0 HAL
Add buffer invalidation message for bufferpool@2.0

Bug: 112203066
Change-Id: Ia1fca213c7e663f619e2061dd0055228aecbf15c
2018-08-30 11:37:36 -07:00
TreeHugger Robot
c66f2f46b1 Merge "android.hardware.media.bufferpool@2.0 HAL" 2018-08-22 17:02:29 +00:00
Sungtak Lee
f8f9489302 android.hardware.media.bufferpool@2.0 HAL
BufferPool HAL 2.0. This is identical to 1.0 HAL now.
The update will be applied afterwards.

Bug: 112203066
Change-Id: I8f5bbf979116f66357f2bc0f8114697472adf762
2018-08-21 13:14:05 -07:00
Steven Moreland
fec4521e83 Merge "Update makefiles after native handle in Java." am: 1847a2f2e7 am: fb6a66b3f7
am: 9dc1ccc852

Change-Id: I30fda77e5c5657c00f57a85b959dfd853d535366
2018-08-14 19:38:07 -07:00
Steven Moreland
f5e4d7fb59 Update makefiles after native handle in Java.
Bug: 35098567
Test: N/A
Change-Id: I54b8d804e480cda09806f8028b966f28c4bd706e
2018-08-14 20:29:42 +00:00
Pawin Vongmasa
841940be1c resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev
am: c0243f2ff8

Change-Id: I25bf6387a074f630cc3e10c3b265d16390e39eca
2018-08-10 14:30:13 -07:00
Pawin Vongmasa
12c2fa9d45 resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev am: c0243f2ff8 am: fedde0ea52 am: 375ff6a3a7
am: 6f3b432c5d

Change-Id: Ib34be1122292383893f398599f52db55b4944982
2018-07-13 01:53:45 -07:00
Pawin Vongmasa
375ff6a3a7 resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev am: c0243f2ff8
am: fedde0ea52

Change-Id: I52c92c4cd9a68a5a57ba652e0284f495e912ea37
2018-07-13 01:45:43 -07:00
Pawin Vongmasa
c0243f2ff8 resolve merge conflicts of b92f1d2e1b to oreo-mr1-vts-dev
Test: make vts -j123 && vts-tradefed run commandAndExit vts \
--skip-all-system-status-check \
--skip-preconditions -m VtsHalMediaOmxV1_0Host \
-l INFO

Bug: 70933963
Change-Id: I38f6309b638e604403dba15fa1fe1022b298c5b2
2018-07-11 23:29:14 -07:00
Pawin Vongmasa
b92f1d2e1b Disable tests for secure audio decoders
Test: make vts -j123 && vts-tradefed run commandAndExit vts \
--skip-all-system-status-check \
--skip-preconditions -m VtsHalMediaOmxV1_0Host \
-l INFO

Bug: 70933963
Change-Id: Iaaf3b7d382e7df4374dd7e03e5cc7b2ae6861fad
2018-07-11 18:05:25 -07:00
Ray Essick
25ae1956d1 Merge "VtsHalMediaOmx should test functionality only" into pi-dev am: 2ae3cb74c7
am: 27aa09d3bb

Change-Id: I9cda9833322ea326cedcf07577b2104e4106e94c
2018-06-04 11:27:51 -07:00
Ray Essick
68df40f9cf VtsHalMediaOmx should test functionality only
The tests insisted on presence of codecs as well as functionality, but
the list it reads is a superset of what may be on the device.  Modified so
that if a codec is not present, we ignore it rather than failing the test.

The Vts tests that check OMX Store are being augmented to ensure any
advertised codecs are indeed present.

Bug: 80029024
Bug: 80530946
Test: vts run VtsHalMediaOmxV1_0Host
Change-Id: Icd6d049c5c0d31f47ef3dbda52d6927e38bd894d
2018-06-01 16:34:54 -07:00
Pawin Vongmasa
bd49dcfd9b Add multichannel support am: c678d51bdc am: 9886d749d4 am: b0da0bce66 am: 5ed6bca916
am: 86e4c2cfd8

Change-Id: I8eb5a776aa7a08a2eac5466f12ffc844f0b649db
2018-05-25 00:50:01 -07:00
Pawin Vongmasa
5ed6bca916 Add multichannel support am: c678d51bdc am: 9886d749d4
am: b0da0bce66

Change-Id: I2b701daf2c12a7b0454c46d48910671f10ccb2b6
2018-05-24 10:33:18 -07:00
Pawin Vongmasa
9886d749d4 Add multichannel support
am: c678d51bdc

Change-Id: I523732b9a00c079d84a3e594ba6b35ee09989a52
2018-05-24 06:57:00 -07:00
Pawin Vongmasa
c678d51bdc Add multichannel support
Test: make vts -j123 && vts-tradefed run commandAndExit vts \
--skip-all-system-status-check \
--skip-preconditions -m VtsHalMediaOmxStoreV1_0Host \
-l INFO

Bug: 69811887
Change-Id: I6ddf882d5a0d991acc8123ed6d220835fc6cce5c
2018-05-10 18:39:25 -07:00
Daniel Cardenas
8df876f0d6 Increase default timeout for changeStateIdletoExecute() from 100ms to 400ms
Bug: 70933963
Test: vts-tradefed run vts -m VtsHalMediaOmxV1_0Host
Change-Id: I2f01b5fcd72b03148750589a8eabbc8037f61e6f
2018-03-08 18:49:39 -08:00
Zhuoyao Zhang
fddd91184d Merge "Convert omx hal test to use VtsHalHidlTargetTestEnvBase" am: 03086cfea4 am: 162e15e590
am: db39ca498b

Change-Id: I6576b40b2b5f3dfb3b8aea95eeb0d043c7ed59cf
2018-02-12 23:27:44 +00:00
Zhuoyao Zhang
db39ca498b Merge "Convert omx hal test to use VtsHalHidlTargetTestEnvBase" am: 03086cfea4
am: 162e15e590

Change-Id: Iaf66c32bd698560b4baf344e0af2d2c3d42e997a
2018-02-12 23:20:53 +00:00
Zhuoyao Zhang
303b2917d4 Convert omx hal test to use VtsHalHidlTargetTestEnvBase
* Move ComponentTestEnvironment to media_hidl_test_common to reduce
  code duplication.

Bug: 64203181
Test: make vts
      vts-tradefed run vts -m VtsHalMediaOmxV1_0Host

Change-Id: Ie34ff637ec7ccf98ebfe8d2bda4d5f28bf4c0e11
2018-02-09 16:31:03 -08:00
Sungtak Lee
108a2fe68c android.hardware.media.bufferpool@1.0 HAL
BufferPool HAL for allocating, deallocating, and recycling buffers
on behalf of media.stagefright.

Bug: 72651719
Change-Id: I30bf630e41de2c8718aaaf8cbf5ee3f48f2859bc
2018-01-29 15:49:41 -08:00
Ram Mohan M
6729c05751 bug fix: close file pointer
Bug: 63796949

Merged-In: Ifd8a27d851cbc659ea8108e0879747cd9169680a
Change-Id: Ifd8a27d851cbc659ea8108e0879747cd9169680a
(cherry picked from commit 727b2ba98c)
2018-01-24 02:03:56 +00:00
Ram Mohan M
8d009afdbb bug fix: restore support for broken flag
timestampDevTest flag can be used to disable timestamp deviation
tests. The flag is not working as intended. This is corrected.

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 64743270
Bug: 65166112

Merged-In: I611e96498a4677b6ccbff33c291d56eed7b48f6f
Change-Id: I611e96498a4677b6ccbff33c291d56eed7b48f6f
(cherry picked from commit dc6270ecc1)
2018-01-23 22:26:15 +00:00
Ram Mohan M
0a542276f8 bug fix: handle multiple port settings change events signalled at once
Components can send various kinds of port settings changed events all
at once. During a full port reconfiguration this is causing problems
due to limited flexibility in the message handling design. For now,
before committing to a full port reconfiguration defer any events
waiting in the queue to be addressed to a later point.

Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 64468705

Merged-In: I537cdd3e7d92cdc6d54168f091d7897afe541599
Change-Id: I537cdd3e7d92cdc6d54168f091d7897afe541599
(cherry picked from commit a230bad8d4)
2018-01-23 22:25:50 +00:00
Ram Mohan M
c4e3cc8b51 bug fix: disable timestamp deviation test for audio decoder
Test: make vts -j99 BUILD_GOOGLE_VTS=true TARGET_PRODUCT=aosp_arm64 \
&& vts-tradefed run commandAndExit vts \
--skip-all-system-status-check --primary-abi-only \
--skip-preconditions --module VtsHalMediaOmxV1_0Test -l INFO

Bug: 64128634
Bug: 65166112

Merged-In: I8a08a8da7dd203cd16cbfbfd3f15e27966db711f
Change-Id: I8a08a8da7dd203cd16cbfbfd3f15e27966db711f
(cherry picked from commit eb9e25a3e2)
2018-01-23 22:23:27 +00:00
Ram Mohan M
56906949cc bug fix: output colorformat configuration fixed
The eColorFormat field in OMX_PARAM_PORTDEFINITIONTYPE structure
has no effect on the component. This has to be configured from
OMX_VIDEO_PARAM_PORTFORMATTYPE. This is corrected. This color format
information is passed to graphic buffer during its allocation

Bug: 63796949

Merged-In: I51b1e59631647d1291ecfac373781ac5e5a0ffd5
Change-Id: I51b1e59631647d1291ecfac373781ac5e5a0ffd5
(cherry picked from commit 1441864f4c)
2018-01-23 22:22:39 +00:00