)]}' { "log": [ { "commit": "b1b1e303d93a5c67eedeca6ef3039be6cb4dc9f9", "tree": "bc494022de5859e096092d63aaffceed5cc2b018", "parents": [ "a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50", "e523889332b88348e673137d272854278acbef8f" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 22:03:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 22:03:28 2014 +0000" }, "message": "am e5238893: Merge \"Fix aosp_arm64 mirror-aosp-master build 1119326\"\n\n* commit \u0027e523889332b88348e673137d272854278acbef8f\u0027:\n Fix aosp_arm64 mirror-aosp-master build 1119326\n" }, { "commit": "e523889332b88348e673137d272854278acbef8f", "tree": "82f9fd986b28db58f18f80e9e2033a8e1fe48be6", "parents": [ "a133bc87eb8269a6fa61772cb708f10c9c3b7a87", "4850983c3a9131af32d0fe61dd9ce3d1e5d735b5" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 21:57:21 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 21:57:22 2014 +0000" }, "message": "Merge \"Fix aosp_arm64 mirror-aosp-master build 1119326\"" }, { "commit": "4850983c3a9131af32d0fe61dd9ce3d1e5d735b5", "tree": "82f9fd986b28db58f18f80e9e2033a8e1fe48be6", "parents": [ "a133bc87eb8269a6fa61772cb708f10c9c3b7a87" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 14:29:37 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 14:54:52 2014 -0700" }, "message": "Fix aosp_arm64 mirror-aosp-master build 1119326\n\nRemove -Werror that was set in \u0027warnings be gone\u0027\n\nChange-Id: I2379dc56f04a6d0ac50f90e6d1cdf05fce3a5c30\n" }, { "commit": "a7281ee11a27d5fa3d9fa62eb8d2c6465007eb50", "tree": "7d8d98145355348aac0c2ce200047368b7b0c95a", "parents": [ "4cd0d582379ca9decba7ee0b99010d9a39f298de", "a133bc87eb8269a6fa61772cb708f10c9c3b7a87" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:30:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 18:30:00 2014 +0000" }, "message": "am a133bc87: Merge \"build fix for aosp-idea133 @ 1119318\"\n\n* commit \u0027a133bc87eb8269a6fa61772cb708f10c9c3b7a87\u0027:\n build fix for aosp-idea133 @ 1119318\n" }, { "commit": "4cd0d582379ca9decba7ee0b99010d9a39f298de", "tree": "96a869d3d4f9b51a0bce75ffffbdf810089d0425", "parents": [ "8819b515f541daea4288a87cfbae37561cb80b13", "0938c6f7a1e713030b04e32548012f0c29c94f4d" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:26:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 18:26:28 2014 +0000" }, "message": "am 0938c6f7: Merge \"warnings be gone (4/4)\"\n\n* commit \u00270938c6f7a1e713030b04e32548012f0c29c94f4d\u0027:\n warnings be gone (4/4)\n" }, { "commit": "8819b515f541daea4288a87cfbae37561cb80b13", "tree": "ae3eace6dbcb6c0d0663d77bc61283e2156d9091", "parents": [ "355c04dfe84b06311bdb15a1617e22bea4eb2571", "2a27a640d0d9747659cc609b4384ffead090866e" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:26:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 18:26:27 2014 +0000" }, "message": "am 2a27a640: Merge \"warnings be gone (3/4)\"\n\n* commit \u00272a27a640d0d9747659cc609b4384ffead090866e\u0027:\n warnings be gone (3/4)\n" }, { "commit": "355c04dfe84b06311bdb15a1617e22bea4eb2571", "tree": "17094420fcab88bdbe28583b8121f92c810a6462", "parents": [ "dd01ce9c28e37d4556606f481faeec032a1fe04e", "797248568b5ba32606ac0d8de024190e3cc95973" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:26:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 18:26:26 2014 +0000" }, "message": "am 79724856: Merge \"warnings be gone (2/4)\"\n\n* commit \u0027797248568b5ba32606ac0d8de024190e3cc95973\u0027:\n warnings be gone (2/4)\n" }, { "commit": "a133bc87eb8269a6fa61772cb708f10c9c3b7a87", "tree": "90e860a944b0dd22e95146f5bbae79e3f18b33a0", "parents": [ "0938c6f7a1e713030b04e32548012f0c29c94f4d", "effbb3a9b72050dbe150af7302d9148fe7e927d3" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:24:17 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:24:17 2014 +0000" }, "message": "Merge \"build fix for aosp-idea133 @ 1119318\"" }, { "commit": "0938c6f7a1e713030b04e32548012f0c29c94f4d", "tree": "b0b4122174721e31b1be7b39bfc9d24a00cf5265", "parents": [ "2a27a640d0d9747659cc609b4384ffead090866e", "bc64e09a65bd5ba97706d2420449b9710c9e9c01" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:21:02 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:21:03 2014 +0000" }, "message": "Merge \"warnings be gone (4/4)\"" }, { "commit": "bc64e09a65bd5ba97706d2420449b9710c9e9c01", "tree": "b0b4122174721e31b1be7b39bfc9d24a00cf5265", "parents": [ "2a27a640d0d9747659cc609b4384ffead090866e" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 09:50:45 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:54 2014 +0000" }, "message": "warnings be gone (4/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I55df09714a0e1cb98a44c8fcddac2c646ae5e139" }, { "commit": "2a27a640d0d9747659cc609b4384ffead090866e", "tree": "2bfacc25072276b6d6d60aa5bbd0b34a708c78a5", "parents": [ "797248568b5ba32606ac0d8de024190e3cc95973", "51b9eb1c330d23b98ddb629200cd177bc9c39def" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:39 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:20:39 2014 +0000" }, "message": "Merge \"warnings be gone (3/4)\"" }, { "commit": "51b9eb1c330d23b98ddb629200cd177bc9c39def", "tree": "2bfacc25072276b6d6d60aa5bbd0b34a708c78a5", "parents": [ "797248568b5ba32606ac0d8de024190e3cc95973" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 09:49:23 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:27 2014 +0000" }, "message": "warnings be gone (3/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I0c5a0c3ea32bb5091d90c7391c67edd02e50397f" }, { "commit": "797248568b5ba32606ac0d8de024190e3cc95973", "tree": "068991ca962780f139d0e752980f728324fdae5f", "parents": [ "52a861d2825544fe2eb90f8e5f6351d02ff95536", "3f37c83d9817cacc0965ca66873b0353fac07228" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:20:12 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 18:20:12 2014 +0000" }, "message": "Merge \"warnings be gone (2/4)\"" }, { "commit": "3f37c83d9817cacc0965ca66873b0353fac07228", "tree": "068991ca962780f139d0e752980f728324fdae5f", "parents": [ "52a861d2825544fe2eb90f8e5f6351d02ff95536" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 09:47:30 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 18:19:51 2014 +0000" }, "message": "warnings be gone (2/4)\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n(squashed with commit b4a7a2df4c28c3f32b5d877b54831d2cc5d78f81)\n\nChange-Id: I048a2c6868515716c7cd7319a3d0abe6311dac4e" }, { "commit": "effbb3a9b72050dbe150af7302d9148fe7e927d3", "tree": "29d9f0e663e597b07bd0807e9e6db40dbf64cc8d", "parents": [ "52a861d2825544fe2eb90f8e5f6351d02ff95536" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 11:01:18 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 11:01:18 2014 -0700" }, "message": "build fix for aosp-idea133 @ 1119318\n\nChange-Id: I34084ebb48318628d46c2ff7ca567bd7638619e4\n" }, { "commit": "dd01ce9c28e37d4556606f481faeec032a1fe04e", "tree": "9d15e20598193a7c4ab3d90beb5f8405c8d27a6f", "parents": [ "52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8", "52a861d2825544fe2eb90f8e5f6351d02ff95536" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 17:26:28 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Apr 11 17:26:28 2014 +0000" }, "message": "am 52a861d2: Merge \"warnings be gone.\"\n\n* commit \u002752a861d2825544fe2eb90f8e5f6351d02ff95536\u0027:\n warnings be gone.\n" }, { "commit": "52a861d2825544fe2eb90f8e5f6351d02ff95536", "tree": "e1c9e21525348fe826b91ecee7075ccb743f843d", "parents": [ "51b3ea2b8f7298bffbd246c65a606cd053357b66", "d411b4ca2945cd8974a3a78199fce94646950128" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 17:20:54 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Apr 11 17:20:55 2014 +0000" }, "message": "Merge \"warnings be gone.\"" }, { "commit": "d411b4ca2945cd8974a3a78199fce94646950128", "tree": "e1c9e21525348fe826b91ecee7075ccb743f843d", "parents": [ "51b3ea2b8f7298bffbd246c65a606cd053357b66" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Apr 11 07:54:53 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Fri Apr 11 17:12:03 2014 +0000" }, "message": "warnings be gone.\n\n(cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36)\n\nModified by Mark Salyzyn \u003csalyzyn@google.com\u003e to keep merge conflicts\nor errors downstream to a minimum.\n\nChange-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613" }, { "commit": "52a23bd3f8ace9f3a6295fc2d2b97e64665d77d8", "tree": "9c3f023eaffaea5a6af70438c30a4f1158e1211a", "parents": [ "8260bf63e2fa974b524029f170d9ad17b69b884f", "51b3ea2b8f7298bffbd246c65a606cd053357b66" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Apr 03 17:11:25 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 03 17:11:25 2014 +0000" }, "message": "am 51b3ea2b: Merge \"64-bit: Correction to OMX_U32 and OMX_S32\"\n\n* commit \u002751b3ea2b8f7298bffbd246c65a606cd053357b66\u0027:\n 64-bit: Correction to OMX_U32 and OMX_S32\n" }, { "commit": "51b3ea2b8f7298bffbd246c65a606cd053357b66", "tree": "4f996c27cafd9ef29e45ba1f3acb05210fbd16e6", "parents": [ "93bbc8343133b910aeae536617efce978040bbae", "66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Apr 03 17:00:25 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 03 17:00:25 2014 +0000" }, "message": "Merge \"64-bit: Correction to OMX_U32 and OMX_S32\"" }, { "commit": "8260bf63e2fa974b524029f170d9ad17b69b884f", "tree": "4902780df01f296a568f4c06d4be923e5a14575e", "parents": [ "d009aa2bac4a4c8ca2e0c1203148194e237cc5d0", "93bbc8343133b910aeae536617efce978040bbae" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Apr 03 15:09:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Apr 03 15:09:26 2014 +0000" }, "message": "am 93bbc834: Merge \"Fix aac decoder flush\"\n\n* commit \u002793bbc8343133b910aeae536617efce978040bbae\u0027:\n Fix aac decoder flush\n" }, { "commit": "93bbc8343133b910aeae536617efce978040bbae", "tree": "0645a0440cbb2f4bda446d3e073916c82d30e033", "parents": [ "2b2fbe299163b544668b41f594943a19b78dafd3", "08fce45fdb537e135868604522aba15461f516be" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Apr 03 15:01:21 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Apr 03 15:01:22 2014 +0000" }, "message": "Merge \"Fix aac decoder flush\"" }, { "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": "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": "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": "66fe2e9ee30bcb4161bc487ec63d2ae4a05f4051", "tree": "4f996c27cafd9ef29e45ba1f3acb05210fbd16e6", "parents": [ "08fce45fdb537e135868604522aba15461f516be" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Apr 02 10:25:35 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 11:45:51 2014 -0700" }, "message": "64-bit: Correction to OMX_U32 and OMX_S32\n\nChange-Id: I9c41bb34c35595ac19a7ab8faaacde8cb4fa9a15\n" }, { "commit": "08fce45fdb537e135868604522aba15461f516be", "tree": "0645a0440cbb2f4bda446d3e073916c82d30e033", "parents": [ "c71a99131ca97bd3bdc5b78473d06e613e96e073" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Sep 20 07:18:21 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Apr 02 11:41:14 2014 -0700" }, "message": "Fix aac decoder flush\n\nb/8543366\n\nChange-Id: I746ffed6289486b802a2292bfc492ea6c780ed0b\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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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": "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" }, { "commit": "84f7a5b28a686f9a165e1df5c90a72b218a87568", "tree": "206c171840be7d16921acb390663e04b9836ec35", "parents": [ "fb08bd765844160649f23c0e5ee76772678528ba", "9ec86fa05479cc468859c69009afda752ea46539" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 21:02:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 21:02:03 2014 +0000" }, "message": "am 9ec86fa0: am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u00279ec86fa05479cc468859c69009afda752ea46539\u0027:\n Fix build\n" }, { "commit": "9ec86fa05479cc468859c69009afda752ea46539", "tree": "f0d895e1c83b6443af1af2fe613bcda7e21193a2", "parents": [ "994cbef7361b0f304883ea463488342347ed67b8", "a577eefbaca24d1b9ac947daca54be1992888748" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 20:57:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 20:57:12 2014 +0000" }, "message": "am a577eefb: am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u0027a577eefbaca24d1b9ac947daca54be1992888748\u0027:\n Fix build\n" }, { "commit": "a577eefbaca24d1b9ac947daca54be1992888748", "tree": "4abecebedcd012d86fbafc1ec822f36ac13c7cd4", "parents": [ "2853e48c855fc95f2bd7bf9438a878f2a79d75a7", "5be9c1daf956c35d37585d21fff5d6b99f506560" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 20:48:52 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 20:48:52 2014 +0000" }, "message": "am 5be9c1da: am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u00275be9c1daf956c35d37585d21fff5d6b99f506560\u0027:\n Fix build\n" }, { "commit": "5be9c1daf956c35d37585d21fff5d6b99f506560", "tree": "ae3cbacd3b548cc7e3b2c4fbc3e8c90d45d2b7df", "parents": [ "6f65db14e310b513c8943b236a6e61cf27cef4c7", "01eed3c0fb951e349d68f4bce818bef22e7925b1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:29:33 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:29:33 2014 -0700" }, "message": "am 01eed3c0: am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u002701eed3c0fb951e349d68f4bce818bef22e7925b1\u0027:\n Fix build\n" }, { "commit": "01eed3c0fb951e349d68f4bce818bef22e7925b1", "tree": "f8ab5f1808ea539cfc77d41ddfb3a62be80f9921", "parents": [ "0e0891f8b49f31e6a28b563f86aae537e66bb6e0", "7a107b857e658ba11c0c1fd2325ac91a2c0569a2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:18:07 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:18:07 2014 -0700" }, "message": "am 7a107b85: am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u00277a107b857e658ba11c0c1fd2325ac91a2c0569a2\u0027:\n Fix build\n" }, { "commit": "7a107b857e658ba11c0c1fd2325ac91a2c0569a2", "tree": "c343516caf66fb2a665705f8520c7a4e2c054688", "parents": [ "6cdc90b5e41374dd665df3ae7283ef0c1f532678", "854aa061b1e2d7eaaf8ffa2ead323c1478393c57" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:13:35 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:13:35 2014 -0700" }, "message": "am 854aa061: am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u0027854aa061b1e2d7eaaf8ffa2ead323c1478393c57\u0027:\n Fix build\n" }, { "commit": "854aa061b1e2d7eaaf8ffa2ead323c1478393c57", "tree": "4dbc152a7a07fd040cd3851ad9816d2d9cceff5b", "parents": [ "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77", "42ba5806c03753a39f85016265173819ac465745" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:08:17 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:08:17 2014 -0700" }, "message": "am 42ba5806: am 72499628: am 25bab830: Fix build\n\n* commit \u002742ba5806c03753a39f85016265173819ac465745\u0027:\n Fix build\n" }, { "commit": "42ba5806c03753a39f85016265173819ac465745", "tree": "80b7de0359644cc3b961bc848460e6dcbd2cf939", "parents": [ "fb49b8bad468db591f55a7064181372f02ad94a2", "72499628a24ccea0befe726de6e2b32176ddf208" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:04:11 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:04:11 2014 -0700" }, "message": "am 72499628: am 25bab830: Fix build\n\n* commit \u002772499628a24ccea0befe726de6e2b32176ddf208\u0027:\n Fix build\n" }, { "commit": "72499628a24ccea0befe726de6e2b32176ddf208", "tree": "80b7de0359644cc3b961bc848460e6dcbd2cf939", "parents": [ "dfd90c8052a913ed2bbbea1873ee51838d40bfe1", "25bab830af062dcaef6f75220066b221fd30957e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 13:00:07 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 13:00:07 2014 -0700" }, "message": "am 25bab830: Fix build\n\n* commit \u002725bab830af062dcaef6f75220066b221fd30957e\u0027:\n Fix build\n" }, { "commit": "25bab830af062dcaef6f75220066b221fd30957e", "tree": "3d4b7cc83a843df86fab1080596eddb13016cff6", "parents": [ "d434944b00cf83a38019047e0d7db155a15d77f4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 12:32:48 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 12:32:48 2014 -0700" }, "message": "Fix build\n\nAs of jb-mr1, need to explicitly include library dependencies. The original\nchange in jb, which the automerger dutyfully merged, did not need this.\n\nChange-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7\n" }, { "commit": "fb08bd765844160649f23c0e5ee76772678528ba", "tree": "8b5d004f1aa36430c5b3c7c3d5cc1e5c7d53a15b", "parents": [ "c250980f65ffec76537d9c6d9b1ad12afc38346a", "994cbef7361b0f304883ea463488342347ed67b8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 19:09:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 19:09:03 2014 +0000" }, "message": "am 994cbef7: am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027994cbef7361b0f304883ea463488342347ed67b8\u0027:\n Verify certificates\n" }, { "commit": "994cbef7361b0f304883ea463488342347ed67b8", "tree": "750ddb5a791fc88c55885269b3931043e8981676", "parents": [ "fb28c384316518f699e7dd3e9149c9e84b05a525", "2853e48c855fc95f2bd7bf9438a878f2a79d75a7" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 18:58:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 18:58:42 2014 +0000" }, "message": "am 2853e48c: am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00272853e48c855fc95f2bd7bf9438a878f2a79d75a7\u0027:\n Verify certificates\n" }, { "commit": "2853e48c855fc95f2bd7bf9438a878f2a79d75a7", "tree": "6dfa3c77406b420f582e0cfc9f42d7f848314d7c", "parents": [ "1faa41704e0b976e546321effcb09a85767d51ba", "6f65db14e310b513c8943b236a6e61cf27cef4c7" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 18:17:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 18:17:24 2014 +0000" }, "message": "am 6f65db14: am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00276f65db14e310b513c8943b236a6e61cf27cef4c7\u0027:\n Verify certificates\n" }, { "commit": "6f65db14e310b513c8943b236a6e61cf27cef4c7", "tree": "2a04fb4a673c20e6ffb26af36c886ef2e8d730ee", "parents": [ "27ae268af29b25d85f83aa34e92ac8b7f6c87c6f", "0e0891f8b49f31e6a28b563f86aae537e66bb6e0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 11:08:43 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 11:08:43 2014 -0700" }, "message": "am 0e0891f8: am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00270e0891f8b49f31e6a28b563f86aae537e66bb6e0\u0027:\n Verify certificates\n" }, { "commit": "0e0891f8b49f31e6a28b563f86aae537e66bb6e0", "tree": "e362e6c968f6db985c142e31744ffc61ad301d17", "parents": [ "00cb884fc870aba4052c8d187a45e4aec50a6b43", "6cdc90b5e41374dd665df3ae7283ef0c1f532678" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:49:15 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:49:15 2014 -0700" }, "message": "am 6cdc90b5: am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00276cdc90b5e41374dd665df3ae7283ef0c1f532678\u0027:\n Verify certificates\n" }, { "commit": "6cdc90b5e41374dd665df3ae7283ef0c1f532678", "tree": "203fce295e8441957dc42d56c8358e622a1a157a", "parents": [ "31d49615007372621ac3fba55e9e3aab48c873f9", "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:31:32 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:31:32 2014 -0700" }, "message": "am ebc9b473: am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027ebc9b47330ab8565f7bdd9b3973a8f75e3206e77\u0027:\n Verify certificates\n" }, { "commit": "ebc9b47330ab8565f7bdd9b3973a8f75e3206e77", "tree": "a79d6dddf8862a80408905f7e24741632376f9df", "parents": [ "27b876d4cf78b262854b9f2aec26467f9323d3ad", "fb49b8bad468db591f55a7064181372f02ad94a2" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:27:04 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:27:04 2014 -0700" }, "message": "am fb49b8ba: am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027fb49b8bad468db591f55a7064181372f02ad94a2\u0027:\n Verify certificates\n" }, { "commit": "fb49b8bad468db591f55a7064181372f02ad94a2", "tree": "61b9f60e8d12c6d5d2891dc5055af49aa00f3bc6", "parents": [ "9bc40a2cfdd307074ef5c23ad444fc8a782bab84", "dfd90c8052a913ed2bbbea1873ee51838d40bfe1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:21:14 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:21:14 2014 -0700" }, "message": "am dfd90c80: am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027dfd90c8052a913ed2bbbea1873ee51838d40bfe1\u0027:\n Verify certificates\n" }, { "commit": "dfd90c8052a913ed2bbbea1873ee51838d40bfe1", "tree": "61b9f60e8d12c6d5d2891dc5055af49aa00f3bc6", "parents": [ "98603acbce87c3a451c8e4c26625048363c3f7f7", "d434944b00cf83a38019047e0d7db155a15d77f4" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:16:53 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:16:53 2014 -0700" }, "message": "am d434944b: am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u0027d434944b00cf83a38019047e0d7db155a15d77f4\u0027:\n Verify certificates\n" }, { "commit": "d434944b00cf83a38019047e0d7db155a15d77f4", "tree": "ad223a08bff12a7cf83dc4804af6cba9abb6d6cd", "parents": [ "36337f8f1c4d7384cb1528205582148c85c69f4d", "3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:11:20 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:11:20 2014 -0700" }, "message": "am 3bc4f7ea: am 0c271b75: Verify certificates\n\n* commit \u00273bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed\u0027:\n Verify certificates\n" }, { "commit": "3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed", "tree": "474128b1314cd7deee61dac6997d68a22d5f2a22", "parents": [ "7d72965ff6a4bf9f91213fbdafcd12cfad8334e5", "0c271b750f7314e187f8479f478ad9382d9a9045" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 20 10:04:18 2014 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 20 10:04:18 2014 -0700" }, "message": "am 0c271b75: Verify certificates\n\n* commit \u00270c271b750f7314e187f8479f478ad9382d9a9045\u0027:\n Verify certificates\n" }, { "commit": "c250980f65ffec76537d9c6d9b1ad12afc38346a", "tree": "1d4211e3cfec5700c5291c9afdd6fce23cd1be89", "parents": [ "08298357a2fb8fe9574a32187c68f34ec356e3a8", "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 21:04:56 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 21:04:56 2014 +0000" }, "message": "am 24e1bd71: Merge \"libstagefright is no longer 32 bit only.\"\n\n* commit \u002724e1bd71ac6850d9062b3bd803b37c0e92f69c7a\u0027:\n libstagefright is no longer 32 bit only.\n" }, { "commit": "24e1bd71ac6850d9062b3bd803b37c0e92f69c7a", "tree": "f21e4aadfd709d10588a17faf9b296258587e137", "parents": [ "bd7bde794c587dc9443c22abd3bcaa78fd804615", "f3aa039a2278f789e3c9d5e18b83f9d937a05a5f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 20:58:48 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 20:58:48 2014 +0000" }, "message": "Merge \"libstagefright is no longer 32 bit only.\"" }, { "commit": "08298357a2fb8fe9574a32187c68f34ec356e3a8", "tree": "f3d9425a77d4cf1d39597fe03850eff8746daa46", "parents": [ "bd1f8f0a5cc55761edfbd2a472e229dd4b0d2cdf", "bd7bde794c587dc9443c22abd3bcaa78fd804615" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 20:37:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 20:37:03 2014 +0000" }, "message": "am bd7bde79: Merge \"Use libaudioresampler instead of libaudioflinger\"\n\n* commit \u0027bd7bde794c587dc9443c22abd3bcaa78fd804615\u0027:\n Use libaudioresampler instead of libaudioflinger\n" }, { "commit": "bd7bde794c587dc9443c22abd3bcaa78fd804615", "tree": "756052e8b34fe18b5b90f7cb53f03409de37ccb6", "parents": [ "36817364738d4c45adc3e448fbec02a9611bfeda", "4269fc8068d10fc95780e8a7e1e4d4eb43483883" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 20:29:11 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 20:29:12 2014 +0000" }, "message": "Merge \"Use libaudioresampler instead of libaudioflinger\"" }, { "commit": "bd1f8f0a5cc55761edfbd2a472e229dd4b0d2cdf", "tree": "eaba9dca39f9dc026bd256e40f0d3f6abf16c969", "parents": [ "f40c4c561151ae93595e8fab5dcaaa1c69df74ef", "fb28c384316518f699e7dd3e9149c9e84b05a525" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 20:00:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 20:00:39 2014 +0000" }, "message": "am fb28c384: am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less\n\n* commit \u0027fb28c384316518f699e7dd3e9149c9e84b05a525\u0027:\n stagefright: allow for minUndequeuedBufs to be one less\n" }, { "commit": "fb28c384316518f699e7dd3e9149c9e84b05a525", "tree": "13da2972f0ce818dc3de0b95d4967a8efeebc273", "parents": [ "9cde517297827156de1c3b2ff54e272a5d4ae7c3", "1faa41704e0b976e546321effcb09a85767d51ba" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 19:56:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 19:56:15 2014 +0000" }, "message": "am 1faa4170: stagefright: allow for minUndequeuedBufs to be one less\n\n* commit \u00271faa41704e0b976e546321effcb09a85767d51ba\u0027:\n stagefright: allow for minUndequeuedBufs to be one less\n" }, { "commit": "f40c4c561151ae93595e8fab5dcaaa1c69df74ef", "tree": "5e0105a852e0587a366b49d6a84ec0db1d265c37", "parents": [ "129c76538570cd42fce2154bfb0aec934cf84ff3", "36817364738d4c45adc3e448fbec02a9611bfeda" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 19:56:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 19:56:09 2014 +0000" }, "message": "am 36817364: Merge \"Add libaudioresampler\"\n\n* commit \u002736817364738d4c45adc3e448fbec02a9611bfeda\u0027:\n Add libaudioresampler\n" }, { "commit": "36817364738d4c45adc3e448fbec02a9611bfeda", "tree": "a1f2797399f967b46ec2d823f6f520f5b8426684", "parents": [ "b2ecad7f079f4f852d334e67fd7a72ff1696a78e", "ddf887c08b58382920effb7f0b2049e471960b4a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 19:45:28 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 19 19:45:29 2014 +0000" }, "message": "Merge \"Add libaudioresampler\"" }, { "commit": "1faa41704e0b976e546321effcb09a85767d51ba", "tree": "64966380d3e178c4092670de4b11d0a43114b221", "parents": [ "b635b0e66b257ab442e230bca96afd5105cf6829" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 12:22:01 2014 -0700" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 12:39:53 2014 -0700" }, "message": "stagefright: allow for minUndequeuedBufs to be one less\n\nBug: 13533477\nChange-Id: I909324e3e24f65d8051e0d5474267620efcfc729\n" }, { "commit": "f3aa039a2278f789e3c9d5e18b83f9d937a05a5f", "tree": "f21e4aadfd709d10588a17faf9b296258587e137", "parents": [ "4269fc8068d10fc95780e8a7e1e4d4eb43483883" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Mar 19 09:07:30 2014 -0700" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Wed Mar 19 18:01:17 2014 +0000" }, "message": "libstagefright is no longer 32 bit only.\n\nChange-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b\nSigned-off-by: Glenn Kasten \u003cgkasten@android.com\u003e" }, { "commit": "4269fc8068d10fc95780e8a7e1e4d4eb43483883", "tree": "756052e8b34fe18b5b90f7cb53f03409de37ccb6", "parents": [ "ddf887c08b58382920effb7f0b2049e471960b4a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 09:05:59 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 10:55:00 2014 -0700" }, "message": "Use libaudioresampler instead of libaudioflinger\n\nin order to be able to build libvideoeditor as 64-bit also.\n\nlibaudioresampler is available in both 32-bit and 64-bit,\nunlike libaudioflinger which is currently 32-bit only.\n\nChange-Id: Id63857da877b1e45b7c1f8e35f18dca6600be3f7\n" }, { "commit": "ddf887c08b58382920effb7f0b2049e471960b4a", "tree": "a1f2797399f967b46ec2d823f6f520f5b8426684", "parents": [ "b2ecad7f079f4f852d334e67fd7a72ff1696a78e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 09:05:08 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Wed Mar 19 10:53:13 2014 -0700" }, "message": "Add libaudioresampler\n\nlibaudioresampler is available in both 32-bit and 64-bit,\nunlike libaudioflinger which is currently 32-bit only.\n\nBug: 8141282\nChange-Id: I839f7b4e6aaed6984012ca6d514323f927669df6\n" }, { "commit": "0c271b750f7314e187f8479f478ad9382d9a9045", "tree": "6a605bc71ee0e29300f0acf8494d983473a92207", "parents": [ "6047633622328711cc6b23667c8d6381bae179bf" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Mar 13 14:18:25 2014 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Mar 19 09:58:37 2014 -0700" }, "message": "Verify certificates\n\nb/13418320\n\nCherrypicked from 8a57d24c733b08da846b54d1adf029e606b5a5f3\nhttps://googleplex-android-review.git.corp.google.com/#/c/433309/\n\nChange-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b\n" }, { "commit": "129c76538570cd42fce2154bfb0aec934cf84ff3", "tree": "e83ec23188412392940089494187011f15aee1b8", "parents": [ "49b2e310f62c590a1af9f921cd8a134cdf589263", "9cde517297827156de1c3b2ff54e272a5d4ae7c3" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 03:15:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 03:15:12 2014 +0000" }, "message": "am 9cde5172: am b635b0e6: mediaplayer: keep more buffers with the BufferQueue\n\n* commit \u00279cde517297827156de1c3b2ff54e272a5d4ae7c3\u0027:\n mediaplayer: keep more buffers with the BufferQueue\n" }, { "commit": "9cde517297827156de1c3b2ff54e272a5d4ae7c3", "tree": "a3a8a64a98b4bc7a01ed5a156e974dbda4c65bf2", "parents": [ "a1f0c62c189f2d162cca4af736c3d440f1eff53c", "b635b0e66b257ab442e230bca96afd5105cf6829" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 03:10:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 03:10:58 2014 +0000" }, "message": "am b635b0e6: mediaplayer: keep more buffers with the BufferQueue\n\n* commit \u0027b635b0e66b257ab442e230bca96afd5105cf6829\u0027:\n mediaplayer: keep more buffers with the BufferQueue\n" }, { "commit": "49b2e310f62c590a1af9f921cd8a134cdf589263", "tree": "565e7bb5d0c5382654d3e3e10e7549158bb0a8af", "parents": [ "c7c839dccf58ab6322c1898cbf1b2332792d2e86", "a1f0c62c189f2d162cca4af736c3d440f1eff53c" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Mar 19 02:25:39 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 02:25:39 2014 +0000" }, "message": "am a1f0c62c: am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.\n\n* commit \u0027a1f0c62c189f2d162cca4af736c3d440f1eff53c\u0027:\n httplive: block-by-block fetch, decrypt, and parse ts files.\n" }, { "commit": "a1f0c62c189f2d162cca4af736c3d440f1eff53c", "tree": "a91c602b0a0a1374d58f5d4633b9f76dbff0bfd7", "parents": [ "a6ca0acf0d009acf45b05561273aaad44ab22533", "43ca783effd99bba0e6e2dd6fe177a8888578ef8" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Wed Mar 19 02:19:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 19 02:19:55 2014 +0000" }, "message": "am 43ca783e: httplive: block-by-block fetch, decrypt, and parse ts files.\n\n* commit \u002743ca783effd99bba0e6e2dd6fe177a8888578ef8\u0027:\n httplive: block-by-block fetch, decrypt, and parse ts files.\n" }, { "commit": "b635b0e66b257ab442e230bca96afd5105cf6829", "tree": "ce27a9ac30a219e6895cffddd6c4f9ab873ca19a", "parents": [ "43ca783effd99bba0e6e2dd6fe177a8888578ef8" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Feb 13 15:29:49 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 02:15:24 2014 +0000" }, "message": "mediaplayer: keep more buffers with the BufferQueue\n\nChange OMX buffer allocation policy to allocate\nnBufferCountMin + what is required for the BQ.\n\nFor the BQ, try to allocate 2 additional buffers than\nthe minimum undequeued count.\n\nAlso account for the fact that BQ may return one less\nthan the actual minimum undequeued count.\n\nIn most cases the resulting number of buffers ends up\nbeing the same as with the previous policy, but we\nkeep more buffers with the BQ.\n\nChange-Id: I826db8bf7dd333b620299dba60bf1b81b228275d\nBug: 13170236" }, { "commit": "43ca783effd99bba0e6e2dd6fe177a8888578ef8", "tree": "943ef354f3544d932b978b977f4525af65d9fa5b", "parents": [ "bd3e2e03f3ab686c52982a9e50cae853128172cf" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Feb 27 12:33:24 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Wed Mar 19 02:09:58 2014 +0000" }, "message": "httplive: block-by-block fetch, decrypt, and parse ts files.\n\nBug: 12060952\nChange-Id: I695345081fe23961b9d0ef6db264885f914703ec" }, { "commit": "c7c839dccf58ab6322c1898cbf1b2332792d2e86", "tree": "13f2f8cf1c27e25e960997a8b34d638215578f61", "parents": [ "0c282de73240b1efce64558ab2fa0a8be1f4292b", "b2ecad7f079f4f852d334e67fd7a72ff1696a78e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 23:30:04 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 18 23:30:04 2014 +0000" }, "message": "am b2ecad7f: Merge \"libstagefright_foundation: fix printf format for 64-bit\"\n\n* commit \u0027b2ecad7f079f4f852d334e67fd7a72ff1696a78e\u0027:\n libstagefright_foundation: fix printf format for 64-bit\n" }, { "commit": "b2ecad7f079f4f852d334e67fd7a72ff1696a78e", "tree": "d2b91f9af4242f913673ceb1b42105ed820ac3b4", "parents": [ "77658a069c81a0d5b4a1b81443b470a3ea64cab0", "67c036a3faada8b77d73cf81bd1b0be4cb60c562" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 23:20:52 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 18 23:20:52 2014 +0000" }, "message": "Merge \"libstagefright_foundation: fix printf format for 64-bit\"" }, { "commit": "67c036a3faada8b77d73cf81bd1b0be4cb60c562", "tree": "d2b91f9af4242f913673ceb1b42105ed820ac3b4", "parents": [ "77658a069c81a0d5b4a1b81443b470a3ea64cab0" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 16:18:27 2014 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 18 16:18:27 2014 -0700" }, "message": "libstagefright_foundation: fix printf format for 64-bit\n\nFixes build error:\nframeworks/av/media/libstagefright/foundation/ANetworkSession.cpp:582:131: error: format \u0027%d\u0027 expects argument of type \u0027int\u0027, but argument 4 has type \u0027size_t {aka long unsigned int}\u0027 [-Werror\u003dformat\u003d]\n ALOGI(\"%d datagrams remain queued.\", mOutFragments.size());\n ^\ncc1plus: all warnings being treated as errors\n\nChange-Id: I69d1f086b8f1e450f107671c8f8f3ed696d170b4\n" }, { "commit": "0c282de73240b1efce64558ab2fa0a8be1f4292b", "tree": "1dc389ec1992e8d5afaab470a0c6aeb7fbfd5298", "parents": [ "098b28fc88b3d96eada2f9db318d9c38c70cf674", "77658a069c81a0d5b4a1b81443b470a3ea64cab0" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Tue Mar 18 17:40:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 18 17:40:58 2014 +0000" }, "message": "am 77658a06: Merge \"AudioPolicyService: malloc/delete pair\"\n\n* commit \u002777658a069c81a0d5b4a1b81443b470a3ea64cab0\u0027:\n AudioPolicyService: malloc/delete pair\n" } ], "next": "77658a069c81a0d5b4a1b81443b470a3ea64cab0" }