)]}' { "log": [ { "commit": "37ae0418c2e3b1995dec2a9976365789ca9310e1", "tree": "d82544dae00da53cd444372e5c4e22b3469607ba", "parents": [ "ff0b6e6cbd5418ad9828adb0700426ccd96bed40", "0cc79c66329b9ffa7d7bdfafa5d245a11fd3660d" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Oct 13 08:59:17 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 13 08:59:17 2011 -0700" }, "message": "am 745e3601: am 0c265c88: Merge \"MtpServer: Pass 0xFFFFFFFF for file size when receiving files \u003e\u003d 4GB in size\" into ics-mr0\n\n* commit \u0027745e360103e81facb6641d035c5e3ccc8ace855e\u0027:\n MtpServer: Pass 0xFFFFFFFF for file size when receiving files \u003e\u003d 4GB in size\n" }, { "commit": "0cc79c66329b9ffa7d7bdfafa5d245a11fd3660d", "tree": "4a958a8de02017bb7a7e8d057bab0101a77837c5", "parents": [ "bbdb412041a1e593c95c29c84d5ddbb8906787e4" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Oct 13 11:38:20 2011 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Oct 13 11:38:20 2011 -0400" }, "message": "MtpServer: Pass 0xFFFFFFFF for file size when receiving files \u003e\u003d 4GB in size\n\nBug: 5432487\n\nChange-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926\nSigned-off-by: Mike Lockwood \u003clockwood@android.com\u003e\n" }, { "commit": "ff0b6e6cbd5418ad9828adb0700426ccd96bed40", "tree": "442a577e2a514fd2ff1d17d7e144dfaf03ae53bb", "parents": [ "92c99e7fec711a8bb829ada6331dc464bfcf9f51", "bbdb412041a1e593c95c29c84d5ddbb8906787e4" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Wed Oct 12 23:38:35 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 12 23:38:35 2011 -0700" }, "message": "am 7a3ba4d7: am 514a6cfb: Merge \"Improve camera javadoc and fix some errors.\" into ics-mr0\n\n* commit \u00277a3ba4d732d5ce394aab9783e4099b2e71f1903f\u0027:\n Improve camera javadoc and fix some errors.\n" }, { "commit": "bbdb412041a1e593c95c29c84d5ddbb8906787e4", "tree": "d989aa9cca0f5224625f34b7b63938a4c6efb0e0", "parents": [ "a808bcba75af9f3a6160c24fc9a8968bac2bbd7f" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Wed Oct 12 19:43:51 2011 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Thu Oct 13 12:04:05 2011 +0800" }, "message": "Improve camera javadoc and fix some errors.\n\nbug:5169599\nChange-Id: Ic2205770753ff462135f884fee0a888ca8ec832d\n" }, { "commit": "92c99e7fec711a8bb829ada6331dc464bfcf9f51", "tree": "3706e1fea552e843b808c84d5d2502fe1bc7bf9d", "parents": [ "ba8b6c4afc726e2d059464b7e3c9072391af5bb4", "a808bcba75af9f3a6160c24fc9a8968bac2bbd7f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 12 20:42:57 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 12 20:42:57 2011 -0700" }, "message": "am eb763a7b: am 8c7951af: Merge \"Assume a PTS of 0 if absent, don\\\u0027t bail on fragmented PES packets not having PTS\" into ics-mr0\n\n* commit \u0027eb763a7b0259f57ee33500ec99b040a16793119f\u0027:\n Assume a PTS of 0 if absent, don\u0027t bail on fragmented PES packets not having PTS\n" }, { "commit": "ba8b6c4afc726e2d059464b7e3c9072391af5bb4", "tree": "60f2ad5e34c93718ad0292e4dafceb89edc878cb", "parents": [ "59a41875fd73126efa0fcee49e5262b4546992aa", "7019d2247e644470a0e8eb99b02b8b2d656fd9fb" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 12 20:01:08 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 12 20:01:08 2011 -0700" }, "message": "am ca2640b2: am 0a273592: Merge \"Add video stabilization control to Camera parameters.\" into ics-mr0\n\n* commit \u0027ca2640b2ab4136eefe138baf07dcfcbaea86da17\u0027:\n Add video stabilization control to Camera parameters.\n" }, { "commit": "a808bcba75af9f3a6160c24fc9a8968bac2bbd7f", "tree": "ef13738c44d0374676106f4ee9ca9420b4648d36", "parents": [ "7019d2247e644470a0e8eb99b02b8b2d656fd9fb", "98a46cf165d8de3779874eba01803bbc485f45b9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 12 13:51:05 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 12 13:51:05 2011 -0700" }, "message": "Merge \"Assume a PTS of 0 if absent, don\u0027t bail on fragmented PES packets not having PTS\" into ics-mr0" }, { "commit": "98a46cf165d8de3779874eba01803bbc485f45b9", "tree": "195e2f763e848ae41097eccaaa6d3e7c043df137", "parents": [ "49c59815369616b0fd5451ccabd377e8fe1dc3fa" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 12 12:14:23 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 12 12:14:23 2011 -0700" }, "message": "Assume a PTS of 0 if absent, don\u0027t bail on fragmented PES packets not having PTS\n\nChange-Id: I3b31f08428fb7195b98f145ae0675006c8756de1\nrelated-to-bug: 5450187\n" }, { "commit": "7019d2247e644470a0e8eb99b02b8b2d656fd9fb", "tree": "b84a2becf9f55cf194a111132e4733fed32d246c", "parents": [ "49c59815369616b0fd5451ccabd377e8fe1dc3fa" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 11 12:41:58 2011 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 12 10:34:10 2011 -0700" }, "message": "Add video stabilization control to Camera parameters.\n\nHardware video stabilization reduces camera shake in preview\nand in recorded videos. It has no effect on still image capture.\n\nConvenience accessor methods hidden for now.\n\nChange-Id: Ie18450bff662b2ef98b85d19719beefc180975fc\n" }, { "commit": "59a41875fd73126efa0fcee49e5262b4546992aa", "tree": "ff45b246d572a7722110cb4b1b6ea4f37f52afe9", "parents": [ "3e8607e35fb668345849cc4e96d063d7242968b2", "49c59815369616b0fd5451ccabd377e8fe1dc3fa" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 10 12:46:52 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 10 12:46:52 2011 -0700" }, "message": "am a5da78f0: Merge \"YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater\"\n\n* commit \u0027a5da78f09df49ed379028ccaaa383c68dcb58397\u0027:\n YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater\n" }, { "commit": "49c59815369616b0fd5451ccabd377e8fe1dc3fa", "tree": "90e8850990af78df26d7c0a1b7097747aa57fda2", "parents": [ "e87a2f05f39203dff8914b7612b1b2a709aeb75f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 07 13:40:45 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 10 12:41:21 2011 -0700" }, "message": "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater\n\nthrough the use of pseudo http headers specified in the setDataSource call.\n\nx-cache-config: -1/-1/0\nx-disconnect-at-highwatermark: 1\n\nturns off keep-alives and disconnects every time the cache is full (will attempt\nto reconnect once it run below lowwater mark)\n\nrelated-to-bug: 5433309\n\nChange-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1\n" }, { "commit": "3e8607e35fb668345849cc4e96d063d7242968b2", "tree": "283b043bb33618f03af5c01afd5988a2c8aef0c9", "parents": [ "e72db078c0669121fd170cbcd2b3b737efbac293", "e87a2f05f39203dff8914b7612b1b2a709aeb75f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 07 10:10:20 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 07 10:10:20 2011 -0700" }, "message": "am 41c95f36: Merge \"Specifying -1 for both low and highwater marks would not actually do the right thing\"\n\n* commit \u002741c95f3642323ec4cfdc84a3bb70537af0da8cca\u0027:\n Specifying -1 for both low and highwater marks would not actually do the right thing\n" }, { "commit": "e87a2f05f39203dff8914b7612b1b2a709aeb75f", "tree": "c4d2d9b0e13b37cc102458072978f7f2562449f9", "parents": [ "5861a9a98c641261c4807c976c750e4611b3a57d", "0b8cd8b0cf1489f8f7c0b2c4d7ea8fea70ca93a1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 07 10:08:48 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 07 10:08:48 2011 -0700" }, "message": "Merge \"Specifying -1 for both low and highwater marks would not actually do the right thing\"" }, { "commit": "0b8cd8b0cf1489f8f7c0b2c4d7ea8fea70ca93a1", "tree": "6be7998d339d1b8182954927aed176d6dca5327c", "parents": [ "003124e20eb0744aab36ad1bde05e15ac122ad75" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 07 10:00:38 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 07 10:00:38 2011 -0700" }, "message": "Specifying -1 for both low and highwater marks would not actually do the right thing\n\nbefore this change. Also make it more consistent in that specifying -1 for the\nkeepalive settings specifies the default.\n\nChange-Id: I086f530fbf42abce66d1c8e61157215cb474e044\n" }, { "commit": "e72db078c0669121fd170cbcd2b3b737efbac293", "tree": "4dfa842976e45a70cb127a0bff832eece61957d2", "parents": [ "bbcf5f312b158365d09c5b3c5c625d12acea318e", "5861a9a98c641261c4807c976c750e4611b3a57d" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Fri Oct 07 09:58:26 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 07 09:58:26 2011 -0700" }, "message": "am 851a14eb: Merge \"Add initialize method to CameraHardwareInterface\"\n\n* commit \u0027851a14eb9443996f29617e84dd8b66281876ae8e\u0027:\n Add initialize method to CameraHardwareInterface\n" }, { "commit": "5861a9a98c641261c4807c976c750e4611b3a57d", "tree": "baba94df5819920a68548a58fd0e9fc28d74d62d", "parents": [ "003124e20eb0744aab36ad1bde05e15ac122ad75" ], "author": { "name": "Tyler Luu", "email": "tluu@ti.com", "time": "Thu Oct 06 00:00:03 2011 -0500" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Fri Oct 07 09:24:05 2011 -0700" }, "message": "Add initialize method to CameraHardwareInterface\n\nAdd intialize() method to CameraHardwareInterface so we can\nreturn a proper error value to CameraService if open of camera\nhardware module fails.\n\nb/5405235\n\nChange-Id: I09c627034ddd22a5753c5163392c4fcff301e0b9\nSigned-off-by: Tyler Luu \u003ctluu@ti.com\u003e\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "bbcf5f312b158365d09c5b3c5c625d12acea318e", "tree": "03f4313c7176771b8fed1ba4ece0ca08d044e9a2", "parents": [ "3c48728a9881660e5e3353903b77ac614cab0e82", "003124e20eb0744aab36ad1bde05e15ac122ad75" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 07 08:01:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 07 08:01:49 2011 -0700" }, "message": "am 59797e6b: Merge \"Allow a system property \"media.stagefright.cache-params\" to override cache/prefetcher\"\n\n* commit \u002759797e6bece0ac2d649d8d93d02ed81979950145\u0027:\n Allow a system property \"media.stagefright.cache-params\" to override cache/prefetcher\n" }, { "commit": "003124e20eb0744aab36ad1bde05e15ac122ad75", "tree": "431a6dd5869c3675abff12ef42579e2e0c90f8da", "parents": [ "6c904e26d4cd7a79f589e613fa7b2866a9fccb15", "a045cb0e77097120e86e367e1cab5494ce2a5d5e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 07 07:59:35 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 07 07:59:35 2011 -0700" }, "message": "Merge \"Allow a system property \"media.stagefright.cache-params\" to override cache/prefetcher\"" }, { "commit": "3c48728a9881660e5e3353903b77ac614cab0e82", "tree": "282ce16d01a7e8f3cb146b3b489f1602c3c4f0e3", "parents": [ "ccab9d2b7cb4ba58139a007f893a9121e1208f57", "6c904e26d4cd7a79f589e613fa7b2866a9fccb15" ], "author": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Fri Oct 07 05:46:43 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 07 05:46:43 2011 -0700" }, "message": "am 17f25410: Merge \"Allow shutter/recording sound to be adjusted unless it\\\u0027s forced.\"\n\n* commit \u002717f254105b399c7a4216da2d477e7f9cbdbd7319\u0027:\n Allow shutter/recording sound to be adjusted unless it\u0027s forced.\n" }, { "commit": "ccab9d2b7cb4ba58139a007f893a9121e1208f57", "tree": "c9db48319613ac1a71f9ea8112a120ca4c47b585", "parents": [ "5c29a244bbcbbfc2d17a40478b17e49df97eff83", "3e754efaddf3e221bcae6fe836d7553185d01944" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Oct 07 05:46:42 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 07 05:46:42 2011 -0700" }, "message": "am 3c02c12c: Merge \"Allow Camera.setDisplayOrientation to be called when preview is active.\"\n\n* commit \u00273c02c12c73fa8719e49a5da6534750196efe3eba\u0027:\n Allow Camera.setDisplayOrientation to be called when preview is active.\n" }, { "commit": "6c904e26d4cd7a79f589e613fa7b2866a9fccb15", "tree": "6af862be56e12cdec873fef7e99129a288a79c3d", "parents": [ "3e754efaddf3e221bcae6fe836d7553185d01944", "90f4bc2a3d361252df898fa31a99f4120aeefb27" ], "author": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Fri Oct 07 03:20:26 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 07 03:20:26 2011 -0700" }, "message": "Merge \"Allow shutter/recording sound to be adjusted unless it\u0027s forced.\"" }, { "commit": "3e754efaddf3e221bcae6fe836d7553185d01944", "tree": "38012e5f87f1da55fca784ebb4dfb14ead3c40a8", "parents": [ "e46c970c8f2fc26ff39cf8bebf984f46b17233ba", "b9f588677910cac6ffc0346092bfcfe1c6620b90" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Oct 07 03:08:23 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 07 03:08:23 2011 -0700" }, "message": "Merge \"Allow Camera.setDisplayOrientation to be called when preview is active.\"" }, { "commit": "b9f588677910cac6ffc0346092bfcfe1c6620b90", "tree": "739803b1d5906d94945de8238e43ea61f4ea3ba8", "parents": [ "d3523f89a867afa111bb332887bf006ec3ae93e6" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Oct 07 13:13:54 2011 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Oct 07 18:01:09 2011 +0800" }, "message": "Allow Camera.setDisplayOrientation to be called when preview is active.\n\nbug:5422679\n\nChange-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb\n" }, { "commit": "90f4bc2a3d361252df898fa31a99f4120aeefb27", "tree": "ce19a06399c465a18e3bde2f38cf7d59f56fbb08", "parents": [ "1b8ba61cb178bb6429bd214db9c615c350d0823a" ], "author": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Fri Oct 07 13:37:42 2011 +0800" }, "committer": { "name": "Chih-Chung Chang", "email": "chihchung@google.com", "time": "Fri Oct 07 13:39:18 2011 +0800" }, "message": "Allow shutter/recording sound to be adjusted unless it\u0027s forced.\n\nChange-Id: I7080d5f50a87f92c8e9395d4cf8f927a6760fa70\n" }, { "commit": "5c29a244bbcbbfc2d17a40478b17e49df97eff83", "tree": "cf5a4c714c26b271fecd92f76d300134bfec4e1d", "parents": [ "2a1b95ec8da61cf2147f77f0c2691af53f50e998", "e46c970c8f2fc26ff39cf8bebf984f46b17233ba" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 06 20:40:14 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 06 20:40:14 2011 -0700" }, "message": "am f3c00568: Merge \"Fix an issue where we should allow negative values but did not\"\n\n* commit \u0027f3c00568163b186202cab8d79b2f11eeacb88646\u0027:\n Fix an issue where we should allow negative values but did not\n" }, { "commit": "e46c970c8f2fc26ff39cf8bebf984f46b17233ba", "tree": "a4819a931234fcc631f902702260ff0aa82f49da", "parents": [ "1b8ba61cb178bb6429bd214db9c615c350d0823a", "b832a03d563dd000faa44f2577e92237525edc32" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 06 20:38:29 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 06 20:38:29 2011 -0700" }, "message": "Merge \"Fix an issue where we should allow negative values but did not\"" }, { "commit": "a045cb0e77097120e86e367e1cab5494ce2a5d5e", "tree": "aa59a2e83f38bf06507b0c81af311f2f096287ec", "parents": [ "d20bf0676d6db8f12edcd2307f82409c076c7015" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 05 14:32:17 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 06 15:27:24 2011 -0700" }, "message": "Allow a system property \"media.stagefright.cache-params\" to override cache/prefetcher\n\ndefault parameters. To override specify a property\n\nadb shell setprop media.stagefright.cache-params \"4096/20480/15\" to\nset the low water threshold to 4096 KB, the high water threshold to 20 MB\nand the keepalive interval to 15 secs.\n\nif high and/or lowwater mark are negative, the default values are used for\nthe respective value.\n\nif keep-alive interval is 0, keep-alives are disabled.\n\nChange-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d\n" }, { "commit": "2a1b95ec8da61cf2147f77f0c2691af53f50e998", "tree": "f9dffd18d43142894111e2d5b905ba94f1b94e01", "parents": [ "933344c82c76c0acc36b209bb9ddf0454b2622de", "1b8ba61cb178bb6429bd214db9c615c350d0823a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 06 09:18:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 06 09:18:07 2011 -0700" }, "message": "am beedd862: Merge \"Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.\"\n\n* commit \u0027beedd8627a82007de61480c9e794dd967b708ded\u0027:\n Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.\n" }, { "commit": "1b8ba61cb178bb6429bd214db9c615c350d0823a", "tree": "fa574c04f26f91bb61fa82ad7259759491a5c408", "parents": [ "ec35a1416472865dbebc22b10199ad718ed2cc95", "788a07fc61bad7ea2f0e3cca3f126b52a9bab376" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 06 09:17:14 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 06 09:17:14 2011 -0700" }, "message": "Merge \"Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.\"" }, { "commit": "788a07fc61bad7ea2f0e3cca3f126b52a9bab376", "tree": "ed991f32cc744c9f8e36a173d2ca679fe12d211a", "parents": [ "d20bf0676d6db8f12edcd2307f82409c076c7015" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 06 09:07:12 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 06 09:07:12 2011 -0700" }, "message": "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.\n\nChange-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749\nrelated-to-bug: 5418914\n" }, { "commit": "b832a03d563dd000faa44f2577e92237525edc32", "tree": "8b8732367ca530715553bd1e215a48161581b8a1", "parents": [ "ec35a1416472865dbebc22b10199ad718ed2cc95" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 05 20:02:05 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 05 20:43:52 2011 -0700" }, "message": "Fix an issue where we should allow negative values but did not\n\nChange-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5\nrelated-to-bug: 5419527\n" }, { "commit": "933344c82c76c0acc36b209bb9ddf0454b2622de", "tree": "e85f84b0b657ba294d9897f99f23063ecee9d1f5", "parents": [ "8cbd4639783e7a60c482699f2b36cd7d50e4f6f1", "ec35a1416472865dbebc22b10199ad718ed2cc95" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Oct 05 18:04:52 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 05 18:04:52 2011 -0700" }, "message": "am 3c892288: Merge \"Fix issue 5381089: problem with A2DP music volume\"\n\n* commit \u00273c892288837d165e0273ff1a0f1194c2347d24ac\u0027:\n Fix issue 5381089: problem with A2DP music volume\n" }, { "commit": "ec35a1416472865dbebc22b10199ad718ed2cc95", "tree": "dcd10e214322dae22492b8a49209fdfb4b33c30f", "parents": [ "d20bf0676d6db8f12edcd2307f82409c076c7015" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Oct 05 17:42:25 2011 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Oct 05 17:42:25 2011 -0700" }, "message": "Fix issue 5381089: problem with A2DP music volume\n\nThis problem only occurs when audio effects are present and\nthe music volume is applied by one effect engine.\nWhen connecting or disconnecting A2DP, audio effects are moved from\none mixer thread to another. When removed from the source thread,\nthe effect is stopped but it is not restarted when added to the\ndestination thread.\nThis regression was introduced by commit 21b5c47e.\n\nChange-Id: I4cc578d8d760ec65b185032b6fda98c739d331bc\n" }, { "commit": "8cbd4639783e7a60c482699f2b36cd7d50e4f6f1", "tree": "7a00184d0ccea7194a6f3111cb67ca58a927f124", "parents": [ "cd9d51f9102178f496adb3b1fe86c413497b5aa2", "d20bf0676d6db8f12edcd2307f82409c076c7015" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 05 10:37:55 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 05 10:37:55 2011 -0700" }, "message": "am 50dabc5f: Merge \"Set crop params to ANative Window during Initialization.\"\n\n* commit \u002750dabc5f0efbe2c4a987579cb2ad94132ee587be\u0027:\n Set crop params to ANative Window during Initialization.\n" }, { "commit": "d20bf0676d6db8f12edcd2307f82409c076c7015", "tree": "f8d91ec301e522a273fae3bf85cf8e6483cb66ed", "parents": [ "d3523f89a867afa111bb332887bf006ec3ae93e6" ], "author": { "name": "Lakshman Gowda", "email": "lakshman79@ti.com", "time": "Thu Sep 29 17:47:35 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 05 10:29:27 2011 -0700" }, "message": "Set crop params to ANative Window during Initialization.\n\nThe native_window_set_crop() is called when port reconfig event callback comes from decoder\u0027s and\ncrop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.\nSince the default crop params are same as port reconfig crop params, the native_window_set_crop()\nis not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).\nBy calling native_window_set_crop() during initilaization of output port of decoder ensures\nin setting up ANative window to crop region.\n\nChange-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688\nSigned-off-by: Lakshman Gowda \u003clakshman79@ti.com\u003e\n" }, { "commit": "cd9d51f9102178f496adb3b1fe86c413497b5aa2", "tree": "289102a0a5061a4bef45fdc5b83330e09ed8b870", "parents": [ "a2fb8a7c2178f956861b6cba60326e72f7e1e57a", "d3523f89a867afa111bb332887bf006ec3ae93e6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 30 11:14:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 30 11:14:38 2011 -0700" }, "message": "am cb52d012: Merge \"Gracefuly return on detecting wrong AAC format from corrupted files\"\n\n* commit \u0027cb52d012e910b86d3562d4cad32d66e17986e286\u0027:\n Gracefuly return on detecting wrong AAC format from corrupted files\n" }, { "commit": "d3523f89a867afa111bb332887bf006ec3ae93e6", "tree": "569a59483ca970991541c7508172df425b6396e0", "parents": [ "fea8f6217455d8cfc957e5b30f4eb2349859518f" ], "author": { "name": "Gilles-Arnaud Bleu-Laine", "email": "gilles@ti.com", "time": "Thu Sep 15 21:30:13 2011 -0500" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 30 10:46:12 2011 -0700" }, "message": "Gracefuly return on detecting wrong AAC format from corrupted files\n\nReturn BAD_VALUE error upon detection of wrongly formatted files.\nThe client should abort the initialization upon error detection.\n\nThe current CHECK() interrupts the configurecodec() preventing a graceful\nexit.\n\nChange-Id: Ic79313fa76a63284897df5d91635de87d06f3100\nSigned-off-by: Gilles-Arnaud Bleu-Laine \u003cgilles@ti.com\u003e\n" }, { "commit": "a2fb8a7c2178f956861b6cba60326e72f7e1e57a", "tree": "9c49ec6cac0aae9a380835464fcc21abd4ff01c6", "parents": [ "bed11fa7067c0a19d5883736da29c5cb5015bfcd", "fea8f6217455d8cfc957e5b30f4eb2349859518f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 28 16:11:32 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 28 16:11:32 2011 -0700" }, "message": "am 0044a15e: Merge \"Support multiple NAL fragments per .mkv payload\"\n\n* commit \u00270044a15eb92588372e21fa56a02fbed396cb5e02\u0027:\n Support multiple NAL fragments per .mkv payload\n" }, { "commit": "fea8f6217455d8cfc957e5b30f4eb2349859518f", "tree": "f264d4ead8fd230576c8b74a2effe6c581fd838b", "parents": [ "5530493f9abcd8f1f0b06cccecd6900e86a99778", "792e33fd19e57e0d615d401a54ab567d04f16251" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 28 16:08:59 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 28 16:08:59 2011 -0700" }, "message": "Merge \"Support multiple NAL fragments per .mkv payload\"" }, { "commit": "792e33fd19e57e0d615d401a54ab567d04f16251", "tree": "ccd5617ec6f8dcfe85731635240096384a212f9a", "parents": [ "729de186450f78c099637e1fce743fe531862c52" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 28 15:06:46 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 28 15:06:46 2011 -0700" }, "message": "Support multiple NAL fragments per .mkv payload\n\nApparently the payload for an h.264 track in an .mkv file can contain multiple\nNAL fragments, we used to discard everything after the first one before, now\nwe preserve them all.\n\nChange-Id: Ic7187365309f3880a3256982879a45df50db697d\nrelated-to-bug: 5337218\n" }, { "commit": "bed11fa7067c0a19d5883736da29c5cb5015bfcd", "tree": "0d04f2d8f368563aa7d86e73099cab43f428910f", "parents": [ "6ffeca88c422ce453609ae8e2e50267126bd8335", "5530493f9abcd8f1f0b06cccecd6900e86a99778" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Sep 28 13:48:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 28 13:48:00 2011 -0700" }, "message": "am 5e28463d: Merge \"Flush resets the count of played audio frames\"\n\n* commit \u00275e28463dc4d12802d173018c572f73e13ba50722\u0027:\n Flush resets the count of played audio frames\n" }, { "commit": "5530493f9abcd8f1f0b06cccecd6900e86a99778", "tree": "191bb6fff2637f3ff074a2cfda970d10be9c6dcb", "parents": [ "729de186450f78c099637e1fce743fe531862c52", "6c375490a5536695770a85b57ec9f828d3c0c9d4" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Sep 28 13:46:49 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 28 13:46:49 2011 -0700" }, "message": "Merge \"Flush resets the count of played audio frames\"" }, { "commit": "6ffeca88c422ce453609ae8e2e50267126bd8335", "tree": "aff96622d76fcf8a989e987742fe15a613ec50fd", "parents": [ "4d8e4e7ab2e9f7d937423d17c4e8fb60f425c0cc", "729de186450f78c099637e1fce743fe531862c52" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 28 13:15:20 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 28 13:15:20 2011 -0700" }, "message": "am 781ae92f: Merge \"Support AMR, G.711 and vorbis audio in ACodec and friends.\"\n\n* commit \u0027781ae92f11ff136b99acb56cc361ad662d9cb6b9\u0027:\n Support AMR, G.711 and vorbis audio in ACodec and friends.\n" }, { "commit": "729de186450f78c099637e1fce743fe531862c52", "tree": "bf05611a1943104189abce2f9b09514f2ec2adeb", "parents": [ "ac4d4d3698e920b9f5c648a781df5b6af8bcfdf0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 28 12:37:36 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 28 12:37:36 2011 -0700" }, "message": "Support AMR, G.711 and vorbis audio in ACodec and friends.\n\nChange-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983\n" }, { "commit": "6c375490a5536695770a85b57ec9f828d3c0c9d4", "tree": "d6b54668915571bd2260ecbc3a05607dfdaab517", "parents": [ "ac4d4d3698e920b9f5c648a781df5b6af8bcfdf0" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Sep 27 22:47:25 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Sep 27 22:47:25 2011 -0700" }, "message": "Flush resets the count of played audio frames\n\nChange-Id: I0cda94646a71757fa113a199d29235e13efd7ac3\nrelated-to-bug: 5331470\n" }, { "commit": "4d8e4e7ab2e9f7d937423d17c4e8fb60f425c0cc", "tree": "d5fa508d838faaa28eb85be5c182939815919de6", "parents": [ "04d90d8ccb8812c6e6eeb620588ea184c3c9d3ff", "ac4d4d3698e920b9f5c648a781df5b6af8bcfdf0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 19:20:19 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 27 19:20:19 2011 -0700" }, "message": "am d4fb497c: Merge \"Cut down on AwesomePlayer and OMXCodec\\\u0027s verbosity.\"\n\n* commit \u0027d4fb497cf4606abf61ec690ed971523ff9d05eac\u0027:\n Cut down on AwesomePlayer and OMXCodec\u0027s verbosity.\n" }, { "commit": "ac4d4d3698e920b9f5c648a781df5b6af8bcfdf0", "tree": "916ceb4b2ceb6f0dcd81fd3831050ab2290dab20", "parents": [ "17799467c64629ef174d8f09cc89c4049624dcac", "c32589a79f8120ac0060945fffc50279143989aa" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 15:26:43 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 27 15:26:43 2011 -0700" }, "message": "Merge \"Cut down on AwesomePlayer and OMXCodec\u0027s verbosity.\"" }, { "commit": "c32589a79f8120ac0060945fffc50279143989aa", "tree": "704e732a82efa9a9bcb13f86cd9c059dc1e02ef9", "parents": [ "dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 15:05:40 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 15:07:36 2011 -0700" }, "message": "Cut down on AwesomePlayer and OMXCodec\u0027s verbosity.\n\nChange-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924\nrelated-to-bug: 5382014\n" }, { "commit": "04d90d8ccb8812c6e6eeb620588ea184c3c9d3ff", "tree": "d08e14063c50da84f042121a73184fea0d6f0c60", "parents": [ "7e069e101782b542449776c402bcb08e9a9307b1", "17799467c64629ef174d8f09cc89c4049624dcac" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 14:09:37 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 27 14:09:37 2011 -0700" }, "message": "am ab7ed38d: Merge \"Fix issue 5373658: memory leak in AudioFlinger.\"\n\n* commit \u0027ab7ed38d5fea82db64eb90bad9d4c646d61d15df\u0027:\n Fix issue 5373658: memory leak in AudioFlinger.\n" }, { "commit": "17799467c64629ef174d8f09cc89c4049624dcac", "tree": "fb668b2815e6c273ee95099f54978aafc1a94007", "parents": [ "dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3", "9d18ec574f5d847a86a21594ac39394ef5b108fc" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 14:07:45 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 27 14:07:45 2011 -0700" }, "message": "Merge \"Fix issue 5373658: memory leak in AudioFlinger.\"" }, { "commit": "7e069e101782b542449776c402bcb08e9a9307b1", "tree": "37045af579faab9d204f3ee5ecb84bbf857210a4", "parents": [ "1bc36cafe025ff247b839a2e153b4317e845229f", "dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 13:38:05 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 27 13:38:05 2011 -0700" }, "message": "am d33b3881: Merge \"Signal an appropriate error even if there are no active streams yet.\"\n\n* commit \u0027d33b3881f7647e721181c46f9166ee139cec7e38\u0027:\n Signal an appropriate error even if there are no active streams yet.\n" }, { "commit": "dd115cd3b1429a39f1c8e77cbdf03e760ebdb6c3", "tree": "ed3e70d787dbc6fd3e9a2ebb59ad7d088251c7fb", "parents": [ "82fd03b854a5e6879dc9eb6d57962414e7082894", "eac68baf095aeef54865c28b6888924dc6295cbd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 13:36:22 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 27 13:36:22 2011 -0700" }, "message": "Merge \"Signal an appropriate error even if there are no active streams yet.\"" }, { "commit": "eac68baf095aeef54865c28b6888924dc6295cbd", "tree": "a1ca9c5de638d21e07be1aab9f25d01e118597e7", "parents": [ "797ab6072402b12721dc226a9ebde3546e7640e9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 12:12:25 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 27 12:13:37 2011 -0700" }, "message": "Signal an appropriate error even if there are no active streams yet.\n\nChange-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49\nrelated-to-bug: 5372901\n" }, { "commit": "9d18ec574f5d847a86a21594ac39394ef5b108fc", "tree": "5c720b5e0835102eeff634fcf6d27f129751c3d1", "parents": [ "797ab6072402b12721dc226a9ebde3546e7640e9" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 12:07:15 2011 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 12:07:15 2011 -0700" }, "message": "Fix issue 5373658: memory leak in AudioFlinger.\n\nUnlink PowerManagerService binder interface death recipient\nin ThreadBase destructor.\n\nChange-Id: Iab06ae9a8a6737bb002b6416a157b0fb50c11ad5\n" }, { "commit": "1bc36cafe025ff247b839a2e153b4317e845229f", "tree": "4fba45964efc2c8461c10a3e2e7c7cbceca4c592", "parents": [ "078741e31e648d5d7585bb8b6729806e8cc55f69", "82fd03b854a5e6879dc9eb6d57962414e7082894" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 10:40:33 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 27 10:40:33 2011 -0700" }, "message": "am 53719fc4: Merge \"Fix issue 5373048: AudioCache decode errors\"\n\n* commit \u002753719fc4c5c441e8696f26bbfb9166b0bd19ef29\u0027:\n Fix issue 5373048: AudioCache decode errors\n" }, { "commit": "82fd03b854a5e6879dc9eb6d57962414e7082894", "tree": "761dbf7ef3ac4853c5b0e3806568376ddf639141", "parents": [ "797ab6072402b12721dc226a9ebde3546e7640e9", "9cb839a0fcc98fe4278b39afb8b6d664c04f1673" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 10:32:17 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 27 10:32:17 2011 -0700" }, "message": "Merge \"Fix issue 5373048: AudioCache decode errors\"" }, { "commit": "9cb839a0fcc98fe4278b39afb8b6d664c04f1673", "tree": "f5847d0d1994489a829368b12c4998dcf229c926", "parents": [ "ece731de0c0af30917316d55313f25c56f91960d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 09:48:56 2011 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 27 10:23:38 2011 -0700" }, "message": "Fix issue 5373048: AudioCache decode errors\n\nWhen decoding a file for the SoundPool, do not\nreject the entire file in case of error but\nreturn what was decoded so far instead.\n\nChange-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd\n" }, { "commit": "078741e31e648d5d7585bb8b6729806e8cc55f69", "tree": "656250d7099c1e0ecc5d5e7ab56524f992313cbd", "parents": [ "3011088bf0a89a7a7826a86f59f88fa5b5c254e2", "797ab6072402b12721dc226a9ebde3546e7640e9" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Sep 26 12:13:33 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 26 12:13:33 2011 -0700" }, "message": "am 4da465a0: Reconcile with ics-factoryrom-release\n\n* commit \u00274da465a056f7a7322a5a4a0f235fe20e525a6eae\u0027:\n Don\u0027t crash during full backup when CheckJNI is enabled\n" }, { "commit": "797ab6072402b12721dc226a9ebde3546e7640e9", "tree": "a6c6a25ce9bd1b423243fca18300955b7e7ef3fb", "parents": [ "070b91e1f67e6e2f129b6b492f38fbec7c8618e4", "031abfb6cc904da49b28423643d80a6485f4e3e6" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Sep 26 12:11:29 2011 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Sep 26 12:11:29 2011 -0700" }, "message": "Reconcile with ics-factoryrom-release\n\nChange-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8\n" }, { "commit": "3011088bf0a89a7a7826a86f59f88fa5b5c254e2", "tree": "656250d7099c1e0ecc5d5e7ab56524f992313cbd", "parents": [ "48e2d84610ae01666613c352ed926c09a9f43cd2", "070b91e1f67e6e2f129b6b492f38fbec7c8618e4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 26 11:28:19 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 26 11:28:19 2011 -0700" }, "message": "am d359b575: Merge \"Properly connect to surface flinger in our shell tools\"\n\n* commit \u0027d359b575f7cc0ac36caacf7bbdcaef3394830a25\u0027:\n Properly connect to surface flinger in our shell tools\n" }, { "commit": "070b91e1f67e6e2f129b6b492f38fbec7c8618e4", "tree": "a6c6a25ce9bd1b423243fca18300955b7e7ef3fb", "parents": [ "dc9bacd838442a524585887e6ea6696836be2eda", "93d5ab693626fa2700375e838e4bb90e4d50e605" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 26 11:26:59 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 26 11:26:59 2011 -0700" }, "message": "Merge \"Properly connect to surface flinger in our shell tools\"" }, { "commit": "48e2d84610ae01666613c352ed926c09a9f43cd2", "tree": "693d9e6b8b6c94926bda98da0570d9840fd86a10", "parents": [ "052dde287199887a3c401df250e6729b3cc2efda", "dc9bacd838442a524585887e6ea6696836be2eda" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 26 11:04:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 26 11:04:49 2011 -0700" }, "message": "am 48719dc6: Merge \"Propagate error signalled by the source all the way to the output EOS notification.\"\n\n* commit \u002748719dc6221fdfbc3cc49a21166b136577fe37b9\u0027:\n Propagate error signalled by the source all the way to the output EOS notification.\n" }, { "commit": "dc9bacd838442a524585887e6ea6696836be2eda", "tree": "230135b6bc20bff2be5a8292e91c0fac86201039", "parents": [ "ece731de0c0af30917316d55313f25c56f91960d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 26 10:53:29 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 26 10:53:29 2011 -0700" }, "message": "Propagate error signalled by the source all the way to the output EOS notification.\n\nChange-Id: I30e959a6d669f09745c59fbdebee08f869511cf7\nrelated-to-bug: 5372901\n" }, { "commit": "052dde287199887a3c401df250e6729b3cc2efda", "tree": "cacd33ee56bf7f4ee89e554ca8afd0740162b64d", "parents": [ "d567784127618309bc164c2911752b7abf80954e", "ece731de0c0af30917316d55313f25c56f91960d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 26 08:10:51 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 26 08:10:51 2011 -0700" }, "message": "am 3bade950: Merge \"Support even more .avi files with .mp3 content not aligned to chunk boundaries\"\n\n* commit \u00273bade9504a648ce7606b876dc7d71b4684e279c9\u0027:\n Support even more .avi files with .mp3 content not aligned to chunk boundaries\n" }, { "commit": "ece731de0c0af30917316d55313f25c56f91960d", "tree": "f22ab3869438cdcbad7036e830ba1aed3b20a0ab", "parents": [ "ce7f4f6345395eb3e715beaf4a74621956070f47", "32e1832dfac3a6bbcc5c0973ccd0e22de4d1a1ac" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 26 08:09:11 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 26 08:09:11 2011 -0700" }, "message": "Merge \"Support even more .avi files with .mp3 content not aligned to chunk boundaries\"" }, { "commit": "32e1832dfac3a6bbcc5c0973ccd0e22de4d1a1ac", "tree": "5e0a3c8ef28fc0dab8428a385c99ca0a643d6a0d", "parents": [ "e2c10206a506381ecd466e050f8b5cdf87db7100" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 23 14:05:49 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 23 14:59:31 2011 -0700" }, "message": "Support even more .avi files with .mp3 content not aligned to chunk boundaries\n\nChange-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d\nrelated-to-bug: 5349382\n" }, { "commit": "d567784127618309bc164c2911752b7abf80954e", "tree": "8cbf1a657501541509a2ccfe87ad51417e46aab0", "parents": [ "620c01ddeedb8ffd7db0119305c2f1375da80b68", "ce7f4f6345395eb3e715beaf4a74621956070f47" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 23 14:44:38 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 23 14:44:38 2011 -0700" }, "message": "am 65837ced: Merge \"Fix issue 5355047: Automated effect tests fail.\"\n\n* commit \u002765837cede462b551742f900f2e2f5a1d5dd576a2\u0027:\n Fix issue 5355047: Automated effect tests fail.\n" }, { "commit": "ce7f4f6345395eb3e715beaf4a74621956070f47", "tree": "10602c3175014873741469cbf20f5f7737d74f7a", "parents": [ "7df9b2be02dc9246ba858a54f28ea71cb9d1da08", "6bffdb8b598a2399e57f6ca48660fb7bdb2490b5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 23 14:43:12 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 23 14:43:12 2011 -0700" }, "message": "Merge \"Fix issue 5355047: Automated effect tests fail.\"" }, { "commit": "620c01ddeedb8ffd7db0119305c2f1375da80b68", "tree": "89f02192490acf52defa5d93595f3a744d538685", "parents": [ "18d6f4ef8a3567fc81cf3d20ef34a043c45eb32a", "7df9b2be02dc9246ba858a54f28ea71cb9d1da08" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 23 11:36:49 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 23 11:36:49 2011 -0700" }, "message": "am 7fa3b435: Merge \"Add an option to dump the raw stream to a file in the stagefright cmdline tool.\"\n\n* commit \u00277fa3b435d67e3ba2c879431f44e262c40716ebd8\u0027:\n Add an option to dump the raw stream to a file in the stagefright cmdline tool.\n" }, { "commit": "031abfb6cc904da49b28423643d80a6485f4e3e6", "tree": "d44f557cc6a511900df865aa0ebd8de877b8e086", "parents": [ "b050002245f1606697488ddf5516e992d0c380be", "e6310baa913c8fcfcaf5cbec91bd99335002256c" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 23 11:35:01 2011 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 23 11:35:01 2011 -0700" }, "message": "merge in ics-factoryrom-release history after reset to ics-factoryrom\n" }, { "commit": "7df9b2be02dc9246ba858a54f28ea71cb9d1da08", "tree": "d3a767168d77e78f45fa46d18d2069d6971c75a1", "parents": [ "0f0fed65815cdf083f70d723b3001a5dbd1837db", "d10c07603a28429beb7471c0fb23a5f9ec90bf26" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 23 11:27:51 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 23 11:27:51 2011 -0700" }, "message": "Merge \"Add an option to dump the raw stream to a file in the stagefright cmdline tool.\"" }, { "commit": "d10c07603a28429beb7471c0fb23a5f9ec90bf26", "tree": "de924db144aa49b74bd594801a519a5654b293ec", "parents": [ "e2c10206a506381ecd466e050f8b5cdf87db7100" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 23 10:25:32 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 23 10:25:32 2011 -0700" }, "message": "Add an option to dump the raw stream to a file in the stagefright cmdline tool.\n\nChange-Id: Ie19eca2cdf162d6973037ec554ef5916243ea7d7\n" }, { "commit": "6bffdb8b598a2399e57f6ca48660fb7bdb2490b5", "tree": "5112db2529cd94fe9632bf781c07103e49a10849", "parents": [ "89aa8fe4cb00d2f24260005b008602232d678684" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 23 08:40:41 2011 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 23 10:15:05 2011 -0700" }, "message": "Fix issue 5355047: Automated effect tests fail.\n\nFixed several regressions in automated audio effect tests due\nto changes in effect framework and visualizer FFT output range.\n\n- Do not suspend Volume effect on session 0 when effects are\nenabled on specific sessions.\n- Adapt energy detection thresholds to new visualizer FFT range.\n- Leave more time for BassBoost and Virtualizer effects to ramp up\nbefore measuring the effect.\n- Removed second insert reverb left by mistake on the player session\nin preset reverb test.\n\nChange-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f\n" }, { "commit": "18d6f4ef8a3567fc81cf3d20ef34a043c45eb32a", "tree": "c80718613ef15bd686c5a7e04a9e3f9dfda4e107", "parents": [ "8e2555636291a59fe509c38082370b0a39bb737c", "0f0fed65815cdf083f70d723b3001a5dbd1837db" ], "author": { "name": "Wei Huang", "email": "weih@google.com", "time": "Fri Sep 23 10:07:33 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 23 10:07:33 2011 -0700" }, "message": "am e448f557: am 3d9a9e55: Merge \"Update camera javadoc about AE and AWB lock.\" into ics-factoryrom\n\n* commit \u0027e448f557f620ae30dcead7a4423059dfb7d70add\u0027:\n Update camera javadoc about AE and AWB lock.\n" }, { "commit": "0f0fed65815cdf083f70d723b3001a5dbd1837db", "tree": "9a1f16368db040e63102136b1632b8261e66864f", "parents": [ "3d5ec85e29edfa0639290610044517bec269c7df", "b050002245f1606697488ddf5516e992d0c380be" ], "author": { "name": "Wei Huang", "email": "weih@google.com", "time": "Fri Sep 23 10:05:22 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 23 10:05:22 2011 -0700" }, "message": "am 3d9a9e55: Merge \"Update camera javadoc about AE and AWB lock.\" into ics-factoryrom\n\n* commit \u00273d9a9e55df85c720573e69ec3062efc331ea69bb\u0027:\n Update camera javadoc about AE and AWB lock.\n" }, { "commit": "b050002245f1606697488ddf5516e992d0c380be", "tree": "d44f557cc6a511900df865aa0ebd8de877b8e086", "parents": [ "3e9bf4061475ae0d01c57e32c13e63808aa3e31f", "ca1d5399c5d6d23d16554be7c702fdf5232e55bd" ], "author": { "name": "Wei Huang", "email": "weih@google.com", "time": "Fri Sep 23 10:04:02 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 23 10:04:02 2011 -0700" }, "message": "Merge \"Update camera javadoc about AE and AWB lock.\" into ics-factoryrom" }, { "commit": "8e2555636291a59fe509c38082370b0a39bb737c", "tree": "2889376e7650bd4a026363d821ed6f0b42282b6f", "parents": [ "58a2b35012414afcdf78c901a3cff9fa501f8dda", "3d5ec85e29edfa0639290610044517bec269c7df" ], "author": { "name": "Pannag Sanketi", "email": "psanketi@google.com", "time": "Fri Sep 23 09:10:41 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 23 09:10:41 2011 -0700" }, "message": "am 91d34137: am 1d71c7b4: Merge \"Returning EOS in SurfaceMediaSource:read\" into ics-factoryrom\n\n* commit \u002791d34137903c278e5e077fa1edef9bbbcdd140f7\u0027:\n Returning EOS in SurfaceMediaSource:read\n" }, { "commit": "3d5ec85e29edfa0639290610044517bec269c7df", "tree": "c0eca34588f66fb2a2e2b3d43e80a2c902b8d418", "parents": [ "e2c10206a506381ecd466e050f8b5cdf87db7100", "3e9bf4061475ae0d01c57e32c13e63808aa3e31f" ], "author": { "name": "Pannag Sanketi", "email": "psanketi@google.com", "time": "Fri Sep 23 09:08:11 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 23 09:08:11 2011 -0700" }, "message": "am 1d71c7b4: Merge \"Returning EOS in SurfaceMediaSource:read\" into ics-factoryrom\n\n* commit \u00271d71c7b40a7f38487e602e78f45279b6a8364fc9\u0027:\n Returning EOS in SurfaceMediaSource:read\n" }, { "commit": "3e9bf4061475ae0d01c57e32c13e63808aa3e31f", "tree": "e202bf8dfb7dc91a2de1248ccee3265740e07760", "parents": [ "669012d77b00a2aacb6fd12837f2870f9ec17865" ], "author": { "name": "Pannag Sanketi", "email": "psanketi@google.com", "time": "Thu Sep 22 17:03:48 2011 -0700" }, "committer": { "name": "Pannag Sanketi", "email": "psanketi@google.com", "time": "Thu Sep 22 17:03:48 2011 -0700" }, "message": "Returning EOS in SurfaceMediaSource:read\n\nIn SurfaceMediaSource::read, if disconnect has already been called, then\nERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it\nsometimes leads to a crash in mediarecorder stop() call.\n\nRelated to FactoryROM bug: 5332812\n\nChange-Id: I22132538ab2501d084e0283876817b1ec3f64a1d\n" }, { "commit": "ca1d5399c5d6d23d16554be7c702fdf5232e55bd", "tree": "265d58933143412e49c38966e5c9b06ba009c359", "parents": [ "669012d77b00a2aacb6fd12837f2870f9ec17865" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Thu Sep 22 11:43:28 2011 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Thu Sep 22 18:19:02 2011 +0800" }, "message": "Update camera javadoc about AE and AWB lock.\n\n- Autofocus does not lock AE and AWB.\n- stopPreview and takePicture do not clear AE and AWB locks.\n\nbug:5356404\n\nChange-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca\n" }, { "commit": "58a2b35012414afcdf78c901a3cff9fa501f8dda", "tree": "9e72718e9f8ec5c1289051c10864b3b116372556", "parents": [ "7fb8a48531e39cf438d0720f0476974032eed82b", "e2c10206a506381ecd466e050f8b5cdf87db7100" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 21 23:08:10 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 21 23:08:10 2011 -0700" }, "message": "am 013ccb70: Merge \"Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436\"\n\n* commit \u0027013ccb7010ac9a231eb737ed268acb4b9653b268\u0027:\n Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436\n" }, { "commit": "e2c10206a506381ecd466e050f8b5cdf87db7100", "tree": "0f4c0d0c2dfc769218737a3d593d46a311c519ff", "parents": [ "10b3b8608c4739e772a80cf84a10fda98e842cd7", "5f6f4e4e89bc9b234d89276aea3eae7f677e2ff7" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 21 23:05:57 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 21 23:05:57 2011 -0700" }, "message": "Merge \"Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436\"" }, { "commit": "5f6f4e4e89bc9b234d89276aea3eae7f677e2ff7", "tree": "5e622df3a534d6023470490592a5ebb79b116310", "parents": [ "fb6f03425a791dcc4188462c860becf6ca6be4ea" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 21 19:18:30 2011 -0700" }, "committer": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 21 21:50:31 2011 -0700" }, "message": "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.\nBUG: 5284436\n\nChange-Id: I99267c81a488860c3c7edb747100d44f3083bfc2\n" }, { "commit": "7fb8a48531e39cf438d0720f0476974032eed82b", "tree": "894fca1759f22900bf26780c9ea1cbbb7eedeca9", "parents": [ "436efe993a784d35a3fbfce02180b02ec0d14950", "10b3b8608c4739e772a80cf84a10fda98e842cd7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 21 13:57:54 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 21 13:57:54 2011 -0700" }, "message": "am bfd1c9d9: Merge \"Support some .avi files containing H.264 video, log warnings if audio/video unsupported\"\n\n* commit \u0027bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23\u0027:\n Support some .avi files containing H.264 video, log warnings if audio/video unsupported\n" }, { "commit": "10b3b8608c4739e772a80cf84a10fda98e842cd7", "tree": "11f0b85b1f03996ed982f6b7b8767c372fdd2ed9", "parents": [ "dc7747d7da61a72b6d26dacf7569de9455d77474", "c639aad6d8894f57c02e620f52ccf49e51b64866" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 21 13:56:09 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 21 13:56:09 2011 -0700" }, "message": "Merge \"Support some .avi files containing H.264 video, log warnings if audio/video unsupported\"" }, { "commit": "c639aad6d8894f57c02e620f52ccf49e51b64866", "tree": "a248fe230bbc299332d7b9ca0c88702f130f8318", "parents": [ "ad8e8bfea2da077248a9f217c029e14fefb01096" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 21 13:19:54 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 21 13:19:54 2011 -0700" }, "message": "Support some .avi files containing H.264 video, log warnings if audio/video unsupported\n\nChange-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677\nrelated-to-bug: 5349382\n" }, { "commit": "436efe993a784d35a3fbfce02180b02ec0d14950", "tree": "5337f49e60c9de28ae1d0ca6c3595ae25622a19e", "parents": [ "ee8b7dd139d74fd4ca321169a23c314fdf1c74b9", "dc7747d7da61a72b6d26dacf7569de9455d77474" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 21 10:54:07 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 21 10:54:07 2011 -0700" }, "message": "am faa75f61: Merge \"Bug 5234242 audio continues after discontinuity\"\n\n* commit \u0027faa75f6146165016685291084ca79ddd377411b4\u0027:\n Bug 5234242 audio continues after discontinuity\n" }, { "commit": "dc7747d7da61a72b6d26dacf7569de9455d77474", "tree": "45ba6cb15ed555139bf1e7a68901bdb1e69cc421", "parents": [ "ad8e8bfea2da077248a9f217c029e14fefb01096" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 21 10:40:01 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 21 10:40:01 2011 -0700" }, "message": "Bug 5234242 audio continues after discontinuity\n\nReduce to 8 buffers of 10 packets from 16 buffers of 20 packets.\n\nChange-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83\n" }, { "commit": "ee8b7dd139d74fd4ca321169a23c314fdf1c74b9", "tree": "719aa1f72beb477bd8e4b4222010d19129edd82e", "parents": [ "cba4873fa3bc325235b6b9de6ebe9721a8a25a14", "ad8e8bfea2da077248a9f217c029e14fefb01096" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Sep 20 14:14:41 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 20 14:14:41 2011 -0700" }, "message": "am 3617cb65: Reconcile with ics-factoryrom-release\n\n* commit \u00273617cb652158c136b4b79f0e69d905794fc12843\u0027:\n Add QVGA resolution to CamcorderProfile\n Add PROPERTY_IMS_REG_REQUIRED.\n" }, { "commit": "cba4873fa3bc325235b6b9de6ebe9721a8a25a14", "tree": "719aa1f72beb477bd8e4b4222010d19129edd82e", "parents": [ "ca84caeed8c990e9b81f7d43b6f0202549665496", "12bbe5d7d47747c093ddac2977f594a4a3c1810e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Sep 20 14:13:50 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 20 14:13:50 2011 -0700" }, "message": "am 3907c79a: am 92d0a64b: Merge \"Add QVGA resolution to CamcorderProfile\" into ics-factoryrom\n\n* commit \u00273907c79aebf8621a5a4880c9e66db3c49a44f359\u0027:\n Add QVGA resolution to CamcorderProfile\n" }, { "commit": "93d5ab693626fa2700375e838e4bb90e4d50e605", "tree": "b61248326ac11a89534e8bf58375ad38301378d7", "parents": [ "ad8e8bfea2da077248a9f217c029e14fefb01096" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 15 12:42:32 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 20 10:37:18 2011 -0700" }, "message": "Properly connect to surface flinger in our shell tools\n\nAlso raise the layer to INT_MAX to float in front of the toolbar.\n\nChange-Id: I045a1c83924e6655f1734d15f2504b90312eec64\n" }, { "commit": "ad8e8bfea2da077248a9f217c029e14fefb01096", "tree": "4d4a5c63650f7cf75ce4c4023cbb145867767349", "parents": [ "12bbe5d7d47747c093ddac2977f594a4a3c1810e", "e6310baa913c8fcfcaf5cbec91bd99335002256c" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Sep 20 07:43:10 2011 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Tue Sep 20 07:43:10 2011 -0700" }, "message": "Reconcile with ics-factoryrom-release\n\nChange-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252\n" }, { "commit": "e6310baa913c8fcfcaf5cbec91bd99335002256c", "tree": "97a5d285ac5092a13ea54a818de5242798b5f96b", "parents": [ "669012d77b00a2aacb6fd12837f2870f9ec17865", "c66c7513b7cd8e92274e478d8431ce3f64b8d2a4" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Sep 20 06:28:15 2011 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Sep 20 06:28:15 2011 -0700" }, "message": "merge in ics-factoryrom-release history after reset to ics-factoryrom\n" }, { "commit": "c66c7513b7cd8e92274e478d8431ce3f64b8d2a4", "tree": "97a5d285ac5092a13ea54a818de5242798b5f96b", "parents": [ "5dc2812abddde309234edc786a541d251c4f820a" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 19 16:27:31 2011 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Sep 19 21:54:30 2011 -0700" }, "message": "Add QVGA resolution to CamcorderProfile\n\nChange-Id: Icebbafb68d8164370f98a2c36699845d10ef081b\nrelated-to-bug: 5145483\n" }, { "commit": "12bbe5d7d47747c093ddac2977f594a4a3c1810e", "tree": "4d4a5c63650f7cf75ce4c4023cbb145867767349", "parents": [ "89aa8fe4cb00d2f24260005b008602232d678684", "669012d77b00a2aacb6fd12837f2870f9ec17865" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 19 20:09:00 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 19 20:09:00 2011 -0700" }, "message": "am 92d0a64b: Merge \"Add QVGA resolution to CamcorderProfile\" into ics-factoryrom\n\n* commit \u002792d0a64b909cd95e8f4ce587438b0cc6d2daeaa0\u0027:\n Add QVGA resolution to CamcorderProfile\n" }, { "commit": "669012d77b00a2aacb6fd12837f2870f9ec17865", "tree": "97a5d285ac5092a13ea54a818de5242798b5f96b", "parents": [ "5dc2812abddde309234edc786a541d251c4f820a" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 19 16:27:31 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 19 19:32:26 2011 -0700" }, "message": "Add QVGA resolution to CamcorderProfile\n\nChange-Id: Icebbafb68d8164370f98a2c36699845d10ef081b\nrelated-to-bug: 5145483\n" }, { "commit": "ca84caeed8c990e9b81f7d43b6f0202549665496", "tree": "3aaa28c7420afdbf5f75705405cc73d59ca7d82b", "parents": [ "4a49123307cdf1982976b5af68ad6eb76f164535", "89aa8fe4cb00d2f24260005b008602232d678684" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 19 13:30:05 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 19 13:30:05 2011 -0700" }, "message": "am e2bb9960: Merge \"Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams\"\n\n* commit \u0027e2bb99600e3a6eed97d2739f62c84998180a705d\u0027:\n Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams\n" }, { "commit": "89aa8fe4cb00d2f24260005b008602232d678684", "tree": "06d871b702884809f45f70ed71b19917cc93fd3d", "parents": [ "84ada693b87f4d9344578e750a506b7789c13eb9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 19 12:18:47 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 19 12:21:33 2011 -0700" }, "message": "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams\n\ncontaining B-frames.\n\nChange-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642\nrelated-to-bug: 5336497\n" }, { "commit": "4a49123307cdf1982976b5af68ad6eb76f164535", "tree": "e387e8107ea0a23026024230899dd057d6bfbefc", "parents": [ "0033abd397da67be1ff113616360f23dc1556681", "84ada693b87f4d9344578e750a506b7789c13eb9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 19 09:44:48 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 19 09:44:48 2011 -0700" }, "message": "am c7342fbf: Merge \"In order to recover from video lagging behind audio, drop avc frames\"\n\n* commit \u0027c7342fbf992091cd37bb34b8fac2e6b6ca47fdf5\u0027:\n In order to recover from video lagging behind audio, drop avc frames\n" }, { "commit": "84ada693b87f4d9344578e750a506b7789c13eb9", "tree": "b619c25fb9b2662a26616cc51e96f5b08dc56c0f", "parents": [ "3169d9fa0a4ee7b00c12eb7892703a2a8ded161d", "3fe62150fa3dd6d25cb84aad80bc9e27ddd16c45" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 19 08:54:59 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 19 08:54:59 2011 -0700" }, "message": "Merge \"In order to recover from video lagging behind audio, drop avc frames\"" } ], "next": "0033abd397da67be1ff113616360f23dc1556681" }