)]}' { "log": [ { "commit": "638986a78c94081cded0cd87dc9d3b31965092a4", "tree": "44113f9b32efc0a8aa09edf4178ff9aab7204386", "parents": [ "6b66a33d399bf2e5b5c555d22c39a9543839827a", "d009aa2bac4a4c8ca2e0c1203148194e237cc5d0" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Apr 03 08:31:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 03 08:31:22 2014 +0000" }, "message": "am d009aa2b: am 81e0bd44: Add signature|system permission to MediaDrm signer APIs\n\n* commit \u0027d009aa2bac4a4c8ca2e0c1203148194e237cc5d0\u0027:\n Add signature|system permission to MediaDrm signer APIs\n" }, { "commit": "d009aa2bac4a4c8ca2e0c1203148194e237cc5d0", "tree": "ccb0affb48caf578a223cbd6d2fd1a869f2c560e", "parents": [ "54654025d656b437eeb5c5c9267104625bcc496d", "81e0bd44a10e90778ab5b0a3babd4fc52cadedd8" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Apr 03 01:35:29 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 03 01:35:29 2014 +0000" }, "message": "am 81e0bd44: Add signature|system permission to MediaDrm signer APIs\n\n* commit \u002781e0bd44a10e90778ab5b0a3babd4fc52cadedd8\u0027:\n Add signature|system permission to MediaDrm signer APIs\n" }, { "commit": "6b66a33d399bf2e5b5c555d22c39a9543839827a", "tree": "f5d4f0af0f9f5fce4601e0d852d70f0241adf44c", "parents": [ "a3fef05b8dfa3363c660ae05090594c76d2fce54", "84a0c6e87c48f58a0d3be71961432c086a4d24cc" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Thu Apr 03 01:15:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Apr 03 01:15:09 2014 +0000" }, "message": "Merge \"Change references of Q19.12 to Q4.27 for clarity\"" }, { "commit": "81e0bd44a10e90778ab5b0a3babd4fc52cadedd8", "tree": "e593e5db634c29de4c9351d9a5f64f2f2e49d503", "parents": [ "68d9d71a792deed75d32fe13febc07c9c12c8449" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 02 16:41:38 2014 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Wed Apr 02 16:41:38 2014 -0700" }, "message": "Add signature|system permission to MediaDrm signer APIs\n\nChange-Id: If970e5ff8dcab2e67af2f3376dcd14dca82f2394\nrelated-to-bug: 12702350\n" }, { "commit": "a3fef05b8dfa3363c660ae05090594c76d2fce54", "tree": "918f5f7b9a78a8f2fee4c6184c0fdec4ac40ccb5", "parents": [ "4cc0bedb859f9773f54f844cca4ce806c86bb6f8", "54654025d656b437eeb5c5c9267104625bcc496d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Apr 02 15:09:37 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Apr 02 15:09:37 2014 -0700" }, "message": "Merge commit \u002754654025\u0027 into manualmerge\n\nChange-Id: I2df92dbae606cc9805ff5dd7abc2f53b60108112\n" }, { "commit": "54654025d656b437eeb5c5c9267104625bcc496d", "tree": "422e98b7e2e2a8156c6b0a6d490f586a2405e671", "parents": [ "f356a123bf966150965a1af1cb9bd6ff2ca020de", "2b2fbe299163b544668b41f594943a19b78dafd3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 21:48:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Apr 02 21:48:01 2014 +0000" }, "message": "am 2b2fbe29: Merge \"Fix decoder EOS handling\"\n\n* commit \u00272b2fbe299163b544668b41f594943a19b78dafd3\u0027:\n Fix decoder EOS handling\n" }, { "commit": "2b2fbe299163b544668b41f594943a19b78dafd3", "tree": "5982cad9d4ca213cf9f7dbbe5cbca3de1771aa1f", "parents": [ "4f53fe74051026e6635ba5bdbed4f1898cb66028", "c71a99131ca97bd3bdc5b78473d06e613e96e073" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 21:38:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Apr 02 21:38:18 2014 +0000" }, "message": "Merge \"Fix decoder EOS handling\"" }, { "commit": "4cc0bedb859f9773f54f844cca4ce806c86bb6f8", "tree": "918f5f7b9a78a8f2fee4c6184c0fdec4ac40ccb5", "parents": [ "99021c47f45ee8bf3317cff7d08226e76c8d8227", "54b0bc74e051bd7df10cd657b481d88db6cdaa27" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Apr 02 21:36:57 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Apr 02 21:36:58 2014 +0000" }, "message": "Merge \"ACodec: do not signal kWhatShutdownCompleted on codec error\"" }, { "commit": "84a0c6e87c48f58a0d3be71961432c086a4d24cc", "tree": "a9bea7e95223dc4d1f3219d4e60dd385881ec6d8", "parents": [ "99021c47f45ee8bf3317cff7d08226e76c8d8227" ], "author": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Apr 02 11:24:53 2014 -0700" }, "committer": { "name": "Andy Hung", "email": "hunga@google.com", "time": "Wed Apr 02 14:33:26 2014 -0700" }, "message": "Change references of Q19.12 to Q4.27 for clarity\n\nChange-Id: I5beb7daf6ff9bc123ff3582f7c294edcaf8652f6\nSigned-off-by: Andy Hung \u003chunga@google.com\u003e\n" }, { "commit": "c71a99131ca97bd3bdc5b78473d06e613e96e073", "tree": "5982cad9d4ca213cf9f7dbbe5cbca3de1771aa1f", "parents": [ "4f53fe74051026e6635ba5bdbed4f1898cb66028" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Aug 29 09:31:26 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 11:41:03 2014 -0700" }, "message": "Fix decoder EOS handling\n\nConceptually it should be the same whether EOS is signalled on the last\nbuffer holding data, or an empty buffer that follows. Make it so that\nthis actually behaves the same for mp3, AAC and Vorbis.\n\nb/8747869\n\nChange-Id: Idece8ef45689a3ffaf70fb45d19862d7b93b2f92\n" }, { "commit": "99021c47f45ee8bf3317cff7d08226e76c8d8227", "tree": "5f8c264aefbb41cab611f5db8272c36827b9fa39", "parents": [ "118e7ff24af2e470ffed2bf7b37c9afa69afee92", "f356a123bf966150965a1af1cb9bd6ff2ca020de" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 01 22:23:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 01 22:23:23 2014 +0000" }, "message": "am f356a123: am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u0027f356a123bf966150965a1af1cb9bd6ff2ca020de\u0027:\n Support CAST V2 Authentication in MediaDrm\n" }, { "commit": "f356a123bf966150965a1af1cb9bd6ff2ca020de", "tree": "22c31d7cd8430663ee6a78b5daafffc718f11454", "parents": [ "4f1ef2cd65d734edae17f8586cf717598b40f2c3", "68d9d71a792deed75d32fe13febc07c9c12c8449" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Apr 01 22:00:45 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 01 22:00:45 2014 +0000" }, "message": "am 68d9d71a: Support CAST V2 Authentication in MediaDrm\n\n* commit \u002768d9d71a792deed75d32fe13febc07c9c12c8449\u0027:\n Support CAST V2 Authentication in MediaDrm\n" }, { "commit": "54b0bc74e051bd7df10cd657b481d88db6cdaa27", "tree": "d0f66d92baae1b16a34e01eab18d640f3e2f8434", "parents": [ "118e7ff24af2e470ffed2bf7b37c9afa69afee92" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Mar 31 12:30:01 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Apr 01 13:29:44 2014 -0700" }, "message": "ACodec: do not signal kWhatShutdownCompleted on codec error\n\nDo not signal kWhatShutdownCompleted when moving to Uninitialized\nstate due to receiving a codec error.\n\nDo not abort if error happens just before handling a stop request.\n\nBug: 13675112\nChange-Id: I4b14b2e64cff0f71215d2bbc24cd850617dfb67b\n" }, { "commit": "118e7ff24af2e470ffed2bf7b37c9afa69afee92", "tree": "a9d4444c4003557e34ed5150cca36cacd3fe96a3", "parents": [ "2ade30003882f0c3782d68018d06cb81b99dfeb2", "ec5f7cc4756d389505e761b9d803a1a3a46b64d7" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Apr 01 18:41:59 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 01 18:41:59 2014 +0000" }, "message": "Merge \"MediaCodec: move to UNINITIALIZED state on codec error\"" }, { "commit": "2ade30003882f0c3782d68018d06cb81b99dfeb2", "tree": "515a19da1dc7387195367c0d706ab2cc92a5e6e5", "parents": [ "1e0c8cd8fad2108c8ea085748fcca2059e3ce4ab", "f7160b5dc3091fd9624f25d534c6848ee831b706" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Apr 01 17:47:00 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 01 17:47:01 2014 +0000" }, "message": "Merge \"FastMixer use FastThread and FastMixerState use FastThreadState\"" }, { "commit": "1e0c8cd8fad2108c8ea085748fcca2059e3ce4ab", "tree": "27d07871207369abdba016641f900838fe6f7c28", "parents": [ "3a6c90aa0617666d9abc94c02b752d9eb3d64772", "4cd161b5bf7a8008d684db4b217ed84d1704e683" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Apr 01 17:32:17 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Apr 01 17:32:17 2014 +0000" }, "message": "Merge changes I5748f47d,I3f074933\n\n* changes:\n Add FastThread.h\n Add FastThreadState\n" }, { "commit": "ec5f7cc4756d389505e761b9d803a1a3a46b64d7", "tree": "2ca458e4746c799bcc2f69c4d39606e46ec943b2", "parents": [ "5e184b0d12f1ec436246a391da8d9355cc21ee08" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Mar 31 12:30:01 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Mar 31 17:14:22 2014 -0700" }, "message": "MediaCodec: move to UNINITIALIZED state on codec error\n\nACodec moves to Uninitialized state after receiving codec error.\nMake MediaCodec also move to the same state, so stop() and\nrelease() will work correctly.\n\nBug: 13675112\nChange-Id: I1c7e8b274f68345fc0e6a55c70dff6c7a4fb2e72\n" }, { "commit": "f7160b5dc3091fd9624f25d534c6848ee831b706", "tree": "521236419b4532dc8e91ed22be147a6aeb8baa34", "parents": [ "4cd161b5bf7a8008d684db4b217ed84d1704e683" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 18 17:01:15 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 31 12:23:11 2014 -0700" }, "message": "FastMixer use FastThread and FastMixerState use FastThreadState\n\nChange-Id: I594c973e9f575113bdefee6f4cf8c29d8beac1f3\n" }, { "commit": "4cd161b5bf7a8008d684db4b217ed84d1704e683", "tree": "7ef8cd9b1e9167a027922256e24675d214551884", "parents": [ "a18f644ce5eb4ab876b343e24ea613566c00058f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 18 16:25:04 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 31 12:23:03 2014 -0700" }, "message": "Add FastThread.h\n\nChange-Id: I5748f47dbfa42c14cc93973742e05ac963bf3ba8\n" }, { "commit": "a18f644ce5eb4ab876b343e24ea613566c00058f", "tree": "0ae47695a79fd411a88c2ae9272bc76c01469071", "parents": [ "5e184b0d12f1ec436246a391da8d9355cc21ee08" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 18 17:17:04 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 31 12:22:54 2014 -0700" }, "message": "Add FastThreadState\n\nChange-Id: I3f07493375ace6e5cfdcd02ad90c4b6fad543b0c\n" }, { "commit": "3a6c90aa0617666d9abc94c02b752d9eb3d64772", "tree": "150424841e6732f1d3a1c6df6139f8f307db0d2f", "parents": [ "5e184b0d12f1ec436246a391da8d9355cc21ee08" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Mar 13 15:07:51 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 31 12:22:09 2014 -0700" }, "message": "Add FIXMEs to createRecord for fast capture\n\nChange-Id: I759be200fae32969212c52a409f46f2e704081e3\n" }, { "commit": "68d9d71a792deed75d32fe13febc07c9c12c8449", "tree": "15ba0a2a541bd0b69fa286d04c9cc40d30b49871", "parents": [ "1000d426bedb1ec38bdfff98fc8f004b64af13cb" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Tue Mar 04 13:21:31 2014 -0800" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Sat Mar 29 08:43:09 2014 -0700" }, "message": "Support CAST V2 Authentication in MediaDrm\n\nJava API version\n\nUpdate frameworks to enable support for CAST\nV2 Authentication in the DRM Plugin.\n\nChange-Id: I9066ada0edf8e0d777c503897d8c7fc7f76f2861\nrelated-to-bug: 12702350\n" }, { "commit": "5e184b0d12f1ec436246a391da8d9355cc21ee08", "tree": "65fee93841a06248c237e858678166d7aa66f55a", "parents": [ "b47558f87ee9bd4fce11a2d5bc213bd1aa9031a8" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 14:37:51 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 14:37:51 2014 -0700" }, "message": "ACodec: ignore OMX messages to already freed component\n\nBug: 12916984\nChange-Id: I92848797b8d556cff468b9b0f0a618946083208f\n" }, { "commit": "b47558f87ee9bd4fce11a2d5bc213bd1aa9031a8", "tree": "762e884fdd1ab5720f2de39080188cbf1b868d77", "parents": [ "1490d5142d8d485ea0d56a9974726fb6dff0a62d" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 09:53:46 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 09:58:26 2014 -0700" }, "message": "mediaplayer: add temporary developer settings to use NuPlayer as default\n\nBug: 11784824\nChange-Id: Ic98f5fd15ee283d7f581bdc3331d000198ecc9e8\n" }, { "commit": "1490d5142d8d485ea0d56a9974726fb6dff0a62d", "tree": "8f3e0673fd986949b0e307e401bbbb832bca0d3f", "parents": [ "afe1ba72551d6bd6e3bee9b77fe7538201ab6193", "cf515ab0030cf5e0bef843638af7c989a8f6843a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Mar 28 16:43:59 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 28 16:43:59 2014 +0000" }, "message": "Merge \"Mark the logging heap read-only to media.log service\"" }, { "commit": "afe1ba72551d6bd6e3bee9b77fe7538201ab6193", "tree": "8b69a34d2e3ad17d22eadfad281065cda707ed21", "parents": [ "b64776fcde848bcab26e3c64b76a4dda2ce33f34", "4f1ef2cd65d734edae17f8586cf717598b40f2c3" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 05:24:07 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 28 05:24:07 2014 +0000" }, "message": "am 4f1ef2cd: (-s ours) am 1000d426: am f780d28d: Merge \"DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\" into klp-dev\n\n* commit \u00274f1ef2cd65d734edae17f8586cf717598b40f2c3\u0027:\n DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\n" }, { "commit": "b64776fcde848bcab26e3c64b76a4dda2ce33f34", "tree": "8b69a34d2e3ad17d22eadfad281065cda707ed21", "parents": [ "7595c47b4842d76dba0fcf26ef3ab98d215efe1e", "ff382d0c40493303ceb81a6c22d1a48c0fecfe9c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 05:24:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 28 05:24:02 2014 +0000" }, "message": "am ff382d0c: (-s ours) am 8bf96c01: am 3d4e4fcb: Merge \"DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\" into klp-dev\n\n* commit \u0027ff382d0c40493303ceb81a6c22d1a48c0fecfe9c\u0027:\n DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\n" }, { "commit": "4f1ef2cd65d734edae17f8586cf717598b40f2c3", "tree": "ef7587a0fa6221794a277b87812ea23d54c85406", "parents": [ "ff382d0c40493303ceb81a6c22d1a48c0fecfe9c", "1000d426bedb1ec38bdfff98fc8f004b64af13cb" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 01:50:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 28 01:50:50 2014 +0000" }, "message": "am 1000d426: am f780d28d: Merge \"DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\" into klp-dev\n\n* commit \u00271000d426bedb1ec38bdfff98fc8f004b64af13cb\u0027:\n DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\n" }, { "commit": "ff382d0c40493303ceb81a6c22d1a48c0fecfe9c", "tree": "7762984677d2b29965cfbdacf584ca8fa9b7c941", "parents": [ "c3dcf1007aa964f825b2ea2ef86acb7f332e748f", "8bf96c011ff4128f9bf06b892a38d869192d6a25" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 01:50:50 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 28 01:50:50 2014 +0000" }, "message": "am 8bf96c01: am 3d4e4fcb: Merge \"DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\" into klp-dev\n\n* commit \u00278bf96c011ff4128f9bf06b892a38d869192d6a25\u0027:\n DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\n" }, { "commit": "1000d426bedb1ec38bdfff98fc8f004b64af13cb", "tree": "97d6e219016a2ab6613ee979f3b0648274f0f2a6", "parents": [ "8bf96c011ff4128f9bf06b892a38d869192d6a25", "f780d28de2e3cf7f6b26b9626321dba75719736e" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 01:45:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 28 01:45:11 2014 +0000" }, "message": "am f780d28d: Merge \"DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\" into klp-dev\n\n* commit \u0027f780d28de2e3cf7f6b26b9626321dba75719736e\u0027:\n DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\n" }, { "commit": "8bf96c011ff4128f9bf06b892a38d869192d6a25", "tree": "369426fa05f2923450b30b6f6f424a5aa0da7c5b", "parents": [ "65550a0e17852fe657795508e3bf05bdbfb2520b", "3d4e4fcbcfc5c16dd794591727f5c713831ab6dc" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 01:45:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 28 01:45:10 2014 +0000" }, "message": "am 3d4e4fcb: Merge \"DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\" into klp-dev\n\n* commit \u00273d4e4fcbcfc5c16dd794591727f5c713831ab6dc\u0027:\n DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\n" }, { "commit": "7595c47b4842d76dba0fcf26ef3ab98d215efe1e", "tree": "8b69a34d2e3ad17d22eadfad281065cda707ed21", "parents": [ "5bdb3c4d93269511d21d155c78790ee70d423095" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Thu Mar 27 16:46:15 2014 -0700" }, "committer": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Thu Mar 27 18:39:04 2014 -0700" }, "message": "CameraMetadata: Fix String tag update null character issue\n\nString8.size() doesn\u0027t count the null character in whatever case. But camera\nmetadata tag android.jpeg.gpsProcessingMethod need a null-terminited string.\n\nBug: 13679912\nChange-Id: I91e742702b16b9ab9b42f9822de189a9a96e8e53\n" }, { "commit": "f780d28de2e3cf7f6b26b9626321dba75719736e", "tree": "e5a07b57875ac19f3e86c64e650cd0e41739c231", "parents": [ "3d4e4fcbcfc5c16dd794591727f5c713831ab6dc", "114c1b6553e3d2dc5f2780a76d92bb382234220c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 00:11:23 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 28 00:11:24 2014 +0000" }, "message": "Merge \"DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\" into klp-dev" }, { "commit": "3d4e4fcbcfc5c16dd794591727f5c713831ab6dc", "tree": "acf2c5ba89002a15ef82677408f11dabc040adf8", "parents": [ "0370be96e33ea0c8fb4069e704deccce43b7403c", "f5ee327780ea2b538b8affafa8063f0ce0390fe0" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 28 00:11:04 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 28 00:11:04 2014 +0000" }, "message": "Merge \"DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\" into klp-dev" }, { "commit": "114c1b6553e3d2dc5f2780a76d92bb382234220c", "tree": "4402098cdfb6cbaa5e633434c1b0f91b3064a2f4", "parents": [ "f5ee327780ea2b538b8affafa8063f0ce0390fe0" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 27 16:44:23 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 27 17:08:00 2014 -0700" }, "message": "DO NOT MERGE: Revert \"mediaplayer: keep more buffers with the BufferQueue\"\n\nThis reverts commit b635b0e66b257ab442e230bca96afd5105cf6829.\n\nBug: 13655631\n" }, { "commit": "f5ee327780ea2b538b8affafa8063f0ce0390fe0", "tree": "d9cf368c102fd957979b9764795bcb23f752dc4e", "parents": [ "f622e2c78407b50806a53a06a89b2b6546420f55" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 27 16:41:37 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 27 17:08:00 2014 -0700" }, "message": "DO NOT MERGE: Revert \"stagefright: allow for minUndequeuedBufs to be one less\"\n\nThis reverts commit a0470879e25394cb85437366fa53ce8055cd556f.\n\nBug: 13655631\n" }, { "commit": "5bdb3c4d93269511d21d155c78790ee70d423095", "tree": "98bcbd76fafee2cec1743000d3e1205a7e093799", "parents": [ "2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2", "95dd5ba5bf83716f2eed5fe72366c4212464d710" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Thu Mar 27 20:24:18 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 27 20:24:19 2014 +0000" }, "message": "Merge \"Camera3: fix HAL3.x version check issue\"" }, { "commit": "2f8a36fc8df14cba33fa7c5c1c9d5a52f8a133c2", "tree": "7d46255b2e5a25ca5de3cc756152a3a64121ea6c", "parents": [ "2347c7b0502f5f71d2f0e22d39f1d5a61add3f6b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 26 19:05:55 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 26 19:05:55 2014 -0700" }, "message": "Fix the build\n\nChange-Id: I2169a3d26f4e35e5cfa35a1264175aab6ac4db41\n" }, { "commit": "95dd5ba5bf83716f2eed5fe72366c4212464d710", "tree": "eb079faddf0fac3f259b9529f4171081105cf2db", "parents": [ "ecdca392ed40e89a6ef14b86446e952c35497ac4" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Wed Mar 26 18:18:00 2014 -0700" }, "committer": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Thu Mar 27 01:24:52 2014 +0000" }, "message": "Camera3: fix HAL3.x version check issue\n\nCamera service should support HAL3.x instead of only HAL3.0.\n\nBug: 13609405\nChange-Id: If7e86f9abe019547fc0be2e11337551cd7c57870" }, { "commit": "2347c7b0502f5f71d2f0e22d39f1d5a61add3f6b", "tree": "6a1902c2f1bbb9c1283d3689e12b251ccdae8c4e", "parents": [ "ec31c8d17f587cba01d5516ccd336aa54323c668", "1b512c05f46465a7b1a1d69f82937d7199d5d926" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Mar 27 01:22:34 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 27 01:22:34 2014 +0000" }, "message": "Merge \"audio policy: remove obsolete AudioPolicyManager class members\"" }, { "commit": "ec31c8d17f587cba01d5516ccd336aa54323c668", "tree": "7c18ea28c41e59211b5cc99f2ef42b897977d83c", "parents": [ "c9b8d90dabdf1234be0117c592f635a92c4eb0d9", "3a4311c68348f728558e87b5db67d47605783890" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Mar 27 01:22:16 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 27 01:22:16 2014 +0000" }, "message": "Merge \"audio policy: use new audio device representation\"" }, { "commit": "c9b8d90dabdf1234be0117c592f635a92c4eb0d9", "tree": "8bbeb033b0eb0bcbbfb12faaa6f2133d3cd093ea", "parents": [ "5c4fa907328c8ee586367272c7525cb87742f14d", "142f519aa1acd5804d111e60d100f170fed28405" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 23:23:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 23:23:09 2014 +0000" }, "message": "Merge \"Use symbol AUDIO_IO_HANDLE_NONE from \u003csystem/audio.h\u003e\"" }, { "commit": "1b512c05f46465a7b1a1d69f82937d7199d5d926", "tree": "354295c76a76128d3122f8f4ac58bb5a1bf4c601", "parents": [ "3a4311c68348f728558e87b5db67d47605783890" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Mar 17 12:42:06 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 26 15:28:47 2014 -0700" }, "message": "audio policy: remove obsolete AudioPolicyManager class members\n\nRemove mHasA2dp, mHasUsb and mHasRemoteSubmix members from\nAudoPolicyManager. They are not needed any more since\nwe use device descriptors with additional attributes.\n\nAlso remove obsolete limitation on device address\nlength (MAX_DEVICE_ADDRESS_LEN).\n\nChange-Id: Iffe760a521692a4b50be3f6b935af84afb61bb86\n" }, { "commit": "3a4311c68348f728558e87b5db67d47605783890", "tree": "920ecdf2868176572b6770200d6e3314c5462dd7", "parents": [ "172a7a965c21c29ee38c77d53d91780c7dca09bf" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Mar 17 12:00:47 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 26 15:28:33 2014 -0700" }, "message": "audio policy: use new audio device representation\n\nRepresent audio devices with more attributes than just the\ntype (audio_device_t).\nThis is in preparation for new routing APIs allowing\ndevice selection based on more criteria than just the type\n(address, channel mask...)\nA new class DeviceDescriptor is created and used by functions\nneeding more information than just the device type.\nBit fields for available and supported input or output devices are\nreplaced by vectors of device descriptors.\nEach available device is allocated a unique ID for future use.\nRemoved obsolete mA2dpDeviceAddress, mScoDeviceAddress and mUsbCardAndDevice\nfields replaced by address stored in DeviceDescriptor.\n\nPolicy decisions like getDeviceForStrategy() are still based\nonly on the device type.\n\nChange-Id: I5de3b3ffb12ff8dcfb746782ab1e6b15bf040d0c\n" }, { "commit": "5c4fa907328c8ee586367272c7525cb87742f14d", "tree": "072ee3fe93cbcc8505118b51bc371265214036f3", "parents": [ "2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350", "adad3d7d935da176ff24941b4ae9edf7340e9b96" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 22:22:23 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 22:22:24 2014 +0000" }, "message": "Merge \"Use LOG_ALWAYS_FATAL instead of LOG_FATAL\"" }, { "commit": "142f519aa1acd5804d111e60d100f170fed28405", "tree": "aaffc4a234a4b0a5e719374056edf12eb2333b29", "parents": [ "ecdca392ed40e89a6ef14b86446e952c35497ac4" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 17:44:59 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 14:56:54 2014 -0700" }, "message": "Use symbol AUDIO_IO_HANDLE_NONE from \u003csystem/audio.h\u003e\n\nChange-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff\n" }, { "commit": "2301acc6a9c7a3af4ad01f3d1d0f76f13eca7350", "tree": "6dde0cdf76066b31d3e0c0c96ea8e36990266fce", "parents": [ "ecdca392ed40e89a6ef14b86446e952c35497ac4" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 17 10:21:00 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 14:49:23 2014 -0700" }, "message": "Update comments\n\nChange-Id: I5776313b9b49072cd666d28880f0d07cc73f827b\n" }, { "commit": "adad3d7d935da176ff24941b4ae9edf7340e9b96", "tree": "7a8a2f8e31c7dd690805c1cfd9982d218c66296b", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 21 14:51:43 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 14:46:28 2014 -0700" }, "message": "Use LOG_ALWAYS_FATAL instead of LOG_FATAL\n\nLOG_FATAL is compiled out in most builds, so the\nassertion checks were not being performed.\n\nChange-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35\n" }, { "commit": "ecdca392ed40e89a6ef14b86446e952c35497ac4", "tree": "bf796efe37aca6ded41ca0ad4291ca344af337ac", "parents": [ "51beebba9d4989d05831a13bbe5cdf53ecac1bf5", "66e4635cb09fadcaccf912f37c387396c428378a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 21:29:28 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 21:29:28 2014 +0000" }, "message": "Merge \"Use symbolic constants from \u003csystem/audio.h\u003e\"" }, { "commit": "51beebba9d4989d05831a13bbe5cdf53ecac1bf5", "tree": "b2c6af1099ba3c20b8dd08d39f8dcf822303971a", "parents": [ "b8f8d231685afdec472136b45c527a71bfb8bcc4", "45faf7e02791993a487d6e038d16ff46395f1975" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 21:14:17 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 21:14:17 2014 +0000" }, "message": "Merge \"Use symbol AUDIO_DEVICE_NONE from \u003csystem/audio.h\u003e\"" }, { "commit": "b8f8d231685afdec472136b45c527a71bfb8bcc4", "tree": "8f5afcbeec0aa0e9c441c5fc1c42a8a8b35d77f3", "parents": [ "9b6fcc2f8294d21b859b4cbcff84107a499e221f", "0ed19594452c901c3c8665d06610fffe46895d06" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 21:13:18 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 21:13:18 2014 +0000" }, "message": "Merge \"Remove stream type from AudioSystem::getRenderPosition()\"" }, { "commit": "9b6fcc2f8294d21b859b4cbcff84107a499e221f", "tree": "ef469d5dd64ebd0b6673163992650fba382c3be5", "parents": [ "73ec11738cd4399c55d4905665a14a7c4cd42cbf", "684d47301aeddd137fb1ba2e42f9fb8b9e8a6a16" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 21:08:12 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 21:08:12 2014 +0000" }, "message": "Merge \"Use symbol AUDIO_SESSION_OUTPUT_MIX from \u003csystem/audio.h\u003e\"" }, { "commit": "73ec11738cd4399c55d4905665a14a7c4cd42cbf", "tree": "1105d7402857079f44e234ba1ab6ecfa8290a094", "parents": [ "8c7b9fb41585fccb06573252823b929c82a40999", "9ea65d0f4a564478343b1a722fae4ce5883670c3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 20:56:04 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 20:56:04 2014 +0000" }, "message": "Merge \"Fix uses of KeyedVector\"" }, { "commit": "8c7b9fb41585fccb06573252823b929c82a40999", "tree": "b15b9c23c2440bf1df24350f1034064016110897", "parents": [ "f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b", "241618f1b286f9e7e02fe61e96d9194e2e1e8a7a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 20:44:48 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 20:44:49 2014 +0000" }, "message": "Merge \"Remove streamType parameter from AudioSystem::getLatency()\"" }, { "commit": "0ed19594452c901c3c8665d06610fffe46895d06", "tree": "54d8cd6a63a3f85d6199d4a9d6b7981fab14b973", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 07:50:05 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 19:22:40 2014 +0000" }, "message": "Remove stream type from AudioSystem::getRenderPosition()\n\nThe I/O handle is never equal to AUDIO_IO_HANDLE_NONE,\nso the stream type is not needed.\n\nChange-Id: I1ab134a2fa379d6dd0b6167345a856a192d478f9\n" }, { "commit": "f7f21b93bfce562784ee8f632fb01a2f8e4ffa6b", "tree": "e5222e0f1f2ff320e83dfe8ef4a068b87be677d0", "parents": [ "887bbadb3e1de315c74c905594ee5f2d29a5675c", "ebb80e4f9873cc1a5ee3f766323f622bb0c07ae5" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 18:59:01 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 18:59:01 2014 +0000" }, "message": "Merge \"Remove dead code\"" }, { "commit": "887bbadb3e1de315c74c905594ee5f2d29a5675c", "tree": "f38f24c20246991410df96339f85fc58db6b987b", "parents": [ "11af89b744733e8c75d48a8d1a566c701c821865", "3f35eb55f0e2bc5a4dda7f58ed52654403a87efa" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 18:44:40 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 18:44:41 2014 +0000" }, "message": "Merge \"Fix log spam when MonoPipe is unable to get local frequency\"" }, { "commit": "11af89b744733e8c75d48a8d1a566c701c821865", "tree": "04ebc940162a5de97e411e78fad918779d76c8d5", "parents": [ "3b084cfe6b77bc065302e8dc6391058cb07e83d2", "1cebdb77323e4554a316b9c34bf36957b7dad5ae" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Mar 26 18:36:18 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 18:36:18 2014 +0000" }, "message": "Merge \"Revert \"camera: Fix setParameters for Preview FPS single/range values\"\"" }, { "commit": "1cebdb77323e4554a316b9c34bf36957b7dad5ae", "tree": "fb2657136544bb4cb32fa0d8adf0782b421884d9", "parents": [ "551cec544652783e3342c18386f64cee22412b60" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Mar 26 18:10:09 2014 +0000" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Mar 26 18:33:45 2014 +0000" }, "message": "Revert \"camera: Fix setParameters for Preview FPS single/range values\"\n\nCauses a regression on some devices, so reverting until we\u0027re in a position to fix those devices.\n\nThis reverts commit 9078a1b3b9f9c0c48046ade0e8e18b0d79a659db.\n\nBug: 13563098\nChange-Id: I7aedd01fde8b8fdee77e972ec395f0ecadbf8ccb" }, { "commit": "3b084cfe6b77bc065302e8dc6391058cb07e83d2", "tree": "4397999caa250566c7faa030a6171ca8475c31bb", "parents": [ "551cec544652783e3342c18386f64cee22412b60", "85d109a4b0eddd76a8c5cee170bc2bcc99d00118" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 18:27:43 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 18:27:43 2014 +0000" }, "message": "Merge \"Document AudioSystem::newAudioSessionId() failures\"" }, { "commit": "551cec544652783e3342c18386f64cee22412b60", "tree": "816a6acded4e9433fd30916ff71c161fdcc54a5e", "parents": [ "172a7a965c21c29ee38c77d53d91780c7dca09bf", "bcefec31bd1346133052356ffc8d7ac8a5b13fab" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 17:38:35 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Mar 26 17:38:35 2014 +0000" }, "message": "Merge \"Document AudioFlinger::nextUniqueId()\"" }, { "commit": "ebb80e4f9873cc1a5ee3f766323f622bb0c07ae5", "tree": "c78d80901828a831e4562847f6ecaf03211bb2bc", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 08:21:17 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 08:27:13 2014 -0700" }, "message": "Remove dead code\n\nChange-Id: I0878d11451c7bbbf96b59f5fe0cd97ba1f033aa9\n" }, { "commit": "684d47301aeddd137fb1ba2e42f9fb8b9e8a6a16", "tree": "04262744950d16d8ed607f73c0c67cd087fde93a", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 17:41:42 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 07:32:08 2014 -0700" }, "message": "Use symbol AUDIO_SESSION_OUTPUT_MIX from \u003csystem/audio.h\u003e\n\nChange-Id: I4e48bb7edcc9f9407ee63bb33d029aca02211d74\n" }, { "commit": "241618f1b286f9e7e02fe61e96d9194e2e1e8a7a", "tree": "fcec6a520e30f66bbb1b5e072f8aadb247724a67", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 17:48:57 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 18:09:12 2014 -0700" }, "message": "Remove streamType parameter from AudioSystem::getLatency()\n\nChange-Id: Ie7346e93436ddc215cad7d16be555dcb6c277d54\n" }, { "commit": "45faf7e02791993a487d6e038d16ff46395f1975", "tree": "d54ff27f6fd42e670ddebfa993a00b5202fb7633", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 17 10:23:01 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 17:29:00 2014 -0700" }, "message": "Use symbol AUDIO_DEVICE_NONE from \u003csystem/audio.h\u003e\n\nChange-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58\n" }, { "commit": "66e4635cb09fadcaccf912f37c387396c428378a", "tree": "7982a54dbc04375babd42e59c03ef930454a9687", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jan 16 17:44:23 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 16:22:54 2014 -0700" }, "message": "Use symbolic constants from \u003csystem/audio.h\u003e\n\nAUDIO_INTERLEAVE_*\nAUDIO_STREAM_MIN\nAUDIO_SESSION_ALLOCATE\n\nChange-Id: I31dd6f327204685e50716079ce21c4ba206dff11\n" }, { "commit": "9ea65d0f4a564478343b1a722fae4ce5883670c3", "tree": "7e23f994d376d45183eac141e914ddbfd126cdf5", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 17 10:21:24 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 16:13:00 2014 -0700" }, "message": "Fix uses of KeyedVector\n\nConstructor for AudioFlinger::mAudioHwDevs was missing, and so\nAudioFlinger::findSuitableHwDev_l() could return an undefined pointer\nif a non-0 module wasn\u0027t found.\n\nA KeyedVector of Plain Old Data (POD) element type must specify the\ndefault value in the constructor, or else the default will be undefined.\n\nMinor:\n - Parameter had wrong type in constructor for AudioSystem::gOutputs.\n - Remove obsolete AudioSystem::gStreamOutputMap.\n\nChange-Id: I9841493e018440e559d8b8b0e4e748ba2b2d365b\n" }, { "commit": "bcefec31bd1346133052356ffc8d7ac8a5b13fab", "tree": "4125808fe2bbae00a8bf93ba260688e2f7c11181", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 17 12:09:05 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 15:42:35 2014 -0700" }, "message": "Document AudioFlinger::nextUniqueId()\n\nChange-Id: Iafe96f1c10bd85cb23a2553945ca68aa601dc2eb\n" }, { "commit": "85d109a4b0eddd76a8c5cee170bc2bcc99d00118", "tree": "063a73398f17da98b0a9ecc5923ab05bbc3fc5d9", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 17 10:25:08 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 15:38:25 2014 -0700" }, "message": "Document AudioSystem::newAudioSessionId() failures\n\nChange-Id: Iaa168722f362c36bdfa87fe20dc0a59b43cf1ca3\n" }, { "commit": "3f35eb55f0e2bc5a4dda7f58ed52654403a87efa", "tree": "0aef3a05fa58a840a3289372c00e102bfaca6ce3", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 21 13:54:25 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 15:23:33 2014 -0700" }, "message": "Fix log spam when MonoPipe is unable to get local frequency\n\nLocal frequency does not change, so only ask for it the first time a\nMonoPipe is constructed in a given client process. Thereafter use a\npreviously cached value. Likewise, if the local frequency is unavailable,\nonly log this the first time.\n\nChange-Id: Ib1fc7251c3832e02fe03811db39a87e500f1df50\n" }, { "commit": "172a7a965c21c29ee38c77d53d91780c7dca09bf", "tree": "dd68d54734eb8fe5f4aa749f7f9d55dd5b138de7", "parents": [ "29cdd9bb46437ab580deabf33b2242106e0090b6", "c3dcf1007aa964f825b2ea2ef86acb7f332e748f" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 25 21:23:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 25 21:23:26 2014 +0000" }, "message": "am c3dcf100: (-s ours) am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n\n* commit \u0027c3dcf1007aa964f825b2ea2ef86acb7f332e748f\u0027:\n DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n" }, { "commit": "29cdd9bb46437ab580deabf33b2242106e0090b6", "tree": "dd68d54734eb8fe5f4aa749f7f9d55dd5b138de7", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1", "a1aaaf86cd04eabaf961a30d7b0a9fa857089862" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Mar 25 21:22:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 25 21:22:52 2014 +0000" }, "message": "am a1aaaf86: am 4f53fe74: Merge \"CameraService: deadlock fix\"\n\n* commit \u0027a1aaaf86cd04eabaf961a30d7b0a9fa857089862\u0027:\n CameraService: deadlock fix\n" }, { "commit": "c3dcf1007aa964f825b2ea2ef86acb7f332e748f", "tree": "c3e72b5ad4c3a145413a2a6e964719dbf908059e", "parents": [ "a1aaaf86cd04eabaf961a30d7b0a9fa857089862", "65550a0e17852fe657795508e3bf05bdbfb2520b" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 25 20:15:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 25 20:15:40 2014 +0000" }, "message": "am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n\n* commit \u002765550a0e17852fe657795508e3bf05bdbfb2520b\u0027:\n DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n" }, { "commit": "65550a0e17852fe657795508e3bf05bdbfb2520b", "tree": "c7c08feacf4c4eee1ac0a387cbe02c0d77b07bfc", "parents": [ "3089021031d6ad0f2b330567f108aec03fa13994", "0370be96e33ea0c8fb4069e704deccce43b7403c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 25 20:11:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 25 20:11:09 2014 +0000" }, "message": "am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n\n* commit \u00270370be96e33ea0c8fb4069e704deccce43b7403c\u0027:\n DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n" }, { "commit": "a1aaaf86cd04eabaf961a30d7b0a9fa857089862", "tree": "0a5552a3fb27bda556afa0cd69ee672fc6f499ac", "parents": [ "5c679d41714e42f153f6aeb492df54510a195bc1", "4f53fe74051026e6635ba5bdbed4f1898cb66028" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Mar 25 19:09:34 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 25 19:09:34 2014 +0000" }, "message": "am 4f53fe74: Merge \"CameraService: deadlock fix\"\n\n* commit \u00274f53fe74051026e6635ba5bdbed4f1898cb66028\u0027:\n CameraService: deadlock fix\n" }, { "commit": "1392eb3d1802e9f894f87d7a7387207d1b6faca1", "tree": "1cce5cc09d21a1de2a7976da00766723194d9a23", "parents": [ "d32ab80d7961bd0bb87e9402bb3017d30220b9e3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 11:49:08 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Mar 25 11:50:21 2014 -0700" }, "message": "Fix operator precedence\n\nChange-Id: I164708a5b76a341a185467b008ecbec98d58a6df\n" }, { "commit": "0370be96e33ea0c8fb4069e704deccce43b7403c", "tree": "9d244524a113db326aa9e86caab40c49a08248f3", "parents": [ "333ceb4f66ccf790081026f645474e07d832fbdb" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Mar 18 18:15:23 2014 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Mar 25 11:20:25 2014 -0700" }, "message": "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values\n\nAs a workaround, duplicate CameraParameters into CameraParameters2 to\nprevent ABI break for some camera HALs that directly link into\nCameraParameters.\n\nCameraParameters2 implements the real fixes needed in the framework,\nwhile CameraParameters is left in to satisfy older camera HALs.\n\nBug: 12609188\nChange-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da\n" }, { "commit": "4f53fe74051026e6635ba5bdbed4f1898cb66028", "tree": "f28808875e71939c1c9e0d30e69a283dac93b9db", "parents": [ "3d7c500234d98464d37ba3e1b65cea763b316b69", "6ec3a15257ca2b56b675a610aef43cc4ec6aaf00" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Mar 25 18:14:01 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 25 18:14:01 2014 +0000" }, "message": "Merge \"CameraService: deadlock fix\"" }, { "commit": "d32ab80d7961bd0bb87e9402bb3017d30220b9e3", "tree": "1ff72320475a94cb76486c80d406599adb37eca9", "parents": [ "d6d1883f607d40be5d9a87909ae563cf94256c24", "eb5d7f2f1cc049ea7f95a4f089ce2113d7683dda" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Mar 25 14:49:27 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 25 14:49:28 2014 +0000" }, "message": "Merge \"mtp: avoid silent allocation overflow in MtpProperty\"" }, { "commit": "6ec3a15257ca2b56b675a610aef43cc4ec6aaf00", "tree": "f28808875e71939c1c9e0d30e69a283dac93b9db", "parents": [ "3d7c500234d98464d37ba3e1b65cea763b316b69" ], "author": { "name": "Kalle Lampila", "email": "kallex.lampila@intel.com", "time": "Tue Apr 30 15:27:19 2013 +0300" }, "committer": { "name": "Xiaokang Qin", "email": "xiaokang.qin@intel.com", "time": "Tue Mar 25 04:29:31 2014 -0700" }, "message": "CameraService: deadlock fix\n\nRelease lock before return from CameraService::dump()\n\nChange-Id: Ia20b0921fc675a284f3b7f8d26e0e3596b5a8774\nSigned-off-by: Kalle Lampila \u003ckallex.lampila@intel.com\u003e\n" }, { "commit": "eb5d7f2f1cc049ea7f95a4f089ce2113d7683dda", "tree": "18f2e7cd60173d83caf6bfa8158cdc7ba71bbc12", "parents": [ "55d15957bc44d11052e1cb3eea3340ec00f70bae" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Mar 24 16:18:36 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Mar 24 19:18:31 2014 -0700" }, "message": "mtp: avoid silent allocation overflow in MtpProperty\n\nBug: 13006907\nChange-Id: Ice0352394840132c9c2ce6c28366632c792a32c0\n" }, { "commit": "d6d1883f607d40be5d9a87909ae563cf94256c24", "tree": "db522970675c8149535f004910e73bb161871f4e", "parents": [ "32ce52b01dab863f2b4749e1c69f619cf820486f", "69a374897392c8bd70f441b7284f6f578c651ec9" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue Mar 25 01:08:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Mar 25 01:08:25 2014 +0000" }, "message": "Merge \"Camera3: Fix flush call deadlock\"" }, { "commit": "32ce52b01dab863f2b4749e1c69f619cf820486f", "tree": "489e255200d3a7bfdac8269bee29a9b55707f14e", "parents": [ "f555c47f1843b5a3557e18c16cb06b0ec06dcf34", "5c679d41714e42f153f6aeb492df54510a195bc1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Mar 24 19:36:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 24 19:36:36 2014 +0000" }, "message": "am 5c679d41: resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp\n\n* commit \u00275c679d41714e42f153f6aeb492df54510a195bc1\u0027:\n libcameraservice: build 64-bit\n libcameraservice: fix 64-bit print format warnings\n" }, { "commit": "f555c47f1843b5a3557e18c16cb06b0ec06dcf34", "tree": "9a1b044149726ec242d3a5e948029d71803aaf7e", "parents": [ "2f5d0b32a8c5fcb03e4b0d55c53ff540052b5374", "ba1390335794a38472bf0349568bc4f199dc5c90" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Mar 24 17:34:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 24 17:34:26 2014 +0000" }, "message": "am ba139033: (-s ours) am 30890210: am 333ceb4f: Merge \"DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\" into klp-dev\n\n* commit \u0027ba1390335794a38472bf0349568bc4f199dc5c90\u0027:\n DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\n" }, { "commit": "69a374897392c8bd70f441b7284f6f578c651ec9", "tree": "de179831b224e28e6693430e80e3299f35c874bf", "parents": [ "2f5d0b32a8c5fcb03e4b0d55c53ff540052b5374" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Sun Mar 23 18:44:49 2014 -0700" }, "committer": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Sun Mar 23 18:44:49 2014 -0700" }, "message": "Camera3: Fix flush call deadlock\n\nFlush shouldn\u0027t call waitUntilDrained directly, as they are all API calls\nwith mLock and mInterfaceLock held. Move the waitUntilDrained implementation\ninto waitUntilDrainedLocked to solve this issue.\n\nChange-Id: Id7d931091d5c11e12204790841097433515446db\n" }, { "commit": "5c679d41714e42f153f6aeb492df54510a195bc1", "tree": "b8100421f7339771067ad447d94ad2a5f6494068", "parents": [ "ba1390335794a38472bf0349568bc4f199dc5c90", "3d7c500234d98464d37ba3e1b65cea763b316b69" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 17:43:32 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 17:43:32 2014 -0700" }, "message": "resolved conflicts for merge of 3d7c5002 to klp-modular-dev-plus-aosp\n\nChange-Id: Ia6d87d56174d1388c1148fb55b6e4bc57d8666db\n" }, { "commit": "2f5d0b32a8c5fcb03e4b0d55c53ff540052b5374", "tree": "9a1b044149726ec242d3a5e948029d71803aaf7e", "parents": [ "cfe09079608d78a0a358f01bb49f279859e38664", "d1afbf1372488bd927afdbb2ca49a3000511125f" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Sat Mar 22 00:29:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Mar 22 00:29:17 2014 +0000" }, "message": "am d1afbf13: am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n\n* commit \u0027d1afbf1372488bd927afdbb2ca49a3000511125f\u0027:\n Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n" }, { "commit": "3d7c500234d98464d37ba3e1b65cea763b316b69", "tree": "c8c46021cf9d734226dc2c9f94111bc3d398c015", "parents": [ "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a", "4bd71b4ed6f1825b287e448c336e3e59138c2956" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Sat Mar 22 00:23:15 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Sat Mar 22 00:23:15 2014 +0000" }, "message": "Merge changes I9f28bc42,I135620e0\n\n* changes:\n libcameraservice: build 64-bit\n libcameraservice: fix 64-bit print format warnings\n" }, { "commit": "cfe09079608d78a0a358f01bb49f279859e38664", "tree": "9a1b044149726ec242d3a5e948029d71803aaf7e", "parents": [ "55d15957bc44d11052e1cb3eea3340ec00f70bae", "90e59c98c343e941b1a75307ffa4b4b5f1eb50d6" ], "author": { "name": "Jianing Wei", "email": "jianingwei@google.com", "time": "Sat Mar 22 00:04:19 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Mar 22 00:04:20 2014 +0000" }, "message": "Merge \"CameraService: Add support for burst capture and repeating burst.\"" }, { "commit": "90e59c98c343e941b1a75307ffa4b4b5f1eb50d6", "tree": "e7fa81cc62b2dd7fbaa30d059b7faacc9633e7b6", "parents": [ "a44148187c21d431aec7c7a6915f0fad2c44cd70" ], "author": { "name": "Jianing Wei", "email": "jianingwei@google.com", "time": "Wed Mar 12 18:29:36 2014 -0700" }, "committer": { "name": "Jianing Wei", "email": "jianingwei@google.com", "time": "Fri Mar 21 16:12:24 2014 -0700" }, "message": "CameraService: Add support for burst capture and repeating burst.\n\nBug: 10749500\nChange-Id: I292a485b222e5cf97388d76bf0d956a6ac54bb2f\n" }, { "commit": "4bd71b4ed6f1825b287e448c336e3e59138c2956", "tree": "c8c46021cf9d734226dc2c9f94111bc3d398c015", "parents": [ "e5729fac81c8a984e984fefc90afc64135817d4f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:09:19 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:09:19 2014 -0700" }, "message": "libcameraservice: build 64-bit\n\nlibcameraservice builds fine for 64-bit, remove LOCAL_32_BIT_ONLY\n\nChange-Id: I9f28bc42dc424dee9b92e6ab092f86d3aa1419b7\n" }, { "commit": "e5729fac81c8a984e984fefc90afc64135817d4f", "tree": "526e94e71d66a2cf8faac48c16716bf3c757a2a6", "parents": [ "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:04:25 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Mar 21 15:04:25 2014 -0700" }, "message": "libcameraservice: fix 64-bit print format warnings\n\nUse PRId64 from inttypes.h to print nsecs_t (int64_t)\nUse %zu to print size_t\n\nChange-Id: I135620e0388db33587a8a7da393b48a45cb7275a\n" }, { "commit": "55d15957bc44d11052e1cb3eea3340ec00f70bae", "tree": "566b043fcaf5f4a292c9c285b86a33e5321a3aeb", "parents": [ "9ac3c9a7ee931088d09027ffa09414cb0402886f", "3b800bf9a1db3c9f2f37c9512deb282588e8b50c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 21 19:29:14 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 21 19:29:14 2014 +0000" }, "message": "Merge \"stagefright: initial media_codecs_google*.xml files\"" }, { "commit": "ba1390335794a38472bf0349568bc4f199dc5c90", "tree": "353c51e2a241fdef811e0203f7d944a49d774369", "parents": [ "d1afbf1372488bd927afdbb2ca49a3000511125f", "3089021031d6ad0f2b330567f108aec03fa13994" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 21 19:26:31 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 19:26:31 2014 +0000" }, "message": "am 30890210: am 333ceb4f: Merge \"DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\" into klp-dev\n\n* commit \u00273089021031d6ad0f2b330567f108aec03fa13994\u0027:\n DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\n" }, { "commit": "3089021031d6ad0f2b330567f108aec03fa13994", "tree": "88c9f6f52c0d82a1182c72caa72171544eed435a", "parents": [ "1bfb8f762dd21b39756fd8fd9990172cae1cef79", "333ceb4f66ccf790081026f645474e07d832fbdb" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 21 19:20:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 19:20:27 2014 +0000" }, "message": "am 333ceb4f: Merge \"DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\" into klp-dev\n\n* commit \u0027333ceb4f66ccf790081026f645474e07d832fbdb\u0027:\n DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\n" }, { "commit": "333ceb4f66ccf790081026f645474e07d832fbdb", "tree": "b010fd0eb1520d19debd1e90a9a8d71bd0a833a8", "parents": [ "f622e2c78407b50806a53a06a89b2b6546420f55", "65e20ffc984c541a8119420f917493dd7b703f77" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 21 19:09:48 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 21 19:09:49 2014 +0000" }, "message": "Merge \"DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\" into klp-dev" }, { "commit": "65e20ffc984c541a8119420f917493dd7b703f77", "tree": "15d1d92e6b53cd32b1e7036359fe58841ff2d0d1", "parents": [ "a577eefbaca24d1b9ac947daca54be1992888748" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Feb 07 12:26:58 2014 -0800" }, "committer": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Mar 21 19:05:17 2014 +0000" }, "message": "DO NOT MERGE: PlaylistFetcher: fix infinite loop when parsing ADTS.\n\nFirst check for embedded ID3 tag, then bail out if invalid.\n\nBug: 12934795\nChange-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f" }, { "commit": "d1afbf1372488bd927afdbb2ca49a3000511125f", "tree": "2ac9ab466eab00269079ea675d1baea80d33f400", "parents": [ "84f7a5b28a686f9a165e1df5c90a72b218a87568", "1bfb8f762dd21b39756fd8fd9990172cae1cef79" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Fri Mar 21 17:11:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 17:11:22 2014 +0000" }, "message": "am 1bfb8f76: am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n\n* commit \u00271bfb8f762dd21b39756fd8fd9990172cae1cef79\u0027:\n Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n" }, { "commit": "1bfb8f762dd21b39756fd8fd9990172cae1cef79", "tree": "c2bfd7682ba3164502911bbaa0aa4215ed35f772", "parents": [ "9ec86fa05479cc468859c69009afda752ea46539", "f622e2c78407b50806a53a06a89b2b6546420f55" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Fri Mar 21 17:08:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 21 17:08:11 2014 +0000" }, "message": "am f622e2c7: Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n\n* commit \u0027f622e2c78407b50806a53a06a89b2b6546420f55\u0027:\n Increased recorded MP4 max file size to 4GB (more precisely 2^32-1 bytes -- FAT32 max file size)\n" }, { "commit": "f622e2c78407b50806a53a06a89b2b6546420f55", "tree": "0a4e6bc97cccf6a40d76ef15e88e1a62b8a6e3b5", "parents": [ "a577eefbaca24d1b9ac947daca54be1992888748" ], "author": { "name": "Rachad", "email": "rachad@google.com", "time": "Mon Feb 10 16:54:46 2014 -0800" }, "committer": { "name": "Vineeta Srivastava", "email": "vsrivastava@google.com", "time": "Fri Mar 21 16:36:35 2014 +0000" }, "message": "Increased recorded MP4 max file size to 4GB\n(more precisely 2^32-1 bytes -- FAT32 max file size)\n\nbug: 11039801\nChange-Id: I6169f798c59d123d02d5fd7afa3b9e645ebdb598\n(cherry picked from commit 1f1f2b1678fd0d038dfc501252dd2b65ecf10cae)\n" } ], "next": "9ac3c9a7ee931088d09027ffa09414cb0402886f" }