aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-07-07Snap for 8808665 from 0bd2d6331bde6053d778f84633759f1336627a79 to ↵aml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000android13-mainline-os-statsd-releaseAndroid Build Coastguard Worker
mainline-os-statsd-release Change-Id: Ib82917591c033da72db55ade5e987d6333abf5be
2022-06-24V4L2EncodeComponent: fix build error am: 3db9508be4Alexandre Courbot
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19033643 Change-Id: Ib0b6f3f9f98bbfa97da79cfde6c4bb51067262fb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-24V4L2EncodeComponent: fix build errorAlexandre Courbot
Patch 0fa30254bd7e introduced a type mismatch when building for 32-bit architecture. This error is visible when running "mmm external/v4l2_codec2": external/v4l2_codec2/components/V4L2EncodeComponent.cpp:782:32: error: no matching function for call to 'max' int64_t newFramerate = std::max( ^~~~~~~~ external/libcxx/include/algorithm:2529:1: note: candidate template ignored: deduced conflicting types for parameter '_Tp' ('long' vs. 'long long') max(const _Tp& __a, const _Tp& __b) ^ external/libcxx/include/algorithm:2539:1: note: candidate template ignored: could not match 'initializer_list<type-parameter-0-0>' against 'long' max(initializer_list<_Tp> __t, _Compare __comp) ^ external/libcxx/include/algorithm:2547:1: note: candidate function template not viable: requires single argument '__t', but 2 arguments were provided max(initializer_list<_Tp> __t) ^ external/libcxx/include/algorithm:2521:1: note: candidate function template not viable: requires 3 arguments, but 2 were provided max(const _Tp& __a, const _Tp& __b, _Compare __comp) ^ Fix this by casting the right member of the cmp operation to int64_t. Test: mmm external/v4l2_codec2 Change-Id: Id2cc220b9122eec412823f577f07ecd82bad60fc (cherry picked from commit a0377993b84da09547aad11f2f27560e0bf4dcd5)
2022-06-20Snap for 8746144 from 09a22ed53c5570d329c3e6603d4fe711cec6e309 to ↵Android Build Coastguard Worker
mainline-os-statsd-release Change-Id: Icfba9877f8d01705161ee99a2df2c51f29636fe0
2022-06-02V4L2EncodeComponent: clamp framerate to at least 1 on dynamic framerate ↵Shao-Chuan Lee
change am: 39f241ae60 Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18707983 Change-Id: Id9ffdaca917cfa024a8168a929ff783cefeba477 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-02V4L2EncodeComponent: clamp framerate to at least 1 on dynamic framerate changeandroid13-devShao-Chuan Lee
Dynamic framerate based on timestamps can become zero when input frames are supplied at >1 sec intervals. Bug: 228828942 Test: android.media.cts.EncodeVirtualDisplayWithCompositionTest#testVirtualDisplayRecycles Test: com.google.android.media.gts.RtcVideoCodecTest#testDynamicFramerateChangeVp8 Change-Id: I3ceefaad9b420f86e4f0b524e6f0b5649af9997b
2022-05-16Snap for 8598489 from 24a45f96483a15ff5057538fc8688865d9596e11 to ↵Android Build Coastguard Worker
mainline-os-statsd-release Change-Id: Ib3fbda45cefbfc6e19b12c548d13acd9d3600092
2022-05-16C2VdaBqBlockPool: reflects C2BufferQueueBlockPoolData change. am: 42116ed33fYuichiro Hanada
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18400302 Change-Id: Ie6fda6a41f242952698e905da5d51e36ccf7ec2e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-16C2VdaBqBlockPool: reflects C2BufferQueueBlockPoolData change.Yuichiro Hanada
ag/18183905 changes the constructor arguments of C2BufferQueueBlockPoolData. Bug: 232711062 Test: m Change-Id: I63a9f9b1c7d8368af4c80777a9f4dcba4b581df0
2022-05-10Snap for 8564071 from e0a555a25277589d68c5b5cac3deda62d07181d1 to ↵Android Build Coastguard Worker
mainline-os-statsd-release Change-Id: I185b84b63f2e4085364b7672d7f543288f50eb54
2022-03-09replace include_dirs with header_libs am: 49556b587bRay Essick
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/17125804 Change-Id: I6e8aeba47a94a334df96dabcb59c4f599a809872
2022-03-08replace include_dirs with header_libsRay Essick
[NB: i don't seem to be able to build this -- keep getting: unknown target 'C2VEACompIntf_test' we'll see if treehugger knows a combination that exercises this. Bug: 201944383 Test: build (trying) Change-Id: Ibaeb2d5cd952f2849764dfa853c3927b95e2cac5
2022-01-06Put v4l2_codec2 underneath a soong namespace am: f83441a3c9 am: ae52ea56b2 ↵Robin Lee
am: bce2d851c3 am: 323a9f3b94 Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162 Change-Id: I94e1c2cdadeb9200025e36b06c45ff9f96b1fa45
2022-01-06Put v4l2_codec2 underneath a soong namespace am: f83441a3c9 am: ae52ea56b2 ↵Robin Lee
am: bce2d851c3 Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162 Change-Id: If30632e779dec49f209a1ac196df1570f9e7fd48
2022-01-06Put v4l2_codec2 underneath a soong namespace am: f83441a3c9 am: ae52ea56b2Robin Lee
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162 Change-Id: Iad6ef4c0c55293748f9b1fed9c4a0d61be31f20d
2022-01-06Put v4l2_codec2 underneath a soong namespace am: f83441a3c9Robin Lee
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162 Change-Id: I09d07f966ff82df54bd31ea4a6382efb623cfc3d
2022-01-06Put v4l2_codec2 underneath a soong namespaceandroid-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Robin Lee
It isn't currently possible for multiple soong modules in the same build to define the same output path, even if one overrides another, so given that the contract of codec2 involves loading libraries from some specific paths, these paths must not have modules built into them by default or they can not be overridden by other soc_specific code. Change-Id: I4823f9942d69a29c53ed88c5e39c3b0cb0786973 Test: Build device using v4l2_codec2 from installclean and ensure the output has not changed Bug: 200265668
2021-11-18c2_e2e_test: ignore configuration changes am: c6443ab01d am: 372d8c8b1bDavid Stevens
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16265240 Change-Id: I4dac368fee5989e53014670694c752bcddba7bde
2021-11-18c2_e2e_test: ignore configuration changes am: c6443ab01dDavid Stevens
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16265240 Change-Id: I7d1e181ab8b7e2e0219a5715dbf9a57838e62682
2021-11-18plugin_store: split getDmabufId() function to dedicated file am: cec802b9d3 ↵Chih-Yu Huang
am: 18986b234e Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16241005 Change-Id: Ib4908ada39761fb2752016b040be6054e7c921be
2021-11-18Merge "Use dma-buf inode number as buffer unique id am: 53f82c27d5" into ↵Vova Sharaienko
sc-v2-dev-plus-aosp am: 9cb7cb3ffb Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16246368 Change-Id: I98652dbfbbd5fc0a32f4f0cd9d9bd65d21eb212f
2021-11-18plugin_store: split getDmabufId() function to dedicated file am: cec802b9d3Chih-Yu Huang
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16241005 Change-Id: I0c5dd2fee99c25f623f65705cd2d7ed3666ce5a1
2021-11-18Merge "Use dma-buf inode number as buffer unique id am: 53f82c27d5" into ↵Vova Sharaienko
sc-v2-dev-plus-aosp
2021-11-17[automerger skipped] Merge "Merge ↵TreeHugger Robot
sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: b6af0e3c9d -s ours am: acbef46b61 -s ours am: 9574400ab5 -s ours am skip reason: Merged-In I27d15d7652ac69bae06e0281fd012e84ef8e8fba with SHA-1 f11b85a5f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16279540 Change-Id: I39ff5ac75d327180138dfa086f0ff8ae73fd504b
2021-11-17[automerger skipped] Merge "Merge ↵TreeHugger Robot
sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: b6af0e3c9d -s ours am: acbef46b61 -s ours am skip reason: Merged-In I27d15d7652ac69bae06e0281fd012e84ef8e8fba with SHA-1 f11b85a5f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16279540 Change-Id: I9ed1009e7dc9e0b3a191b104a0cb49587e07ea6d
2021-11-17[automerger skipped] Merge "Merge ↵TreeHugger Robot
sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master am: b6af0e3c9d -s ours am skip reason: Merged-In I27d15d7652ac69bae06e0281fd012e84ef8e8fba with SHA-1 f11b85a5f6 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16279540 Change-Id: I111594a47a61446ff3c146e3a6e899bcb187508b
2021-11-17Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into ↵TreeHugger Robot
stage-aosp-master
2021-11-16c2_e2e_test: ignore configuration changes am: d49af9174f am: 6e496ec265 am: ↵David Stevens
3651e78215 am: 8f575fbaf6 Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1893475 Change-Id: Ib4b81583496655a5c6cbf4efa28bb8ecc1b63016
2021-11-16c2_e2e_test: ignore configuration changes am: d49af9174f am: 6e496ec265 am: ↵David Stevens
3651e78215 Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1893475 Change-Id: Ia68bd7ad3c9450b2a531d37ce5dae79a4bbeaf51
2021-11-16c2_e2e_test: ignore configuration changes am: d49af9174f am: 6e496ec265David Stevens
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1893475 Change-Id: I0b13bf5fb9cc2b2a9e83d112b85b15cb995860b7
2021-11-16c2_e2e_test: ignore configuration changes am: d49af9174fDavid Stevens
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1893475 Change-Id: I100cb04f0af3c2f40258074da2f083779b16eb07
2021-11-16c2_e2e_test: ignore configuration changesDavid Stevens
Update the E2eTestActivity manifest so that it handles configuration changes itself, and just ignore them. This prevents the activity from being recreated, which destroys the test surface. Bug: 206342802 Test: tast run octopus arc.VideoDecodeAccelPerf.* Change-Id: Ie48cf0650424c9f641c2770b3127f75e6407c01d
2021-11-16c2_e2e_test: ignore configuration changesandroid-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseDavid Stevens
Update the E2eTestActivity manifest so that it handles configuration changes itself, and just ignore them. This prevents the activity from being recreated, which destroys the test surface. Bug: 206342802 Test: tast run octopus arc.VideoDecodeAccelPerf.* Change-Id: Ie48cf0650424c9f641c2770b3127f75e6407c01d (cherry picked from commit 0127892edd2d5f62623e14db20b1a023850e0667)
2021-11-12Use dma-buf inode number as buffer unique id am: 53f82c27d5Roman Stratiienko
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16241004 Change-Id: Ic37167189d6c3e9fbafc945e649450bec302bd60
2021-11-12plugin_store: split getDmabufId() function to dedicated fileChih-Yu Huang
Currently, getDmabufId() is placed at C2VdqBqBlockPool.h. However, the header file already has many dependencies. The caller of getDmabufId() would need to add many unnecessary dependency libraries. This CL splits the method to a dedicated file to reduce this issue. Bug: 205501954 Test: m -j32 Change-Id: Ie7e366ddf77ceec105cbacf6d16e6b6dc3a58198
2021-11-12Use dma-buf inode number as buffer unique idRoman Stratiienko
Importing buffer into DRM/KMS just to obtain unique_id is redundant and can cause issues if wrong DRM/KMS device selected. Bug: 205501954 Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com> Change-Id: I0f20cf8f230f26be4641a85bf1f7ec4d47690494
2021-11-10Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918Xin Li
Bug: 205056467 Merged-In: I27d15d7652ac69bae06e0281fd012e84ef8e8fba Change-Id: Iee2496c2f3b9ab3582a3c755ae92d433a992146b
2021-11-09Merge "plugin_store: split getDmabufId() function to dedicated file" am: ↵Treehugger Robot
2c2e7cdb85 am: 98d279afaa am: 7ee4c865bc am: 1a3b3ae6cc am: 7a777b9f05 Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1883434 Change-Id: I74e8fd54205edfc217dfddef8f3d7cfca77effb4
2021-11-09V4L2Device: Increase max /dev/video device index from 9 to 15 am: 95568fdc85 ↵Roman Stratiienko
am: 309f289e65 am: 895f244b7b am: 83ef3f77ba am: 560dd3751a Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1882080 Change-Id: Ic02850f09c51c9f1827cdeed963c2e2dc5c7ee55
2021-11-09Merge "plugin_store: split getDmabufId() function to dedicated file" am: ↵Treehugger Robot
2c2e7cdb85 am: 98d279afaa am: 7ee4c865bc am: 1a3b3ae6cc Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1883434 Change-Id: I8b319ac872382faa9097feaf37532a864befccf4
2021-11-09V4L2Device: Increase max /dev/video device index from 9 to 15 am: 95568fdc85 ↵Roman Stratiienko
am: 309f289e65 am: 895f244b7b am: 83ef3f77ba Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1882080 Change-Id: I49a5df2c5473c1ead95294b37284b5a6c94ea35b
2021-11-09Merge "plugin_store: split getDmabufId() function to dedicated file" am: ↵Treehugger Robot
2c2e7cdb85 am: 98d279afaa am: 7ee4c865bc Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1883434 Change-Id: I5f4066b26c70b5edc2a3fae1ba2d9f13adff0f70
2021-11-09V4L2Device: Increase max /dev/video device index from 9 to 15 am: 95568fdc85 ↵Roman Stratiienko
am: 309f289e65 am: 895f244b7b Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1882080 Change-Id: I5c8dbabdcede229a089468a86a64e65a836fdfee
2021-11-09Merge "plugin_store: split getDmabufId() function to dedicated file" am: ↵Treehugger Robot
2c2e7cdb85 am: 98d279afaa Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1883434 Change-Id: I2b07fcd4cc9811cdf0b34f589070d4cc862a97e6
2021-11-09V4L2Device: Increase max /dev/video device index from 9 to 15 am: 95568fdc85 ↵Roman Stratiienko
am: 309f289e65 Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1882080 Change-Id: I252fc0f5e7abbc2c49d6229797811982731c9798
2021-11-09Merge "plugin_store: split getDmabufId() function to dedicated file" am: ↵Treehugger Robot
2c2e7cdb85 Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1883434 Change-Id: I855a1adf97069458635f62a0088a1579ccc002cd
2021-11-09V4L2Device: Increase max /dev/video device index from 9 to 15 am: 95568fdc85Roman Stratiienko
Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1882080 Change-Id: I5a40a888f5e55471dcd9ee1a62e6e3e206aaf13c
2021-11-09Merge "plugin_store: split getDmabufId() function to dedicated file"Treehugger Robot
2021-11-08V4L2Device: Increase max /dev/video device index from 9 to 15Roman Stratiienko
RaspberryPI codecs are allocated in the system at /dev/video{10-12}. Signed-off-by: Roman Stratiienko <r.stratiienko@gmail.com> Change-Id: Ia95b3859b126c5a9054b75e3c6442827a055429b
2021-11-08plugin_store: split getDmabufId() function to dedicated fileChih-Yu Huang
Currently, getDmabufId() is placed at C2VdqBqBlockPool.h. However, the header file already has many dependencies. The caller of getDmabufId() would need to add many unnecessary dependency libraries. This CL splits the method to a dedicated file to reduce this issue. Bug: 205501954 Test: m -j32 Change-Id: Ie7e366ddf77ceec105cbacf6d16e6b6dc3a58198