am skip reason: Merged-In I3ceefaad9b420f86e4f0b524e6f0b5649af9997b with SHA-1 39f241ae is already in history

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2186764



Change-Id: I30de62144cbda5d852f2d06a221aa00f2e7ab1d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I3ceefaad9b420f86e4f0b524e6f0b5649af9997b with SHA-1 39f241ae is already in history

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2186764



Change-Id: I19a758c7ac1fc7475dd48c2d2b481a57b50daeaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 242648940
Merged-In: I3ceefaad9b420f86e4f0b524e6f0b5649af9997b
Change-Id: I04b3505c478d96f4676ec6bc3268dba24f2123fa

[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 1425bf6c -s ours am: 92bfd9cd -s ours

am skip reason: Merged-In I3ceefaad9b420f86e4f0b524e6f0b5649af9997b with SHA-1 39f241ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19094255



Change-Id: I111ec9b3622c9310911cf73769fcae7148903a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

am skip reason: Merged-In I3ceefaad9b420f86e4f0b524e6f0b5649af9997b with SHA-1 39f241ae is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19094255



Change-Id: Idce765aba832c1c6330367e6761d362c3c233ba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Bug: 236760014
Merged-In: I3ceefaad9b420f86e4f0b524e6f0b5649af9997b
Change-Id: I5fd9a4d5bd3c0add0c25dea8cf1b8cde51a80da1

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19033643



Change-Id: Icb2b2b13a52ba97f79d9bd597ca6a6bab77dfee7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19033643



Change-Id: If6825b4e905eea85cd4cec0dcbcf50801c7936e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19033643



Change-Id: I479b223cf61c242f7a801ab800fa0f79c388f5f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/19033643



Change-Id: I66bedd31069b8173e44f2718c379c6708bf506e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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)

Merge "V4L2EncodeComponent: clamp framerate to at least 1 on dynamic framerate change am: 39f241ae am: 45d7895a" into tm-d1-dev-plus-aosp

V4L2EncodeComponent: clamp framerate to at least 1 on dynamic framerate change am: 39f241ae am: 45d7895a

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18707983



Change-Id: I14849e87ec645214b34435ede93920bf67303d4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

V4L2EncodeComponent: clamp framerate to at least 1 on dynamic framerate change am: 39f241ae am: f8b1084d

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18707983



Change-Id: I1156919a47da97be21b7de54615e9a7839e4846c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18707983



Change-Id: Ic1f73083e703286e35e97221216fc005aef72e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18707983



Change-Id: I8c017b9582bb731db9eba805ab60eb62aa449d2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2063617



Change-Id: Ie2f2db73c3dda66fff6b2c21825cfb76ffb91e63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2063617



Change-Id: I9199f590aeb3f9707e746244de57b4e7702f0adb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/2063617



Change-Id: Ib2676acf3ce729b7c3d87eb8e5cfd7474720721b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Merge "C2VdaBqBlockPool: reflects C2BufferQueueBlockPoolData change. am: 42116ed3 am: 40521db6" into tm-d1-dev-plus-aosp

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18400302



Change-Id: I4b13854cee11f374fa2b9b2fccbd0ea16b272774
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18400302



Change-Id: Ibea82f9b4fead48cec2885c607c3f65e81159a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18400302



Change-Id: Iedb8d40592bfb29a11d7c96390d247bfb50d1829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/18400302



Change-Id: I610398add9f9ac520aba8de8d6e2648e1b935786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

ag/18183905 changes the constructor arguments of C2BufferQueueBlockPoolData.

Bug: 232711062
Test: m
Change-Id: I63a9f9b1c7d8368af4c80777a9f4dcba4b581df0

Deleted deprecated clang property in Android.bp files using bpmodify.

Bug: 208980553
Test: treehugger
Change-Id: Ia6fef78af0555dd7346adbb29c4bb14ad31918a8

[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

Put v4l2_codec2 underneath a soong namespace am: f83441a3 am: ae52ea56 am: bce2d851 am: 323a9f3b

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162

Change-Id: I94e1c2cdadeb9200025e36b06c45ff9f96b1fa45

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162

Change-Id: If30632e779dec49f209a1ac196df1570f9e7fd48

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162

Change-Id: Iad6ef4c0c55293748f9b1fed9c4a0d61be31f20d

Original change: https://android-review.googlesource.com/c/platform/external/v4l2_codec2/+/1928162

Change-Id: I09d07f966ff82df54bd31ea4a6382efb623cfc3d

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16265240

Change-Id: I4dac368fee5989e53014670694c752bcddba7bde

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16265240

Change-Id: I7d1e181ab8b7e2e0219a5715dbf9a57838e62682

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16241005

Change-Id: Ib4908ada39761fb2752016b040be6054e7c921be

Merge "Use dma-buf inode number as buffer unique id am: 53f82c27" into sc-v2-dev-plus-aosp am: 9cb7cb3f

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16246368

Change-Id: I98652dbfbbd5fc0a32f4f0cd9d9bd65d21eb212f

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/v4l2_codec2/+/16241005

Change-Id: I0c5dd2fee99c25f623f65705cd2d7ed3666ce5a1