)]}' { "log": [ { "commit": "369c3a57543b6abff69f91a8e5c5c48970dffaf7", "tree": "9155a45be80ea5db382c2a0866f63769c5138509", "parents": [ "72028075d3d8dc65a8ea28a0364bd1a5b7df5fee", "a0f2bf56e30f580535229fa6a58e7d48b762727c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 12:02:53 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 05 12:02:53 2011 -0800" }, "message": "am f2e12498: Merge \"Properly identify how much metadata we need to cache in order to instantiate\" into ics-mr1\n\n* commit \u0027f2e1249846a17c69d728189a8dc67f37261f0a59\u0027:\n Properly identify how much metadata we need to cache in order to instantiate\n" }, { "commit": "a0f2bf56e30f580535229fa6a58e7d48b762727c", "tree": "f375e7f5e9f183289bbd5c907f90b89924f11aa8", "parents": [ "fed8bb604c31bf6a60ca84aafed016d21d3e0f90" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 11:34:43 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Dec 05 11:34:43 2011 -0800" }, "message": "Properly identify how much metadata we need to cache in order to instantiate\n\nthe extractor without blocking (and therefore be able to abort).\n\nChange-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3\nrelated-to-bug: 5666532\n" }, { "commit": "72028075d3d8dc65a8ea28a0364bd1a5b7df5fee", "tree": "ea42bead8ddee2f92ea90d042e49a34064a9bee6", "parents": [ "a33b7d94103696702e40533c6a0b8043e66498af", "fed8bb604c31bf6a60ca84aafed016d21d3e0f90" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 13:22:28 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 02 13:22:28 2011 -0800" }, "message": "am 1a3ece9f: Merge \"MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\" into ics-mr1\n\n* commit \u00271a3ece9f871c94eb524543ae618a2a1c88cab2cd\u0027:\n MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n" }, { "commit": "a33b7d94103696702e40533c6a0b8043e66498af", "tree": "e9cab385cc07545c35632ef327f082b2e904b4ca", "parents": [ "d7217d71683c6643b2608032cf1cd38e10a6b2c7", "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 13:22:26 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Dec 02 13:22:26 2011 -0800" }, "message": "am 7f87d9cf: Merge \"MTP: Don\\\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\" into ics-mr1\n\n* commit \u00277f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1\u0027:\n MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n" }, { "commit": "fed8bb604c31bf6a60ca84aafed016d21d3e0f90", "tree": "b6241932aebde1c0f71c9d52d63bb2ea7ef5adf7", "parents": [ "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 16:58:41 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 15:12:47 2011 -0500" }, "message": "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE\n\nBug: 5527220\n\nChange-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "8af4c7d02fc484ed1bdc082fc2a5383bc50f2180", "tree": "89d39512087cd15a3fb44a8bb5f28e36303eeb19", "parents": [ "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Thu Dec 01 18:36:06 2011 -0500" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Fri Dec 02 15:12:30 2011 -0500" }, "message": "MTP: Don\u0027t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE\n\nThis could happen sometimes if other operations increased the size of the\ndata packet buffer to \u003e 16K\n\nChange-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "d7217d71683c6643b2608032cf1cd38e10a6b2c7", "tree": "997c28a92706caf86bd4c7ba37faf58cae7ac287", "parents": [ "1b493416e52241b71eec6ab875516529da6430d5", "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:19:52 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 01 10:19:52 2011 -0800" }, "message": "am 2c2ed7be: Merge \"Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\" into ics-mr1\n\n* commit \u00272c2ed7bef931f43dc0701ab723beb0cbed2cb630\u0027:\n Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n" }, { "commit": "4fe1c6c3988f79fd67c14a1f91e4b1df8a7e806f", "tree": "fba9ea601042188ab396e20cb69e98ffe6ff6290", "parents": [ "21befea3720fb847aef5440d507902d8705a671a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:02:37 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Dec 01 10:02:37 2011 -0800" }, "message": "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions\n\nChange-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab\nrelated-to-bug: 5696324\n" }, { "commit": "1b493416e52241b71eec6ab875516529da6430d5", "tree": "f015b5f684e4f8aac0de70744c4ef844ad43ed1b", "parents": [ "a2d54aea18b469a186a6f8112c10c963710ab154", "21befea3720fb847aef5440d507902d8705a671a" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue Nov 29 17:26:59 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 17:26:59 2011 -0800" }, "message": "am 6f1dd757: Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1\n\n* commit \u00276f1dd757cb158d17c76baeb170f7db2271802ef8\u0027:\n SurfaceMediaSource: use the vid enc usage bit\n" }, { "commit": "21befea3720fb847aef5440d507902d8705a671a", "tree": "d0cf40e356b3fdd74a907275b45f41680287eb3f", "parents": [ "7609b2304379fd6d3e5c8d13a34c680441dc48b6", "4c57986f963c81fc7c2455deb113c9b32b135468" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue Nov 29 17:25:09 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 17:25:09 2011 -0800" }, "message": "Merge \"SurfaceMediaSource: use the vid enc usage bit\" into ics-mr1" }, { "commit": "a2d54aea18b469a186a6f8112c10c963710ab154", "tree": "213f038c97479a941f226f5cb34e19d535697dd7", "parents": [ "d7dbc9e610281bcdd5a1f0292e066aa2dbf749c4", "7609b2304379fd6d3e5c8d13a34c680441dc48b6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:30:46 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:30:46 2011 -0800" }, "message": "am 564fee36: Merge \"Make sure we can properly shutdown even if\" into ics-mr1\n\n* commit \u0027564fee36667e2699c59a29102136220dc2f65862\u0027:\n Make sure we can properly shutdown even if\n" }, { "commit": "d7dbc9e610281bcdd5a1f0292e066aa2dbf749c4", "tree": "ddfbfbf5682c8b20468f7d1ded274d28c150443c", "parents": [ "4d1ba696c0b308cc5a148e8228b9ef3a9a9e48f4", "5274010d068b05333e3e5544d59ca284802b1a8e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:30:45 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:30:45 2011 -0800" }, "message": "am d12dc284: Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1\n\n* commit \u0027d12dc28460f622ab29e83fa688ad83a8263e9417\u0027:\n If an error occurs that prevents us from reallocating buffers during a format change\n" }, { "commit": "4d1ba696c0b308cc5a148e8228b9ef3a9a9e48f4", "tree": "0388cb35e787c6754f1108fe6be81a539d87298c", "parents": [ "65879b6ff9b3e3f254b33b29c91c1f6db5271faa", "544ee287d01d98efbe9eeeaeb7016c8dd55e3748" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:30:43 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:30:43 2011 -0800" }, "message": "am 351143fb: Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1\n\n* commit \u0027351143fb0e2fcfb7dc2ef1045d693c71eb0ea329\u0027:\n Updated (internal) API for IStreamSource to signal discontinuities\n" }, { "commit": "65879b6ff9b3e3f254b33b29c91c1f6db5271faa", "tree": "f5e746365339a3b259decb6f3c77c1a03797ecf5", "parents": [ "48679acff8977bf8e378478882f1a32cb77a5a77", "6e3d311b6631b12aac2879d1b08c3534aece78b1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:30:40 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 29 14:30:40 2011 -0800" }, "message": "am 405a4e34: Merge \"Finer granularity discontinuity support.\" into ics-mr1\n\n* commit \u0027405a4e34032f8a07028138266fe9f79f6753b466\u0027:\n Finer granularity discontinuity support.\n" }, { "commit": "7609b2304379fd6d3e5c8d13a34c680441dc48b6", "tree": "8cd10d7ed5228247ee71cdf01dd8619ab1ee4999", "parents": [ "5274010d068b05333e3e5544d59ca284802b1a8e", "b58ce9f5e8d0696f9571a94ba5fc05f4500f663f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:09:10 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:09:10 2011 -0800" }, "message": "Merge \"Make sure we can properly shutdown even if\" into ics-mr1" }, { "commit": "5274010d068b05333e3e5544d59ca284802b1a8e", "tree": "a3af410cc5f0990f5caf0bf01fc77702acdfc247", "parents": [ "544ee287d01d98efbe9eeeaeb7016c8dd55e3748", "d3d822204249eaca4259bdf46f6f0357b96e8e21" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:09:03 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:09:03 2011 -0800" }, "message": "Merge \"If an error occurs that prevents us from reallocating buffers during a format change\" into ics-mr1" }, { "commit": "544ee287d01d98efbe9eeeaeb7016c8dd55e3748", "tree": "8a757cc879f9a06bf4b13a94d3831a48787871dd", "parents": [ "6e3d311b6631b12aac2879d1b08c3534aece78b1", "bfcc8d8ab7c56bc013bd221a29e1ecf3a6390813" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 14:08:45 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 29 14:08:45 2011 -0800" }, "message": "Merge \"Updated (internal) API for IStreamSource to signal discontinuities\" into ics-mr1" }, { "commit": "bfcc8d8ab7c56bc013bd221a29e1ecf3a6390813", "tree": "0469bc8cc740ad84a42b502ba57e02b3e520748a", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 11:57:35 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 29 11:59:10 2011 -0800" }, "message": "Updated (internal) API for IStreamSource to signal discontinuities\n\nChange-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96\nrelated-to-bug: 5553055\n" }, { "commit": "6e3d311b6631b12aac2879d1b08c3534aece78b1", "tree": "001b5d677ee599a4d6f8d1ba636fbf4e5f0c6a4e", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 12:36:11 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:45:13 2011 -0800" }, "message": "Finer granularity discontinuity support.\n\nNo clients can signal a format change on either audio or video track (or both)\nand a time discontinuity (timestamps changed) independantly.\n\nChange-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f\nrelated-to-bug: 5553055\n" }, { "commit": "b58ce9f5e8d0696f9571a94ba5fc05f4500f663f", "tree": "4c30ef7b134b02bd84cb0d7dc7407c27f5c945a3", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:27:35 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 16:27:35 2011 -0800" }, "message": "Make sure we can properly shutdown even if\n\na) one of the two decoders has a pending discontinuity\nb) the renderer holds on to all output buffers for that decoder\nc) the renderer is paused\n\nif all three conditions are met the decoder won\u0027t ask for more input data\nand therefore never see the discontinuity.\n\nTo avoid this we briefly resume the renderer just before shutting down.\n\nChange-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a\nrelated-to-bug: 5655016\n" }, { "commit": "d3d822204249eaca4259bdf46f6f0357b96e8e21", "tree": "f48558114991dfd8e267b6c166367cff7353305b", "parents": [ "7cafbb32999049873d4746ba83bd20c88abe6ce6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 10:54:12 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 28 10:54:12 2011 -0800" }, "message": "If an error occurs that prevents us from reallocating buffers during a format change\n\nwe need to transition to executing state anyway to be able to properly flush/shutdown\nin the future.\n\nChange-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f\nrelated-to-bug: 5655016\n" }, { "commit": "1a316cee915740189465fda64b2a11cd6403b632", "tree": "c7cc982a0a0ca792341009a3276fe9a47db1dcd4", "parents": [ "b8813d07df166e26d126184c77e870169d975790", "e933cb5ae546d023ab756391a135c170874e7901" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 22 08:41:26 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 22 08:41:26 2011 -0800" }, "message": "am cb6fbc89: Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1\n\n* commit \u0027cb6fbc89c25298643ab342b4a228e772b0e56978\u0027:\n Report a runtime error instead of asserting on malformed avc configuration data.\n" }, { "commit": "e933cb5ae546d023ab756391a135c170874e7901", "tree": "4a538f125f876469ea59e173b9d3645000c91cd4", "parents": [ "e8e5f86e9e310b065596c8cbbca1543eb833dee1", "71b61a960ae30df990976ca5dbe780d85a15b0d1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 22 08:39:11 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 22 08:39:11 2011 -0800" }, "message": "Merge \"Report a runtime error instead of asserting on malformed avc configuration data.\" into ics-mr1" }, { "commit": "b8813d07df166e26d126184c77e870169d975790", "tree": "9c6d4ca8203dfffddfdd40d963e4881eb3bfb4b7", "parents": [ "863992ab17511fb2550f0347b59065066dd6f8b5", "e8e5f86e9e310b065596c8cbbca1543eb833dee1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 21 20:30:14 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 21 20:30:14 2011 -0800" }, "message": "am 02740dc4: Merge \"Fix log spamming during time lapse video recording\" into ics-mr1\n\n* commit \u002702740dc49df86fc94c872454aa9db98737d5e8c8\u0027:\n Fix log spamming during time lapse video recording\n" }, { "commit": "4c57986f963c81fc7c2455deb113c9b32b135468", "tree": "a7c275b861fd66017002efa82eb25e08e096f652", "parents": [ "6f5cc45c48c02173bfae8d54b54a92c9bae256a1" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon Nov 21 16:51:47 2011 -0800" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Mon Nov 21 17:48:19 2011 -0800" }, "message": "SurfaceMediaSource: use the vid enc usage bit\n\nThis change makes SurfaceMediaSource add the VIDEO_ENC usage bit when\nallocating its GraphicBuffers rather than the HW_TEXTURE bit.\n\nChange-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb\n" }, { "commit": "e8e5f86e9e310b065596c8cbbca1543eb833dee1", "tree": "9093e89f8a7bf9544061fdfbe52383ae314e28b4", "parents": [ "6f5cc45c48c02173bfae8d54b54a92c9bae256a1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Nov 20 09:45:44 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 21 12:09:51 2011 -0800" }, "message": "Fix log spamming during time lapse video recording\n\nChange-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f\n\nrelated-to-bug: 5626569\n" }, { "commit": "863992ab17511fb2550f0347b59065066dd6f8b5", "tree": "419f5ded9a1413ccaa49abedd1cb6289a3489480", "parents": [ "6402ec10dfa1687a147c94167dc66051ca27bb87", "6f5cc45c48c02173bfae8d54b54a92c9bae256a1" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 15:10:38 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 18 15:10:38 2011 -0800" }, "message": "am 7ff7821a: am d4b22ab4: status_t !\u003d bool\n\n* commit \u00277ff7821a601a39fffb318e29873957b4a3703c46\u0027:\n status_t !\u003d bool\n" }, { "commit": "6f5cc45c48c02173bfae8d54b54a92c9bae256a1", "tree": "8f79a2e61ce7f69d24918e19d7a232ff12b252b3", "parents": [ "6479b955d21707609eae70008cf7956dddf12371", "91e2c7d2988c4947aca8a637f88a2179d905b970" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 15:07:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 18 15:07:21 2011 -0800" }, "message": "am d4b22ab4: status_t !\u003d bool\n\n* commit \u0027d4b22ab4889f9b1885bfc0dc45667c846a171a98\u0027:\n status_t !\u003d bool\n" }, { "commit": "91e2c7d2988c4947aca8a637f88a2179d905b970", "tree": "d73196fde1d16c5dbc71ca1f2b064db3883785d7", "parents": [ "fd8f534c7389e8215671a36a02c4666321f8816d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 13:10:56 2011 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Nov 18 14:21:34 2011 -0800" }, "message": "status_t !\u003d bool\n\nb/5567433\n\nChange-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e\n" }, { "commit": "71b61a960ae30df990976ca5dbe780d85a15b0d1", "tree": "b8a9826f9287872f217be9cbb8d48b18ad2b234d", "parents": [ "6479b955d21707609eae70008cf7956dddf12371" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 18 12:22:59 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 18 12:22:59 2011 -0800" }, "message": "Report a runtime error instead of asserting on malformed avc configuration data.\n\nChange-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845\nrelated-to-bug: 5641069\n" }, { "commit": "6402ec10dfa1687a147c94167dc66051ca27bb87", "tree": "d509db0206209d1161cd394bd2a0af18ba20abc4", "parents": [ "8964aadebe10e872b078f0821389b00cd5ec4e87", "6479b955d21707609eae70008cf7956dddf12371" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 17 09:07:48 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 17 09:07:48 2011 -0800" }, "message": "am c1b1709b: Merge \"Make sure not to cancel pending seek/EOS notifications on a cache underrun...\" into ics-mr1\n\n* commit \u0027c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd\u0027:\n Make sure not to cancel pending seek/EOS notifications on a cache underrun...\n" }, { "commit": "c34233e673c9791e137456d0c427d58db184b690", "tree": "caa611bce19db70a90586d6caa93bcf4ca6ec6ff", "parents": [ "9621addc73c029e77fd3d50f38a34f8f264b6e38" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 16 10:46:05 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 16 10:46:05 2011 -0800" }, "message": "Make sure not to cancel pending seek/EOS notifications on a cache underrun...\n\nor they are lost for good.\n\nChange-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62\nrelated-to-bug: 5544907\n" }, { "commit": "20ad2b6133af0ccb2bc11f7b4dc949d8ec07eaf6", "tree": "19f3dda61d19094f6ca73371a8cb13ed5a92f839", "parents": [ "732e23d6eb840991cf16fbbd2d3d6f16f786ef13", "9621addc73c029e77fd3d50f38a34f8f264b6e38" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Nov 15 09:45:24 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 15 09:45:24 2011 -0800" }, "message": "am 481ffa50: Merge \"Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\" into ics-mr1\n\n* commit \u0027481ffa505bb1d8f5089ea98e3b5960d409b6819c\u0027:\n Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\n" }, { "commit": "9621addc73c029e77fd3d50f38a34f8f264b6e38", "tree": "c79a225dd0af519094743dabf2b6c2871c638758", "parents": [ "72ae9fd9cca0af6e5c1001eeeca80841f712b096", "3a9cefebd2c5d2157aefaed01c54f151dc64a5b3" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Tue Nov 15 09:42:37 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 15 09:42:37 2011 -0800" }, "message": "Merge \"Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\" into ics-mr1" }, { "commit": "3a9cefebd2c5d2157aefaed01c54f151dc64a5b3", "tree": "33d2825031600b28086498c72925c94d6d6ed556", "parents": [ "1dc0ab1d2e2c5f40193556ad1239e304563f3083" ], "author": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Thu Nov 10 14:54:26 2011 -0800" }, "committer": { "name": "Hong Teng", "email": "hongteng@google.com", "time": "Mon Nov 14 13:02:59 2011 -0800" }, "message": "Fix for issue 5309336\n-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.\n\nChange-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509\n" }, { "commit": "2b5a61f40a1b7c4dd84d7c552c81ee4829358a82", "tree": "6cbf98dae66211e2d9e10c69502de4be3fe0012d", "parents": [ "38f5f175d9e7e07ebb986090c61368abea4568f0", "7ac9a9afafbc7c515a73086c11a15a27c7fd05b1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 11:50:37 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:50:37 2011 -0800" }, "message": "am 23217182: Merge \"Didn\\\u0027t mean to check this in...\" into ics-mr1\n\n* commit \u002723217182743521063655c6fb1b1580d3558cfbe7\u0027:\n Didn\u0027t mean to check this in...\n" }, { "commit": "38f5f175d9e7e07ebb986090c61368abea4568f0", "tree": "2c80e03562d332b50d6e16209f9abce25a610192", "parents": [ "9569e3b2d560a7b56b68f2732a6a111d8dede98f", "04ccb823442a4dae4f418228dd28f8607f174978" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 11 11:50:28 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:50:28 2011 -0800" }, "message": "am 1f8c6212: Merge \"visualizer: reset buffer if playback is idle\" into ics-mr1\n\n* commit \u00271f8c621279ddb163ee3d63bf32d79955679db0c5\u0027:\n visualizer: reset buffer if playback is idle\n" }, { "commit": "9569e3b2d560a7b56b68f2732a6a111d8dede98f", "tree": "c357528e96274a8f25e64da2fec0236e57445596", "parents": [ "e294ab6ecca7989316aaf64ff33bb8f7bc7c03e3", "73b1fd56d99b356b0effe8cf96ecf7446beb207f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 11:50:23 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:50:23 2011 -0800" }, "message": "am cd556b82: Merge \"Instead of asserting, signal a runtime error if the session doesn\\\u0027t contain\" into ics-mr1\n\n* commit \u0027cd556b82fd12dceb49e9d6543f80212721b220ec\u0027:\n Instead of asserting, signal a runtime error if the session doesn\u0027t contain\n" }, { "commit": "e294ab6ecca7989316aaf64ff33bb8f7bc7c03e3", "tree": "7ee7385eb48c6e2a9c61c71b13ba418c26bd57ff", "parents": [ "78a96239c6227997522c5e01bead7732f95e4dbc", "4ab3045755d33ab24bd312cfbc888f300c5e01f9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 11:50:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:50:21 2011 -0800" }, "message": "am 5d42075e: Merge \"DO NOT MERGE: Instead of asserting, remove active streams if their sockets\" into ics-mr1\n\n* commit \u00275d42075e450a49af2bb37ca3a9610921df7607f2\u0027:\n DO NOT MERGE: Instead of asserting, remove active streams if their sockets\n" }, { "commit": "78a96239c6227997522c5e01bead7732f95e4dbc", "tree": "24b43b194a51d9823ee34f9151296887895d556a", "parents": [ "8d3016b0b04602187f90e7a5229a15e5fc4ef25d", "4c5f7e33c26a858fd61438e3c1aea5c196a770e7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 11:50:20 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:50:20 2011 -0800" }, "message": "am d9f25bc9: Merge \"Disconnect on socket error on the RTSP control connection.\" into ics-mr1\n\n* commit \u0027d9f25bc941746f268ab978e6b2af7b7c4ec2ea89\u0027:\n Disconnect on socket error on the RTSP control connection.\n" }, { "commit": "8d3016b0b04602187f90e7a5229a15e5fc4ef25d", "tree": "a62c477c32c0807b442c8a8803e56945afcd2c4d", "parents": [ "719b23faa1ce43e749ecf245f030bcdf2d2d7f7d", "4948818cb91176df74c972ac27b2f392b5d148bc" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Nov 11 11:50:14 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 11 11:50:14 2011 -0800" }, "message": "am 08e42967: Merge \"Add support for retrieving location information in mp4/3gpp files\" into ics-mr1\n\n* commit \u002708e42967b9e459b7beb22e859f1f1eba0546741b\u0027:\n Add support for retrieving location information in mp4/3gpp files\n" }, { "commit": "7ac9a9afafbc7c515a73086c11a15a27c7fd05b1", "tree": "5550d546b9610985bfd447b04562fdceef310c1e", "parents": [ "04ccb823442a4dae4f418228dd28f8607f174978", "91f230461288a2a5091182ef9e17079aabf8ebaa" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 10:46:02 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 10:46:02 2011 -0800" }, "message": "Merge \"Didn\u0027t mean to check this in...\" into ics-mr1" }, { "commit": "91f230461288a2a5091182ef9e17079aabf8ebaa", "tree": "264129533957295e676822b91e4ae5e1cba7e9e4", "parents": [ "73b1fd56d99b356b0effe8cf96ecf7446beb207f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 10:17:00 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 10:17:00 2011 -0800" }, "message": "Didn\u0027t mean to check this in...\n\nChange-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7\n" }, { "commit": "04ccb823442a4dae4f418228dd28f8607f174978", "tree": "8f749edbf5c2ede2f62b91aea9fc9de60cddcfc8", "parents": [ "73b1fd56d99b356b0effe8cf96ecf7446beb207f", "3df40a093d8d3d211f693e0e3ef4076750cabfea" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 11 08:17:22 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 08:17:22 2011 -0800" }, "message": "Merge \"visualizer: reset buffer if playback is idle\" into ics-mr1" }, { "commit": "73b1fd56d99b356b0effe8cf96ecf7446beb207f", "tree": "e9de870ee19df7fc19a009cf084e4742acf5602a", "parents": [ "4ab3045755d33ab24bd312cfbc888f300c5e01f9", "f0c86a83c687074be79397e082e3775ca56641b1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 07:39:25 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 07:39:25 2011 -0800" }, "message": "Merge \"Instead of asserting, signal a runtime error if the session doesn\u0027t contain\" into ics-mr1" }, { "commit": "4ab3045755d33ab24bd312cfbc888f300c5e01f9", "tree": "c4acc6eecf6e65fcbc6c1439fec5d1c23190053e", "parents": [ "4c5f7e33c26a858fd61438e3c1aea5c196a770e7", "19de627354d465c4e9ccd1fcdcffd132861330b2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 07:39:18 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 07:39:18 2011 -0800" }, "message": "Merge \"DO NOT MERGE: Instead of asserting, remove active streams if their sockets\" into ics-mr1" }, { "commit": "4c5f7e33c26a858fd61438e3c1aea5c196a770e7", "tree": "fef12a963d5d741f1e7e172ea843918d870120c3", "parents": [ "4948818cb91176df74c972ac27b2f392b5d148bc", "0fbe0577cfeda28bd016110e670708cce0752044" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 11 07:39:11 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 11 07:39:11 2011 -0800" }, "message": "Merge \"Disconnect on socket error on the RTSP control connection.\" into ics-mr1" }, { "commit": "0fbe0577cfeda28bd016110e670708cce0752044", "tree": "605a833a1985f4a0fcdf821f5d7a18a2b6039f96", "parents": [ "1dc0ab1d2e2c5f40193556ad1239e304563f3083" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 14:48:20 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 15:10:15 2011 -0800" }, "message": "Disconnect on socket error on the RTSP control connection.\n\nChange-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b\n" }, { "commit": "19de627354d465c4e9ccd1fcdcffd132861330b2", "tree": "6ef9dc9534ae97e6f927833ec9fe50683d1a9a1d", "parents": [ "1dc0ab1d2e2c5f40193556ad1239e304563f3083" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 14:26:43 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 12:41:51 2011 -0800" }, "message": "DO NOT MERGE: Instead of asserting, remove active streams if their sockets\n\nreturn failure\n\nChange-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79\nrelated-to-bug: 5593654\n" }, { "commit": "f0c86a83c687074be79397e082e3775ca56641b1", "tree": "ac5473dd00309001ec4cea2d2296d93ef90ec1dc", "parents": [ "1dc0ab1d2e2c5f40193556ad1239e304563f3083" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 12:40:30 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 12:40:30 2011 -0800" }, "message": "Instead of asserting, signal a runtime error if the session doesn\u0027t contain\n\nany playable tracks at all.\n\nChange-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6\n" }, { "commit": "4948818cb91176df74c972ac27b2f392b5d148bc", "tree": "e7aaec9695649fe12c95ab33c1aca7b686017622", "parents": [ "1dc0ab1d2e2c5f40193556ad1239e304563f3083" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 09 00:48:56 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Nov 10 11:40:11 2011 -0800" }, "message": "Add support for retrieving location information in mp4/3gpp files\n\nChange-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687\nrelated-to-bug: 5560253\n" }, { "commit": "3df40a093d8d3d211f693e0e3ef4076750cabfea", "tree": "c26b2befde35a0235263d12d17dd30ad8d98370c", "parents": [ "1dc0ab1d2e2c5f40193556ad1239e304563f3083" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Nov 10 10:02:18 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Nov 10 10:27:05 2011 -0800" }, "message": "visualizer: reset buffer if playback is idle\n\nVisualizer capture buffer must be reset if audio framework has stopped\ncalling process for a given period of time to get read of residual\ndata from previous captures.\n\nIssue 5571920.\n\nChange-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb\n" }, { "commit": "719b23faa1ce43e749ecf245f030bcdf2d2d7f7d", "tree": "e08531f5a8e01a48441644e4ddcf49185f4dd705", "parents": [ "52c155208d8bb7ef2b885494e0583226c02de0e0", "1dc0ab1d2e2c5f40193556ad1239e304563f3083" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 16:52:19 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 10 16:52:19 2011 +0000" }, "message": "am 2375d163: Merge \"Send RTSP control connection keep-alive requests\" into ics-mr1\n\n* commit \u00272375d16378e6f8b7694c5a2cd9e0622e382e6049\u0027:\n Send RTSP control connection keep-alive requests\n" }, { "commit": "52c155208d8bb7ef2b885494e0583226c02de0e0", "tree": "ff12d738b6963e30e3a553109153c938daa7aaf9", "parents": [ "7f438868794d83cb560c0852e7c7acd3124ceaa1", "ca957d753496aff94dbb93b547e1c605bbfa064b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 16:52:17 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 10 16:52:17 2011 +0000" }, "message": "am b42aea5b: Merge \"Don\\\u0027t believe the PV decoder\\\u0027s lies...\" into ics-mr1\n\n* commit \u0027b42aea5b4c7cc7b2766f80f5ceda94b324d776e5\u0027:\n Don\u0027t believe the PV decoder\u0027s lies...\n" }, { "commit": "7f438868794d83cb560c0852e7c7acd3124ceaa1", "tree": "26c61917f531591d5f1da4ba2afaad22a92d2213", "parents": [ "f2c5aff16e0c654a697bbf2a17f862d3a953e233", "d57a4ddd1ab42401c4a011df7e9577b843de1b68" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 16:49:12 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 10 16:49:12 2011 +0000" }, "message": "am 7c063cf9: Merge \"There\\\u0027s no point in trying to continue to decode after an error was signalled.\" into ics-mr1\n\n* commit \u00277c063cf9679a2ecdda5e1639cfdca3e1084019f9\u0027:\n There\u0027s no point in trying to continue to decode after an error was signalled.\n" }, { "commit": "1dc0ab1d2e2c5f40193556ad1239e304563f3083", "tree": "a6c242b2ca49c925056256061428961358c0e92d", "parents": [ "ca957d753496aff94dbb93b547e1c605bbfa064b", "908dbdee96856693decc04fa143c2ba525495d43" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 08:48:44 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 10 08:48:44 2011 -0800" }, "message": "Merge \"Send RTSP control connection keep-alive requests\" into ics-mr1" }, { "commit": "ca957d753496aff94dbb93b547e1c605bbfa064b", "tree": "575862af4ce60087607dd536a19ec33168976052", "parents": [ "d57a4ddd1ab42401c4a011df7e9577b843de1b68", "0029faf8f4efbca3844c4174b75d46c432f8f272" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 08:48:34 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 10 08:48:34 2011 -0800" }, "message": "Merge \"Don\u0027t believe the PV decoder\u0027s lies...\" into ics-mr1" }, { "commit": "d57a4ddd1ab42401c4a011df7e9577b843de1b68", "tree": "3f6108bdf416cfa0a84d6611c747464c41032576", "parents": [ "b5d340314ac6da461f15fe4d1db996ae28770d67", "2961a85f5f00343c115ac8e5dc17de631694fb6e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 10 08:47:25 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Nov 10 08:47:25 2011 -0800" }, "message": "Merge \"There\u0027s no point in trying to continue to decode after an error was signalled.\" into ics-mr1" }, { "commit": "f2c5aff16e0c654a697bbf2a17f862d3a953e233", "tree": "29acc85f0294f14cabc96abb5734f286e8d1b30e", "parents": [ "0990dae8a2808e1c896a2ca692145432f30e0014", "b5d340314ac6da461f15fe4d1db996ae28770d67" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 09 19:00:05 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 09 19:00:05 2011 +0000" }, "message": "am f2c2b1c4: am 19998120: Merge \"Bug 5478024 drop after decode if can\\\u0027t drop before\" into ics-mr0\n\n* commit \u0027f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2\u0027:\n Bug 5478024 drop after decode if can\u0027t drop before\n" }, { "commit": "2961a85f5f00343c115ac8e5dc17de631694fb6e", "tree": "d63ced935a4f2ab3e6d02072481825f81fb65227", "parents": [ "936a981ba15d528a023311aa32f46446813551d9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:26:06 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:26:06 2011 -0800" }, "message": "There\u0027s no point in trying to continue to decode after an error was signalled.\n\nChange-Id: I2a2410cac9444eadd85be5d104799703171f1a24\nrelated-to-bug: 5588658\n" }, { "commit": "0029faf8f4efbca3844c4174b75d46c432f8f272", "tree": "9b59633ede7c8f7a91bb8a56afd411567287cb01", "parents": [ "936a981ba15d528a023311aa32f46446813551d9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:03:07 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Nov 09 10:03:07 2011 -0800" }, "message": "Don\u0027t believe the PV decoder\u0027s lies...\n\nChange-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27\n" }, { "commit": "b5d340314ac6da461f15fe4d1db996ae28770d67", "tree": "cf6832c7d73a0ecf7237880dc2401ce5f4738fc9", "parents": [ "a47b69c6f7c6fe0044ebcb2d0790ce3548de56fd", "683525b61bc1b58b4fd9e1b3ef9ed3b0c3bf34ae" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 09 16:41:19 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 09 16:41:19 2011 +0000" }, "message": "am 19998120: Merge \"Bug 5478024 drop after decode if can\\\u0027t drop before\" into ics-mr0\n\n* commit \u002719998120f53caceb620f138c6eea182f1e693660\u0027:\n Bug 5478024 drop after decode if can\u0027t drop before\n" }, { "commit": "908dbdee96856693decc04fa143c2ba525495d43", "tree": "64a11df6061e668c16ce5afe02e3741d145d08d6", "parents": [ "936a981ba15d528a023311aa32f46446813551d9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 15:31:23 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 15:39:15 2011 -0800" }, "message": "Send RTSP control connection keep-alive requests\n\ndefault to 60 secs unless overridden by server\u0027s session-id response.\n\nChange-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c\nrelated-to-bug: 5562303\n" }, { "commit": "1e2c4152878a400cbd6d1ccf148ba1e0f6582c11", "tree": "3a45e6dc1ea3b2c63cc159f56ca5ce14f50c81d9", "parents": [ "0f31bfac8cc3317a1f96f7c2bb1cf3941c5c148c", "936a981ba15d528a023311aa32f46446813551d9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 17:58:45 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 08 17:58:45 2011 +0000" }, "message": "am 26f70db9: Merge \"Remove surface legacy APIs and code.\" into ics-mr1\n\n* commit \u002726f70db99f483be36caa7a4c84fec5de50bec034\u0027:\n Remove surface legacy APIs and code.\n" }, { "commit": "936a981ba15d528a023311aa32f46446813551d9", "tree": "324a081cdeffe2566802e2224dfa9b9798182c05", "parents": [ "e1a8a719c7c62fdb337b71f68844ae20042c2b79", "3901e5d87573447db33fb9930871a1f5266a9b2c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 08 08:48:31 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 08 08:48:31 2011 -0800" }, "message": "Merge \"Remove surface legacy APIs and code.\" into ics-mr1" }, { "commit": "c0d3b9a32e04a9fe1e88097be8785d8055397232", "tree": "8692346628e99bf3fda0b167e1d0f85bab7b7d99", "parents": [ "d3011ec5d392996849dd1a62c42832155f46acf2", "49e82712b2b7072bb8b8d6e2c86115eaa82e9943" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 08 06:58:11 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 08 06:58:11 2011 +0000" }, "message": "am ee7ebb32: Merge \"Fix a hang issue where the first frame can be dropped for timelapse video recording.\" into ics-mr1\n\n* commit \u0027ee7ebb3257d9337627b175835dc3d08f9b8ab339\u0027:\n Fix a hang issue where the first frame can be dropped for timelapse video recording.\n" }, { "commit": "49e82712b2b7072bb8b8d6e2c86115eaa82e9943", "tree": "fbd8e5b9db9272c35e91e240af395bd8862e464e", "parents": [ "197388e5f42fc21175a03e3abb05020fabbcbb71", "93594b5aa16dbbb0b196f6e181a8ca099d7ab62b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 07 22:57:02 2011 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 07 22:57:02 2011 -0800" }, "message": "Merge \"Fix a hang issue where the first frame can be dropped for timelapse video recording.\" into ics-mr1" }, { "commit": "683525b61bc1b58b4fd9e1b3ef9ed3b0c3bf34ae", "tree": "495b8c8bd23d3d1114b0538aa92030a7dcf90693", "parents": [ "ee74c46968e632915bdff1af5d59a1b2ca3ac796" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Nov 04 18:05:35 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Nov 04 18:05:35 2011 -0700" }, "message": "Bug 5478024 drop after decode if can\u0027t drop before\n\nChange-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371\n" }, { "commit": "ff7eb864cdef857b076f2427c58ee58e59e75994", "tree": "628b10ab6b9ce081616021cea2cc990d6986d400", "parents": [ "93f6ba45115134ebd75ff7381bdf715251b0a6c3", "4d954c4ff6ab7110df23f1f3ebfe296beb97f3de" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 04 15:32:13 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 04 15:32:13 2011 +0000" }, "message": "am 914972be: Merge \"Fix device management in lvm effect bundle wrapper.\" into ics-mr1\n\n* commit \u0027914972be65bef1fd7e886825e7af27c29eff0a1e\u0027:\n Fix device management in lvm effect bundle wrapper.\n" }, { "commit": "93f6ba45115134ebd75ff7381bdf715251b0a6c3", "tree": "c7b77c9ef19c761216ce0aa9d898f00a50daeef1", "parents": [ "f8bbc7a0ffe9b93f8c496979904d18e595027010", "047f160561fc7a87fc5794762d36225bfa5d2e89" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 04 15:29:44 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 04 15:29:44 2011 +0000" }, "message": "am 79178b8b: Merge \"Fix problem in lvm effect bundle wrapper.\" into ics-mr1\n\n* commit \u002779178b8b3da8f69f34a72be13f2a374afbec4f40\u0027:\n Fix problem in lvm effect bundle wrapper.\n" }, { "commit": "4d954c4ff6ab7110df23f1f3ebfe296beb97f3de", "tree": "08359befbbcfeb0a4e401724e87d277c86a7d7e9", "parents": [ "047f160561fc7a87fc5794762d36225bfa5d2e89", "b6431802fc6cff501a4311de288ba469839fbf86" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 04 08:29:30 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 04 08:29:30 2011 -0700" }, "message": "Merge \"Fix device management in lvm effect bundle wrapper.\" into ics-mr1" }, { "commit": "047f160561fc7a87fc5794762d36225bfa5d2e89", "tree": "ee130b1d3b1b4ba24f93f3106fd83e485605d41d", "parents": [ "fc1a3ac1641b8849bf925a6bf0fa96b2abcdd91f", "5dc65e2ce92c7364da60bdff5f345daf145c2c0f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 04 08:27:45 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Nov 04 08:27:45 2011 -0700" }, "message": "Merge \"Fix problem in lvm effect bundle wrapper.\" into ics-mr1" }, { "commit": "ee74c46968e632915bdff1af5d59a1b2ca3ac796", "tree": "bf203cb52a3c051c326dc2c9c65c7f367abbcc86", "parents": [ "2cf981a8e3dcc815e422f21ae4f09e17934906e1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 03 11:00:21 2011 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Nov 03 18:15:43 2011 -0700" }, "message": "DO NOT MERGE Poll input data with a small timeout and don\u0027t consume a full core.\n\nChange-Id: I3c288698920fe6ead0df24a52330483609821a41\nrelated-to-bug: 5549263\n" }, { "commit": "b518cf9d4456dc0ef58d67f09efe1db0e017852a", "tree": "f52a8c4d2249de589004b292f80ef9ec1f10a849", "parents": [ "fd57665ece9b8ee174d6efe4df7e41e07c7c44f1", "1183a4ab06b9fe01fe39a4b8728bfc71789361fc" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 03 18:10:44 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Nov 03 18:10:44 2011 +0000" }, "message": "am e395f645: Poll input data with a small timeout and don\\\u0027t consume a full core.\n\n* commit \u0027e395f645aa4c30a4fad8beb3da6f8fad72338617\u0027:\n Poll input data with a small timeout and don\u0027t consume a full core.\n" }, { "commit": "1183a4ab06b9fe01fe39a4b8728bfc71789361fc", "tree": "00ddd671c9cccb82663b0b6928880307f25af975", "parents": [ "254c2211b5088bb7d84d7126306aad7763b58372" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 03 11:00:21 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 03 11:00:21 2011 -0700" }, "message": "Poll input data with a small timeout and don\u0027t consume a full core.\n\nChange-Id: I3c288698920fe6ead0df24a52330483609821a41\nrelated-to-bug: 5549263\n" }, { "commit": "5dc65e2ce92c7364da60bdff5f345daf145c2c0f", "tree": "90ed0dc7e58b08a673b19a7b72676ba4c9630b70", "parents": [ "09ebde724b2cd224968d1fdba4f5afd81c998c6a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Oct 31 17:36:03 2011 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Nov 02 09:14:13 2011 -0700" }, "message": "Fix problem in lvm effect bundle wrapper.\n\nWhen an effect is disabled, the process function should either\ncopy or accumulate the content of the input buffer to the output buffer\ndepending on the behavior requested by the framework.\nCurrent implementation is copying the input buffer unconditionally.\n\nRelated to issue 5433942.\n\nChange-Id: Ic488ca97eadcc4c763de570d7e6c6f5b7a979415\n" }, { "commit": "b6431802fc6cff501a4311de288ba469839fbf86", "tree": "596a877457ca1b1a6e1eb6e5c547a4cb0dcbc67d", "parents": [ "841fa37451fb74f3d5978a15aab606bbb67e8c39" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Oct 31 18:48:15 2011 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 01 09:12:19 2011 -0700" }, "message": "Fix device management in lvm effect bundle wrapper.\n\nThe virtualizer and bass boost effects should be disabled when\nnot playing throught headsets or headphones.\n\nThere is a bug in current wrapper implementation that makes that those\neffects are not disabled if the effect is enabled by the user after\nthe headset has been removed (current logic only works if the device selection\noccurs while the effect is enabled).\n\nChange-Id: I7c66b15a0339d95fb9ed13c8320d66379725d3b6\n" }, { "commit": "2f5ef5818cb23e854992ef5b78c6439639353f2d", "tree": "8bf1bfe8e53e8f9c20b1aeeb8e3ab5d5d61eb803", "parents": [ "0656c64d9e2fef4fd3b775c8e0959c1794e84e8c", "841fa37451fb74f3d5978a15aab606bbb67e8c39" ], "author": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Mon Oct 31 06:06:27 2011 -0700" }, "committer": { "name": "Ed Heyl", "email": "ed@google.com", "time": "Mon Oct 31 06:06:27 2011 -0700" }, "message": "merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed)\n\nChange-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928\n" }, { "commit": "3901e5d87573447db33fb9930871a1f5266a9b2c", "tree": "2ed377c9705a41c95cbc6ea29d683cd646ff2dc8", "parents": [ "841fa37451fb74f3d5978a15aab606bbb67e8c39" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 25 13:45:00 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 28 09:39:23 2011 -0700" }, "message": "Remove surface legacy APIs and code.\n\nAll surfaces are now supported through surface textures.\n\nChange-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6\n" }, { "commit": "841fa37451fb74f3d5978a15aab606bbb67e8c39", "tree": "3a5aa72aca0d0eeed60d8a17e8c84ffe59ecbeba", "parents": [ "262620399c228b3b201c2c4b39c87508d3047d74", "a4af2143ecbd630e946647c1b5f90fda8f61ebb3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 28 09:13:54 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 28 09:13:54 2011 -0700" }, "message": "Merge \"Properly report that we\u0027re no longer playing after receiving event\" into ics-mr1" }, { "commit": "07436fc0daa56a429bf3f777b9e5793a9f4e57de", "tree": "d02ce019e7424db8dfd55ce1450c9cf71b92d072", "parents": [ "3c56184d33c3f08eddff38f3883ccc14348a87bd" ], "author": { "name": "Jason Simmons", "email": "jsimmons@google.com", "time": "Fri Sep 16 13:46:40 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Oct 28 10:14:50 2011 -0400" }, "message": "Configure the A@H TX media player with one string\n\nMusic2 would prefer a configuration interface that takes a single\nblob of data passed in from the RPC client and then passes it\nopaquely to the media player. This eliminates the need for Music2\nto rev their application if we add more configuration options to\nthe TX player.\n\nChange-Id: Ia2daea3ff2502f91f8a5a82b898752c435279a0f\n" }, { "commit": "3c56184d33c3f08eddff38f3883ccc14348a87bd", "tree": "8d40d235e2ac62a4b844bbdfc07b78441c4d4368", "parents": [ "395575aba45ef636ac8ecf0f85e30329ba094150" ], "author": { "name": "Jason Simmons", "email": "jsimmons@google.com", "time": "Thu Sep 15 14:19:36 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Oct 28 10:14:50 2011 -0400" }, "message": "Ensure that the TRTP retry buffer has contiguous sequence numbers\n\nPreviously, sequence numbers for audio packets were assigned by the\nTX player before packets were queued to the sender. This caused a\nrace between assignment of sequence numbers on audio packets and\nsequence numbers on heartbeat packets. A heartbeat could get queued\nand added to the retry buffer before an audio packet with an earlier\nsequence number got queued.\n\nThis CL centralizes packet sequence number assignment and insertion\ninto the retry buffer inside AAH_TXSender::doSendPacket_l. It also\nmakes explicit what operations can be done on a TRTPPacket before\nand after packing.\n\nChange-Id: I6d02eae81061983e4def4f1b3dd7c1625467b151\n" }, { "commit": "395575aba45ef636ac8ecf0f85e30329ba094150", "tree": "93f2f0eb852f6e6e32cd66cfe16f5ac28b6e9aeb", "parents": [ "1a5e6b1f38ab3c542dd27f7fe600a3200b4dd7f2" ], "author": { "name": "Jason Simmons", "email": "jsimmons@google.com", "time": "Mon Sep 12 16:58:07 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Oct 28 10:14:49 2011 -0400" }, "message": "Hold the AAHDecoderPump ThreadWrapper in a ref-counting pointer\n\nChange-Id: Iff840dbd9e1f79a07e62c1481b2b0797f30247cb\n" }, { "commit": "1a5e6b1f38ab3c542dd27f7fe600a3200b4dd7f2", "tree": "33dfa8fd1f279da5aa3e235c4dfd9e40dcdb3064", "parents": [ "033e42b72f70ad777e65f9ba4a5f7a3ab3331ab0" ], "author": { "name": "Mike J. Chen", "email": "mjchen@google.com", "time": "Mon Aug 15 13:24:13 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Oct 28 10:14:49 2011 -0400" }, "message": "MediaPlayer changes for Tungsten/Android@Home.\n\nSquashed merge from master-tungsten of the following changes:\n\ncommit e8b156c6b224f0fe5b6a81d5f92bade36275027c\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Fri Aug 12 10:28:48 2011 -0700\n\n Add a null check to handle failure of android::createPlayer\n\n Change-Id: Iacbbc90369a825838d4374b1f774c8880b25753b\n\ncommit 43be3231034ff8537fdd84422a7954780038671f\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 27 18:59:12 2011 -0700\n\n Move libaah_rtp over from the vendor directory.\n\n Also move factor PipeEvent out into utils.\n\n Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37\n\ncommit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 27 17:06:49 2011 -0700\n\n Name changes for the TRTP Players s/tungsten/aah/g\n\n Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51\n\ncommit cbf2903ab6893b6e662514e2f6d670e268a419df\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Fri Apr 15 09:27:54 2011 -0700\n\n Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.\n\n Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502\n\nChange-Id: I73f3be191cd974933acddf52892e5600d253cc03\nSigned-off-by: Mike J. Chen \u003cmjchen@google.com\u003e\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\n" }, { "commit": "033e42b72f70ad777e65f9ba4a5f7a3ab3331ab0", "tree": "0d4042b1444ba183dd1d6a225855fd48563984c1", "parents": [ "94dacaf173ff4aad8a39a3343b12a513b92ed2a8" ], "author": { "name": "Mike J. Chen", "email": "mjchen@google.com", "time": "Mon Aug 15 11:26:02 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Oct 28 10:14:49 2011 -0400" }, "message": "Add media/libaah_rtp\n\nRTP library used to broadcast media from one device to a collection\nof listeners. Handles failures/retries/etc.\n\nThis is a squashed merge from master-tungsten of the following changes:\n\ncommit e1a5101fe627d71739a7c4263bb3a65c7bc44385\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Fri Aug 12 13:24:21 2011 -0700\n\n Hold ThreadWrapper in a ref-counting pointer\n\n Change-Id: Iaf3343182e37bcc0ca99fbaf8f9bbb8c4984072a\n\ncommit 89b90d62e164ff3db27c9cba85255fc476d2dd96\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Wed Aug 10 13:08:25 2011 -0700\n\n Update the Tungsten TX player to use HTTPBase\n\n Change-Id: I9f7ecf1b4b496cec1815284dbcdb958a43284169\n\ncommit 43be3231034ff8537fdd84422a7954780038671f\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 27 18:59:12 2011 -0700\n\n Move libaah_rtp over from the vendor directory.\n\n Also move factor PipeEvent out into utils.\n\n Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37\n\nChange-Id: I5fe1ea941c09204d7b33f15f4e2b2ab320dc468b\nSigned-off-by: Mike J. Chen \u003cmjchen@google.com\u003e\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\nSigned-off-by: Jason Simmons \u003cjsimmons@google.com\u003e\n" }, { "commit": "500e510c7bd96a3d2959cdd858db4045b74a0e1a", "tree": "1bc7df57dc78a0db2d7c9fb3b0945ff5e681328e", "parents": [ "0d681abd16873a265a10aee1e9ae8fa062309de3" ], "author": { "name": "Mike J. Chen", "email": "mjchen@google.com", "time": "Mon Aug 15 13:28:26 2011 -0700" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Fri Oct 28 10:14:48 2011 -0400" }, "message": "Media framework changes for Tungsten.\n\nSquashed merge from master-tungsten of the following changes:\n\ncommit 73d09e18c4557e583a1684d44d598a1a02fd0cf2\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 20 13:57:44 2011 -0700\n\n Remove TungstenMisc and rename LinearTransform\n\n Change-Id: Ie8aa3e24e09fdbf6ef8996c26deb9c5640e20d1b\n\ncommit 3114aabe76ad733b59929d87e49c68229f5ae2e8\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Fri Jun 3 10:47:16 2011 -0700\n\n Name changes and spelling fixes.\n\n + Replace the term TungstenTime with the Eugene-approved term CommonTime.\n + Fix a spelling error in a comment I noticed.\n\n Change-Id: I8c10d618206826d16055f78c7724e24443bb03fd\n\ncommit cbf2903ab6893b6e662514e2f6d670e268a419df\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Fri Apr 15 09:27:54 2011 -0700\n\n Migrate Tungsten code from the HC-Tungsten to the Master-Tungsten branch.\n\n Change-Id: I95372d913a0761d90168edb4016f5ece0ea74502\n\ncommit bc7c46aa629f9883e959ef23de8da297f9eb508b\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Mon Jun 20 13:59:17 2011 -0700\n\n Create a separate class for timed AudioTracks\n\ncommit 43be3231034ff8537fdd84422a7954780038671f\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 27 18:59:12 2011 -0700\n\n Move libaah_rtp over from the vendor directory.\n\n Also move factor PipeEvent out into utils.\n\n Change-Id: Id3877c66efe22d771cf3ef4877107e431b828e37\n\ncommit 17526eb3148c9c3d4365b6d5b47e8dc13bca71b6\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 27 17:06:49 2011 -0700\n\n Name changes for the TRTP Players s/tungsten/aah/g\n\n Change-Id: I55e9ad13003f6aa6a36955b54426a7efbe31ac51\n\ncommit 423fc1bfc0fda799c421a650c83c4b9293b1a08c\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Mon Jun 20 17:56:09 2011 -0700\n\n More timed AudioFlinger changes requested by code review:\n * change trimTimedBufferQueue to trimTimedBufferQueue_l\n * create one timed audio buffer heap per client process instead of one per track\n * grow the silence buffer on demand\n * some error handling fixes in timed getNextBuffer\n * calculate the next output PTS in all mixer and track hooks\n\n Change-Id: Ifc51a08b55029b7c48902ab2f22933ad7bafe1ad\n\ncommit a148e2674b1d3cb73289b82b85c333f0a66824a9\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 20 17:02:24 2011 -0700\n\n Move the A@H time service into frameworks/base\n\n Change-Id: I5c570cde70e8931e205516cb33517585804ce841\n\ncommit dfa438fa49bdaeeb2ec5fd0d17b30d881608b6b1\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Mon Jun 20 11:55:36 2011 -0700\n\n Fix the build after Mike\u0027s code moving.\n\n Change-Id: Ia883643ded252168bcc5a70584ab6ce97bb05266\n\ncommit 04489474ec8e73efe1bf52918831f41659033162\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Fri Jun 17 14:19:50 2011 -0700\n\n Refactor the local/common clock services.\n\n This change is one of a set of 5 changes made to different repositories. Look\n for this comment in all of them.\n\n Refactor the local/common clock services in tungsten to match android best\n practice. Notable changes include\n\n + The kernel no longer knows anything about common time. Common time has been\n moved completely up into user land. This has an impact on the accuracy of the\n timesync debugging code, and the netfilter assisted approach to network based\n timesync is going to have to be modified.\n + The timesync driver used by A@H is now just local time driver.\n + The kernel no longer needs access to the linear transform math code, and it\n has been removed.\n + A new HAL has been introduced to expose the concept of local time to the\n system.\n + A non-slewable stub implementation of the local time HAL based on\n CLOCK_MONOTONIC has been added.\n + The TungstenTime library has been eliminated. Its functionality has been\n distributed among the common time binder service, the local time hal and the\n linear transform utility code.\n + All clients of the old TungstenTime library have been changed to be clients of\n the binder service, the hal and the utility code.\n + The reset_tt utilities have been removed, they no longer have a purpose in the\n system.\n + more progress has been made in eliminating the word \"tungsten\" from the code.\n\n Things left to do include\n + Finish getting rid of tungsten from the time service.\n + Move the time service into the framework; AudioFlinger\u0027s new timed mode\n depends on it and the service cannot continue to live in vendor tungsten.\n\n Change-Id: I999b6cfb4a9d267818a86d747c35eecfc6693101\n\ncommit d48194545eed1116a84d81e2fb53315d2b0701a7\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Thu Jun 16 14:22:46 2011 -0700\n\n Change the interface of the AudioMixer and AudioBufferProvider to accept a presentation timestamp\n\n Change-Id: Ice2df5628d45a7f77100e7008103b35b3d3160a4\n\ncommit 02561419db82b01ffb28df38000716c612988427\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Tue May 10 14:00:21 2011 -0700\n\n Put in a hack for controling master volume in the policy manager.\n Fix initial master volume reporting.\n\n Change-Id: Ia6caf2bbc6083c5f99fab852baa40fff10fc5fc7\n\ncommit 549cdc3ba115dc654cdade261fb055c72c6cdb79\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Wed May 4 11:46:17 2011 -0700\n\n Make certain the logic for computing the output stream mixing point is hardened\n against underflow and overflow when input and output sample rates don\u0027t match.\n\n Change-Id: I5ebea07c9938107b435bec7413418622767e4e16\n\ncommit 8043d8ed63f51e76d452d22be7d453d4a7794530\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Wed Apr 27 18:06:27 2011 -0700\n\n Add the patch for timed audio support to the mono resampler\n\n Change-Id: I526f34ae9d1e8e3b0ed2fb05af3d024d5c5fe711\n\ncommit 2be89486ef23f0b0b0cc2dc25a4c0ee691043f00\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Wed Apr 27 10:38:57 2011 -0700\n\n Extend the AudioHWInterface to allow it to specify the initial master volume used by AudioFlinger.\n\n Change-Id: I8823330801c927494cf7ca31a6b8f9264fbfbb26\n\ncommit ff89a4d5e37e6a05a2b03f79ab4e97833dd66393\nAuthor: John Grossman \u003cjohngro@google.com\u003e\nDate: Wed Apr 27 09:07:14 2011 -0700\n\n Fix an issue with inconsistent volume reporting.\n\n Changed masterVolume() to return the same value as the last call\n to setMasterVolume when the HW layer is implementing master\n volume control. The masterVolume/setMasterVolume API seems to be\n an idea which was abandonded a long time ago; as of today the\n system only ever sets it to 1.0 at startup and then never changes\n it. Until we can figure out how the concept of external\n amplifier gain control fits into the Android audio framework,\n Tungsten is exposing this API via a hack-tastic invoke back door\n in the TungstenRXPlayer and needs the getter/setter results to be\n consistent.\n\n Change-Id: I2ac730fa8fc9ee28c88f1a8e6f2e493eb5b65544\n\ncommit 086511b2d19cceb976747ac23e12b73fc7c28bea\nAuthor: Jason Simmons \u003cjsimmons@google.com\u003e\nDate: Mon Apr 25 16:07:19 2011 -0700\n\n Add handling of timed audio tracks in the generic resampling mixer\n\n Change-Id: Ic3be1d21b1117f1b233808be543c28a0dcec4792\n\nChange-Id: I6ec5d2bca9b8ebc0acd395a7dd92e1a48fcdfa9b\nSigned-off-by: Mike J. Chen \u003cmjchen@google.com\u003e\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\nSigned-off-by: Jason Simmons \u003cjsimmons@google.com\u003e\n" }, { "commit": "262620399c228b3b201c2c4b39c87508d3047d74", "tree": "96e7fd612606424311873d34492def7da58bd6d8", "parents": [ "be1480bade58688d201335860247734aec6b11cb", "7dae00baa6e8957be15523c46bb948bd1dde64c3" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Fri Oct 28 02:14:01 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 28 02:14:01 2011 +0000" }, "message": "am 08479cee: Merge \"Stagefright: ANW::connect in MediaPlayerService\" into ics-mr0\n\n* commit \u002708479ceeba56c460fb52f60a24df27776f1936c3\u0027:\n Stagefright: ANW::connect in MediaPlayerService\n" }, { "commit": "be1480bade58688d201335860247734aec6b11cb", "tree": "fe3e9edcb33c3c36fc76286780b5ebcd4bd77840", "parents": [ "0d681abd16873a265a10aee1e9ae8fa062309de3", "b05e3b5b3c2d77f6c71631ea538f6190ec61b3d9" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 27 15:24:28 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 27 15:24:28 2011 -0700" }, "message": "Merge \"Report call status from AudioSource::start() to file writer\" into ics-mr1" }, { "commit": "0d681abd16873a265a10aee1e9ae8fa062309de3", "tree": "f0652f4f7ebf746c3f803f6ca122571ab2cf66fd", "parents": [ "71adab54edf9d0e2c89473d3be12edb6b9dc4549", "32bdfd5acb76a02e82e0059c8bd892bc1f73a7e3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 27 09:07:23 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 27 09:07:23 2011 -0700" }, "message": "Merge \"Fix a reference to a stale pointer in AwesomePlayer.\" into ics-mr1" }, { "commit": "93594b5aa16dbbb0b196f6e181a8ca099d7ab62b", "tree": "2d936537947edf25a440817cbdd82a32d65f3609", "parents": [ "71adab54edf9d0e2c89473d3be12edb6b9dc4549" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 26 23:47:55 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 26 23:47:55 2011 -0700" }, "message": "Fix a hang issue where the first frame can be dropped for timelapse video recording.\n\nChange-Id: I04754f1005a983953a80a659ff13f8762d0e120c\nrelated-to-bug: 5523502\n" }, { "commit": "b05e3b5b3c2d77f6c71631ea538f6190ec61b3d9", "tree": "cd65eee696e82e202f039e216e373cdcc3441c63", "parents": [ "71adab54edf9d0e2c89473d3be12edb6b9dc4549" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 26 23:32:13 2011 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 26 23:35:01 2011 -0700" }, "message": "Report call status from AudioSource::start() to file writer\n\nChange-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330\nrelated-to-bug: 5514288\n" }, { "commit": "7dae00baa6e8957be15523c46bb948bd1dde64c3", "tree": "195997b2a0541d250d8ad61ae08232046bbd62bd", "parents": [ "1765d6e0c962d2b89897c0278f969084f632d181" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Wed Oct 26 18:36:31 2011 -0700" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Wed Oct 26 18:40:00 2011 -0700" }, "message": "Stagefright: ANW::connect in MediaPlayerService\n\nThis change moves the ANativeWindow connect and disconnect logic from\nMediaPlayer to MediaPlayerService::Client.\n\nBug: 5502654\nChange-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d\n" }, { "commit": "a4af2143ecbd630e946647c1b5f90fda8f61ebb3", "tree": "90937772071f770fd7fb21a17a0ddb1f05d4b936", "parents": [ "1d2acaffde56ad79e6e96f228d7857863462397c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 26 15:23:31 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 26 15:23:31 2011 -0700" }, "message": "Properly report that we\u0027re no longer playing after receiving event\n\nMEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR.\n\nChange-Id: I03eeba751d3728adb33d9c66de4c7444a91696f3\n" }, { "commit": "71adab54edf9d0e2c89473d3be12edb6b9dc4549", "tree": "bb97c3a8e32c085d22043754457555d14dedbe27", "parents": [ "1d2acaffde56ad79e6e96f228d7857863462397c", "1765d6e0c962d2b89897c0278f969084f632d181" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Wed Oct 26 20:34:38 2011 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 26 20:34:38 2011 +0000" }, "message": "am b7b4eaaa: Merge \"Stagefright: push blank buffers when tearing down\" into ics-mr0\n\n* commit \u0027b7b4eaaa05284634d50d581d924a250f1194f66d\u0027:\n Stagefright: push blank buffers when tearing down\n" }, { "commit": "32bdfd5acb76a02e82e0059c8bd892bc1f73a7e3", "tree": "e4288e20580707ad79b7967c03ccac86aeefd165", "parents": [ "1d2acaffde56ad79e6e96f228d7857863462397c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 26 11:22:40 2011 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 26 12:35:03 2011 -0700" }, "message": "Fix a reference to a stale pointer in AwesomePlayer.\n\nThe pointer returned by MetaData::findCString may become stale if the metadata\nobject is modified. Make a copy of the returned mime type in order to prevent\nMediaPlayer::dump log corruption.\n\nChange-Id: I9077aee36c4316d83b37fb909bf91e6b3f75d5d2\n" }, { "commit": "1765d6e0c962d2b89897c0278f969084f632d181", "tree": "236c1712a02b293093d658a3248804ebaf4f3786", "parents": [ "55f4bc5c3d1acfaa735b8b19cf34b6b68f6cfcca" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue Oct 25 14:50:16 2011 -0700" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Tue Oct 25 18:35:02 2011 -0700" }, "message": "Stagefright: push blank buffers when tearing down\n\nThis change makes OMXCodec push RGB 565 buffers filled with black to an\nANativeWindow when tearing down after decoding to protected gralloc\nbuffers. This allows the OMX tear down to zero out any protected\nbuffers that were used without the possibility that the buffer is still\nbeing used by SurfaceFlinger or HWComposer.\n\nBug: 5483222\nChange-Id: I8acedd81a7bb67dfdc2fd15733e3375b6ce8d560\n" }, { "commit": "1d2acaffde56ad79e6e96f228d7857863462397c", "tree": "e5e05f30fbca34668d58ff6e6b3199a4ab947e3b", "parents": [ "e6a823c276302b0c499d7a39956c1b731f23dd4c", "55f4bc5c3d1acfaa735b8b19cf34b6b68f6cfcca" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Wed Oct 19 22:38:45 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 19 22:38:45 2011 -0700" }, "message": "am 23d64420: Merge \"Stagefright: idle OMX after ANW errors\" into ics-mr0\n\n* commit \u002723d644202a44383bf008ff86f6faa3ea7e447290\u0027:\n Stagefright: idle OMX after ANW errors\n" }, { "commit": "55f4bc5c3d1acfaa735b8b19cf34b6b68f6cfcca", "tree": "699af111d9580cb63e00d88ea422b416c196cccd", "parents": [ "8888a75f01d904541e409e858d23e4150ace34b6", "b1d666f5cb555d135eb69e005e88a03330bbb54c" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Wed Oct 19 22:37:18 2011 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 19 22:37:18 2011 -0700" }, "message": "Merge \"Stagefright: idle OMX after ANW errors\" into ics-mr0" }, { "commit": "b1d666f5cb555d135eb69e005e88a03330bbb54c", "tree": "573c9d484c210cfc7104d94f2f630cae0b70bb01", "parents": [ "3c57859f03ce9257128e3b2cd29a906b8f9a6aa5" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Wed Oct 19 21:14:13 2011 -0700" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Wed Oct 19 21:22:19 2011 -0700" }, "message": "Stagefright: idle OMX after ANW errors\n\nThis change fixes an issue in Stagefright where the state of an OMXCodec\nobject can get out of sync with the state of the OMX component. In\nparticular, if one of the ANativeWindow functions failed and put the\nOMXCodec into the ERROR state, this would cause Stagefright to skip\ndoing the Executing -\u003e Idle transition. Without this transition the\nfreeBuffersOnPort call would never be made, and the MediaBuffers would\nend up being leaked (which would also leak the Gralloc buffers they\nreference).\n\nBug: 5333695\nChange-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34\n" }, { "commit": "d24bac2f9e83d3dbc0ef9d2aae3b8ad8e4d2b731", "tree": "e653b32aa31661e403d313439e1f2d6914cc9fb6", "parents": [ "545d1e935b8ee12255bbd443a89a4b8ec2aeeb35", "2e5bcd4a0d1f3078acfd88785aa29923ae03a3bb" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 19 17:57:58 2011 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 19 17:57:58 2011 -0700" }, "message": "am b3cdadb6: Merge \"Check whether media recorder client exists before dumping.\" into ics-mr0\n\n* commit \u0027b3cdadb639027f62c7c1637ca962a70d2d1f3b4d\u0027:\n Check whether media recorder client exists before dumping.\n" } ], "next": "e579e28089c6b86f56d257030b778c5e22b1a5a5" }