)]}' { "log": [ { "commit": "a5ad0383f56b9d4ae31875f6d10f4d9c2d97921a", "tree": "88116eeb17ed2868dc6252faab13fa0fa18c16af", "parents": [ "5fa433b8c9ff7d415f5fb1ebefe0d989a7d11432", "b53ba5e7a68deb8d71cf145639fe8a184078fff5" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:46:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:46:49 2016 +0000" }, "message": "Merge \\\\\\\\\\\\\"Revert \\\\\\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\\\\\"\\\\\\\\\\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745 am: 9d65d13cc7 am: 4ef5122525 am: 77d31bde26\nam: b53ba5e7a6\n\nChange-Id: I72a7f15894380adabfc21e017abac88b6fe26348\n" }, { "commit": "77d31bde26ba5c3c986fce1dcfa94a2727253f49", "tree": "856d7a7b625973b25453be2f1a57a62e7418a9dd", "parents": [ "fcb008b74333b63074144198e1f069473ce5fda0", "4ef5122525e0ce7a4d3e16bb07c295340a813b00" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:39:08 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:39:08 2016 +0000" }, "message": "Merge \\\\\\\\\"Revert \\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\"\\\\\\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745 am: 9d65d13cc7\nam: 4ef5122525\n\nChange-Id: Ib0106bbe2ffba8de744907a2714eedf207756abe\n" }, { "commit": "4ef5122525e0ce7a4d3e16bb07c295340a813b00", "tree": "681ce3d5db15f8161147c550662dd5dd03a8ff21", "parents": [ "7e06799472dd93f3c4e33807ab41256e75287291", "9d65d13cc7c207d4ef877df2834d4fbac74741ad" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:36:14 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:36:14 2016 +0000" }, "message": "Merge \\\\\\\"Revert \\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\"\\\\\\\" into klp-dev am: 7e6bd6a911 am: 3ad7688745\nam: 9d65d13cc7\n\nChange-Id: Ib8d8f9c58c1ffb169cf488d57fb841f80a664e97\n" }, { "commit": "9d65d13cc7c207d4ef877df2834d4fbac74741ad", "tree": "0d22666b8004a8e4ae781514d99b9a00e0059d16", "parents": [ "4c969bf93f71e394de3aa8b08f0ed0f96c48379d", "3ad7688745fc44d01707157ba4edcbad8d41fc3e" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:33:49 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:33:49 2016 +0000" }, "message": "Merge \\\\\"Revert \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\"\\\\\" into klp-dev am: 7e6bd6a911\nam: 3ad7688745\n\nChange-Id: I02de46ed2ce14428a45826270b557426ee2aaf47\n" }, { "commit": "7e6bd6a911c5eba7b36b9b01804dd4d00132a175", "tree": "57ee9ab2cc93c2fbaaaaf8e77999dac195fc770e", "parents": [ "8f73edb22a30260a2f4f7946fbedd3fd3005c5b6", "66c4dbb96c38630d0cd6551fc8c9bf8fa3318903" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:27:32 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 22 18:27:32 2016 +0000" }, "message": "Merge \"Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\" into klp-dev" }, { "commit": "66c4dbb96c38630d0cd6551fc8c9bf8fa3318903", "tree": "ec4f2f5e250208980491f0b0fbc0ee250d3bc15c", "parents": [ "25e029746796fe88e82417fb01af2e27b8bbadb2" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:19:15 2016 +0000" }, "committer": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:19:15 2016 +0000" }, "message": "Revert \"Impose a size bound for dynamically allocated tables in stbl.\"\n\nThis reverts commit 25e029746796fe88e82417fb01af2e27b8bbadb2.\n\nChange-Id: I91225838a8be72a3cd413f2bcb99e7dca7e62929\n" }, { "commit": "5fa433b8c9ff7d415f5fb1ebefe0d989a7d11432", "tree": "b4faed4e03cd239a9daa691253deceea3a917588", "parents": [ "24bf4834182bf8e96af8e16f1f50617f8bfae9ac", "26dc0a2a9130c406541aa76285fa0e64112fb1e8" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:11:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:11:22 2016 +0000" }, "message": "Merge \\\\\\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\\\\\" into klp-dev am: 8f73edb22a am: a263248bf0 am: 4c969bf93f am: 7e06799472 am: fcb008b743\nam: 26dc0a2a91\n\nChange-Id: Ic91093f89dad5ada3f6997b7dff1557e726099c4\n" }, { "commit": "fcb008b74333b63074144198e1f069473ce5fda0", "tree": "1f407c84e31c79adc83e545b59d001cf4c91cf67", "parents": [ "f45a909f14380be824e28e8c29774f404aeb40b0", "7e06799472dd93f3c4e33807ab41256e75287291" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 18:01:43 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 18:01:43 2016 +0000" }, "message": "Merge \\\\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\\\" into klp-dev am: 8f73edb22a am: a263248bf0 am: 4c969bf93f\nam: 7e06799472\n\nChange-Id: I4c877fcf9839e44ca849d25f46ba55f74cd0064e\n" }, { "commit": "7e06799472dd93f3c4e33807ab41256e75287291", "tree": "843c2e0db67fc2232d609ae6f80566b72722a682", "parents": [ "495ba35a1706cbf6fa95616e23c6b656f3b1048b", "4c969bf93f71e394de3aa8b08f0ed0f96c48379d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jun 22 17:58:26 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 17:58:26 2016 +0000" }, "message": "Merge \\\\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\\\" into klp-dev am: 8f73edb22a am: a263248bf0\nam: 4c969bf93f\n\nChange-Id: I6258bac89bbe02e47b3c912df26f26033d7b76b4\n" }, { "commit": "4c969bf93f71e394de3aa8b08f0ed0f96c48379d", "tree": "637b8ec7d12c6d0fa0341098f22267172baf93d9", "parents": [ "5c1f01675ca0f4f231f206fc7fe64d353592f726", "a263248bf02014dfb5d76ac4c07e7dfcdd6518c1" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 17:55:12 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 22 17:55:12 2016 +0000" }, "message": "Merge \\\\\"Impose a size bound for dynamically allocated tables in stbl.\\\\\" into klp-dev am: 8f73edb22a\nam: a263248bf0\n\nChange-Id: I0389073f6b18450edc8fa70ed3ec72683a166915\n" }, { "commit": "8f73edb22a30260a2f4f7946fbedd3fd3005c5b6", "tree": "64727d7547fdef61a404952709b3867f48f681d8", "parents": [ "22d65757103e46bef8c6902ea08c84a775b62a0b", "25e029746796fe88e82417fb01af2e27b8bbadb2" ], "author": { "name": "Wonsik Kim", "email": "wonsik@google.com", "time": "Wed Jun 22 17:38:54 2016 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jun 22 17:38:54 2016 +0000" }, "message": "Merge \"Impose a size bound for dynamically allocated tables in stbl.\" into klp-dev" }, { "commit": "25e029746796fe88e82417fb01af2e27b8bbadb2", "tree": "b09f9538145fdae6557e38aae36433a8faad7603", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Tue Jun 21 19:10:21 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Jun 22 01:00:26 2016 -0700" }, "message": "Impose a size bound for dynamically allocated tables in stbl.\n\nImpose a restriction of 200MiB for tables in stsc, stts, ctts and stss\nboxes. Also change Vector to std::vector for efficiency and consistency.\n\nBug: 29367429\nChange-Id: I175da524612b9fe68496c612966af51f01a5cd5e\n" }, { "commit": "5c1f01675ca0f4f231f206fc7fe64d353592f726", "tree": "0d22666b8004a8e4ae781514d99b9a00e0059d16", "parents": [ "8b35cb563de25a0b5f743de2eeb385a87e95ca6c", "4bec033dedcb2e9297001878c7837a3d46d205a3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Jun 21 22:03:33 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Tue Jun 21 22:03:33 2016 +0000" }, "message": "Merge \\\\\"DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\\\\\" into klp-dev am: 22d6575710\nam: 4bec033ded\n\nChange-Id: I68dd7d3ea94b10104c235007fd03230ef5ae0146\n" }, { "commit": "54fc49c9f5ac06ea3c21cfe05a00f36c7df91b3f", "tree": "1ac44e86f7e902ab31974e23e456260033c87a05", "parents": [ "cf1aed625841c82c050fc6d460f561038f772a9c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 17:00:14 2016 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 21:32:22 2016 -0700" }, "message": "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\n\nSubtract address of a random static object from pointers being routed\nthrough app process.\n\nBug: 28466701\nChange-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04\n" }, { "commit": "7a3de84808f700615816397acc7c7927987bab6e", "tree": "926c2963967ecb1fb82d5b4584433b30dd3e531d", "parents": [ "dc7357d20175fadfabd903370094917408bf6e3e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 17:00:14 2016 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Jun 20 21:32:08 2016 -0700" }, "message": "DO NOT MERGE: Camera: Adjust pointers to ANW buffers to avoid infoleak\n\nSubtract address of a random static object from pointers being routed\nthrough app process.\n\nBug: 28466701\nChange-Id: Idcbfe81e9507433769672f3dc6d67db5eeed4e04\n" }, { "commit": "d01cc80eaf2c5e1a1681d1410626c0ea7ba1dca8", "tree": "8a1c35093cbc3047302712b71b494cf6de353750", "parents": [ "edf89fa6b7722c8a02ea54f5959e73c309e4b5af" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:26:43 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jun 09 10:51:07 2016 -0700" }, "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n" }, { "commit": "949333a3ab4868c1cc7b2e0ed26d045fd99d8a88", "tree": "fcb2eb5c39ff0f580a509faabaf585feef73c57a", "parents": [ "803ae13af2bef90c651cbcccb76bbd75403ff1ab", "d0f4bfb5527e88e868c4263cb6c9d219367b9fc9" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jun 09 17:18:06 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Jun 09 17:18:06 2016 +0000" }, "message": "Don\\\u0027t use sp\u003c\u003e\u0026\nam: d0f4bfb552\n\nChange-Id: I0490c443ad93133a8023134789dcecbcfc159cf3\n" }, { "commit": "d0f4bfb5527e88e868c4263cb6c9d219367b9fc9", "tree": "69301a8556126d12747adc0544dc57a8c389d97a", "parents": [ "33e914c861732cbcca923d34d368e1635b68434f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:26:43 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 17:10:39 2016 -0700" }, "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n" }, { "commit": "e66381758d6ba02494251e6097e0774a56524be5", "tree": "df4f40e2ccb8ca187d1b6a65a597e01ea5615605", "parents": [ "08cb85206ab65cc2b9df372e4ae5f75c331ae7a1", "0ee3710873997f09b9a0a645e8b2de9923894f17" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Jun 08 23:14:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Jun 08 23:14:09 2016 +0000" }, "message": "Merge \\\\\"Don\\\\\u0027t use sp\u003c\u003e\u0026\\\\\" into klp-dev am: 598f8d3218\nam: 0ee3710873\n\nChange-Id: I95ce93c3c1975b444bd6cd2c49a3b215395d2754\n" }, { "commit": "fc47a301b7b2b044eddaedc98861d55193ec7dc0", "tree": "8f64350afe90fc797bba02c7a24720a9c80c31f5", "parents": [ "b016207fc2442420e8d3a8633575ffe4fc29fef3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:26:43 2016 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jun 07 12:31:11 2016 -0700" }, "message": "Don\u0027t use sp\u003c\u003e\u0026\n\nbecause they may end up pointing to NULL after a NULL check was performed.\n\nBug: 28166152\nChange-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe\n" }, { "commit": "87695f6695d184a1b7c47b6957ae106049494901", "tree": "0e26399ba2dd1da416a61724eb1bee2b0914e470", "parents": [ "3e1803fc40052b5cf6f3f7a63aa82bf446749724", "f7201862c852cbf780e546c0e23e23cd7dcab4a1" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:19:22 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:19:22 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527 am: e896c41 am: a0970c9 am: ab72763 am: 8cf4bf3\nam: f720186\n\n* commit \u0027f7201862c852cbf780e546c0e23e23cd7dcab4a1\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I3b26c1a4781e38d2b327b09972091d169bba1338\n" }, { "commit": "8cf4bf38b13adb805746a3f3e172670b1af7c9fd", "tree": "9012536dcc279186bb0014559404e3e785a6cc9c", "parents": [ "9d9ebc990f4b4b18f48d09232b053b3cb69dbb6b", "ab7276351e41bc0d40d28c231993ba240b5f21a0" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:13:47 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:13:47 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527 am: e896c41 am: a0970c9\nam: ab72763\n\n* commit \u0027ab7276351e41bc0d40d28c231993ba240b5f21a0\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I3dc4066c53dfeb3fc07ee31431ee5a5571c89528\n" }, { "commit": "ab7276351e41bc0d40d28c231993ba240b5f21a0", "tree": "ee86ba8839dec7ccb3906ab7db5169a617b1bfa8", "parents": [ "76f606bdf9d52a4406dc285e06a0f15b13903bac", "a0970c9faabdaca647cb22b78432511de3220399" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:11:25 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:11:25 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527 am: e896c41\nam: a0970c9\n\n* commit \u0027a0970c9faabdaca647cb22b78432511de3220399\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I7d7e410e25d8a5b1066251cae8cddfa050b07f71\n" }, { "commit": "a0970c9faabdaca647cb22b78432511de3220399", "tree": "f1f32337b6812a38e1fda5417b3489e9b84de193", "parents": [ "9f3762d8c76b778c8f600486a464838731105b09", "e896c41d85a15de06c74885fe040f3f57b63cd5d" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Sat Apr 16 00:09:00 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Sat Apr 16 00:09:00 2016 +0000" }, "message": "Merge \"SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\" into klp-dev am: 5964527\nam: e896c41\n\n* commit \u0027e896c41d85a15de06c74885fe040f3f57b63cd5d\u0027:\n SampleTable.cpp: Prevent corrupted stts block from causing excessive memory allocation.\n\nChange-Id: I5f23c14d155ea5a64b00d877a329c77cfc5b55f7\n" }, { "commit": "a3630a418b4f65277a42cd4018cd3b0b7e134d0c", "tree": "faeb669973973cbe4c538f4eec492a1bb9575997", "parents": [ "52636f8462b2a24f77524ca912e3579c33ac113e" ], "author": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Wed Apr 13 16:25:12 2016 -0700" }, "committer": { "name": "Pawin Vongmasa", "email": "pawin@google.com", "time": "Thu Apr 14 23:25:16 2016 +0000" }, "message": "SampleTable.cpp: Prevent corrupted stts block from causing\nexcessive memory allocation.\n\nDetails:\n\nDataSource.h\n- Added function getVector() for reading from a data source into\n a Vector object, whose capacity grows only as much as needed\n (in case of EOS or reading error).\nSampleTable.h\n- Changed the type of mTimeToSample from uint32_t* to\n Vector\u003cuint32_t\u003e.\nSampleTable.cpp\n- In setTimeToSample, modified the code to use getVector()\n instead of readAt(). If the input source has a corrupt\n time-to-sample table size that is too big, EOS will be reached\n before the whole table is read, and the return value from\n getVector() will be false.\n- Also, tightened the bound for the provided time-to-sample table\n size to guarantee that the table does not take more than\n UINT_MAX32 bytes in memory.\n\nBug: 28076789\nChange-Id: Id207f369ab7b27787d83f5d8fc48dc53ed9fcdc9\n" }, { "commit": "6bac803b1595a653180da15d409fe6167534334c", "tree": "1a292c76bf8582802ec03f02b96680559e273cad", "parents": [ "7786bd9376f34b23db9a67aae16368fb1851fe34", "5984d6cbf9c7eae7a0f46c948a9b35b56f0268a5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 22:06:16 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 22:06:16 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab am: 93f5bcab20 am: d11972f8d4 am: c0cefa9f37 am: 73079eec40\nam: 5984d6cbf9\n\n* commit \u00275984d6cbf9c7eae7a0f46c948a9b35b56f0268a5\u0027:\n Get service by value instead of reference\n" }, { "commit": "73079eec4013621ac516f22b0ec6d55203d1e245", "tree": "e2a6bb52738c5f61bd14ff3be21a7bf4524c35b9", "parents": [ "d132bc5b0bc15152f7acf769408c55da7a5b31f7", "c0cefa9f37e296a7a60978e442b374b5c7f24d65" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 21:53:01 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 21:53:01 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab am: 93f5bcab20 am: d11972f8d4\nam: c0cefa9f37\n\n* commit \u0027c0cefa9f37e296a7a60978e442b374b5c7f24d65\u0027:\n Get service by value instead of reference\n" }, { "commit": "d11972f8d48d14a1a52e98e64b8216abfc7f00e0", "tree": "513d2cd1a96344f2f505defaeeffbe0188088e48", "parents": [ "776aacce9e5e2dfbc4e7a955916ea0d397af74bf", "93f5bcab205f8d7cd4557eacda513867e8b8ea65" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 21:37:05 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 21:37:05 2016 +0000" }, "message": "Get service by value instead of reference am: 61a6d26aab\nam: 93f5bcab20\n\n* commit \u002793f5bcab205f8d7cd4557eacda513867e8b8ea65\u0027:\n Get service by value instead of reference\n" }, { "commit": "93f5bcab205f8d7cd4557eacda513867e8b8ea65", "tree": "8b1ad39e3a33cbe4b76e36e17a37cb705f8948d6", "parents": [ "33514675f6588d70a203b2c9200792bca18d425c", "61a6d26aab95870279b274e565c1495748befde0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 24 21:24:09 2016 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Feb 24 21:24:09 2016 +0000" }, "message": "Get service by value instead of reference\nam: 61a6d26aab\n\n* commit \u002761a6d26aab95870279b274e565c1495748befde0\u0027:\n Get service by value instead of reference\n" }, { "commit": "61a6d26aab95870279b274e565c1495748befde0", "tree": "d58c9beb9e499e5983db76a52f02f2456c35ff92", "parents": [ "f7a388203a1632084dbe3307d7e3265f689bc11e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Feb 18 08:25:47 2016 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 23 19:28:09 2016 -0800" }, "message": "Get service by value instead of reference\n\nto prevent a cleared service binder from being used.\n\nBug: 26040840\nChange-Id: Ifb5483c55b172d3553deb80dbe27f2204b86ecdb\n" }, { "commit": "208bc477d92dbd2e5b4d1c0b2d000fa4c231e9d3", "tree": "f24b4d3f782bf473dbeb70c5e4b579bc135eaa15", "parents": [ "9e1d7751b12ea976323abc1fe7760323ab142d39", "3d6a7149802928ecf3f58b7218b0e82699b492df" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Dec 03 22:55:36 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\nam: 3d6a714980\n\n* commit \u00273d6a7149802928ecf3f58b7218b0e82699b492df\u0027:\n DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n" }, { "commit": "3d6a7149802928ecf3f58b7218b0e82699b492df", "tree": "d1733d4792e95ae68ed843927cf38291863e4c42", "parents": [ "6afc659b00c3f4a83b9f5f3c744b7119b33340b4" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Dec 03 18:54:00 2015 +0000" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "19c47afbc402542720ddd280e1bbde3b2277b586", "tree": "d2c3657298566f4466ea0f6ee51217ffe1a9b7a1", "parents": [ "09c291c838bc74bb7c10c22f7232abb946cad8ff" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 15:55:23 2015 -0800" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Dec 02 18:05:32 2015 -0800" }, "message": "DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread\n\nSample decoding still occurs in SoundPoolThread\nwithout holding the SoundPool lock.\n\nBug: 25781119\nChange-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8\n" }, { "commit": "0378676b3f12158537a01916e69f6ab51817605f", "tree": "50acfa79aca6076b56c66e1f6d0d26b530038242", "parents": [ "f30d7e0acc573b58333c3c704c2a46eda1dbfcff", "92990810407a2e1101f5db156c1e264887886c82" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 19 19:37:04 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 19 19:37:04 2015 +0000" }, "message": "am 92990810: am b1231923: am e550d213: am f70b69a8: Merge \"stagefright: check bounds for MediaCodecList.getCodecInfo\" into lmp-dev\n\n* commit \u002792990810407a2e1101f5db156c1e264887886c82\u0027:\n stagefright: check bounds for MediaCodecList.getCodecInfo\n" }, { "commit": "b1231923f134a167a0351091d8944b7583928a4f", "tree": "2565d910572223b4ee0b900f7545580a9d77ca63", "parents": [ "f5bff8c9df4444ca91a14ba26cfe005f9f100250", "e550d21360287c752fd79a67f1962244ee272be1" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 19 12:26:55 2015 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 19 12:26:55 2015 -0700" }, "message": "am e550d213: am f70b69a8: Merge \"stagefright: check bounds for MediaCodecList.getCodecInfo\" into lmp-dev\n\n* commit \u0027e550d21360287c752fd79a67f1962244ee272be1\u0027:\n stagefright: check bounds for MediaCodecList.getCodecInfo\n" }, { "commit": "77c185d5499d6174e7a97b3e1512994d3a803151", "tree": "f5ad0fe15b5eac1f8eb5ca52384c022ac2e60b57", "parents": [ "0b1936bee532545381db6adf22f31ac437673f30" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 12 17:10:31 2015 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Oct 12 17:27:17 2015 -0700" }, "message": "stagefright: check bounds for MediaCodecList.getCodecInfo\n\nBug: 24445127\nChange-Id: I1c6cb9e2518b852d48d5d0d625b54409bd4e13ec\n" }, { "commit": "91aa4a0aefa43ad53a20b3d4538a6a986c902818", "tree": "26f92a59a28b761d463006f652634d583058dbfc", "parents": [ "a6b9d752e7e266b63a2d9a694b3422198cb512a1", "f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 20:10:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 08 20:10:39 2015 +0000" }, "message": "am f106f9e4: am 15e991bd: resolved conflicts for 0b09da7a to lmp-mr1-dev\n\n* commit \u0027f106f9e4eacc1cb10ccc851a37619ed4b37bbb1b\u0027:\n DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n" }, { "commit": "15e991bdf8870c2c9820c2d98e0d30dae2e05a25", "tree": "ad4f68934ac1f3dc1f20f9dedbccf89d1f6b75d7", "parents": [ "39f64a1e4903624bd6395aa2a1c6875a10ed489d", "0b09da7a98d5f55674dba7b380e1b8d262f709b0" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 10:02:30 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 10:02:30 2015 -0700" }, "message": "resolved conflicts for 0b09da7a to lmp-mr1-dev\n\nChange-Id: Ib6a1aa4cee00e0449da30ae158d71403d6236487\n" }, { "commit": "dd184a4824acc31160895e2c6f8d93a7facfc2c8", "tree": "b59541270989719862e923d24637064ef10aa810", "parents": [ "fc0e2a87c17b1f326b5e3302e8f534c143fd5784", "3b4a72acf039c58c33807b6d6fcdd5e09eafb1df" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Thu Oct 08 16:48:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 08 16:48:33 2015 +0000" }, "message": "am 3b4a72ac: Merge \"DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\" into klp-dev\n\n* commit \u00273b4a72acf039c58c33807b6d6fcdd5e09eafb1df\u0027:\n DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n" }, { "commit": "2482595baadd16f20d3992c8c9d6a14061836872", "tree": "1b2d060855dc645f847ff2143e359166005f829a", "parents": [ "07395f4cd72cf29d1de2864cde42876db4e54411" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 11:32:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Oct 07 13:53:25 2015 -0700" }, "message": "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n\nBug: 24310423\nChange-Id: Iebcfc58b447f925ec2134898060af2ef227266a3\n(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)\n" }, { "commit": "4a03d784f7c0e3a9685d182eee92ba6580eaf5a1", "tree": "a7356ea6c85c6d1b4b45e0288f43b4f9fe9edae4", "parents": [ "74d1927e4122a1748f89ca2ef79406fc06ee94b2" ], "author": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Mon Sep 28 11:32:23 2015 -0700" }, "committer": { "name": "Wei Jia", "email": "wjia@google.com", "time": "Wed Oct 07 11:27:32 2015 -0700" }, "message": "DO NOT MERGE - OMX: allow only secure codec to remotely call allocateBuffer.\n\nBug: 24310423\nChange-Id: Iebcfc58b447f925ec2134898060af2ef227266a3\n(cherry picked from commit 8dde7269a5356503d2b283234b6cb46d0c3f214e)\n" }, { "commit": "02a65c4f599035bf6d58ceda766311f8cb188ba3", "tree": "ee6b8c9a55375e1585a567ac94ba579007f1d49d", "parents": [ "612cf86e53f48cd347cf9b5a87e1d91d3d1dc601", "8910f92aea5791f245da2c69a8c2ad3fb92bb310" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Thu Aug 20 01:16:06 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 20 01:16:06 2015 +0000" }, "message": "am 8910f92a: am 2ea335b1: am fecbc5da: am 5b4a5cce: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into lmp-dev\n\n* commit \u00278910f92aea5791f245da2c69a8c2ad3fb92bb310\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "27362395cec5673a9cbfe7179ad5490c4e475329", "tree": "e157babb6cdfb2579d9382b2ce2db7da23908611", "parents": [ "6035c811849a8475697268cf71b5cf923705abe8", "2ed42aea9c6fbca4bde52d647ff082b997b5968c" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:39 2015 +0000" }, "message": "am 2ed42aea: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into klp-dev\n\n* commit \u00272ed42aea9c6fbca4bde52d647ff082b997b5968c\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "2ea335b11c1e328896a6c7a2e6d2bc190b7f06fc", "tree": "b12bf3da1c3457982ccff6c6d4aeb24d90ffb639", "parents": [ "afa0e3698355f341009a8042d62c82016f86a1c8", "fecbc5da64a992f91f74ef6c67a7e247b0da7777" ], "author": { "name": "Jon Larimer", "email": "jlarimer@google.com", "time": "Tue Aug 18 15:13:19 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 18 15:13:19 2015 +0000" }, "message": "am fecbc5da: am 5b4a5cce: Merge \"do not dequeue from native window after we hit fatal error -- DO NOT MERGE\" into lmp-dev\n\n* commit \u0027fecbc5da64a992f91f74ef6c67a7e247b0da7777\u0027:\n do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n" }, { "commit": "bf47eb9c67ed364f3c288954857aab9d9311db4c", "tree": "5ba3da2bb1e2103a1719e9c014dfb290392ff0b1", "parents": [ "e4ac35fa524b011f272d396b2c12515382bddb94" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 13:50:02 2015 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Aug 17 17:14:50 2015 +0000" }, "message": "do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n\nbug: 22845824\nChange-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141\n(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)\n" }, { "commit": "734e65e6e7e1ee863781c1ebd87003933bb4a752", "tree": "33fc593159d45ac2a84e93aa8c2d05583acfac65", "parents": [ "3ce293842fed1b3abd2ff0aecd2a0c70a55086ee" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Aug 14 13:50:02 2015 -0700" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Mon Aug 17 17:14:17 2015 +0000" }, "message": "do not dequeue from native window after we hit fatal error -- DO NOT MERGE\n\nbug: 22845824\nChange-Id: I8c375790c697e02b6ab3ea54b84d3f70d5e78141\n(cherry picked from commit 346de3c26a8fbd0fa0c8102f4a21ea4dcee4432a)\n" }, { "commit": "48192b84db39879e7d83a2f4e7023048fb81ee8e", "tree": "da2e27ff472d39842ee796d3523785036acd6d42", "parents": [ "9ac30bd4a43e025ce27c0a78bbe2ac05a66bcbda", "0625841daae5bb1351034909ce705aab517eea2d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 15:01:52 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 15:01:52 2015 +0000" }, "message": "am 0625841d: am dfaea255: am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3\n\n* commit \u00270625841daae5bb1351034909ce705aab517eea2d\u0027:\n Fix crash on malformed id3\n" }, { "commit": "dfaea255546340742b42c216663f61c6b7301c4f", "tree": "7e77aeb1072938040bab56ba4a9ed6b48c0a8473", "parents": [ "fbf1c8d65fe257847b35ec7289f9450ac34c8034", "578d5b66fc9f5e36ca0cb19b21771aa85ec131ee" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 14:47:48 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 14:47:48 2015 +0000" }, "message": "am 578d5b66: am 171b5fad: am d6ea7f65: am f26400c9: Fix crash on malformed id3\n\n* commit \u0027578d5b66fc9f5e36ca0cb19b21771aa85ec131ee\u0027:\n Fix crash on malformed id3\n" }, { "commit": "171b5fadb9d304f5e06686e4f3d060ef335d7250", "tree": "8d45331766e9cb5c701db4a8ca4e51e89f1ac5ad", "parents": [ "d8bb17e33ef33ce173fa2d096211785145d41921", "d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 14:32:40 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 14:32:40 2015 +0000" }, "message": "am d6ea7f65: am f26400c9: Fix crash on malformed id3\n\n* commit \u0027d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3\u0027:\n Fix crash on malformed id3\n" }, { "commit": "d6ea7f65dd31d5dacf497cc3c494d4fa3910f7c3", "tree": "b62ef0d8d86dd5a159fda3997b7b7369ced8a96c", "parents": [ "42bd61d73e8b4d0b1101e73324a59fde51077112", "f26400c9d01a0e2f71690d5ebc644270f098d590" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 07 14:25:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 07 14:25:10 2015 +0000" }, "message": "am f26400c9: Fix crash on malformed id3\n\n* commit \u0027f26400c9d01a0e2f71690d5ebc644270f098d590\u0027:\n Fix crash on malformed id3\n" }, { "commit": "f26400c9d01a0e2f71690d5ebc644270f098d590", "tree": "b96386b9c3bf83c969ed207dbd7b53eb29e6c6a3", "parents": [ "d9a9a324766b26be2ff0d10537ea0b215b0261e3" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 04 16:49:28 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Aug 04 23:52:34 2015 +0000" }, "message": "Fix crash on malformed id3\n\nBug: 22954006\nChange-Id: I488cb1e2c69fc7043b6040481b30fa866000515d\n" }, { "commit": "0eb7c79398ef04e457c76f117feef6d7bcbbc684", "tree": "f4858d5db5415c19ca25f3e8899f880307b3b6a5", "parents": [ "a4b4ca508827cc85db9708307243886024f298bc", "b5fbb81157eaab594bb37275176a0a178098dc46" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue May 12 22:55:01 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 12 22:55:01 2015 +0000" }, "message": "am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge \"Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\" into lmp-dev\n\n* commit \u0027b5fbb81157eaab594bb37275176a0a178098dc46\u0027:\n Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\n" }, { "commit": "bcf2becf206b5d56c89bf2b43356fd7995003302", "tree": "0fa5c016138944033cdfe35b821853499541dc56", "parents": [ "07e80f7a2da0a28d977adfb0372fdf385f964bc7", "c531d9956513b9b82dad84aeb507b866e6b3951a" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue May 12 22:14:58 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue May 12 22:14:58 2015 +0000" }, "message": "am c531d995: am 438217a0: Merge \"Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\" into lmp-dev\n\n* commit \u0027c531d9956513b9b82dad84aeb507b866e6b3951a\u0027:\n Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\n" }, { "commit": "a3e8f60f5e409f65f12636df5fad7f20ff736df5", "tree": "782d8d5c457afc6b57397ea6890f06b4c0067eec", "parents": [ "5a75b4215821d633af18dd8dae2495299c070bf0", "7acac10aae34da5ae4d628c5a270e7e3e94f7598" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Mon May 11 11:10:36 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon May 11 11:10:36 2015 +0000" }, "message": "am 7acac10a: Merge \"DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\" into klp-dev\n\n* commit \u00277acac10aae34da5ae4d628c5a270e7e3e94f7598\u0027:\n DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\n" }, { "commit": "67a30ebfe785f7cd5ecfb0d2fb487e54536a3d48", "tree": "2d7fa0640fa55b339ae5083e7d75022ab3d56720", "parents": [ "6429079345404932c5be5956efc7154390d2ed0e" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Apr 01 19:32:25 2015 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Sat Apr 25 00:46:59 2015 +0000" }, "message": "DO NOT MERGE: Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\n\nBug: 19641538\nChange-Id: I5aae3f100846c125decc61eec7cd6563e3f33777\n" }, { "commit": "bfed843041b6aaec13ee19996748a7a1476db9c8", "tree": "f6f6744dbf809a6d7897767f264944922fe954cf", "parents": [ "eb204f82afd5519eb544bf8bee692e7152820c3b" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Apr 01 19:32:25 2015 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Apr 24 17:10:41 2015 -0700" }, "message": "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes\n\nBug: 19641538\nChange-Id: I5aae3f100846c125decc61eec7cd6563e3f33777\n" }, { "commit": "17c39e708ed657b8fa66f8acce5128e51696915c", "tree": "ec0f96c66e44c39e83800bb7a02792ab57781e99", "parents": [ "340cebdaa2875ba2ab9725b81218ebc59d84164b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Mar 20 09:15:11 2015 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Mar 20 09:15:11 2015 -0700" }, "message": "ulaw and alaw aren\u0027t limited to 8kHz\n\nBug: https://code.google.com/p/android/issues/detail?id\u003d158490\nChange-Id: Ib30e156c99a997db861bb85e17244a5effdd55cf\n" }, { "commit": "1f9b6745d7c88dac2bfd19d583c3d98b361f67b3", "tree": "fa16251e7e839cc14b09074a4874dfab2f1c00cb", "parents": [ "2d9ded1d03653c747ba173f622e19ed6d56f26f4", "56fbb4d7bcb34af71a08cd126891afafdec217f1" ], "author": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Feb 19 14:31:34 2015 -0800" }, "committer": { "name": "Bill Yi", "email": "byi@google.com", "time": "Thu Feb 19 14:31:34 2015 -0800" }, "message": "Merge commit \u002756fbb4d7bcb34af71a08cd126891afafdec217f1\u0027 into HEAD\n" }, { "commit": "f09611f2f33752afc28141e1bbaa897651c05d6f", "tree": "0c22a41f082abda66b93bb73840a072c8837d277", "parents": [ "ec0472ba9c1cfaee293636536f3951c0e6e671b4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Feb 13 14:12:42 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 18 09:14:06 2015 -0800" }, "message": "Add dumpsys info\n\nPrint a list of looper-handler pairs and the number of messages\nthey\u0027ve processed, and optionally break those stats out by\nmessage type.\n\nChange-Id: I68ce4a7003152d5c9b5cb3f42e6f3949b471aa6e\n" }, { "commit": "157defdde7013062bbd04f7e873b6856adce14ca", "tree": "bf6503e41529df950c27f694e256519add85752b", "parents": [ "6d5a1afac2a7bca6b171261ca9b237c3a516e567", "4fc5d758d6722bedf341e5d93a0ba5698c658c29" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Feb 10 04:33:08 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 10 04:33:08 2015 +0000" }, "message": "am 4fc5d758: am 0c11f31b: Merge \"nuplayer: acquire wakelock during offload pause timeout\" into lmp-mr1-dev\n\n* commit \u00274fc5d758d6722bedf341e5d93a0ba5698c658c29\u0027:\n nuplayer: acquire wakelock during offload pause timeout\n" }, { "commit": "35d5af131c9d4962e935082f204ccd6a2130861c", "tree": "3a0456f7e9ddba7cddb0769f2a15d1589f820647", "parents": [ "17e95f40a534101e2df48f077a8029430adef6c3" ], "author": { "name": "Weiyin Jiang", "email": "wjiang@codeaurora.org", "time": "Wed Jan 28 16:14:02 2015 +0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Feb 06 16:32:24 2015 -0800" }, "message": "nuplayer: acquire wakelock during offload pause timeout\n\nHold a wakelock while paused in audio offload mode, until audio\nteardown event is received, or pause is canceled.\n\nSince ARM cores are sleeping, the delayed AMessage will not be\nreceived, and the audio output driver will not be closed.\nThis blocks XO shutdown.\n\nBug: 19297092\nChange-Id: I3d11fef633e3f2783f4aa31e71285e2fa09d234c\n" }, { "commit": "e576086224f6e630159eaeec59ab5146c8533dc7", "tree": "5a9605c000abb905142dfad5e6597915ab51f784", "parents": [ "7dbbc7ec95c3040668388162a0ffbc45b68af6f1", "bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Feb 06 00:06:50 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Feb 06 00:06:50 2015 +0000" }, "message": "am bcd22f0f: am 0662f5b0: Merge \"stagefright: add fallback for native flex-YUV support\" into lmp-mr1-dev\n\n* commit \u0027bcd22f0f3a4cd5f78e03af23aafadb2d1aec6794\u0027:\n stagefright: add fallback for native flex-YUV support\n" }, { "commit": "3b5d119522bdf9c23be622be395d7a95d465616e", "tree": "9f7e695fabcdf8f849b2be640903ae635c16a18e", "parents": [ "e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7", "7b66f713fc53ee81453763788c02f3c741d19520" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Feb 04 21:11:33 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 04 21:11:33 2015 +0000" }, "message": "am 7b66f713: am 57f75272: Merge \"stagefright: add support for native flex-YUV formats\" into lmp-mr1-dev\n\n* commit \u00277b66f713fc53ee81453763788c02f3c741d19520\u0027:\n stagefright: add support for native flex-YUV formats\n" }, { "commit": "3a01a71dcbb467d06cc5da4a72a82bb588648cfc", "tree": "f35a84d74ff7cbcf6199d46c444acae9775880f8", "parents": [ "57f75272fcd16b205ed60cdd0b33ffc19991fd10" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Jan 30 19:30:05 2015 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Feb 04 12:58:17 2015 -0800" }, "message": "stagefright: add fallback for native flex-YUV support\n\nUse software renderer if codec cannot support flex-YUV on a surface\n\nBug: 17906609\nChange-Id: I3d0e3ff5fee7d7b3e2416892968fa18f6139598a\n" }, { "commit": "e91c3dd028c6cf551e905c5d2cfb5d1fc0c8bcb7", "tree": "9e7913af62ee68d339a399723f83c4ef05b79d32", "parents": [ "7bc903581f879c86f3881a2f7563bd28c1ac29b7", "6a025acb630a3ac4a84715d188aeb48f1946bc3f" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Feb 04 20:14:50 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 04 20:14:50 2015 +0000" }, "message": "am 6a025acb: am ec0472ba: Merge \"Move AString\\\u0027s StringPrintf out of the way.\"\n\n* commit \u00276a025acb630a3ac4a84715d188aeb48f1946bc3f\u0027:\n Move AString\u0027s StringPrintf out of the way.\n" }, { "commit": "a1e8944a21e5833b7aadc451776f11797f5f9273", "tree": "b7f4c150346d21f4862f231160c7df6602509a12", "parents": [ "16e8d463bc5c8805ae6815c67875b16d177a9d8a" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Feb 04 11:54:28 2015 -0800" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Feb 04 11:54:28 2015 -0800" }, "message": "Move AString\u0027s StringPrintf out of the way.\n\nWe should come back and replace AString with std::string and switch to the\n\"real\" StringPrintf family, but this fixes the ODR violation that was\npreventing us from booting.\n\nBug: 19265750\nChange-Id: I798eb9ca5dd634e44625af5e583439ef9f0cdc35\n" }, { "commit": "0d09182a1dde960f7acda1c28469e5deead1b996", "tree": "ccbf3a9429264d06cb957f2664ae47fef80e3646", "parents": [ "efbb61950db36a5eb789be83f077246172507c67" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Jan 30 14:07:25 2015 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Feb 04 00:02:58 2015 -0800" }, "message": "stagefright: add support for native flex-YUV formats\n\nBug: 17906609\nChange-Id: I14116796eaa94aa8ae62dcc29f67cb7d2c060d34\n" }, { "commit": "a601b86287ab5437a7e9aaf6f09bc171803cdc3d", "tree": "5e262eb49429ca1d98f11ee83e68a3a3846ada7a", "parents": [ "82bbd248d0578e5da04aa95d9906006275c330b5", "c9e11696c4f80e9803f7e65e29af962f199a574d" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Mon Feb 02 15:30:01 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 02 15:30:01 2015 +0000" }, "message": "am c9e11696: am 36dca156: Merge \"Acodec: Send framerate information to OMX decoder if available\" into lmp-mr1-dev\n\n* commit \u0027c9e11696c4f80e9803f7e65e29af962f199a574d\u0027:\n Acodec: Send framerate information to OMX decoder if available\n" }, { "commit": "78b01639c08fe5e7e9c1be5e9dc5de560f1383f9", "tree": "0187106f6f7e64716a6cc66a57450559fc61d400", "parents": [ "64c496c8d51c71605cd34a510da2ecd8180656ec" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Thu Jan 29 19:24:08 2015 -0800" }, "committer": { "name": "Rachad", "email": "rachad@google.com", "time": "Thu Jan 29 19:24:08 2015 -0800" }, "message": "Acodec: Send framerate information to OMX decoder if available\n\nBug: 19110889\nChange-Id: Ia8dbe1b77aaac421ec9415884e1248b9b68168dc\n" }, { "commit": "9391844deb3f6a442745cea62f78aca2cea19e50", "tree": "c8868256f6cbd8e683b45c7fa4e3d56aa26d2574", "parents": [ "b7909adcef247c627fbe8026624b9ecbeba47655", "b955b7224382b488a4d8d5663c92118feb8deb1e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 27 10:04:01 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 27 10:04:01 2015 -0800" }, "message": "resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp\n\nChange-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72\n" }, { "commit": "b7848f1c442bc8c71020957948d1b003a62a25b7", "tree": "b0a1dfd418429171c0af5379a1820569775a840b", "parents": [ "1ed13b3b443735e7f7b5002954f31741b0b1c572" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Dec 04 08:57:56 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Jan 26 07:57:39 2015 -0800" }, "message": "Remove MediaPlayerService::decode()\n\nand make SoundPool use MediaCodec for decoding files to PCM.\n\nBug: 18239054\nChange-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310\n" }, { "commit": "17c933cc07be9656aee8afc82dc866a67b3fd78e", "tree": "1dbb1c050687cda6d0877c29d60ac80d281a05b3", "parents": [ "7e85361e364bf8f80ab43dd5feb0f584e481019e", "cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Jan 13 23:31:16 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 13 23:31:16 2015 +0000" }, "message": "am cec272df: am 724b9ea5: Merge \"Replace MidiFile player with a Midi extractor\"\n\n* commit \u0027cec272dfe2cf6bf6cdb8a4afa5afdd0e910c915f\u0027:\n Replace MidiFile player with a Midi extractor\n" }, { "commit": "7e85361e364bf8f80ab43dd5feb0f584e481019e", "tree": "fbc76909e02d1aab4f53f2ec76063c0ce92fbdd0", "parents": [ "e6453027baf4c79e95b31aa602b18621e3118423", "26c73acb73b5af94cb27e5d285d1708d25eb6892" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Sat Jan 10 02:00:10 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Jan 10 02:00:10 2015 +0000" }, "message": "am 26c73acb: am 0b460ad7: Merge \"ACodec: Added support for E-AC3 decoders\" into lmp-mr1-dev\n\n* commit \u002726c73acb73b5af94cb27e5d285d1708d25eb6892\u0027:\n ACodec: Added support for E-AC3 decoders\n" }, { "commit": "0b460ad7557f6be56aad3fa027d93b38d5995ac4", "tree": "12dd16e6b1087cc75aae47c8550f312554efbb86", "parents": [ "38a97bd7891cb0e16f8127510aa81b1b05df3f17", "8a4728966dc9c78e21c3c93a927707e93c05e5e0" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Sat Jan 10 01:31:02 2015 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jan 10 01:31:02 2015 +0000" }, "message": "Merge \"ACodec: Added support for E-AC3 decoders\" into lmp-mr1-dev" }, { "commit": "8840754c5bc44c7e11ed5e9acc15e9569f5814c5", "tree": "b3aee3af2d94e1c84729d1d5579a6177b5b05b70", "parents": [ "7993d6b343f2723872dac085756743630371454d", "2702d5a073dce89fa3d97c304264b719b187c9fe" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 08 14:00:56 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 08 14:00:56 2015 -0800" }, "message": "resolved conflicts for merge of 2702d5a0 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Ic9841f0a66930f57a5ebea527c6a841d7c49cccf\n" }, { "commit": "0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7", "tree": "915b24bd6c686000a5c4fb8af920c8a16204e30e", "parents": [ "c52af00beda4477d0fd00c3071e6ffd9c465430b" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 08 13:40:53 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 08 13:48:52 2015 -0800" }, "message": "Replace MidiFile player with a Midi extractor\n\nThis gets rids of a bunch of special midi handling and replaces it\nwith an extractor that works with NuPlayer and MediaMetadataRetriever.\n\nChange-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217\n" }, { "commit": "bc11e713063f3f96f98256abc81c0d8ee1ddb312", "tree": "b45b5c9d24ed7779e2bc6a19d3169c6b79b363a6", "parents": [ "43637c2e0313ed9fea4e4aceb14c166349327aea" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 08 12:26:36 2015 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 08 12:28:17 2015 -0800" }, "message": "Use callbacks for Midi I/O\n\nInstead of having the Sonivox engine directly open the file and\nuse stdio to read from it, use caller-provided callbacks.\n\nChange-Id: Ie55129109060a4a7862fee3177f994401e00b6c1\n" }, { "commit": "7993d6b343f2723872dac085756743630371454d", "tree": "3577f12b2dee471ed021462b9ca731fb5e85a51d", "parents": [ "27a78b56e1cf9814971192883cb7d15c186465f7", "e03447548d1c56fa9875cac7d500f1012a6b5c26" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Jan 08 17:57:36 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 08 17:57:36 2015 +0000" }, "message": "am e0344754: am 468977f0: Merge \"mark any copyrighted content as protected to disable capture\" into lmp-mr1-dev\n\n* commit \u0027e03447548d1c56fa9875cac7d500f1012a6b5c26\u0027:\n mark any copyrighted content as protected to disable capture\n" }, { "commit": "1713460104b86f6be3a5d9993d9ace864d889b2d", "tree": "47be834572c94f418cd6d087e953a53a9d655127", "parents": [ "5db7897ddd32e3ec3ab45ecdb6f21b6265e7e14a" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Wed Jan 07 16:14:34 2015 -0800" }, "committer": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Wed Jan 07 17:08:43 2015 -0800" }, "message": "mark any copyrighted content as protected to disable capture\n\nbug: 18916274\nChange-Id: I23f096b51433bf18a10dc5fe6dc6b75c3881c340\n" }, { "commit": "51281663443ea39db9b4c6e2415343e26a6b3fb8", "tree": "126b2c46af9297178a9204e608d0ba8454f17269", "parents": [ "991aa3a70b26c7d9c93361394a43a95355c1c26e", "69897ae4889328807760ea359ee62efffdaca933" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Jan 05 17:02:32 2015 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 05 17:02:32 2015 +0000" }, "message": "am 69897ae4: am 75afcc1f: Merge \"Use define for drm property keys instead of defining as char pointers\"\n\n* commit \u002769897ae4889328807760ea359ee62efffdaca933\u0027:\n Use define for drm property keys instead of defining as char pointers\n" }, { "commit": "8a4728966dc9c78e21c3c93a927707e93c05e5e0", "tree": "6b27f91419fcecb7d06f277b03d74e68676e8d68", "parents": [ "0d19abb440c7e62e944efbeadf02299990f9a589" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Tue Dec 23 16:10:32 2014 -0800" }, "committer": { "name": "Rachad", "email": "rachad@google.com", "time": "Tue Dec 23 16:10:32 2014 -0800" }, "message": "ACodec: Added support for E-AC3 decoders\n\nBug: 17883772\n\nChange-Id: I05f674c33522eec0e6ceeece88dd800b1857b3ab\n" }, { "commit": "c0fcdc07cc3fd44a1fd27fc9b84a5be3651cea22", "tree": "97c2aef42582a548f61ddd1487fb850495d5f4a2", "parents": [ "09a1f34f2f45fe01b7dc6a15b15259ba61e47b5b" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Thu Nov 27 22:51:14 2014 +0200" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Thu Dec 18 16:31:57 2014 +0200" }, "message": "Use define for drm property keys instead of defining as char pointers\n\nWhen defined as char pointers, every compilation unit that includes\nthe NdkMediaDrm.h header defines a new copy of the same global\nvariables - leading to linker errors due to multiple definitions\nif more than one file includes it.\n\nBy using a define, they don\u0027t generate any symbols. The NdkMediaFormat.h\nheader uses extern const char* for a similar set of keys, but that\ncan\u0027t be added after the actual platform has shipped. The other\nalternative would be to declare them as static const char*, which\nwouldn\u0027t generate global symbols, but which could trigger warnings\nabout unused static symbols instead.\n\nChange-Id: I14ca81d94309b7f437b3bc144920c48a8b3f0261\n" }, { "commit": "d7aa535fc6ed1f4f0ee68bd3c7c483717d30205e", "tree": "67ff24ec2416909682edb9b160da2ae2ec1752ad", "parents": [ "dc039672b8fad7746200ecc36304d0e85db4f367", "06f9952190357426445344090b4e20b8758a118a" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Dec 15 22:41:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 15 22:41:38 2014 +0000" }, "message": "am 06f99521: am 2aa82e78: Merge \"MediaCodecList: handle binder death\" into lmp-mr1-dev\n\n* commit \u002706f9952190357426445344090b4e20b8758a118a\u0027:\n MediaCodecList: handle binder death\n" }, { "commit": "eee82e44548f17253c2e06b25725f91c7b549ec2", "tree": "cf936ad01c06be9f7e8fe80cf83f73b630de4db7", "parents": [ "8ddb02230d02968d471aa41b22433957c38827c0" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Dec 12 12:27:54 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Dec 12 20:18:35 2014 -0800" }, "message": "MediaCodecList: handle binder death\n\nBug: 18691591\nChange-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e\n" }, { "commit": "3e08ca6709b5a75dc3b779cf3eba8196b08a0245", "tree": "0d91cba9d1c188d1898289f6b21826c6f6d316d3", "parents": [ "2592184c976ef83aa9fdad7d63bfdb408c95aa7d", "6571ed31d9c967faacd552be238b41088ae11e25" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Dec 11 11:17:51 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Dec 11 11:17:51 2014 -0800" }, "message": "resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp\n\nChange-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37\n" }, { "commit": "a0940a569f2bc24b00dc10ce0fa7658b1dc3a3a5", "tree": "913e39ed6eff31c956135701290e1a5af21fd0f8", "parents": [ "94a92c69af528edf6ec17d7978a0c3bb6ab51e63" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Sep 24 13:57:35 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Dec 10 18:04:14 2014 -0800" }, "message": "stagefright: misc fixes to software video encoders (and decoders)\n\n- move logic to set encoder parameters to common encoder class\n (similarly to what was done for decoders)\n- set compressed buffer size based on frame size and compression ratio,\n and codec-specific minimum size\n- set raw buffer size based on frame size and metadata mode\n- do not set stride and slice height on compressed ports\n- advertise only QCIF support for google H263 encoder\n- set large-enough input size for video decoders to support adaptive\n playback\n- do not change input buffer size on output port reconfiguration, as\n no input buffer reallocation takes place\n- do not return empty buffers with EOS after EOS has been signaled\n\nBug: 18513091\nBug: 18639027\nChange-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41\n" }, { "commit": "66b17e9dfe114ae968bfb2f8ad8325527e373c65", "tree": "8069ffdd95cd722e4da206b203856d2afe23f154", "parents": [ "b279f5adfa2fd6f22c87b3a7106fbb62a0b9a5d2", "f5a968a0d0d3275dc3f69fa827ae7978999e5916" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Dec 10 14:15:03 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Dec 10 14:15:03 2014 -0800" }, "message": "Merge commit \u0027f5a968a0\u0027 into mm\n\nChange-Id: Ifd30546c11def40ad483f27c9d7baa4008fcbac3\n" }, { "commit": "b279f5adfa2fd6f22c87b3a7106fbb62a0b9a5d2", "tree": "3e53a23fbf31379eab4d76b68af9f6b20b4c7e0c", "parents": [ "a2bc118cfe860f9c108ba089b021d3b003185c56", "c49d9cda49dab8b7dd0376cf56476b3e1895d5c6" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 10 21:55:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 10 21:55:52 2014 +0000" }, "message": "am c49d9cda: am 2dda40d6: Merge \"audio policy: add support for custom mixes\" into lmp-mr1-dev\n\n* commit \u0027c49d9cda49dab8b7dd0376cf56476b3e1895d5c6\u0027:\n audio policy: add support for custom mixes\n" }, { "commit": "baac183f3808d7b68f184647a97bd381620415fe", "tree": "af81e602db02f55eb35852e3d0851499199166ed", "parents": [ "275e8e9de2e11b4b344f5a201f1f0e51fda02d9c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Dec 01 17:52:59 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Dec 09 15:47:30 2014 -0800" }, "message": "audio policy: binder calls for dynamic audio policy mixes\n\nAdd binder calls to register and unregister dynamic mixes\nto AudioPolicyManager.\n\nBug: 16009464.\n\nChange-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac\n" }, { "commit": "275e8e9de2e11b4b344f5a201f1f0e51fda02d9c", "tree": "c22e1c0b8541aa04fd6c8d803e4fa6704a84e6e2", "parents": [ "82a69ea8b090d57bff5e02774688b546a711bbb8" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sun Nov 30 15:14:47 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Dec 09 15:47:19 2014 -0800" }, "message": "audio policy: add support for custom mixes\n\nAdd support for custom mixes in AudioPolicyManager.\n\nTwo methods are added to register or unregister a list of custom mixes\nwith their attributes and format.\n\ngetOutputForAttr() and getInputForAttr() first look for a match in\nregistered mixes before defaulting to normal output/input selection\n\nRemote submix device connection disconnection now takes address into\naccount to identify the correspnoding custom mix.\n\nBug: 16009464.\n\nChange-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408\n" }, { "commit": "e09bf82465ff83f4da966b77d551367f7c050154", "tree": "48f1fa8084b86bf3586aa6c2edabec5701116a28", "parents": [ "1ed99f0c1b9d7c4fbf2a59b3aeeb4901cc536e5c", "6874ed79fd525cf5d6ec8a953475c14f5a185cb4" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Dec 08 19:37:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 08 19:37:02 2014 +0000" }, "message": "am 6874ed79: am a9d2f9fb: Merge \"stagefright: preserve output format flags on format change\" into lmp-mr1-dev\n\n* commit \u00276874ed79fd525cf5d6ec8a953475c14f5a185cb4\u0027:\n stagefright: preserve output format flags on format change\n" }, { "commit": "4e865a3cfe4c955e0890321a6b488cf661808b63", "tree": "468dc095999eef48d402e92af1b6b80eaed36333", "parents": [ "a147c17adabaab819ac108fbc448c49525cf74bc" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Dec 05 15:54:51 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Dec 05 16:05:58 2014 -0800" }, "message": "stagefright: preserve output format flags on format change\n\nSome flags are only set in configure, and get lost when output\nformat changes.\n\nBug: 17383204\nChange-Id: I2011bce70920c4ee46fccc378da3b428f3395c11\n" }, { "commit": "61280541836947ce0b281b240ffa4c55bbf5bd55", "tree": "4a287a2b07095295e7f054399fd9fb3052629d70", "parents": [ "b438123fb1ee0a8c232fd66de658d5382d2083cf", "390ef84373b7edd1397381f780ca235326357094" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Nov 27 00:06:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 27 00:06:00 2014 +0000" }, "message": "am 390ef843: am f20c4356: Merge \"AudioRecord: use audio attributes instead of audio source.\" into lmp-mr1-dev\n\n* commit \u0027390ef84373b7edd1397381f780ca235326357094\u0027:\n AudioRecord: use audio attributes instead of audio source.\n" }, { "commit": "121143d5242a790d0bd01fe1b9cec5d28a1ba1d7", "tree": "ede3e199b33b12c6c5767f2bd566e4664905bada", "parents": [ "0e47b16ffcf78acb81b0ebf14d058db191f74af0", "bf14c62e7973ed793a3b00c2c67beca4484c1c7a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Nov 26 18:41:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 26 18:41:26 2014 +0000" }, "message": "am bf14c62e: am 72bf901c: Merge \"audio policy: new getOutputForAttr() prototype.\" into lmp-mr1-dev\n\n* commit \u0027bf14c62e7973ed793a3b00c2c67beca4484c1c7a\u0027:\n audio policy: new getOutputForAttr() prototype.\n" }, { "commit": "caf7f48a0ef558689d39aafd187c1571ff4128b4", "tree": "7a2c90732783e2c90cabb6045c4ab0dcea842bf1", "parents": [ "087eb332cdd64026de27c914194127f8fda1a846" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 25 17:50:47 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 25 17:50:47 2014 -0800" }, "message": "AudioRecord: use audio attributes instead of audio source.\n\nAdded AudioRecord constructor with audio attributes.\nReplaced AudioPolicymanager::getInput() by getInputForAttr().\n\nNo new functionality for now.\n\nAlso:\n\n- Fixed warnings in AudioPolicyManager\n- Allocate audio session ID before calling getOutputForAttr() in\nAudioTrack.\n\nBug: 16006090.\nChange-Id: I15df21e4411db688e3096dd801cf579d76d81711\n" }, { "commit": "e83b55dc29ca16092ba02f36f55fa6e0e37fd78c", "tree": "f8232611b6372b74579e3ed03dfbeb167011d257", "parents": [ "0f78eabb733e1413d7febd00c0bad0f0add02314" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 14 10:06:21 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 25 12:48:19 2014 -0800" }, "message": "audio policy: new getOutputForAttr() prototype.\n\nUpdate getOutputForAttr() prototype and group all logic\ndealing with audio attributes to stream type conversion in\naudio policy manager.\n\ngetOutputForAttr():\n- specifies the audio session (for future use)\n- returns a status code\n- receives either stream type (for legacy) or audio attributes\n- returns an updated streamtype\n\nRemove logic dealing with legacy stream types to attributes conversion\nfrom AudioTrack.\n\nUse correct type for audio sessions in other APIs (startOutput() ...).\n\nreleaseOutput() specifies the audio session (for future use).\n\nBug: 18067208.\n\nChange-Id: I1bfbe9626c04c7955d77f8a70aecfad2cb204817\n" }, { "commit": "56df21d760d70a106adfbc8417b6ea179d576e24", "tree": "6273f4b4b81bf7000d7d1337e75d6269cb2e55d8", "parents": [ "7ac1df382ad86f0bc7af2c92843978ad8990eee1", "f8c2d1665393d8e0620a7129ef3865f34489e6ef" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Nov 21 00:44:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 21 00:44:00 2014 +0000" }, "message": "am f8c2d166: am a7cf01da: Merge \"Fix missing loop count for static tracks.\" into lmp-mr1-dev\n\n* commit \u0027f8c2d1665393d8e0620a7129ef3865f34489e6ef\u0027:\n Fix missing loop count for static tracks.\n" }, { "commit": "c9769c557e202df671e35196c8c735b49257be7d", "tree": "1a3eac103aea7f8357756241cbe83095ce4dddb5", "parents": [ "d0e12a161471823d1ab269cb608be3f3b0a71ed1", "568689b169d8b0ae2cc252b88602db5e5acaa604" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 21 00:43:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 21 00:43:58 2014 +0000" }, "message": "am 568689b1: am 3a2a32b5: Merge \"AudioSystem: fix cross deadlock\" into lmp-mr1-dev\n\n* commit \u0027568689b169d8b0ae2cc252b88602db5e5acaa604\u0027:\n AudioSystem: fix cross deadlock\n" }, { "commit": "d0e12a161471823d1ab269cb608be3f3b0a71ed1", "tree": "f9a2f2ea19f528495278c1b651db5d75c8306869", "parents": [ "75cfc881e25a9d7647701526484b5885dc43c574", "902dc42d79b075395d484ce1c71f215b199aaa2a" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 23:47:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 20 23:47:28 2014 +0000" }, "message": "am 902dc42d: am 07715ac3: Merge \"C++11 compatibility.\"\n\n* commit \u0027902dc42d79b075395d484ce1c71f215b199aaa2a\u0027:\n C++11 compatibility.\n" }, { "commit": "36802bd18b7b4e8c87fa019c7e3068bee330d174", "tree": "a5c4847a10d5f77a04b9a621174a774d84cb7c31", "parents": [ "de14fae779240a99c53d58ef16ce3086321ff897" ], "author": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 11:31:17 2014 -0800" }, "committer": { "name": "Dan Albert", "email": "danalbert@google.com", "time": "Thu Nov 20 11:34:32 2014 -0800" }, "message": "C++11 compatibility.\n\n * Fix string literal concatenation to not be interpreted as UD\n literals.\n * Add constexpr compatibility for non-integral static members.\n * Use __typeof__ instead of typeof (should become decltype once this\n actually becomes C++11).\n * Add an appropriate cast for atomic_uintptr_t, since moving to C++11\n means moving from \u003cstdatomic.h\u003e to \u003catomic\u003e, which has better\n typechecking (hooray for not macros!).\n\nBug: 18466763\nChange-Id: I9561dcb2526578687819ff85421ba80d8e1a9694\n" } ], "next": "a7cf01da547bad8d4e66e3e4570eddeac98b6b05" }