)]}' { "log": [ { "commit": "a240be908fa76b07074aa04d5e9b2d73c7563d48", "tree": "5a9258e001ed7490b68a6115dfe9101678ae5993", "parents": [ "a8464f173b1735fcaa7f82e450d971eb0733eba8", "a714f11cdd24d9bb0688f944da419c768f213397" ], "author": { "name": "Sungtak Lee", "email": "taklee@google.com", "time": "Thu Mar 25 02:54:44 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 25 02:54:44 2021 +0000" }, "message": "Merge changes from topic \"c2V1_2-impl\" into sc-dev\n\n* changes:\n Implement hardware.interface.media.c2@1.2 HAL\n Codec2: Add classes and interfaces for blocking allocator\n Codec2: Add C2Fence returnable fetch interfaces to C2BlockPool\n" }, { "commit": "a714f11cdd24d9bb0688f944da419c768f213397", "tree": "78cc5dbef3f608e84ef2be1f62a51ae267fa33ef", "parents": [ "fce527c470916468667fe26caad553fa3ce19a08" ], "author": { "name": "Sungtak Lee", "email": "taklee@google.com", "time": "Tue Mar 16 05:40:03 2021 -0700" }, "committer": { "name": "Sungtak Lee", "email": "taklee@google.com", "time": "Wed Mar 24 19:35:41 2021 -0700" }, "message": "Implement hardware.interface.media.c2@1.2 HAL\n\nImplement block allocator using BufferQueue.\n\nBug: 157111613\nChange-Id: I9d9e5b777f2253cd18960236dcbec73668ae215e\n" }, { "commit": "f09d5fa8d60917811e50b104b8b5fad4af651254", "tree": "f1d53444517cbaed9082cc56928d244ff91f0046", "parents": [ "e7c81cd7dcbc54d6f9f8a303d589fa4b9c06e4f3", "853bec382fd014c9521cc339e518bdc25e65c01e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 24 21:58:56 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 24 21:58:56 2021 +0000" }, "message": "Merge \"codec2: use libyuv for copying planes\" am: 274e353439 am: a962aaf42e am: 853bec382f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1649447\n\nChange-Id: Ib845a6df64af5abe6780e9ee0a0b403f34312f3c\n" }, { "commit": "853bec382fd014c9521cc339e518bdc25e65c01e", "tree": "7cd78aab63323227b1273b70521d4d6bb24ad493", "parents": [ "5d425fd6d7e23f57bdd65d8d9fdd68562c030781", "a962aaf42e04d7a5d530f71c4f89f6844683060d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 24 21:14:51 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 24 21:14:51 2021 +0000" }, "message": "Merge \"codec2: use libyuv for copying planes\" am: 274e353439 am: a962aaf42e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1649447\n\nChange-Id: I54478922403b58dbf465cc550b5a5877cb03edb4\n" }, { "commit": "274e3534395442c466a414eaa6c9d4fdde3fde6c", "tree": "325e300781ee01a2fc0d4d316fe30656cfc6ba3d", "parents": [ "f16b1ffcf118f353c8f069c92fd2fbd1b87497ab", "f37f242bade8157b980393d19417a70f6377a1c3" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 24 20:30:57 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 24 20:30:57 2021 +0000" }, "message": "Merge \"codec2: use libyuv for copying planes\"" }, { "commit": "020ac2cfafe57a66b9138d37605c57e562d8b24b", "tree": "913d9b59804bc6eaad0794f19bb4984d025d72b0", "parents": [ "135c989c0c7df54672dd673e54aeede0528d2db6", "87c7803f988af79b28561a03723eb5876fd3d578" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 24 06:49:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 24 06:49:37 2021 +0000" }, "message": "Merge \"MediaCodec: add methods to query/subscribe vendor parameters\" am: b63d314ddf am: 81d971a159 am: 87c7803f98\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1634940\n\nChange-Id: I5cf5770ae4d56ec6447f9616b6599827a83cff7e\n" }, { "commit": "87c7803f988af79b28561a03723eb5876fd3d578", "tree": "7f847f5777f024dd168d9d4fc9add61a1543f4eb", "parents": [ "7838a48d6a7677c19e3ee0ce168422f733c20e7c", "81d971a1593ced33e1f757957103dc9127ac45b7" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 24 06:04:34 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 24 06:04:34 2021 +0000" }, "message": "Merge \"MediaCodec: add methods to query/subscribe vendor parameters\" am: b63d314ddf am: 81d971a159\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1634940\n\nChange-Id: I6738d92bd9ecee1f27f3a5334d10b8ecb80ed194\n" }, { "commit": "b63d314ddf75e7c6a3349f91be7db85051570e35", "tree": "345927d1c018e2450e1376cca0ccad62a0079b6f", "parents": [ "f787fd49ffa22b07a73527e570f9e8b1bfa63d8f", "874ad38f9ea33907b3ac2a68dc7ed7ba6a171a2d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Mar 24 04:58:36 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 24 04:58:36 2021 +0000" }, "message": "Merge \"MediaCodec: add methods to query/subscribe vendor parameters\"" }, { "commit": "135c989c0c7df54672dd673e54aeede0528d2db6", "tree": "39dc7807b4fedb41e80abad2cd0775ef2f16e9ac", "parents": [ "41443f19d58cc42982968de999029d30042e0698", "7838a48d6a7677c19e3ee0ce168422f733c20e7c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 24 04:47:54 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 24 04:47:54 2021 +0000" }, "message": "Merge \"RELAND CCodec: handle dataspace update from GraphicBufferSource\" am: f787fd49ff am: 2fcd4bef11 am: 7838a48d6a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1643682\n\nChange-Id: I4daa97cea3996742b6e26d55f8386e2c2d71645b\n" }, { "commit": "7838a48d6a7677c19e3ee0ce168422f733c20e7c", "tree": "e2dc58332b3b28448e37ef5e224adcd61d5527f2", "parents": [ "c6d6cd23bd860de366416b5a4615c2640cacdf51", "2fcd4bef11998ef68c3aca41cc9dead48425cae1" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 24 04:01:15 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 24 04:01:15 2021 +0000" }, "message": "Merge \"RELAND CCodec: handle dataspace update from GraphicBufferSource\" am: f787fd49ff am: 2fcd4bef11\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1643682\n\nChange-Id: I71e062bbc5daad2f1243b2eb0b28e92c70b05afd\n" }, { "commit": "673dd1917a4765740908e357fc5b5223d12826d6", "tree": "872236646fb85890ead6e8c2c1eb9eb7569b1449", "parents": [ "24ba1e48cc65d07e8c08387716dd59e245b3643e" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Jan 29 14:58:12 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Mar 23 11:50:59 2021 -0700" }, "message": "RELAND CCodec: handle dataspace update from GraphicBufferSource\n\nIn addition, add ColorUtils::getColorConfigFromDataSpace and use it to\nget platform color configs out of dataspace.\n\nBug: 178675686\nTest: atest ccodec_unit_test\nChange-Id: I657156093e9d9cdcc12e6ed55644a3f6648ed7c9\n" }, { "commit": "f37f242bade8157b980393d19417a70f6377a1c3", "tree": "be803976754b8bc7711705a87b1a8613cf3e3e83", "parents": [ "0a2021b06fa5409d4c5b6a21a81d4f0dc6c37d9c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Mar 04 15:38:59 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Mar 22 15:50:06 2021 -0700" }, "message": "codec2: use libyuv for copying planes\n\nBug: 182386024\nTest: atest CtsVideoTestCases\nChange-Id: I7a5f51f63c07e614235d1f046b9ef227e36fa32a\n" }, { "commit": "874ad38f9ea33907b3ac2a68dc7ed7ba6a171a2d", "tree": "93d7a8e30a46083c321db3ae2e90283c98f0c44e", "parents": [ "0a2021b06fa5409d4c5b6a21a81d4f0dc6c37d9c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Mar 12 09:59:36 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Mar 22 12:13:01 2021 -0700" }, "message": "MediaCodec: add methods to query/subscribe vendor parameters\n\nBug: 183242434\nTest: atest android.media.cts.MediaCodecTest\nChange-Id: Ie6ffd648c6f8d89ba6ecadf5a3dbfb7f55963e50\n" }, { "commit": "3612da7488fc89517408197dcdcf150545919bf4", "tree": "efc099bfe57abb869e81151f481191ec43f794ab", "parents": [ "e7be55d0a7324d90d7c1535af1f12f08b2b53a2e", "b3e76b60d9fd524681650f1608f606180040a186" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Sun Mar 21 20:18:25 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Mar 21 20:18:25 2021 +0000" }, "message": "Merge changes from topic \"b181830609-part2\" into sc-dev\n\n* changes:\n Rework how QP bounds are passed, AVC encoder\n Rework how QP bounds are passed\n" }, { "commit": "a0ae69790a8e96a5a386260b5197f4472b930dac", "tree": "517549c335128f8b86a7c8ced96ca23eee60b89a", "parents": [ "047263a05704ed32810b5c5cc0f529d4367f3acb" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Wed Mar 10 19:40:01 2021 -0800" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Mar 19 16:24:16 2021 -0700" }, "message": "Rework how QP bounds are passed\n\nPass via an (variable length) set of settings for picture types\ninstead of the fixed I/P/B types. Also makes it possible to\npass a max without also passing a min.\n\nBug: 181830609\nTest: vq testing, ALOG\nChange-Id: I69bba8e35f0eda234530df92706230dc898b4ae9\n" }, { "commit": "8c4e9c7ea3a034f71c04045e7554d92b48f050cf", "tree": "5cfc408021781c753b309d36b633bee10c6c56ce", "parents": [ "c5ee316aea229c38f89eac80b4db81e90961e0e2" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Mon Mar 15 15:25:21 2021 -0700" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Thu Mar 18 19:53:10 2021 -0700" }, "message": "Look for additional media codec XML files\n\nmedia_codecs_overlay.xml in /product and /odm directories\nmedia_codecs_overlay.xml under /apex/com.android.media/etc/formatshaper\n(all optional)\n\nBug: 182827840\nTest: atest XMLParserTest\nTest: atest ccodec_unit_test\nTest: atest mc_sanity_test\nChange-Id: I689b3dd7ae5902043e376c3c7b473894f58c6e52\n" }, { "commit": "c5ee316aea229c38f89eac80b4db81e90961e0e2", "tree": "2c00a23fee7d53d1b41f5bb5dc609751a59c07e0", "parents": [ "00158ad01aba5fcaee7dfcde10f5f895b266a8b7", "11ef354bf6f5052ebf3899bcc86792630516354b" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 21:14:00 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 17 21:14:00 2021 +0000" }, "message": "Merge \"CCodec: rework image data processing\" am: 0a2021b06f am: a561560fbe am: 11ef354bf6\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1625184\n\nChange-Id: I851d96270b6bd09c811da9d49e3188fbdc615bc3\n" }, { "commit": "00158ad01aba5fcaee7dfcde10f5f895b266a8b7", "tree": "a330f217bc4cb678ab1585dc22361904f4664516", "parents": [ "0f5b498aaa0a99ffc423a0eeb747faf2fbf83407", "131f7f0c37bd3fa6b27512e1ce67755a12bbedc3" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 21:13:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 17 21:13:37 2021 +0000" }, "message": "Merge \"Revert \"CCodec: handle dataspace update from GraphicBufferSource\"\" am: 9314296877 am: 3bbd27e29e am: 131f7f0c37\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1640765\n\nChange-Id: I4b480d4404b4bb69e459576b1306fe970fed2f9e\n" }, { "commit": "11ef354bf6f5052ebf3899bcc86792630516354b", "tree": "b75f2caa08cc0f9718b117df5824860d667ca5c9", "parents": [ "131f7f0c37bd3fa6b27512e1ce67755a12bbedc3", "a561560fbe8bac62ebdf0da310eca61e338686f0" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 20:50:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 17 20:50:36 2021 +0000" }, "message": "Merge \"CCodec: rework image data processing\" am: 0a2021b06f am: a561560fbe\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1625184\n\nChange-Id: Ic5d3b23e5a7f6ac290b8d3938b9275ebb176ef54\n" }, { "commit": "131f7f0c37bd3fa6b27512e1ce67755a12bbedc3", "tree": "7e85520b9be121ce9995359be3067c3f373666d5", "parents": [ "b35428ea5055a201ce856f59f82ce52d3bb9de1b", "3bbd27e29eed03f61dcaa10abf14b8471fb4efdc" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 20:50:05 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 17 20:50:05 2021 +0000" }, "message": "Merge \"Revert \"CCodec: handle dataspace update from GraphicBufferSource\"\" am: 9314296877 am: 3bbd27e29e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1640765\n\nChange-Id: I8583d562c84d50a393d0812846696fccce6e7a0f\n" }, { "commit": "0a2021b06fa5409d4c5b6a21a81d4f0dc6c37d9c", "tree": "282ca05305f8e5690ff704370bfd4e86cd9ec1a7", "parents": [ "9314296877970096f530f7d494dc60ac64e2843b", "4a3c046e1742b3f54895bcc4f42eed5cd28e73f9" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 15:51:08 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 17 15:51:08 2021 +0000" }, "message": "Merge \"CCodec: rework image data processing\"" }, { "commit": "9314296877970096f530f7d494dc60ac64e2843b", "tree": "95dbd391dab9921d0a337add2a769dc19c44ecfe", "parents": [ "08d9d325f3c5df8d40f98f529e21cac2b61a2a90", "4f13d11b40dbef6c019d4231f05ed53f83396dd9" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 14:49:21 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 17 14:49:21 2021 +0000" }, "message": "Merge \"Revert \"CCodec: handle dataspace update from GraphicBufferSource\"\"" }, { "commit": "4f13d11b40dbef6c019d4231f05ed53f83396dd9", "tree": "09e7939f55f2ea049a66d68b78fddde748754024", "parents": [ "40aaf9549cb6a4eb5c5de4dc010f6a4ade78ea96" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 04:37:46 2021 +0000" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Mar 17 04:37:46 2021 +0000" }, "message": "Revert \"CCodec: handle dataspace update from GraphicBufferSource\"\n\nThis reverts commit 40aaf9549cb6a4eb5c5de4dc010f6a4ade78ea96.\n\nReason for revert: b/182820205\n\nChange-Id: Id59363390691d457b404161f973bb548d1c34db7\n" }, { "commit": "8b92ac8c49c6cb33bc54bbc9813562007936867c", "tree": "0d273e131604b01ca0b9799955f6842e6b6f0187", "parents": [ "cc3bbba8b7b66248bcd56d212cbb30e074e91b8a", "c0ac355a731ab50a9067324c1c86b3729b9ac270" ], "author": { "name": "Chih-yu Huang", "email": "akahuang@google.com", "time": "Wed Mar 17 01:16:40 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 17 01:16:40 2021 +0000" }, "message": "Merge \"Close the handle returned by WrapNativeCodec2GrallocHandle()\" into sc-dev" }, { "commit": "d7c87362d62d723590d108465486b896ff5c093b", "tree": "b4cd95eb5ea9c71c2c97c16b2a1b729a246b0d6f", "parents": [ "047263a05704ed32810b5c5cc0f529d4367f3acb", "b69fedaacf25e14fee37031bc6efc8d0da13e4c2" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Mar 15 05:07:31 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 15 05:07:31 2021 +0000" }, "message": "Merge changes I47894ce3,Ibc2013cf,Ide4eb89b am: 532501a256 am: 1329fe6887 am: b69fedaacf\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1564488\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: If2289c434d7f52ef0322116403f459397454fec0\n" }, { "commit": "b69fedaacf25e14fee37031bc6efc8d0da13e4c2", "tree": "f8b4e58872d65d02c51f7b14fb1659f235421f91", "parents": [ "94e68196714d7a42c06bde027e28d9f35677fa33", "1329fe6887f9ff2ed3b12d960acb9cfeda34e83a" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Mar 15 04:23:39 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 15 04:23:39 2021 +0000" }, "message": "Merge changes I47894ce3,Ibc2013cf,Ide4eb89b am: 532501a256 am: 1329fe6887\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1564488\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I27168c44f715982c4d561a1407fb9adc09b42be7\n" }, { "commit": "532501a25692281aee1e1c4713e5b91c7c5fb8b1", "tree": "771b942917a18de963710fc1813ab70da7c31ebb", "parents": [ "41f53a9bab6215cdd4d4c21aefba6e939d91219d", "05b6a7c59297884dccd56a111cea581d93de84f0" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Mar 15 03:20:53 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 15 03:20:53 2021 +0000" }, "message": "Merge changes I47894ce3,Ibc2013cf,Ide4eb89b\n\n* changes:\n stagefright: propagate dataspace from BufferQueue to MediaCodec.\n CCodec: handle dataspace update from GraphicBufferSource\n CCodec: handle default dataspace\n" }, { "commit": "c0ac355a731ab50a9067324c1c86b3729b9ac270", "tree": "ab55d46d1bbb576fe2506adf6919f32d91193cbf", "parents": [ "047263a05704ed32810b5c5cc0f529d4367f3acb" ], "author": { "name": "Chih-Yu Huang", "email": "akahuang@google.com", "time": "Thu Mar 11 14:37:10 2021 +0900" }, "committer": { "name": "Chih-yu Huang", "email": "akahuang@google.com", "time": "Mon Mar 15 00:48:37 2021 +0000" }, "message": "Close the handle returned by WrapNativeCodec2GrallocHandle()\n\nWrapNativeCodec2GrallocHandle() creates a new native handle, and\nclones the fd of the input native handle. The caller should explicitly\nclose and delete the returned native handle.\n\nThis CL updates the description of WrapNativeCodec2GrallocHandle(),\nand calls native_handle_close() and native_handle_delete() if the\nownership of the returned handle is not transfered to\nC2GraphicAllocation successfully.\n\nBug: 181541291\nTest: android.media.cts.AdaptivePlaybackTest\n\nChange-Id: I53726b61115a212675a199ddcd843df1fead948c\n" }, { "commit": "b1b1aef1d7394f9c82ec9a514d8a49aea919f360", "tree": "733dab751024cde45f6875e2c5e4bfafbd428abb", "parents": [ "3b7f9769f244522136405145d30c1513161d5584", "94e68196714d7a42c06bde027e28d9f35677fa33" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Sat Mar 13 08:30:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Mar 13 08:30:20 2021 +0000" }, "message": "Merge \"CCodec: add support for tunneled playback.\" am: 41f53a9bab am: d977835d80 am: 94e6819671\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1455053\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I162bba3d932617eda8ca0cc7725c37101e2597af\n" }, { "commit": "94e68196714d7a42c06bde027e28d9f35677fa33", "tree": "2725a5b64b8cdbd07e1309092575a7c9b22dd2b9", "parents": [ "626154dd317036cbf838d6027cb55d133979399f", "d977835d80f33402b3824420d0c560426b5fb61e" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Sat Mar 13 08:08:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Mar 13 08:08:36 2021 +0000" }, "message": "Merge \"CCodec: add support for tunneled playback.\" am: 41f53a9bab am: d977835d80\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1455053\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I79ebf0b02f86a1d7d638767d45c37713eff182cd\n" }, { "commit": "41f53a9bab6215cdd4d4c21aefba6e939d91219d", "tree": "ce7ba9bd4c6997100405fd7399ab63c30969d078", "parents": [ "ce9b8c44db73495433e2a0c96169bf55f3c1cc30", "765db4da4315846d38c5af420e32d8c5204e7628" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Sat Mar 13 07:03:15 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Mar 13 07:03:15 2021 +0000" }, "message": "Merge \"CCodec: add support for tunneled playback.\"" }, { "commit": "765db4da4315846d38c5af420e32d8c5204e7628", "tree": "f2eecaa1791af3d3d929ea5e4d6eab1eb19c2ad0", "parents": [ "6a0e64617eb2fc92e07e60ef79eab5546453e9b4" ], "author": { "name": "ted.sun", "email": "ted.sun@mediatek.com", "time": "Tue Jun 23 14:03:41 2020 +0800" }, "committer": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Fri Mar 12 14:23:53 2021 -0800" }, "message": "CCodec: add support for tunneled playback.\n\nBug: 151997287\nChange-Id: I50e417e5a070684623c37af05bc3c97120b5da7f\n" }, { "commit": "587f54969fc20525d8f62e0cab4b83ffa9467b94", "tree": "a51f4853364441f740b7dcca8832989361ca9630", "parents": [ "e92846312056520875da7a51fd61a3b4f68f442c", "081695ddf7e1aa5cd0cbf96f2bdb7e86df1bfee2" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Fri Mar 12 19:53:43 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 12 19:53:43 2021 +0000" }, "message": "Merge \"CCodec: add support for onFrameRendered for tunneled playback.\" am: 51c7f563e2 am: e9f0f9f1dd am: 081695ddf7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1455054\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I79385e8a2ff9fe471e753b9cff58e5956542e9a2\n" }, { "commit": "081695ddf7e1aa5cd0cbf96f2bdb7e86df1bfee2", "tree": "0ee7ae3ba6a3456c857210ba38205cfe81b751d9", "parents": [ "41425f4d1c802f46e08fad845169ca439943ac31", "e9f0f9f1dda9dbbfdceab83704c1ad7c5bbcf849" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Fri Mar 12 19:28:44 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 12 19:28:44 2021 +0000" }, "message": "Merge \"CCodec: add support for onFrameRendered for tunneled playback.\" am: 51c7f563e2 am: e9f0f9f1dd\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1455054\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I51639df2733e152eeaab8408b03f7fa83e85797b\n" }, { "commit": "51c7f563e2b07deb57967269cdcb293278915205", "tree": "0d1b2f8e40928ac5aab95ac748c18102447e8f45", "parents": [ "8da0203667851368251a0fc5e6a1aafed2ccba68", "b1fbfdb272fb77366520a22a9a22548b62d3f0ba" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Fri Mar 12 18:24:47 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Mar 12 18:24:47 2021 +0000" }, "message": "Merge \"CCodec: add support for onFrameRendered for tunneled playback.\"" }, { "commit": "40aaf9549cb6a4eb5c5de4dc010f6a4ade78ea96", "tree": "e8684fb9988a50b910ca91b749e5dddc8289d2da", "parents": [ "77e97c78aa1d33190c71323e32cb3b132a581312" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Jan 29 14:58:12 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Mar 12 16:43:01 2021 +0000" }, "message": "CCodec: handle dataspace update from GraphicBufferSource\n\nBug: 178675686\nTest: manual\nChange-Id: Ibc2013cf2208a369dda52616507e4ade8b607caa\n" }, { "commit": "2b1a24c9d3739fa75be0559f93f62edccd241bc3", "tree": "7ca61b6c50402f9a8863eb7e2242b0fa0825fffe", "parents": [ "8b35e9299a41100fd0d982d4de43cf013181eef1", "e7e019a54fa4a7c09ae2711e37bf2812f22ff489" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Fri Mar 12 04:39:07 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 12 04:39:07 2021 +0000" }, "message": "Merge \"stagefright/codec2: fix KEY_PREPEND_HEADER_TO_SYNC_FRAMES\" am: deba9fd176 am: 935b95fbf0 am: e7e019a54f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1463007\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Iacd76c4b5234a4ef0e59045afb1a479ae5db2626\n" }, { "commit": "e7e019a54fa4a7c09ae2711e37bf2812f22ff489", "tree": "fc727f39351f6aa784a7f82d43f7ade0d022fbfd", "parents": [ "acb393667b4bd342fc412ffd36349351c37dd123", "935b95fbf06db9e0631ef383ff5e13999d691b91" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Fri Mar 12 03:52:11 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 12 03:52:11 2021 +0000" }, "message": "Merge \"stagefright/codec2: fix KEY_PREPEND_HEADER_TO_SYNC_FRAMES\" am: deba9fd176 am: 935b95fbf0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1463007\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I5cdfed67f19fd3c19d94d8bd032d6b094a524076\n" }, { "commit": "b1fbfdb272fb77366520a22a9a22548b62d3f0ba", "tree": "66e3450f92bdaf191559f41c08998714c1fa4f8c", "parents": [ "6a0e64617eb2fc92e07e60ef79eab5546453e9b4" ], "author": { "name": "ted.sun", "email": "ted.sun@mediatek.com", "time": "Tue Jun 23 14:03:41 2020 +0800" }, "committer": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Thu Mar 11 10:51:27 2021 -0800" }, "message": "CCodec: add support for onFrameRendered for tunneled playback.\n\nBug: 151997287\nChange-Id: I3c09ec2149f2eea1a92a87271049798f6379b3ac\n" }, { "commit": "77e97c78aa1d33190c71323e32cb3b132a581312", "tree": "09e7939f55f2ea049a66d68b78fddde748754024", "parents": [ "85ed8fd8d8aba408e2ee149a4a457772e82b479f" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jan 20 10:33:22 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Mar 11 00:35:31 2021 -0800" }, "message": "CCodec: handle default dataspace\n\nBug: 160727754\nTest: manual\nChange-Id: Ide4eb89b19761dd6c9ff680297b82bdb9c3f084f\n" }, { "commit": "a2b5f5a818b7ad15fef32ceab1eafed559dd9691", "tree": "a91aaa8957d35d9391b982c70e0fd40b56ec0e01", "parents": [ "378c3eb076c039ad59ea24fdee9062e7d0468f46" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Oct 14 16:36:18 2020 -0700" }, "committer": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Thu Mar 11 02:02:06 2021 +0000" }, "message": "stagefright/codec2: fix KEY_PREPEND_HEADER_TO_SYNC_FRAMES\n\nThis had incorrectly was copied as KEY_PREPEND_HEADERS_TO_SYNC_FRAMES.\n\nChange-Id: Ie42d2f1b06d693c4a0e66fcf061bfd26ce3b1005\n" }, { "commit": "4a3c046e1742b3f54895bcc4f42eed5cd28e73f9", "tree": "487ea73fc69e102b34c688cebb88e7c60dd2d943", "parents": [ "85ed8fd8d8aba408e2ee149a4a457772e82b479f" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Mar 09 15:45:05 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Mar 09 15:57:07 2021 -0800" }, "message": "CCodec: rework image data processing\n\nBug: 181810375\nTest: atest CtsMediaV2TestCases:android.mediav2.cts.CodecDecoderTest\nChange-Id: Id6689c326c23d3d7631ba53b6e6cc66951f3a1bf\n" }, { "commit": "6108fd4e6ef14b32388628ee1467892635610939", "tree": "e5b5f969030a8f61da9357e5a945a1ef5b4304cb", "parents": [ "7a525d62bfe089e2512013f6592b72f2d435034f", "fe679136d2c30427852487d9dc69c2ccae43f154" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Sat Mar 06 05:31:12 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Mar 06 05:31:12 2021 +0000" }, "message": "Merge changes from topic \"b181830609\" into sc-dev\n\n* changes:\n AVC encoder processes QP bounding parameters\n Codec2 pass standard QP bounding keys\n" }, { "commit": "9470d46b4d13884dcf04b23cb260be0692b6546f", "tree": "ba3674f433049412c0e9032267f9b12e459eddb6", "parents": [ "3435b89745f6ea9dd0ab90554237a45e10689349" ], "author": { "name": "Ray Essick", "email": "essick@google.com", "time": "Thu Mar 04 13:25:44 2021 -0800" }, "committer": { "name": "Ray Essick", "email": "essick@google.com", "time": "Fri Mar 05 16:06:53 2021 -0800" }, "message": "Codec2 pass standard QP bounding keys\n\nHave the Codec2 framework pass the newly standardized QP bounding\ninformation through to the underlying codecs.\n\nBug: 181830609\nTest: vq framework testing\nChange-Id: I837dff6a7a12ab782c70016f78b582ca77fe168c\n" }, { "commit": "06d564506d35a5d420c42ec588e9a879c126c64f", "tree": "eaef0c032863f9c44694cb66744d7ba6c9e40bb4", "parents": [ "aff5ddaaeb57d0bc125847255e404770e9d9a29d", "a91c90c537d7b56413ac1c704ccbebc233213b7b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Mar 05 14:11:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 05 14:11:36 2021 +0000" }, "message": "Merge \"CCodec: translate C2_NO_MEMORY to NO_MEMORY in onError callback\" am: a03f71733b am: 0e57afcf5c am: a91c90c537\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1619564\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Id39f67740fe097aaa650cbae2f026012f181245e\n" }, { "commit": "a91c90c537d7b56413ac1c704ccbebc233213b7b", "tree": "575bbee08c9e3b4730360201ea7be0bb116b7e0b", "parents": [ "33485b618fb78d820f11ceff0217fc8767f37465", "0e57afcf5c2eb82c9f0128a324ee610a4b29180c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Mar 05 13:23:39 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Mar 05 13:23:39 2021 +0000" }, "message": "Merge \"CCodec: translate C2_NO_MEMORY to NO_MEMORY in onError callback\" am: a03f71733b am: 0e57afcf5c\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1619564\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I79ce3ba37695ef44203a0ea3523c4b1f8ca47fef\n" }, { "commit": "a03f71733b11d0e01ccc66c0dfa135917d822e06", "tree": "74ae6d52e1f817fe246d47fa3f7cd84048a0ad8e", "parents": [ "6ae3b22771b482b429532b296f361980252694e1", "10f33c00eeac762159452c49d4d2f519b3f4501c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Mar 05 12:20:14 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Mar 05 12:20:14 2021 +0000" }, "message": "Merge \"CCodec: translate C2_NO_MEMORY to NO_MEMORY in onError callback\"" }, { "commit": "10f33c00eeac762159452c49d4d2f519b3f4501c", "tree": "99a4ce2cf97ac7b700baea50ada2f0b7f0170ecf", "parents": [ "353d2e39948802eac48f2fe4329d9afd3e59a395" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Mar 04 15:04:14 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Mar 04 15:04:14 2021 -0800" }, "message": "CCodec: translate C2_NO_MEMORY to NO_MEMORY in onError callback\n\nBug: 181873019\nBug: 181874733\nTest: atest CtsMediaTestCases:MediaCodecCapabilitiesTest\nTest: atest CtsMediaTestCases:ResourceManagerTest\nChange-Id: I4eff1dcb994a49859797155fe49f76bfa34e000b\n" }, { "commit": "ab736ea066b57188ce97243b56fb24466439744c", "tree": "1ec6800466a99b94a7c87c6bbb2e41b4ec4f17fe", "parents": [ "a96220469d69701c956e17cb7bf85701331e6df3", "699a3958507760c2612e4cd1931451e8000b9271" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Mar 02 22:33:08 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 02 22:33:08 2021 +0000" }, "message": "Merge \"CCodec: handle stride/vstride for encoder input buffers\" am: a667efe6dd am: 4df23d482f am: 699a395850\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1606898\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I488bb1a42aa58b8abd3b053a8c5690e05e2902d9\n" }, { "commit": "699a3958507760c2612e4cd1931451e8000b9271", "tree": "1275fa9ac7d3b71df79c21efe824e52e8c0deb03", "parents": [ "bdeb21c7682fdef24e321e6a9484656030c3208f", "4df23d482f167ab1cd49b50446a5c6769b773a54" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Mar 02 21:50:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 02 21:50:25 2021 +0000" }, "message": "Merge \"CCodec: handle stride/vstride for encoder input buffers\" am: a667efe6dd am: 4df23d482f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1606898\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I518f0325b4a21ce084dcc7388c381a97e402b891\n" }, { "commit": "6f226f6713904abb84d251ac32cdb18ac52efd04", "tree": "48b1a166cd4bf235838adfce30dae04fa67845d7", "parents": [ "759aa32a738f9d01b9079ddd3abb080332b2d241", "60e662cf02280df8e85c6d45a91fbeb635028df8" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Mar 02 20:40:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 02 20:40:20 2021 +0000" }, "message": "Merge \"CCodec: move lower-res workaround to C2OMXNode\" am: 00c58edb65 am: 6e22684502 am: 60e662cf02\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1612361\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I02ee618828b677b2cc10a6d283b9a3cbab6146c7\n" }, { "commit": "60e662cf02280df8e85c6d45a91fbeb635028df8", "tree": "c192267b1691b946d5a0cd473cbb085740b3bae1", "parents": [ "9b7ca24104c2e71ee6ca8758c6e93a643c3319a9", "6e2268450252bb6496fe7b31ecb8e93a367d7d93" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Mar 02 19:48:52 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 02 19:48:52 2021 +0000" }, "message": "Merge \"CCodec: move lower-res workaround to C2OMXNode\" am: 00c58edb65 am: 6e22684502\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1612361\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I41a77c8d6fc720efa9246035084f5e26d1bbd395\n" }, { "commit": "a667efe6ddaeb2c6d5420e2bda7da654d1917b09", "tree": "db51acf6c2555f2f81b80304ebad86b5e1133ffb", "parents": [ "0d45784c4569b5196a0b22bc3ead11062c01c55f", "d91f3fbed6c6b52637c8316f3467d54321ab778e" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Mar 02 19:35:47 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 02 19:35:47 2021 +0000" }, "message": "Merge \"CCodec: handle stride/vstride for encoder input buffers\"" }, { "commit": "d91f3fbed6c6b52637c8316f3467d54321ab778e", "tree": "6f9764b6962444526ffec9dd0b5d1982b8566b18", "parents": [ "353d2e39948802eac48f2fe4329d9afd3e59a395" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Feb 24 12:35:31 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Mar 02 17:15:37 2021 +0000" }, "message": "CCodec: handle stride/vstride for encoder input buffers\n\nBug: 180949721\nTest: atest CtsVideoTestCases:VideoEncoderDecoderTest\nChange-Id: I343211912cb7384a301c915f2dea75d189866d15\n" }, { "commit": "34d6601898a64ae50d0c18017aa8917ddaf91e3b", "tree": "a8e7e8731ed519cf363020d6946c601eafed3bba", "parents": [ "353d2e39948802eac48f2fe4329d9afd3e59a395" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Mar 01 16:40:33 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Mon Mar 01 18:19:27 2021 -0800" }, "message": "CCodec: move lower-res workaround to C2OMXNode\n\nBug: 177496388\nTest: slow-motion recording\nTest: atest CtsCameraTestCases:RecordingTest\nChange-Id: If319a8c0cea93d92688b7df800a232dfe7797c30\n" }, { "commit": "c74fd5f5f0477cf2b2304c44969e7028fdb19096", "tree": "48272ee059720e2ff18bac46f30626896e9ca023", "parents": [ "fd3bd1de208358210d09b6298a555d8badaa3c9d", "dd2d95f2d1e3decb164ebbee3933d031fe19f5de" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Feb 26 06:43:23 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 26 06:43:23 2021 +0000" }, "message": "Merge \"CCodec: fix default color aspects handling\" am: 020dc0424b am: d9fc71522e am: dd2d95f2d1\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1606716\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I45574ac96224e9f80461e04bffd4fc03cc68ba17\n" }, { "commit": "dd2d95f2d1e3decb164ebbee3933d031fe19f5de", "tree": "419d0186541e30dfacf23e9a9f7ca70f47d41269", "parents": [ "a827a22ab20dd0e09ecb4ddc4ef0e1b2fd8152cf", "d9fc71522e316b112362d0556e19e89d45a4aa3c" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Fri Feb 26 06:02:25 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 26 06:02:25 2021 +0000" }, "message": "Merge \"CCodec: fix default color aspects handling\" am: 020dc0424b am: d9fc71522e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1606716\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I2c17f3863cb51ffa234e0c8b62bf65dd0fb14a5b\n" }, { "commit": "56786ac1035b158c23c150884d2d6415f9fbd1ea", "tree": "309e190927e12f9076359905ea5e2258f25700a1", "parents": [ "445b895828747b82170610a75598a0615025918c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Feb 25 15:24:36 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Feb 25 15:24:36 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n apex/Android.bp\n apex/testing/Android.bp\n camera/cameraserver/Android.bp\n camera/tests/Android.mk\n cmds/screenrecord/Android.bp\n cmds/stagefright/Android.mk\n drm/common/Android.bp\n drm/drmserver/Android.bp\n drm/libdrmframework/Android.bp\n drm/libdrmframework/plugins/common/util/Android.bp\n drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.bp\n drm/libdrmframework/plugins/passthru/Android.bp\n drm/libmediadrm/Android.bp\n drm/libmediadrm/fuzzer/Android.bp\n drm/libmediadrm/protos/Android.bp\n drm/libmediadrm/tests/Android.bp\n drm/mediacas/plugins/clearkey/Android.bp\n drm/mediacas/plugins/clearkey/tests/Android.bp\n drm/mediacas/plugins/mock/Android.bp\n drm/mediadrm/plugins/clearkey/common/Android.bp\n drm/mediadrm/plugins/clearkey/default/Android.bp\n drm/mediadrm/plugins/clearkey/default/tests/Android.bp\n drm/mediadrm/plugins/mock/Android.bp\n media/audioserver/Android.bp\n media/bufferpool/1.0/Android.bp\n media/bufferpool/1.0/vts/Android.bp\n media/bufferpool/2.0/Android.bp\n media/bufferpool/2.0/tests/Android.bp\n media/codec2/components/aac/Android.bp\n media/codec2/components/amr_nb_wb/Android.bp\n media/codec2/components/aom/Android.bp\n media/codec2/components/avc/Android.bp\n media/codec2/components/base/Android.bp\n media/codec2/components/cmds/Android.bp\n media/codec2/components/flac/Android.bp\n media/codec2/components/g711/Android.bp\n media/codec2/components/gav1/Android.bp\n media/codec2/components/gsm/Android.bp\n media/codec2/components/hevc/Android.bp\n media/codec2/components/mp3/Android.bp\n media/codec2/components/mpeg2/Android.bp\n media/codec2/components/mpeg4_h263/Android.bp\n media/codec2/components/opus/Android.bp\n media/codec2/components/raw/Android.bp\n media/codec2/components/vorbis/Android.bp\n media/codec2/components/vpx/Android.bp\n media/codec2/components/xaac/Android.bp\n media/codec2/core/Android.bp\n media/codec2/faultinjection/Android.bp\n media/codec2/fuzzer/Android.bp\n media/codec2/hidl/1.0/utils/Android.bp\n media/codec2/hidl/1.0/vts/functional/Android.bp\n media/codec2/hidl/1.0/vts/functional/audio/Android.bp\n media/codec2/hidl/1.0/vts/functional/common/Android.bp\n media/codec2/hidl/1.0/vts/functional/component/Android.bp\n media/codec2/hidl/1.0/vts/functional/master/Android.bp\n media/codec2/hidl/1.0/vts/functional/video/Android.bp\n media/codec2/hidl/1.1/utils/Android.bp\n media/codec2/hidl/client/Android.bp\n media/codec2/hidl/plugin/Android.bp\n media/codec2/hidl/plugin/samples/Android.bp\n media/codec2/hidl/services/Android.bp\n media/codec2/sfplugin/Android.bp\n media/codec2/sfplugin/tests/Android.bp\n media/codec2/sfplugin/utils/Android.bp\n media/codec2/tests/Android.bp\n media/codec2/vndk/Android.bp\n media/codecs/amrnb/common/Android.bp\n media/codecs/amrnb/enc/fuzzer/Android.bp\n media/codecs/amrnb/fuzzer/Android.bp\n media/codecs/amrwb/dec/fuzzer/Android.bp\n media/codecs/amrwb/enc/Android.bp\n media/codecs/amrwb/enc/SampleCode/Android.bp\n media/codecs/amrwb/enc/fuzzer/Android.bp\n media/codecs/amrwb/enc/test/Android.bp\n media/codecs/g711/decoder/Android.bp\n media/codecs/g711/fuzzer/Android.bp\n media/codecs/m4v_h263/dec/Android.bp\n media/codecs/m4v_h263/dec/test/Android.bp\n media/codecs/m4v_h263/fuzzer/Android.bp\n media/codecs/mp3dec/fuzzer/Android.bp\n media/extractors/Android.bp\n media/extractors/aac/Android.bp\n media/extractors/amr/Android.bp\n media/extractors/flac/Android.bp\n media/extractors/fuzzers/Android.bp\n media/extractors/midi/Android.bp\n media/extractors/mkv/Android.bp\n media/extractors/mp3/Android.bp\n media/extractors/mp4/Android.bp\n media/extractors/mpeg2/Android.bp\n media/extractors/ogg/Android.bp\n media/extractors/tests/Android.bp\n media/extractors/wav/Android.bp\n media/img_utils/Android.bp\n media/libaaudio/Android.bp\n media/libaaudio/examples/Android.bp\n media/libaaudio/examples/input_monitor/Android.bp\n media/libaaudio/examples/loopback/Android.bp\n media/libaaudio/examples/write_sine/Android.bp\n media/libaaudio/src/Android.bp\n media/libaaudio/tests/Android.bp\n media/libaudioclient/Android.bp\n media/libaudioclient/fuzzer/Android.bp\n media/libaudioclient/tests/Android.bp\n media/libaudiofoundation/Android.bp\n media/libaudiofoundation/tests/Android.bp\n media/libaudiohal/Android.bp\n media/libaudiohal/impl/Android.bp\n media/libaudioprocessing/Android.bp\n media/libaudioprocessing/audio-resampler/Android.bp\n media/libaudioprocessing/tests/Android.bp\n media/libaudioprocessing/tests/fuzzer/Android.bp\n media/libcpustats/Android.bp\n media/libdatasource/Android.bp\n media/libeffects/config/Android.bp\n media/libeffects/downmix/Android.bp\n media/libeffects/downmix/tests/Android.bp\n media/libeffects/dynamicsproc/Android.bp\n media/libeffects/factory/Android.bp\n media/libeffects/hapticgenerator/Android.bp\n media/libeffects/loudness/Android.bp\n media/libeffects/lvm/benchmarks/Android.bp\n media/libeffects/lvm/lib/Android.bp\n media/libeffects/lvm/tests/Android.bp\n media/libeffects/lvm/wrapper/Android.bp\n media/libeffects/preprocessing/Android.bp\n media/libeffects/preprocessing/benchmarks/Android.bp\n media/libeffects/preprocessing/tests/Android.bp\n media/libeffects/proxy/Android.bp\n media/libeffects/visualizer/Android.bp\n media/libheif/Android.bp\n media/libmedia/Android.bp\n media/libmedia/tests/codeclist/Android.bp\n media/libmedia/tests/mediaplayer/Android.bp\n media/libmedia/xsd/Android.bp\n media/libmedia/xsd/vts/Android.bp\n media/libmediahelper/Android.bp\n media/libmediahelper/tests/Android.bp\n media/libmediametrics/Android.bp\n media/libmediaplayerservice/Android.bp\n media/libmediaplayerservice/datasource/Android.bp\n media/libmediaplayerservice/nuplayer/Android.bp\n media/libmediaplayerservice/tests/Android.bp\n media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp\n media/libmediatranscoding/Android.bp\n media/libmediatranscoding/tests/Android.bp\n media/libmediatranscoding/transcoder/Android.bp\n media/libmediatranscoding/transcoder/benchmark/Android.bp\n media/libmediatranscoding/transcoder/tests/Android.bp\n media/libmediatranscoding/transcoder/tests/fuzzer/Android.bp\n media/libnbaio/Android.bp\n media/libnblog/Android.bp\n media/libshmem/Android.bp\n media/libstagefright/Android.bp\n media/libstagefright/bqhelper/Android.bp\n media/libstagefright/bqhelper/tests/Android.bp\n media/libstagefright/codecs/aacdec/Android.bp\n media/libstagefright/codecs/aacenc/Android.bp\n media/libstagefright/codecs/amrnb/dec/Android.bp\n media/libstagefright/codecs/amrnb/enc/Android.bp\n media/libstagefright/codecs/amrwbenc/Android.bp\n media/libstagefright/codecs/avcdec/Android.bp\n media/libstagefright/codecs/avcenc/Android.bp\n media/libstagefright/codecs/common/Android.bp\n media/libstagefright/codecs/flac/dec/Android.bp\n media/libstagefright/codecs/flac/enc/Android.bp\n media/libstagefright/codecs/g711/dec/Android.bp\n media/libstagefright/codecs/gsm/dec/Android.bp\n media/libstagefright/codecs/hevcdec/Android.bp\n media/libstagefright/codecs/m4v_h263/dec/Android.bp\n media/libstagefright/codecs/m4v_h263/enc/Android.bp\n media/libstagefright/codecs/mp3dec/Android.bp\n media/libstagefright/codecs/mpeg2dec/Android.bp\n media/libstagefright/codecs/on2/dec/Android.bp\n media/libstagefright/codecs/on2/enc/Android.bp\n media/libstagefright/codecs/opus/dec/Android.bp\n media/libstagefright/codecs/raw/Android.bp\n media/libstagefright/codecs/vorbis/dec/Android.bp\n media/libstagefright/codecs/xaacdec/Android.bp\n media/libstagefright/colorconversion/Android.bp\n media/libstagefright/data/Android.bp\n media/libstagefright/filters/Android.bp\n media/libstagefright/flac/dec/Android.bp\n media/libstagefright/flac/dec/test/Android.bp\n media/libstagefright/foundation/Android.bp\n media/libstagefright/foundation/tests/AVCUtils/Android.bp\n media/libstagefright/foundation/tests/Android.bp\n media/libstagefright/foundation/tests/OpusHeader/Android.bp\n media/libstagefright/foundation/tests/colorutils/Android.bp\n media/libstagefright/http/Android.bp\n media/libstagefright/httplive/Android.bp\n media/libstagefright/id3/Android.bp\n media/libstagefright/id3/test/Android.bp\n media/libstagefright/mpeg2ts/Android.bp\n media/libstagefright/mpeg2ts/test/Android.bp\n media/libstagefright/omx/Android.bp\n media/libstagefright/omx/tests/Android.bp\n media/libstagefright/renderfright/Android.bp\n media/libstagefright/renderfright/tests/Android.bp\n media/libstagefright/rtsp/Android.bp\n media/libstagefright/tests/Android.bp\n media/libstagefright/tests/ESDS/Android.bp\n media/libstagefright/tests/HEVC/Android.bp\n media/libstagefright/tests/extractorFactory/Android.bp\n media/libstagefright/tests/fuzzers/Android.bp\n media/libstagefright/tests/mediacodec/Android.bp\n media/libstagefright/tests/metadatautils/Android.bp\n media/libstagefright/tests/writer/Android.bp\n media/libstagefright/timedtext/Android.bp\n media/libstagefright/timedtext/test/Android.bp\n media/libstagefright/webm/Android.bp\n media/libstagefright/webm/tests/Android.bp\n media/libstagefright/writer_fuzzers/Android.bp\n media/libstagefright/xmlparser/Android.bp\n media/libstagefright/xmlparser/test/Android.bp\n media/libstagefright/xmlparser/vts/Android.bp\n media/libwatchdog/Android.bp\n media/mediaserver/Android.bp\n media/mtp/Android.bp\n media/mtp/tests/MtpFfsHandleTest/Android.bp\n media/mtp/tests/MtpFuzzer/Android.bp\n media/mtp/tests/PosixAsyncIOTest/Android.bp\n media/tests/benchmark/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp\n media/tests/benchmark/src/native/common/Android.bp\n media/tests/benchmark/src/native/decoder/Android.bp\n media/tests/benchmark/src/native/encoder/Android.bp\n media/tests/benchmark/src/native/extractor/Android.bp\n media/tests/benchmark/src/native/muxer/Android.bp\n media/tests/benchmark/tests/Android.bp\n media/utils/Android.bp\n media/utils/fuzzers/Android.bp\n media/utils/tests/Android.bp\n services/audioflinger/Android.bp\n services/audiopolicy/Android.bp\n services/audiopolicy/common/Android.bp\n services/audiopolicy/common/managerdefinitions/Android.bp\n services/audiopolicy/config/Android.bp\n services/audiopolicy/engine/common/Android.bp\n services/audiopolicy/engine/config/Android.bp\n services/audiopolicy/engine/config/tests/Android.bp\n services/audiopolicy/engine/config/tests/resources/Android.bp\n services/audiopolicy/engine/interface/Android.bp\n services/audiopolicy/engineconfigurable/Android.bp\n services/audiopolicy/engineconfigurable/config/Android.bp\n services/audiopolicy/engineconfigurable/config/example/automotive/Android.bp\n services/audiopolicy/engineconfigurable/config/example/caremu/Android.bp\n services/audiopolicy/engineconfigurable/config/example/phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.bp\n services/audiopolicy/engineconfigurable/tools/Android.bp\n services/audiopolicy/engineconfigurable/wrapper/Android.bp\n services/audiopolicy/enginedefault/Android.bp\n services/audiopolicy/enginedefault/config/example/Android.bp\n services/audiopolicy/fuzzer/Android.bp\n services/audiopolicy/fuzzer/resources/Android.bp\n services/audiopolicy/managerdefault/Android.bp\n services/audiopolicy/service/Android.bp\n services/audiopolicy/tests/Android.bp\n services/audiopolicy/tests/resources/Android.bp\n services/camera/libcameraservice/Android.bp\n services/camera/libcameraservice/fuzzer/Android.bp\n services/camera/libcameraservice/libcameraservice_fuzzer/Android.bp\n services/camera/libcameraservice/tests/Android.mk\n services/mediacodec/Android.bp\n services/mediacodec/registrant/Android.bp\n services/mediaextractor/Android.bp\n services/medialog/Android.bp\n services/medialog/fuzzer/Android.bp\n services/mediametrics/Android.bp\n services/mediametrics/benchmarks/Android.bp\n services/mediametrics/fuzzer/Android.bp\n services/mediametrics/tests/Android.bp\n services/mediaresourcemanager/Android.bp\n services/mediaresourcemanager/fuzzer/Android.bp\n services/mediaresourcemanager/test/Android.bp\n services/mediatranscoding/Android.bp\n services/mediatranscoding/tests/Android.bp\n services/mediatranscoding/tests/TranscodingUidPolicyTestApp/Android.bp\n services/minijail/Android.bp\n services/oboeservice/Android.bp\n services/tuner/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:\n media/codecs/amrnb/dec/Android.bp\n media/codecs/amrnb/dec/test/Android.bp\n media/codecs/amrnb/enc/Android.bp\n media/codecs/amrnb/enc/test/Android.bp\n media/codecs/amrwb/dec/Android.bp\n media/codecs/amrwb/dec/test/Android.bp\n media/codecs/m4v_h263/enc/Android.bp\n media/codecs/m4v_h263/enc/test/Android.bp\n media/codecs/mp3dec/Android.bp\n media/codecs/mp3dec/test/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD\n SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS\n legacy_by_exception_only\nto:\n Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT\n SPDX-license-identifier-Unicode-DFS\nto:\n camera/Android.bp\n camera/ndk/Android.bp\n media/ndk/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 legacy_by_exception_only\nto:\n drm/mediadrm/plugins/clearkey/hidl/Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: I4e4ecdbb43c90f5c3cd8e5ccec51b39fa0b5ae9b\n" }, { "commit": "759ac74b47148d8b5680b0aa7f7fcbc161f4e9ea", "tree": "b94aaf1e744ee206234507dc5489ffe038e9408d", "parents": [ "efd0374e08bcee7f28e46e73af094aed7545ea3a" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Feb 24 23:05:15 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Feb 25 23:20:53 2021 +0000" }, "message": "CCodec: fix default color aspects handling\n\nBug: 181049458\nTest: atest android.mediav2.cts.DecoderColorAspectsTest\nChange-Id: I203537112460236bdc1cb6942c0e99a22a489467\n" }, { "commit": "4bb55f617f2b95b778bca0e278ffa317f5dbc3a7", "tree": "ae796d87ca28b74fc69e5c3d5a12f58d0c2e6192", "parents": [ "71f8da2a99ed2320f0821a4155d84f019044057f", "ceb6f8df4e031f26c34ace7b58668a5f28d37263" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Feb 25 22:57:51 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 25 22:57:51 2021 +0000" }, "message": "CCodec: handle color-transfer-request am: 58d8333d3e am: ceb6f8df4e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1596372\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I2d781393f705b5cdf3788e75637e6e09abd07a0c\n" }, { "commit": "ceb6f8df4e031f26c34ace7b58668a5f28d37263", "tree": "de169381c5e958680dc0bd1612f724f2c0f11577", "parents": [ "50a0d08a332434f6b9d72c4ef86603fa8824258e", "58d8333d3e0a5794c2c46f97a8d7ac85afc2863d" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Feb 25 22:11:16 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 25 22:11:16 2021 +0000" }, "message": "CCodec: handle color-transfer-request am: 58d8333d3e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1596372\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I666a637f566c05d74c6ce9db0bb9b4011391e14e\n" }, { "commit": "efd0374e08bcee7f28e46e73af094aed7545ea3a", "tree": "fb010860f5852309b7321c51b967b19d65644813", "parents": [ "51f482db8c822bb1ef0a833ad98f71613c0de51b", "c6046709ae008ac255297160760f988e8a9c6a72" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Thu Feb 25 21:27:14 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 25 21:27:14 2021 +0000" }, "message": "Merge changes I630138a1,I545e9890,I20223fa1,I9e966951,I9fe167dd\n\n* changes:\n codec2: add util method to fill Traits from C2ComponentInterface\n CCodec: handle color-transfer-request\n codec2: integrate filter plugin with codec2 hidl utils\n codec2: add filter plugin interface \u0026 wrapper implementation\n codec2: allow multiple components to get block pool from ID\n" }, { "commit": "5739fff71185219a5dcc56a12620948164287608", "tree": "8f123bc9e9ad5d3ebc0aee78a2ed7bb3b1dbc07b", "parents": [ "5530dd3df904c1b22ee4098bec1b801c379b8d4f" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Feb 25 11:40:14 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Feb 25 11:45:35 2021 -0800" }, "message": "Revert \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\"\n\nThis reverts commit 3908e7be0b90e95ffb1f0e3db9274b2cbef57728.\n\nThis reverts commit c837504ed5b9c708896bb97b1ef9225c376816a7.\n\nThis reverts commit 948e6aace91d16acfaa97763c7228029a1c2afe0.\n\nChange-Id: Ib53daa5debdae7062155add5a70a5b3d5fcd1050\n" }, { "commit": "58d8333d3e0a5794c2c46f97a8d7ac85afc2863d", "tree": "56a7290c151a633deba62b2fdfd3390c426afcb4", "parents": [ "aec5f4b9b697059b1dcaff3c7c4425592a75938d" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Sun Feb 07 22:19:56 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Feb 24 23:12:00 2021 -0800" }, "message": "CCodec: handle color-transfer-request\n\nAdd support for MediaCodec format \"color-transfer-request\" to signal\nHDR to SDR conversion. If supported, this will show up in the input\nformat.\n\nIn adding the support, tweaked color aspects handling for components\nnot supporting color aspects natively.\n\nBug: 160259947\nTest: manual test with a sample plugin\nMerged-In: I545e989056366184b5c142ebe70bbcd2ef80adc0\nChange-Id: I545e989056366184b5c142ebe70bbcd2ef80adc0\n" }, { "commit": "50b445954a6c9b176e4a5d8bf4b4c49916a248a0", "tree": "71ce72b867f1fd16108d766fac7deb03c809876e", "parents": [ "5a5ab5b142c867ae0dbfec0132960c134126926d", "5d968aab682cad2ce1f6727bf04e65159e2c57a1" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Wed Feb 24 23:00:43 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 24 23:00:43 2021 +0000" }, "message": "Merge \"CCodec: reflect output format change after configure.\" am: 73a4a083c3 am: b9d6ab019f am: 5d968aab68\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1574084\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Id52139a35ba10f838276e769d34e908c11bf2fa2\n" }, { "commit": "5a5ab5b142c867ae0dbfec0132960c134126926d", "tree": "7afd1607e3cbb17d8921e2c6edd54ea96b30d4f6", "parents": [ "c962eb65466acd9ac41a05ac14784ba63cae254e", "6a4bf037c758feb445f5276ceec17b98d3e69f0a" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Feb 24 23:00:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 24 23:00:37 2021 +0000" }, "message": "Merge \"CCodec: Updates to RevertOutputFormatIfNeeded\" am: 6169766b54 am: ab8692eb32 am: 6a4bf037c7\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1604882\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ibd0193f6257adb7d83f307fe5628dec9e0748018\n" }, { "commit": "5d968aab682cad2ce1f6727bf04e65159e2c57a1", "tree": "9703b18659cbb9c726bc538b4303f16204995316", "parents": [ "6a4bf037c758feb445f5276ceec17b98d3e69f0a", "b9d6ab019f7aeab9c02c670826ef70cd56bb3754" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Wed Feb 24 22:20:38 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 24 22:20:38 2021 +0000" }, "message": "Merge \"CCodec: reflect output format change after configure.\" am: 73a4a083c3 am: b9d6ab019f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1574084\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ie4ef98314bef2460db56fd17453f1b5fd4c88f86\n" }, { "commit": "6a4bf037c758feb445f5276ceec17b98d3e69f0a", "tree": "7fc010a005a44ba6b67a8f329e28efdfa7accaec", "parents": [ "08c951222ac8b44b806fa209f19deda428da9381", "ab8692eb32c8c565b6a8918830d482799700b6dd" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Feb 24 22:20:31 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 24 22:20:31 2021 +0000" }, "message": "Merge \"CCodec: Updates to RevertOutputFormatIfNeeded\" am: 6169766b54 am: ab8692eb32\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1604882\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I2f2d93b2a50c454e2571c86231087ea773b09405\n" }, { "commit": "73a4a083c3eecc0df17747af9cd530046c1aca0d", "tree": "ce421377730f007dd0ec3bac553bd2664f345e69", "parents": [ "6169766b5400927123cd78ed0b7f6664bee3f442", "183ca3d9e33cd458535655daf3e12801aea098d4" ], "author": { "name": "Henry Fang", "email": "quxiangfang@google.com", "time": "Wed Feb 24 20:48:54 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 24 20:48:54 2021 +0000" }, "message": "Merge \"CCodec: reflect output format change after configure.\"" }, { "commit": "183ca3d9e33cd458535655daf3e12801aea098d4", "tree": "896f769384c88a925968d71913c07e2237dbb918", "parents": [ "bb9c5e15751a25241a172f02415cdf8793d5b01c" ], "author": { "name": "Houxiang Dai", "email": "houxiang.dai@mediatek.com", "time": "Thu Feb 04 14:20:11 2021 +0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Feb 24 20:29:16 2021 +0000" }, "message": "CCodec: reflect output format change after configure.\n\nIn\nhttps://developer.android.com/reference/android/media/MediaCodec#getOutputFormat()\npublic MediaFormat getOutputFormat ()\nYou can also call this after configure(MediaFormat, Surface, MediaCrypto, int)\nreturns successfully to get the output format initially configured for the codec.\n\nIt means output format should be updated to reflect the parameters set\nto codec in configure.\n\nbug: 181137009\nChange-Id: Ic27e008ac4dd6851659f1a9e8a9921026d454f6b\n" }, { "commit": "8c53750ec5a4e9e1ccdfd55253d9398187a729d8", "tree": "28409d50c7c75b099a6d793ababea8691cbe89f7", "parents": [ "d90aeec7d734fab978b550df142ea3bf75be7dd7" ], "author": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Tue Feb 23 21:20:22 2021 -0800" }, "committer": { "name": "Harish Mahendrakar", "email": "harish.mahendrakar@ittiam.com", "time": "Wed Feb 24 05:56:48 2021 +0000" }, "message": "CCodec: Updates to RevertOutputFormatIfNeeded\n\n- Ignore signalling the changes in the following as output\n format change.\n KEY_FRAME_RATE, KEY_MAX_WIDTH, KEY_MAX_HEIGHT\n\n- Call RevertOutputFormatIfNeeded in signalResume()\n\nBug: 180508570\nTest: atest CtsMediaTestCases:android.media.cts.AdaptivePlaybackTest\n\nChange-Id: Ic3ebd23b825953454779afc6f8a05f4a67c6dca3\n" }, { "commit": "d5a3fb2900ddbbe150eae43916f93a5a2688fec8", "tree": "752e0cdb2bc4f8f84c2b168b7337a93810942547", "parents": [ "0e08d7187fafd2f5ccee5fe05f361de75881ed91", "562c924793d234e1fa4e8fb8ce322db7fc89d484" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Feb 23 22:11:03 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 23 22:11:03 2021 +0000" }, "message": "Merge changes I0aa848bb,If81dd3c1,Ib03bde00,I1ae58c7f am: 7327aab894 am: 562c924793\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1591122\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ic24f672a2d149515dd2eff015fb26152447d4ea6\n" }, { "commit": "44d75843de61ca8d99d22aa1e0a066367b6f5a5c", "tree": "627f25157d26d065438faf380fd5248c9c667de1", "parents": [ "280b9cd7563c42cdd6f1473865892be7ecbea9c3", "56636e586b9fc8d2a8b93e515495617e55462844" ], "author": { "name": "Byeongjo Park", "email": "bjo.park@samsung.com", "time": "Tue Feb 23 22:10:59 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 23 22:10:59 2021 +0000" }, "message": "VT: Rx side of CVO implementation to CCodec. am: 25c3a3d280 am: 56636e586b\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1591120\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: If06456800875f924c1ab2eaee833bd3e074b9214\n" }, { "commit": "8eddf4be3678b37a2a788c9ef8891b35806e3ae1", "tree": "d3a3c45e76c344a8a9365c0e7280a67b2883a894", "parents": [ "6ffdc403c870cdcf4aaae039fdae7b5ee425c25b" ], "author": { "name": "Josh Hou", "email": "joshhou@google.com", "time": "Tue Feb 02 16:26:53 2021 +0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Feb 17 21:24:25 2021 -0800" }, "message": "VT: print debug logs between nalunits -\u003e decoder -\u003e renderer\n\nUse the property to control whether to print FPS information.\n\n1) Following log will be printed for every nal units which are going to be provided to decoder\n10-08 15:23:44.660 D 5626 8278 AAVCAssembler: Access unit complete (1 nal units)\n10-08 15:23:44.700 D 5626 8278 AAVCAssembler: Access unit complete (1 nal units)\n\n2) Following log will be printed for every frame which is going to be rendered.\n10-08 15:23:44.865 D 5626 8282 CCodecBufferChannel: [c2.exynos.h264.decoder#49] queue buffer successful\n10-08 15:23:44.865 D 5626 8282 CCodecBufferChannel: [c2.exynos.h264.decoder#49] queue buffer successful\n\nBug: 179124671\nTest: Verify the property works\nChange-Id: I0aa848bb75c0db1821c5a40577c5ca90984753e7\nMerged-In: I0aa848bb75c0db1821c5a40577c5ca90984753e7\n" }, { "commit": "25c3a3d28086f587b53619adae0e9aa94eeef808", "tree": "a59825281b149da177d62d539f4c62394fff6861", "parents": [ "7bf2734afc94390bdc85e9ecbe4a30e9220207cd" ], "author": { "name": "Byeongjo Park", "email": "bjo.park@samsung.com", "time": "Fri Jun 12 17:24:21 2020 +0900" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Feb 17 21:24:21 2021 -0800" }, "message": "VT: Rx side of CVO implementation to CCodec.\n\n[Problem] video rotation is not working with CCodec in VT scenario.\n[Cause] video rotation should be applied if cvo exists in\n meta() of MediaCodecBuffer.\n[Solution] C2StreamRotationInfo of outputbuffer will be updated\n if cvo exist in inputbuffer.\n\nBug: 167935079\n\nSigned-off-by: Byeongjo Park \u003cbjo.park@samsung.com\u003e\nChange-Id: Ib03bde00cefbeb4ac6ea4ea9eff150c686780c38\nMerged-In: Ib03bde00cefbeb4ac6ea4ea9eff150c686780c38\n" }, { "commit": "3baecdaa346739ed7d1077c4a5589344d2906a7f", "tree": "32aee5fe0ccc5ef8347442c3476fa2a451dc6ea2", "parents": [ "68bdda6d6e24c0ae86c8a10ee1e92351e8a2121a" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Sun Feb 07 22:19:56 2021 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Feb 18 04:49:28 2021 +0000" }, "message": "CCodec: handle color-transfer-request\n\nAdd support for MediaCodec format \"color-transfer-request\" to signal\nHDR to SDR conversion. If supported, this will show up in the input\nformat.\n\nIn adding the support, tweaked color aspects handling for components\nnot supporting color aspects natively.\n\nBug: 160259947\nTest: manual test with a sample plugin\nChange-Id: I545e989056366184b5c142ebe70bbcd2ef80adc0\n" }, { "commit": "b62cce4a6c9ff07945bd2c8baa2ca7255359a392", "tree": "a0bfddfda751f6b627771e08c3481e9bf0964635", "parents": [ "f3fe1d60eeac2e8bd589024d55cd46b81cedb72b", "c837504ed5b9c708896bb97b1ef9225c376816a7" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Thu Feb 18 02:01:22 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 18 02:01:22 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\" into sc-dev" }, { "commit": "95c92a2cae2da3ea22165f6ff12e0bba13c6c416", "tree": "fa20b70d1f9025a1212b525c34781f34ebf1a6fc", "parents": [ "ec3b5095cf9410411def8fcad8c0582aa9121412", "42813e623968b20f9ec683c70c2e32c2ec2e6538" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 22:45:46 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 22:45:46 2021 +0000" }, "message": "Merge changes I5a0827eb,Ibd0da668,I74c71975 am: 65f7dd435d am: 47bc0dd0b9 am: 42813e6239\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1585096\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I39a3f2fd4230a7a3b8fab42b0e63337f2e528ff8\n" }, { "commit": "42813e623968b20f9ec683c70c2e32c2ec2e6538", "tree": "0f9a35ce84527fe103ff3a3603bd1b0d21803219", "parents": [ "6d8a463a74b8c92dd2e9f91084bd573614895aba", "47bc0dd0b9a740bbd0f372a123d93344e3d24e94" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 22:05:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 17 22:05:02 2021 +0000" }, "message": "Merge changes I5a0827eb,Ibd0da668,I74c71975 am: 65f7dd435d am: 47bc0dd0b9\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1585096\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I34a6625ed13bc5cacb3aa2871ffead62c97017a0\n" }, { "commit": "65f7dd435d8a2c96bd975eccbd8b4e70cdef3a58", "tree": "b6ec83e0e09f89395c017814eee044d37f20a06a", "parents": [ "159665dd0df0f965f986a1f7b4b59edf6c42ad9f", "d79ee1fd7baf6b8a8ea70c93348530c60bb889fa" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Wed Feb 17 21:04:42 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 17 21:04:42 2021 +0000" }, "message": "Merge changes I5a0827eb,Ibd0da668,I74c71975\n\n* changes:\n CCodec: revamp color format support\n codec2: add P010 support\n C2AllocatorGralloc: Convert C2Rect to Rect correctly\n" }, { "commit": "c837504ed5b9c708896bb97b1ef9225c376816a7", "tree": "4b86c06c7fd70680e0482475807ca8f19f00502b", "parents": [ "6d858b5665aeea773ce10d81fd875a80fdb09b85" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 21:02:31 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Wed Feb 17 12:43:41 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n apex/Android.bp\n camera/cameraserver/Android.bp\n camera/tests/Android.mk\n cmds/screenrecord/Android.bp\n cmds/stagefright/Android.mk\n drm/common/Android.bp\n drm/drmserver/Android.bp\n drm/libdrmframework/Android.bp\n drm/libdrmframework/plugins/common/util/Android.bp\n drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.bp\n drm/libdrmframework/plugins/passthru/Android.bp\n drm/libmediadrm/Android.bp\n drm/libmediadrm/fuzzer/Android.bp\n drm/libmediadrm/protos/Android.bp\n drm/libmediadrm/tests/Android.bp\n drm/mediacas/plugins/clearkey/Android.bp\n drm/mediacas/plugins/clearkey/tests/Android.bp\n drm/mediacas/plugins/mock/Android.bp\n drm/mediadrm/plugins/clearkey/common/Android.bp\n drm/mediadrm/plugins/clearkey/default/Android.bp\n drm/mediadrm/plugins/clearkey/default/tests/Android.bp\n drm/mediadrm/plugins/mock/Android.bp\n media/audioserver/Android.mk\n media/bufferpool/1.0/Android.bp\n media/bufferpool/1.0/vts/Android.bp\n media/bufferpool/2.0/Android.bp\n media/bufferpool/2.0/tests/Android.bp\n media/codec2/components/aac/Android.bp\n media/codec2/components/amr_nb_wb/Android.bp\n media/codec2/components/aom/Android.bp\n media/codec2/components/avc/Android.bp\n media/codec2/components/base/Android.bp\n media/codec2/components/cmds/Android.bp\n media/codec2/components/flac/Android.bp\n media/codec2/components/g711/Android.bp\n media/codec2/components/gav1/Android.bp\n media/codec2/components/gsm/Android.bp\n media/codec2/components/hevc/Android.bp\n media/codec2/components/mp3/Android.bp\n media/codec2/components/mpeg2/Android.bp\n media/codec2/components/mpeg4_h263/Android.bp\n media/codec2/components/opus/Android.bp\n media/codec2/components/raw/Android.bp\n media/codec2/components/vorbis/Android.bp\n media/codec2/components/vpx/Android.bp\n media/codec2/components/xaac/Android.bp\n media/codec2/core/Android.bp\n media/codec2/faultinjection/Android.bp\n media/codec2/fuzzer/Android.bp\n media/codec2/hidl/1.0/utils/Android.bp\n media/codec2/hidl/1.0/vts/functional/Android.bp\n media/codec2/hidl/1.0/vts/functional/audio/Android.bp\n media/codec2/hidl/1.0/vts/functional/common/Android.bp\n media/codec2/hidl/1.0/vts/functional/component/Android.bp\n media/codec2/hidl/1.0/vts/functional/master/Android.bp\n media/codec2/hidl/1.0/vts/functional/video/Android.bp\n media/codec2/hidl/1.1/utils/Android.bp\n media/codec2/hidl/client/Android.bp\n media/codec2/hidl/services/Android.bp\n media/codec2/sfplugin/Android.bp\n media/codec2/sfplugin/tests/Android.bp\n media/codec2/sfplugin/utils/Android.bp\n media/codec2/tests/Android.bp\n media/codec2/vndk/Android.bp\n media/codecs/amrnb/common/Android.bp\n media/codecs/amrnb/enc/fuzzer/Android.bp\n media/codecs/amrnb/fuzzer/Android.bp\n media/codecs/amrwb/dec/fuzzer/Android.bp\n media/codecs/amrwb/enc/Android.bp\n media/codecs/amrwb/enc/SampleCode/Android.bp\n media/codecs/amrwb/enc/fuzzer/Android.bp\n media/codecs/amrwb/enc/test/Android.bp\n media/codecs/g711/decoder/Android.bp\n media/codecs/g711/fuzzer/Android.bp\n media/codecs/m4v_h263/dec/Android.bp\n media/codecs/m4v_h263/dec/test/Android.bp\n media/codecs/m4v_h263/fuzzer/Android.bp\n media/codecs/mp3dec/fuzzer/Android.bp\n media/extractors/Android.bp\n media/extractors/aac/Android.bp\n media/extractors/amr/Android.bp\n media/extractors/flac/Android.bp\n media/extractors/fuzzers/Android.bp\n media/extractors/midi/Android.bp\n media/extractors/mkv/Android.bp\n media/extractors/mp3/Android.bp\n media/extractors/mp4/Android.bp\n media/extractors/mpeg2/Android.bp\n media/extractors/ogg/Android.bp\n media/extractors/tests/Android.bp\n media/extractors/wav/Android.bp\n media/img_utils/Android.bp\n media/libaaudio/Android.bp\n media/libaaudio/examples/Android.bp\n media/libaaudio/examples/input_monitor/Android.bp\n media/libaaudio/examples/loopback/Android.bp\n media/libaaudio/examples/write_sine/Android.bp\n media/libaaudio/src/Android.bp\n media/libaaudio/tests/Android.bp\n media/libaudioclient/Android.bp\n media/libaudioclient/tests/Android.bp\n media/libaudiofoundation/Android.bp\n media/libaudiofoundation/tests/Android.bp\n media/libaudiohal/Android.bp\n media/libaudiohal/impl/Android.bp\n media/libaudioprocessing/Android.bp\n media/libaudioprocessing/audio-resampler/Android.bp\n media/libaudioprocessing/tests/Android.bp\n media/libaudioprocessing/tests/fuzzer/Android.bp\n media/libcpustats/Android.bp\n media/libdatasource/Android.bp\n media/libeffects/config/Android.bp\n media/libeffects/downmix/Android.bp\n media/libeffects/downmix/tests/Android.bp\n media/libeffects/dynamicsproc/Android.bp\n media/libeffects/factory/Android.bp\n media/libeffects/loudness/Android.bp\n media/libeffects/lvm/benchmarks/Android.bp\n media/libeffects/lvm/lib/Android.bp\n media/libeffects/lvm/tests/Android.bp\n media/libeffects/lvm/wrapper/Android.bp\n media/libeffects/preprocessing/Android.bp\n media/libeffects/preprocessing/benchmarks/Android.bp\n media/libeffects/preprocessing/tests/Android.bp\n media/libeffects/proxy/Android.bp\n media/libeffects/visualizer/Android.mk\n media/libheif/Android.bp\n media/libmedia/Android.bp\n media/libmedia/tests/codeclist/Android.bp\n media/libmedia/xsd/Android.bp\n media/libmedia/xsd/vts/Android.bp\n media/libmediahelper/Android.bp\n media/libmediahelper/tests/Android.bp\n media/libmediametrics/Android.bp\n media/libmediaplayerservice/Android.bp\n media/libmediaplayerservice/datasource/Android.bp\n media/libmediaplayerservice/nuplayer/Android.bp\n media/libmediaplayerservice/tests/Android.bp\n media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp\n media/libmediatranscoding/Android.bp\n media/libmediatranscoding/tests/Android.bp\n media/libnbaio/Android.bp\n media/libnblog/Android.bp\n media/libstagefright/Android.bp\n media/libstagefright/bqhelper/Android.bp\n media/libstagefright/bqhelper/tests/Android.bp\n media/libstagefright/codecs/aacdec/Android.bp\n media/libstagefright/codecs/aacenc/Android.bp\n media/libstagefright/codecs/amrnb/dec/Android.bp\n media/libstagefright/codecs/amrnb/enc/Android.bp\n media/libstagefright/codecs/amrwbenc/Android.bp\n media/libstagefright/codecs/avcdec/Android.bp\n media/libstagefright/codecs/avcenc/Android.bp\n media/libstagefright/codecs/common/Android.bp\n media/libstagefright/codecs/flac/dec/Android.bp\n media/libstagefright/codecs/flac/enc/Android.bp\n media/libstagefright/codecs/g711/dec/Android.bp\n media/libstagefright/codecs/gsm/dec/Android.bp\n media/libstagefright/codecs/hevcdec/Android.bp\n media/libstagefright/codecs/m4v_h263/dec/Android.bp\n media/libstagefright/codecs/m4v_h263/enc/Android.bp\n media/libstagefright/codecs/mp3dec/Android.bp\n media/libstagefright/codecs/mpeg2dec/Android.bp\n media/libstagefright/codecs/on2/dec/Android.bp\n media/libstagefright/codecs/on2/enc/Android.bp\n media/libstagefright/codecs/opus/dec/Android.bp\n media/libstagefright/codecs/raw/Android.bp\n media/libstagefright/codecs/vorbis/dec/Android.bp\n media/libstagefright/codecs/xaacdec/Android.bp\n media/libstagefright/colorconversion/Android.bp\n media/libstagefright/data/Android.bp\n media/libstagefright/filters/Android.bp\n media/libstagefright/flac/dec/Android.bp\n media/libstagefright/flac/dec/test/Android.bp\n media/libstagefright/foundation/Android.bp\n media/libstagefright/foundation/tests/AVCUtils/Android.bp\n media/libstagefright/foundation/tests/Android.bp\n media/libstagefright/foundation/tests/OpusHeader/Android.bp\n media/libstagefright/foundation/tests/colorutils/Android.bp\n media/libstagefright/http/Android.bp\n media/libstagefright/httplive/Android.bp\n media/libstagefright/id3/Android.bp\n media/libstagefright/id3/test/Android.bp\n media/libstagefright/mpeg2ts/Android.bp\n media/libstagefright/mpeg2ts/test/Android.bp\n media/libstagefright/omx/Android.bp\n media/libstagefright/omx/tests/Android.bp\n media/libstagefright/rtsp/Android.bp\n media/libstagefright/tests/Android.bp\n media/libstagefright/tests/ESDS/Android.bp\n media/libstagefright/tests/HEVC/Android.bp\n media/libstagefright/tests/extractorFactory/Android.bp\n media/libstagefright/tests/fuzzers/Android.bp\n media/libstagefright/tests/mediacodec/Android.bp\n media/libstagefright/tests/metadatautils/Android.bp\n media/libstagefright/tests/writer/Android.bp\n media/libstagefright/timedtext/Android.bp\n media/libstagefright/timedtext/test/Android.bp\n media/libstagefright/webm/Android.bp\n media/libstagefright/webm/tests/Android.bp\n media/libstagefright/writer_fuzzers/Android.bp\n media/libstagefright/xmlparser/Android.bp\n media/libstagefright/xmlparser/test/Android.bp\n media/libstagefright/xmlparser/vts/Android.bp\n media/libwatchdog/Android.bp\n media/mediaserver/Android.bp\n media/mtp/Android.bp\n media/mtp/tests/Android.bp\n media/tests/benchmark/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp\n media/tests/benchmark/src/native/common/Android.bp\n media/tests/benchmark/src/native/decoder/Android.bp\n media/tests/benchmark/src/native/encoder/Android.bp\n media/tests/benchmark/src/native/extractor/Android.bp\n media/tests/benchmark/src/native/muxer/Android.bp\n media/tests/benchmark/tests/Android.bp\n media/utils/Android.bp\n media/utils/fuzzers/Android.bp\n services/audioflinger/Android.bp\n services/audiopolicy/Android.bp\n services/audiopolicy/common/Android.bp\n services/audiopolicy/common/managerdefinitions/Android.bp\n services/audiopolicy/config/Android.bp\n services/audiopolicy/engine/common/Android.bp\n services/audiopolicy/engine/config/Android.bp\n services/audiopolicy/engine/interface/Android.bp\n services/audiopolicy/engineconfigurable/Android.bp\n services/audiopolicy/engineconfigurable/config/Android.bp\n services/audiopolicy/engineconfigurable/config/example/automotive/Android.bp\n services/audiopolicy/engineconfigurable/config/example/caremu/Android.bp\n services/audiopolicy/engineconfigurable/config/example/phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.bp\n services/audiopolicy/engineconfigurable/tools/Android.bp\n services/audiopolicy/engineconfigurable/wrapper/Android.bp\n services/audiopolicy/enginedefault/Android.bp\n services/audiopolicy/enginedefault/config/example/Android.bp\n services/audiopolicy/manager/Android.mk\n services/audiopolicy/managerdefault/Android.bp\n services/audiopolicy/service/Android.mk\n services/audiopolicy/tests/Android.bp\n services/camera/libcameraservice/Android.bp\n services/camera/libcameraservice/fuzzer/Android.bp\n services/camera/libcameraservice/tests/Android.mk\n services/mediacodec/Android.bp\n services/mediacodec/registrant/Android.bp\n services/mediaextractor/Android.bp\n services/medialog/Android.bp\n services/medialog/fuzzer/Android.bp\n services/mediametrics/Android.bp\n services/mediametrics/benchmarks/Android.bp\n services/mediametrics/fuzzer/Android.bp\n services/mediametrics/tests/Android.bp\n services/mediaresourcemanager/Android.bp\n services/mediaresourcemanager/fuzzer/Android.bp\n services/mediaresourcemanager/test/Android.bp\n services/mediatranscoding/Android.bp\n services/mediatranscoding/tests/Android.bp\n services/minijail/Android.bp\n services/oboeservice/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:\n media/codecs/amrnb/dec/Android.bp\n media/codecs/amrnb/dec/test/Android.bp\n media/codecs/amrnb/enc/Android.bp\n media/codecs/amrnb/enc/test/Android.bp\n media/codecs/amrwb/dec/Android.bp\n media/codecs/amrwb/dec/test/Android.bp\n media/codecs/m4v_h263/enc/Android.bp\n media/codecs/m4v_h263/enc/test/Android.bp\n media/codecs/mp3dec/Android.bp\n media/codecs/mp3dec/test/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD\n SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS\n legacy_by_exception_only\nto:\n Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT\n SPDX-license-identifier-Unicode-DFS\nto:\n apex/testing/Android.bp\n camera/Android.bp\n camera/ndk/Android.bp\n media/ndk/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp\n services/audiopolicy/tests/resources/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 legacy_by_exception_only\nto:\n drm/mediadrm/plugins/clearkey/hidl/Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\n\nChange-Id: I8360756b326b891b56629127091540310851c941\nMerged-in: I8360756b326b891b56629127091540310851c941\n" }, { "commit": "97b531bbd69eab455e2b0d60018a9ee678bc8fb9", "tree": "715ec82c4516acd748771420bf5a36aa4105d121", "parents": [ "33fe0f07e3ce5071bcf6b854d6ea353f78f1fbbc", "81ef1c94a334651c2cf113642ff0d26ea65fed6a" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 21:04:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 21:04:49 2021 +0000" }, "message": "Merge changes I39f15cc4,I9639692c,I0a10bacc am: 39c92dd8fc am: 591674d1c0 am: 81ef1c94a3\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1570243\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ied8cddb82fde1af5df78d95e429c0b04e5dd7eff\n" }, { "commit": "81ef1c94a334651c2cf113642ff0d26ea65fed6a", "tree": "f9a27762e34bd0031fe49d8dd6cfcf3067fc1838", "parents": [ "14a4c130c1aeb298f43298ecf625820f86a07145", "591674d1c06743e5b9386a863636b57c0275912d" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 20:40:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 20:40:20 2021 +0000" }, "message": "Merge changes I39f15cc4,I9639692c,I0a10bacc am: 39c92dd8fc am: 591674d1c0\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1570243\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I0d0280246e55d054012c2c4b41d07ebca1978613\n" }, { "commit": "14a4c130c1aeb298f43298ecf625820f86a07145", "tree": "ae211bd1e5a98edc52a4e617bf09b8bae423e365", "parents": [ "e41a9f91fa4370bf7aa7d98b924d8e747a49e3f1", "76c337710ecda664f2701f166b2d168df0eaf1e0" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Feb 16 20:40:18 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 20:40:18 2021 +0000" }, "message": "RELAND CCodec: simplify format change logic am: 970bf0bef8 am: 76c337710e\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1570241\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Iadca6b8cdf5ee2a88a38be5b5a828050d6cbb76d\n" }, { "commit": "76c337710ecda664f2701f166b2d168df0eaf1e0", "tree": "0ad8a2096e47cf03312aa40c5af4fcd9d880f14c", "parents": [ "26ec49f8e8ade3065761a364d75c308b916b9fcb", "970bf0bef8c2edf29751285f300800d1a76dcf43" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Feb 16 20:07:14 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 20:07:14 2021 +0000" }, "message": "RELAND CCodec: simplify format change logic am: 970bf0bef8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1570241\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ic5f4ed750323a22c51d8cfaea6a8fcd7c852c362\n" }, { "commit": "39c92dd8fc04b45ee62b28f9144bef0203a00a7e", "tree": "067e8080b477802aac9196d2670ed96d3c99e2ef", "parents": [ "9e11c9b635ffd9230b9b1b661f9ed25e9669e2dc", "597435f828316dca72cbb25759fc5141cbd6a32b" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 19:38:22 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 16 19:38:22 2021 +0000" }, "message": "Merge changes I39f15cc4,I9639692c,I0a10bacc\n\n* changes:\n RELAND aacdec: don\u0027t report DRC_COMPRESSION_MODE back\n RELAND CCodecConfig: don\u0027t read DRC_COMPRESSION_MODE back\n RELAND CCodec: simplify format change logic\n" }, { "commit": "e41a9f91fa4370bf7aa7d98b924d8e747a49e3f1", "tree": "5a5b489e5e02aba4682b13bfc032aabf867d97b2", "parents": [ "7e2876d79a690d2e1654e3d0c91ad9b714260d9e", "26ec49f8e8ade3065761a364d75c308b916b9fcb" ], "author": { "name": "Treehugger Robot", "email": "treehugger-gerrit@google.com", "time": "Tue Feb 16 15:56:36 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 16 15:56:36 2021 +0000" }, "message": "Merge \"[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\" am: 9e11c9b635 am: 26ec49f8e8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1588170\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I9b7dfcc4ba58aca32293fcf08a9fb546825c41f2\n" }, { "commit": "948e6aace91d16acfaa97763c7228029a1c2afe0", "tree": "e1213aacab8f21fd8bf9dcd02dbc82741013379f", "parents": [ "367398038247b09a3f92e05affac5f9b1f5e2f90" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Fri Feb 12 21:02:31 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Feb 16 04:09:57 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to frameworks/av\n\nAdded SPDX-license-identifier-Apache-2.0 to:\n apex/Android.bp\n camera/cameraserver/Android.bp\n camera/tests/Android.mk\n cmds/screenrecord/Android.bp\n cmds/stagefright/Android.mk\n drm/common/Android.bp\n drm/drmserver/Android.bp\n drm/libdrmframework/Android.bp\n drm/libdrmframework/plugins/common/util/Android.bp\n drm/libdrmframework/plugins/forward-lock/FwdLockEngine/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/common/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/converter/Android.bp\n drm/libdrmframework/plugins/forward-lock/internal-format/decoder/Android.bp\n drm/libdrmframework/plugins/passthru/Android.bp\n drm/libmediadrm/Android.bp\n drm/libmediadrm/fuzzer/Android.bp\n drm/libmediadrm/protos/Android.bp\n drm/libmediadrm/tests/Android.bp\n drm/mediacas/plugins/clearkey/Android.bp\n drm/mediacas/plugins/clearkey/tests/Android.bp\n drm/mediacas/plugins/mock/Android.bp\n drm/mediadrm/plugins/clearkey/common/Android.bp\n drm/mediadrm/plugins/clearkey/default/Android.bp\n drm/mediadrm/plugins/clearkey/default/tests/Android.bp\n drm/mediadrm/plugins/mock/Android.bp\n media/audioserver/Android.mk\n media/bufferpool/1.0/Android.bp\n media/bufferpool/1.0/vts/Android.bp\n media/bufferpool/2.0/Android.bp\n media/bufferpool/2.0/tests/Android.bp\n media/codec2/components/aac/Android.bp\n media/codec2/components/amr_nb_wb/Android.bp\n media/codec2/components/aom/Android.bp\n media/codec2/components/avc/Android.bp\n media/codec2/components/base/Android.bp\n media/codec2/components/cmds/Android.bp\n media/codec2/components/flac/Android.bp\n media/codec2/components/g711/Android.bp\n media/codec2/components/gav1/Android.bp\n media/codec2/components/gsm/Android.bp\n media/codec2/components/hevc/Android.bp\n media/codec2/components/mp3/Android.bp\n media/codec2/components/mpeg2/Android.bp\n media/codec2/components/mpeg4_h263/Android.bp\n media/codec2/components/opus/Android.bp\n media/codec2/components/raw/Android.bp\n media/codec2/components/vorbis/Android.bp\n media/codec2/components/vpx/Android.bp\n media/codec2/components/xaac/Android.bp\n media/codec2/core/Android.bp\n media/codec2/faultinjection/Android.bp\n media/codec2/fuzzer/Android.bp\n media/codec2/hidl/1.0/utils/Android.bp\n media/codec2/hidl/1.0/vts/functional/Android.bp\n media/codec2/hidl/1.0/vts/functional/audio/Android.bp\n media/codec2/hidl/1.0/vts/functional/common/Android.bp\n media/codec2/hidl/1.0/vts/functional/component/Android.bp\n media/codec2/hidl/1.0/vts/functional/master/Android.bp\n media/codec2/hidl/1.0/vts/functional/video/Android.bp\n media/codec2/hidl/1.1/utils/Android.bp\n media/codec2/hidl/client/Android.bp\n media/codec2/hidl/services/Android.bp\n media/codec2/sfplugin/Android.bp\n media/codec2/sfplugin/tests/Android.bp\n media/codec2/sfplugin/utils/Android.bp\n media/codec2/tests/Android.bp\n media/codec2/vndk/Android.bp\n media/codecs/amrnb/common/Android.bp\n media/codecs/amrnb/enc/fuzzer/Android.bp\n media/codecs/amrnb/fuzzer/Android.bp\n media/codecs/amrwb/dec/fuzzer/Android.bp\n media/codecs/amrwb/enc/Android.bp\n media/codecs/amrwb/enc/SampleCode/Android.bp\n media/codecs/amrwb/enc/fuzzer/Android.bp\n media/codecs/amrwb/enc/test/Android.bp\n media/codecs/g711/decoder/Android.bp\n media/codecs/g711/fuzzer/Android.bp\n media/codecs/m4v_h263/dec/Android.bp\n media/codecs/m4v_h263/dec/test/Android.bp\n media/codecs/m4v_h263/fuzzer/Android.bp\n media/codecs/mp3dec/fuzzer/Android.bp\n media/extractors/Android.bp\n media/extractors/aac/Android.bp\n media/extractors/amr/Android.bp\n media/extractors/flac/Android.bp\n media/extractors/fuzzers/Android.bp\n media/extractors/midi/Android.bp\n media/extractors/mkv/Android.bp\n media/extractors/mp3/Android.bp\n media/extractors/mp4/Android.bp\n media/extractors/mpeg2/Android.bp\n media/extractors/ogg/Android.bp\n media/extractors/tests/Android.bp\n media/extractors/wav/Android.bp\n media/img_utils/Android.bp\n media/libaaudio/Android.bp\n media/libaaudio/examples/Android.bp\n media/libaaudio/examples/input_monitor/Android.bp\n media/libaaudio/examples/loopback/Android.bp\n media/libaaudio/examples/write_sine/Android.bp\n media/libaaudio/src/Android.bp\n media/libaaudio/tests/Android.bp\n media/libaudioclient/Android.bp\n media/libaudioclient/tests/Android.bp\n media/libaudiofoundation/Android.bp\n media/libaudiofoundation/tests/Android.bp\n media/libaudiohal/Android.bp\n media/libaudiohal/impl/Android.bp\n media/libaudioprocessing/Android.bp\n media/libaudioprocessing/audio-resampler/Android.bp\n media/libaudioprocessing/tests/Android.bp\n media/libaudioprocessing/tests/fuzzer/Android.bp\n media/libcpustats/Android.bp\n media/libdatasource/Android.bp\n media/libeffects/config/Android.bp\n media/libeffects/downmix/Android.bp\n media/libeffects/downmix/tests/Android.bp\n media/libeffects/dynamicsproc/Android.bp\n media/libeffects/factory/Android.bp\n media/libeffects/loudness/Android.bp\n media/libeffects/lvm/benchmarks/Android.bp\n media/libeffects/lvm/lib/Android.bp\n media/libeffects/lvm/tests/Android.bp\n media/libeffects/lvm/wrapper/Android.bp\n media/libeffects/preprocessing/Android.bp\n media/libeffects/preprocessing/benchmarks/Android.bp\n media/libeffects/preprocessing/tests/Android.bp\n media/libeffects/proxy/Android.bp\n media/libeffects/visualizer/Android.mk\n media/libheif/Android.bp\n media/libmedia/Android.bp\n media/libmedia/tests/codeclist/Android.bp\n media/libmedia/xsd/Android.bp\n media/libmedia/xsd/vts/Android.bp\n media/libmediahelper/Android.bp\n media/libmediahelper/tests/Android.bp\n media/libmediametrics/Android.bp\n media/libmediaplayerservice/Android.bp\n media/libmediaplayerservice/datasource/Android.bp\n media/libmediaplayerservice/nuplayer/Android.bp\n media/libmediaplayerservice/tests/Android.bp\n media/libmediaplayerservice/tests/stagefrightRecorder/Android.bp\n media/libmediatranscoding/Android.bp\n media/libmediatranscoding/tests/Android.bp\n media/libnbaio/Android.bp\n media/libnblog/Android.bp\n media/libstagefright/Android.bp\n media/libstagefright/bqhelper/Android.bp\n media/libstagefright/bqhelper/tests/Android.bp\n media/libstagefright/codecs/aacdec/Android.bp\n media/libstagefright/codecs/aacenc/Android.bp\n media/libstagefright/codecs/amrnb/dec/Android.bp\n media/libstagefright/codecs/amrnb/enc/Android.bp\n media/libstagefright/codecs/amrwbenc/Android.bp\n media/libstagefright/codecs/avcdec/Android.bp\n media/libstagefright/codecs/avcenc/Android.bp\n media/libstagefright/codecs/common/Android.bp\n media/libstagefright/codecs/flac/dec/Android.bp\n media/libstagefright/codecs/flac/enc/Android.bp\n media/libstagefright/codecs/g711/dec/Android.bp\n media/libstagefright/codecs/gsm/dec/Android.bp\n media/libstagefright/codecs/hevcdec/Android.bp\n media/libstagefright/codecs/m4v_h263/dec/Android.bp\n media/libstagefright/codecs/m4v_h263/enc/Android.bp\n media/libstagefright/codecs/mp3dec/Android.bp\n media/libstagefright/codecs/mpeg2dec/Android.bp\n media/libstagefright/codecs/on2/dec/Android.bp\n media/libstagefright/codecs/on2/enc/Android.bp\n media/libstagefright/codecs/opus/dec/Android.bp\n media/libstagefright/codecs/raw/Android.bp\n media/libstagefright/codecs/vorbis/dec/Android.bp\n media/libstagefright/codecs/xaacdec/Android.bp\n media/libstagefright/colorconversion/Android.bp\n media/libstagefright/data/Android.bp\n media/libstagefright/filters/Android.bp\n media/libstagefright/flac/dec/Android.bp\n media/libstagefright/flac/dec/test/Android.bp\n media/libstagefright/foundation/Android.bp\n media/libstagefright/foundation/tests/AVCUtils/Android.bp\n media/libstagefright/foundation/tests/Android.bp\n media/libstagefright/foundation/tests/OpusHeader/Android.bp\n media/libstagefright/foundation/tests/colorutils/Android.bp\n media/libstagefright/http/Android.bp\n media/libstagefright/httplive/Android.bp\n media/libstagefright/id3/Android.bp\n media/libstagefright/id3/test/Android.bp\n media/libstagefright/mpeg2ts/Android.bp\n media/libstagefright/mpeg2ts/test/Android.bp\n media/libstagefright/omx/Android.bp\n media/libstagefright/omx/tests/Android.bp\n media/libstagefright/rtsp/Android.bp\n media/libstagefright/tests/Android.bp\n media/libstagefright/tests/ESDS/Android.bp\n media/libstagefright/tests/HEVC/Android.bp\n media/libstagefright/tests/extractorFactory/Android.bp\n media/libstagefright/tests/fuzzers/Android.bp\n media/libstagefright/tests/mediacodec/Android.bp\n media/libstagefright/tests/metadatautils/Android.bp\n media/libstagefright/tests/writer/Android.bp\n media/libstagefright/timedtext/Android.bp\n media/libstagefright/timedtext/test/Android.bp\n media/libstagefright/webm/Android.bp\n media/libstagefright/webm/tests/Android.bp\n media/libstagefright/writer_fuzzers/Android.bp\n media/libstagefright/xmlparser/Android.bp\n media/libstagefright/xmlparser/test/Android.bp\n media/libstagefright/xmlparser/vts/Android.bp\n media/libwatchdog/Android.bp\n media/mediaserver/Android.bp\n media/mtp/Android.bp\n media/mtp/tests/Android.bp\n media/tests/benchmark/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/Android.bp\n media/tests/benchmark/MediaBenchmarkTest/src/main/cpp/Android.bp\n media/tests/benchmark/src/native/common/Android.bp\n media/tests/benchmark/src/native/decoder/Android.bp\n media/tests/benchmark/src/native/encoder/Android.bp\n media/tests/benchmark/src/native/extractor/Android.bp\n media/tests/benchmark/src/native/muxer/Android.bp\n media/tests/benchmark/tests/Android.bp\n media/utils/Android.bp\n media/utils/fuzzers/Android.bp\n services/audioflinger/Android.bp\n services/audiopolicy/Android.bp\n services/audiopolicy/common/Android.bp\n services/audiopolicy/common/managerdefinitions/Android.bp\n services/audiopolicy/config/Android.bp\n services/audiopolicy/engine/common/Android.bp\n services/audiopolicy/engine/config/Android.bp\n services/audiopolicy/engine/interface/Android.bp\n services/audiopolicy/engineconfigurable/Android.bp\n services/audiopolicy/engineconfigurable/config/Android.bp\n services/audiopolicy/engineconfigurable/config/example/automotive/Android.bp\n services/audiopolicy/engineconfigurable/config/example/caremu/Android.bp\n services/audiopolicy/engineconfigurable/config/example/phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/plugin/Android.bp\n services/audiopolicy/engineconfigurable/tools/Android.bp\n services/audiopolicy/engineconfigurable/wrapper/Android.bp\n services/audiopolicy/enginedefault/Android.bp\n services/audiopolicy/enginedefault/config/example/Android.bp\n services/audiopolicy/manager/Android.mk\n services/audiopolicy/managerdefault/Android.bp\n services/audiopolicy/service/Android.mk\n services/audiopolicy/tests/Android.bp\n services/camera/libcameraservice/Android.bp\n services/camera/libcameraservice/fuzzer/Android.bp\n services/camera/libcameraservice/tests/Android.mk\n services/mediacodec/Android.bp\n services/mediacodec/registrant/Android.bp\n services/mediaextractor/Android.bp\n services/medialog/Android.bp\n services/medialog/fuzzer/Android.bp\n services/mediametrics/Android.bp\n services/mediametrics/benchmarks/Android.bp\n services/mediametrics/fuzzer/Android.bp\n services/mediametrics/tests/Android.bp\n services/mediaresourcemanager/Android.bp\n services/mediaresourcemanager/fuzzer/Android.bp\n services/mediaresourcemanager/test/Android.bp\n services/mediatranscoding/Android.bp\n services/mediatranscoding/tests/Android.bp\n services/minijail/Android.bp\n services/oboeservice/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD to:\n media/codecs/amrnb/dec/Android.bp\n media/codecs/amrnb/dec/test/Android.bp\n media/codecs/amrnb/enc/Android.bp\n media/codecs/amrnb/enc/test/Android.bp\n media/codecs/amrwb/dec/Android.bp\n media/codecs/amrwb/dec/test/Android.bp\n media/codecs/m4v_h263/enc/Android.bp\n media/codecs/m4v_h263/enc/test/Android.bp\n media/codecs/mp3dec/Android.bp\n media/codecs/mp3dec/test/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD\n SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS\n legacy_by_exception_only\nto:\n Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT\n SPDX-license-identifier-Unicode-DFS\nto:\n apex/testing/Android.bp\n camera/Android.bp\n camera/ndk/Android.bp\n media/ndk/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp\n services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp\n services/audiopolicy/tests/resources/Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 legacy_by_exception_only\nto:\n drm/mediadrm/plugins/clearkey/hidl/Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\n\nChange-Id: I8360756b326b891b56629127091540310851c941\nMerged-in: Ic169757d64ad8da7eebd0e1febdcbfb467fe81f4\nMerged-in: Ifa3fefe5dc12229e8043a54ffd1f3958d6b02310\nMerged-in: I1e32081a069c4c1b25aa200dcdb165c0feb07b8a\nMerged-in: Ib2050becaf89b8e4db5867bc601dedeb4eb8ebd2\nMerged-in: I5a4d51fb1244ed49bcd70e446aaa26e2aa8ed7b1\n" }, { "commit": "c4d7130118aefd4db6e4bfeee7b229dcc8475727", "tree": "00c04aaaf70d28cde19b818ef041b3d9c06ba5f7", "parents": [ "e49067bfb5020b634ab68857e3a27f5c1c5b8ae5", "3b4349ac928d7beb64e8440bb6789ab66084c58c" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Feb 12 20:44:16 2021 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 12 20:44:16 2021 +0000" }, "message": "Merge \"RELAND CCodec: simplify format change logic\" into sc-dev" }, { "commit": "65a62a34a1908903979cf117c66570a345d4414a", "tree": "b98ea07222d6da96c3836fc99fd2b1d5248d1db2", "parents": [ "970bf0bef8c2edf29751285f300800d1a76dcf43" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Oct 27 17:00:36 2020 -0700" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Feb 12 12:41:57 2021 -0800" }, "message": "RELAND CCodecConfig: don\u0027t read DRC_COMPRESSION_MODE back\n\nDRC_COMPRESSION_MODE is not meant to be read back from components\n\nBug: 149751672\nTest: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small\nTest: atest CtsMediaTestCases:DecoderTestAacDrc\nChange-Id: I9639692ca45d605a45092c7d85ce4603d25f9916\n" }, { "commit": "970bf0bef8c2edf29751285f300800d1a76dcf43", "tree": "b859c1b3b2b2ceb06e7a1a4405ba681ef1c04bb8", "parents": [ "7e7b547d07934755c61820d0d011c016ab8f5c8a" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Nov 10 11:54:15 2020 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Feb 12 12:41:12 2021 -0800" }, "message": "RELAND CCodec: simplify format change logic\n\nUse the reference \u0026 dup to track format change.\n\nBug: 149751672\nTest: atest CtsMediaTestCases:AdaptivePlaybackTest\nTest: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small\nMerged-In: I0a10bacc11bed974d7393aea1158b06ded286f19\nChange-Id: I0a10bacc11bed974d7393aea1158b06ded286f19\n" }, { "commit": "18cbd9a3fb3a71149a3b2240c9a1def7d1531f61", "tree": "77161d03e388e6d87192b3a9de1d0a2a0b0dc77a", "parents": [ "3fbf0f290c0ea9a8edbaa0f9cac98807dd3e230b", "f3367cf47a9e69191079824cecb4aa98f6918b52" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Feb 12 17:29:22 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 12 17:29:22 2021 +0000" }, "message": "Merge \"CCodec: Report codec error to MediaCodec\" am: 5b7d0abcb8 am: 4c3e68707f am: f3367cf47a\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1580729\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I56bef6762bcbf1137cf4834f3ebfd1f0d4c77e51\n" }, { "commit": "f3367cf47a9e69191079824cecb4aa98f6918b52", "tree": "a5a6ebc61eb4386bf1d14bb6d4dd373d206f9885", "parents": [ "4190e4779365ca9e0295d21cfb9d37e5bb40a592", "4c3e68707ff657a8c1378129d2f35b093d8034e1" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Feb 12 16:51:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 12 16:51:37 2021 +0000" }, "message": "Merge \"CCodec: Report codec error to MediaCodec\" am: 5b7d0abcb8 am: 4c3e68707f\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1580729\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Icff719bc2fd32c66ae998a632d2e62ae5a1b0035\n" }, { "commit": "5b7d0abcb809e70b586eebeb8b3a1766394add49", "tree": "be00f05e07f2cb7cbf8be8c67d1b52cf79d40e18", "parents": [ "6dc3a9c4cd7fc8e41cac530261192e0e4594ae02", "72eff016bfa9fd6b55158403b83532f94adb4c1b" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Feb 12 15:19:21 2021 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 12 15:19:21 2021 +0000" }, "message": "Merge \"CCodec: Report codec error to MediaCodec\"" }, { "commit": "d79ee1fd7baf6b8a8ea70c93348530c60bb889fa", "tree": "060e1ffa942a9c18fa8a416644e746ff804f1c66", "parents": [ "29e3c4d6c17d9fce32e47e299730c60c3667e17f" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Aug 27 17:41:56 2020 -0700" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Fri Feb 12 00:00:33 2021 -0800" }, "message": "CCodec: revamp color format support\n\n- Allow color format pass-through\n- Query vendor flexible color format\n\nBug: 163020028\nTest: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small\nTest: atest ccodec_unit_test:RawGraphicOutputBuffersTest\nChange-Id: I5a0827eb54f0c6834a247bfaa653489e4633b6c7\n" }, { "commit": "29e3c4d6c17d9fce32e47e299730c60c3667e17f", "tree": "14efbf9eb25354c33c0578c03d9837a581aeb4ca", "parents": [ "486aa5da58d96c08f453f28935e3080fc8a4f2df" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Sep 02 12:19:44 2020 -0700" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Feb 11 23:10:35 2021 -0800" }, "message": "codec2: add P010 support\n\nBug: 163020028\nTest: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small\nTest: atest ccodec_unit_test:RawGraphicOutputBuffersTest\nChange-Id: Ibd0da668c510665a8838f0d7e6abd264814d6526\n" }, { "commit": "3b4349ac928d7beb64e8440bb6789ab66084c58c", "tree": "a3a857accf4dfc210da353bccaf5355ca76ca3ed", "parents": [ "63790633b2167a301d8461866580a5666ddbd658" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Tue Nov 10 11:54:15 2020 -0800" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Thu Feb 11 11:11:59 2021 -0800" }, "message": "RELAND CCodec: simplify format change logic\n\nUse the reference \u0026 dup to track format change.\n\nBug: 149751672\nTest: atest CtsMediaTestCases:AdaptivePlaybackTest\nTest: atest CtsMediaTestCases -- --module-arg CtsMediaTestCases:size:small\nChange-Id: I0a10bacc11bed974d7393aea1158b06ded286f19\n" }, { "commit": "da79bd6246e27dcf0bc6c122088b2f61d4a5fa35", "tree": "2549c425b98b5ae9b7ec6a60a21ec73255daa2b2", "parents": [ "308b8bf7c2d67f9a1dca02cca26651987b43c810", "a65b7d3172972186b3503973ff301138a7d611a2" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Feb 09 23:41:57 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 09 23:41:57 2021 +0000" }, "message": "Merge \"CCodec: make HDR10/+ support detection logic work for encoders\" am: 4e1eeb3038 am: f7a2c50ff8 am: a65b7d3172\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1579466\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I9b5bdf86afe8108645d96169f29aacccfcc85b17\n" }, { "commit": "a65b7d3172972186b3503973ff301138a7d611a2", "tree": "bd2bd3661d0195a90bc73707744b4c94df1ad797", "parents": [ "59184ec24c3bdd56cdb080fcec1fe4a0016f6d65", "f7a2c50ff89466ecbfe7d46cb1a5cd18213edb26" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Feb 09 22:49:08 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 09 22:49:08 2021 +0000" }, "message": "Merge \"CCodec: make HDR10/+ support detection logic work for encoders\" am: 4e1eeb3038 am: f7a2c50ff8\n\nOriginal change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1579466\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ie445b914b9a8386c81d682379a1c856919eb2bf4\n" }, { "commit": "72eff016bfa9fd6b55158403b83532f94adb4c1b", "tree": "1103c86818bee5ffdd2d81f9e38f91860c8d06a7", "parents": [ "210105afef4f6242fa431f2f67fe6c7cc0d11dcd" ], "author": { "name": "Praveen Chavan", "email": "pchavan@quicinc.com", "time": "Fri Nov 20 23:20:28 2020 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Feb 08 17:35:29 2021 -0800" }, "message": "CCodec: Report codec error to MediaCodec\n\nPropagate codec error to MediaCodec\n\nTest:\n Simulate HW error from Codec2 component and\n check if app is notified of the error.\n\nBug: 173095521\nChange-Id: I1e25881f664226b4afd7b1e8a6acb68d40cc8c52\n" } ], "next": "739fe737fa27bce2eed7e7fdbfbd60e3dac4fefa" }