)]}' { "log": [ { "commit": "05adea42e17b0af3b90e51945f800aa26a2d0240", "tree": "a2fbe66947c9da426e10e544625b4e8c67c3233d", "parents": [ "2b61341c6308b99254b504a7fa9d890200796369", "05b22175a0d186d964694a5162892b6b3476c562" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Jan 24 16:30:12 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 24 16:30:12 2011 -0800" }, "message": "am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder\n\n* commit \u0027efebdf4bd4da35bc50c7d81450c8473697f6654a\u0027:\n DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder\n" }, { "commit": "05b22175a0d186d964694a5162892b6b3476c562", "tree": "1417f736200d0c6678d30109f47fc651220cff1d", "parents": [ "b517e006b51c95db9c44bf5f104f562d431ae597" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Jan 24 13:36:30 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Jan 24 15:59:14 2011 -0800" }, "message": "DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder\n\nChange-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37\nrelated-to-bug: 3384367\n" }, { "commit": "2b61341c6308b99254b504a7fa9d890200796369", "tree": "5e59c875c4bebd9c55eee1e7c6be6bc153926dca", "parents": [ "b23ef145ac2a62068a6a8848f1f5d8a74f9c2b34", "b517e006b51c95db9c44bf5f104f562d431ae597" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jan 20 21:46:21 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 20 21:46:21 2011 -0800" }, "message": "am c5694ebd: Merge \"do not merge - Fix issue 3371096.\" into gingerbread\n\n* commit \u0027c5694ebda9a50be391ef9cfaa7f93e9efb04b6c5\u0027:\n do not merge - Fix issue 3371096.\n" }, { "commit": "b23ef145ac2a62068a6a8848f1f5d8a74f9c2b34", "tree": "21366520a5f7082e22a9663aff5e1987aa36a6af", "parents": [ "ea59c3e26a903af458cb1cadaeed869a99bf5680", "6e3edc2dffb0d424b02ac57b55114b0d13163f56" ], "author": { "name": "Dave Sparks", "email": "davidsparks@android.com", "time": "Thu Jan 20 17:41:30 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 20 17:41:30 2011 -0800" }, "message": "am 65d39eeb: Merge \"DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.\" into gingerbread\n\n* commit \u002765d39eeb9b032e5507a01daa25afff62b29bffe4\u0027:\n DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.\n" }, { "commit": "b517e006b51c95db9c44bf5f104f562d431ae597", "tree": "92595dc209798655c6c41444b68a9b6809b54510", "parents": [ "6e3edc2dffb0d424b02ac57b55114b0d13163f56" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Jan 19 18:36:13 2011 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jan 20 12:05:25 2011 -0800" }, "message": "do not merge - Fix issue 3371096.\n\nEffectModule::process() was copying effect chain input buffer to\noutput buffer if no effect was active instead of accumulating it.\n\nChange-Id: If4ca75601ea69a088d0f71d88aec53e90a1dec89\n" }, { "commit": "6e3edc2dffb0d424b02ac57b55114b0d13163f56", "tree": "06e553aeaa4efe814f992cfe3674763e3b25f400", "parents": [ "f4c056aeacad2dac60a83ccd7928bfeaa9d6ddf6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 15:07:19 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 15:44:23 2011 -0800" }, "message": "DO NOT MERGE: Prefill the cache before trying to instantiate the media extractor.\n\nThe latter is an operation that otherwise could block on the datasource\nfor a significant amount of time. During that time we\u0027d be unable to\nabort the preparation phase without this prefill.\n\nChange-Id: I3bc889b264f599bfd5c2bbdf48b88ccb55d86172\nrelated-to-bug: 3362836\n" }, { "commit": "ea59c3e26a903af458cb1cadaeed869a99bf5680", "tree": "62ed0207ff0ddeeec2c5cc0b67cca97c36bbb1e2", "parents": [ "cf3592c5bf1c66ba510934fff5eb57ee0b3fd761", "f4c056aeacad2dac60a83ccd7928bfeaa9d6ddf6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 19 08:23:47 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 19 08:23:47 2011 -0800" }, "message": "am e9a00235: Merge \"DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking \"connect\"\" into gingerbread\n\n* commit \u0027e9a00235c102d198a702bc665b2ea5b5e8c4bc07\u0027:\n DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking \"connect\"\n" }, { "commit": "f4c056aeacad2dac60a83ccd7928bfeaa9d6ddf6", "tree": "33c73abc7fb95445121cc4595a863ed45000b29e", "parents": [ "95304d5488ba465f19cc788f1c7394218c2ea2d1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 15:26:40 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 18 15:52:31 2011 -0800" }, "message": "DO NOT MERGE: Apparently our native TCP sockets do not return an error from blocking \"connect\"\n\nif the network interface is shutdown while connecting.\n\nChange-Id: I168c6026de24812efa9b7e607a9eb83efded8c1f\nrelated-to-bug: 3362836\n" }, { "commit": "cf3592c5bf1c66ba510934fff5eb57ee0b3fd761", "tree": "db789ee0027babcee8f5a9a4b090546275365b8f", "parents": [ "3ed11317ce695a413d337c60fde222f30306f092", "95304d5488ba465f19cc788f1c7394218c2ea2d1" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Jan 14 18:33:51 2011 -0800" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Jan 14 18:33:51 2011 -0800" }, "message": "merge 83fdc69e from gingerbread - do not merge\n\nChange-Id: Ib1e9e12244a44f75a93d66142e71915de6386680\n" }, { "commit": "3ed11317ce695a413d337c60fde222f30306f092", "tree": "f6690821acfed0e3c10e34c0e8b1354a987122df", "parents": [ "72b228f6b18763a95023fd8ba44eb7354cfd7f74", "13e05b3f569965d97ec7d7f65e4cd46c6a22c23d" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jan 13 11:11:51 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 13 11:11:51 2011 -0800" }, "message": "am a220a297: Merge \"Initial OMA DRM forward lock contribution\"\n\n* commit \u0027a220a2979937700024662be0f8fc166ca65506ed\u0027:\n Initial OMA DRM forward lock contribution\n" }, { "commit": "13e05b3f569965d97ec7d7f65e4cd46c6a22c23d", "tree": "27dbcb7a1f26d44723dbb123ce4c36e6cfc1b177", "parents": [ "c2322f7ac756e78de9491c17dc3c0dd14456c599", "fdd65a0fc7df2c878cc601e4c0f4021cb264f051" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Jan 13 10:51:13 2011 -0800" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Thu Jan 13 10:51:13 2011 -0800" }, "message": "Merge \"Initial OMA DRM forward lock contribution\"" }, { "commit": "95304d5488ba465f19cc788f1c7394218c2ea2d1", "tree": "5f5269238a292e0e747cbfa2a01e6a2fb24615b8", "parents": [ "e49051406baa71cb63d5754d33908ce3df201af1" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 02 17:42:08 2010 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 12 17:12:46 2011 -0800" }, "message": "Squash commits of the following patches, cherry-picked from other branch - do not merge.\n\no Prepare for publishing MediaMetadataRetriever as public API\n step one:\n o replaced captureFrame with getFrameAtTime\n o removed getMode\n\no Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()\n as part of the preparation for publishing MediaMetadataRetriever as public Java API\n\no Remove captureFrame from MediaMetadataRetriever.java class\n It has been replaced by getFrameAtTime() method\n\no Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java\n\no Publish MediaMetadataRetriever.java as public API\n o Removed setMode() methods and related mode constants\n o Removed some of the unused the metadata keys\n o Updated the javadoc\n o part of a multi-project change.\n\nbug - 3309041\n\nChange-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4\n" }, { "commit": "72b228f6b18763a95023fd8ba44eb7354cfd7f74", "tree": "d17c7c9cf584a6fdcc3d7318e52cc0baa8937e23", "parents": [ "4c0104e004f30d7e48381ef8d728b2e93931611f", "e49051406baa71cb63d5754d33908ce3df201af1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 10:35:18 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 12 10:35:18 2011 -0800" }, "message": "am 7c615360: Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\n* commit \u00277c6153606cc963191362494c8cb5669749e84326\u0027:\n Fail to parse duration instead of asserting, if the server response cannot be parsed.\n" }, { "commit": "e49051406baa71cb63d5754d33908ce3df201af1", "tree": "18fde73551a4c51a3c6d9c9edecfecc816507c0e", "parents": [ "9a0cf4fb7d18e186e06341bde915de234992d969" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 09:57:23 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 12 09:57:23 2011 -0800" }, "message": "Fail to parse duration instead of asserting, if the server response cannot be parsed.\n\nChange-Id: I95c61ed83800db82e99c0023b942fb8ae05ed3cf\nrelated-to-bug: 3338518\n" }, { "commit": "4c0104e004f30d7e48381ef8d728b2e93931611f", "tree": "99d6c0e2d582ecb8a85a7bd33142535f1cf02595", "parents": [ "960737e761895d5850beabab809d03b3621d0ec3", "9a0cf4fb7d18e186e06341bde915de234992d969" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 11 16:22:33 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Jan 11 16:22:33 2011 -0800" }, "message": "am 7e2f9cc8: DO NOT MERGE: Fix Matroska issues\n\n* commit \u00277e2f9cc81da788006790365ff11f06551fc1bc26\u0027:\n DO NOT MERGE: Fix Matroska issues\n" }, { "commit": "9a0cf4fb7d18e186e06341bde915de234992d969", "tree": "b476b0c1e1e5d7abc7ae61e653cebda64d81681d", "parents": [ "0d85990f20106513b6da5a446702aa62ab61397f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 11 16:01:33 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 11 16:02:31 2011 -0800" }, "message": "DO NOT MERGE: Fix Matroska issues\n\nrelated-to-bug: 3331623\n\nSquashed commit of the following:\n\ncommit 8484811f3784564ce962ec1b6311bac532d73ffc\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Tue Jan 11 11:56:06 2011 -0800\n\n Properly parse Matroska lacing flags and extract all frames contained in a block.\n\n related-to-bug: 3331623\n\ncommit 38f1f39381a01659577461b3d35bd22db45ba317\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Mon Nov 15 15:10:34 2010 -0800\n\n Proper support for variable NALsize lengths of AVC content in .mkv files.\n\n related-to-bug: 3197442\n\nChange-Id: I4b404f3c3d0a2a2fa336b9edff75eb25ffc66a2f\n" }, { "commit": "960737e761895d5850beabab809d03b3621d0ec3", "tree": "f3296d85930b340675dc2c41bcb80ac29af16e03", "parents": [ "7b8a803497450bb90b9c4f5ba3426bf984fad274", "0d85990f20106513b6da5a446702aa62ab61397f" ], "author": { "name": "repo sync", "email": "andih@google.com", "time": "Tue Jan 11 15:26:51 2011 -0800" }, "committer": { "name": "repo sync", "email": "andih@google.com", "time": "Tue Jan 11 15:26:51 2011 -0800" }, "message": "resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp\n\nChange-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26\n" }, { "commit": "0d85990f20106513b6da5a446702aa62ab61397f", "tree": "82de1cf909430710c421b3ce311087e7699cd3b8", "parents": [ "32c8335c6b6eb87a88e9193db1a5aab29175d043" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 11 09:51:34 2011 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 11 09:53:30 2011 -0800" }, "message": "DO NOT MERGE: Fix parsing of ntp\u003d PLAY response.\n\nrelated-to-bug: 3340186\n\nSquashed commit of the following:\n\ncommit b61c36b7228aec9f5360883b1e1c1e0530488974\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Wed Oct 27 13:59:59 2010 -0700\n\n Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFrames \u003e 1 and the sub frames did not align with RTP packet boundaries.\n\ncommit b10f322c07e5bebcaf032e8624cb4a5d733dfc15\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Mon Oct 25 09:40:52 2010 -0700\n\n We don\u0027t have access to the md5 implementation on the simulator, let\u0027s disable digest authentication in rtsp for simulator targets.\n\ncommit 0aa83cf9e4637adf9501708fcdf7d0d6d4dc4fe1\nAuthor: Andreas Huber \u003candih@google.com\u003e\nDate: Wed Oct 20 15:00:34 2010 -0700\n\n Support for BASIC and DIGEST authentication schemes in RTSP. Support for malformed packet descriptions that end lines in LF only, instead of CRLF.\n\n related-to-bug: 3084183\n\nChange-Id: I6e512cb73cc8d5624a83f7154aa5699f7fef7534\n" }, { "commit": "7b8a803497450bb90b9c4f5ba3426bf984fad274", "tree": "74e28c69edf407830c632b5a1dd2e8fc7344b416", "parents": [ "9cfc9eff42a0700029c39e89c38b52488845ad63", "32c8335c6b6eb87a88e9193db1a5aab29175d043" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Jan 10 12:09:09 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Jan 10 12:09:09 2011 -0800" }, "message": "am 13d1cb56: Merge \"Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\" into gingerbread\n\n* commit \u002713d1cb56dfdfc89888de6a0389b0fe6cf7e36c27\u0027:\n Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\n" }, { "commit": "32c8335c6b6eb87a88e9193db1a5aab29175d043", "tree": "a7ee67ba1dd4051a2440eeee2f1347dc133d8389", "parents": [ "288fb7e5bd7060cbe9b737500975754c9312e2db" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Jan 10 08:55:02 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Jan 10 10:27:02 2011 -0800" }, "message": "Avoid deadlock in OMX::freeNode by making sure OMXCodecObserver does not hold the last reference of OMXCodec object - do not merge\n\ncherry-picked from: I4c79b66a900c527e3ae6a833f76d5da1b75c5a89\n\nbug - 3336424\n\nChange-Id: I2d8ecb79a5422342988c195c012c9e6327ac457a\n" }, { "commit": "9cfc9eff42a0700029c39e89c38b52488845ad63", "tree": "e838338c56e10b5de2f718c9c9b7e7130ae902a5", "parents": [ "e28b1e565705ffb85b05c8e226e1ab5010cb3821", "c2322f7ac756e78de9491c17dc3c0dd14456c599" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Jan 07 15:34:08 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Jan 07 15:34:08 2011 -0800" }, "message": "am 0544d059: Merge \"DRM Framework bug fixes.\"\n\n* commit \u00270544d05990c0f43a143e98e71f7fc60277872806\u0027:\n DRM Framework bug fixes.\n" }, { "commit": "c2322f7ac756e78de9491c17dc3c0dd14456c599", "tree": "07e0dad46bb5d1a926db251d06ae812fc7beb204", "parents": [ "7f7371ad2df83fe6a085089446575d0bcd24d59a", "c618b5af98dec06d49374a61a5a94016f9fec2d3" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Jan 07 11:10:49 2011 -0800" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Fri Jan 07 11:10:49 2011 -0800" }, "message": "Merge \"DRM Framework bug fixes.\"" }, { "commit": "e28b1e565705ffb85b05c8e226e1ab5010cb3821", "tree": "ac2b9fc614c8509a83742260841358f0b5e043e5", "parents": [ "e6bf51ea9c5a4c1294e9a6c26d8a9b86534fee1f", "288fb7e5bd7060cbe9b737500975754c9312e2db" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 06 20:29:11 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Jan 06 20:29:11 2011 -0800" }, "message": "am ba77a3f9: Add support for the \"compilation\" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831\n\n* commit \u0027ba77a3f9cb1d68b2ed4813aaae856444578e3a75\u0027:\n Add support for the \"compilation\" tag in mp3, mp4 and ogg, and also add support for two common ways of specifying album artist in ogg files. b/3311831\n" }, { "commit": "288fb7e5bd7060cbe9b737500975754c9312e2db", "tree": "666d36f72e5d8517fd39db346d941286529c3a69", "parents": [ "91dcf1510491c4128f506a0d28e64de5ecbf459d" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 06 11:12:17 2011 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Jan 06 15:05:06 2011 -0800" }, "message": "Add support for the \"compilation\" tag in mp3, mp4 and ogg, and also add\nsupport for two common ways of specifying album artist in ogg files.\nb/3311831\n\nChange-Id: Iba1152013b7577168af71f947d7249560419fa05\n" }, { "commit": "e6bf51ea9c5a4c1294e9a6c26d8a9b86534fee1f", "tree": "bf0df997f25fa4c5d85af140b7dfbaad0ad2eb3c", "parents": [ "74de24045c00d641e79483b459d7d00d3d5bffe3", "91dcf1510491c4128f506a0d28e64de5ecbf459d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 05 17:55:27 2011 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 05 17:55:27 2011 -0800" }, "message": "am 35e8dcb9: Merge \"Suppress the recording sound in the recorded video\" into gingerbread\n\n* commit \u002735e8dcb9df8c3d77ede120e3f1aaf842b2928639\u0027:\n Suppress the recording sound in the recorded video\n" }, { "commit": "fdd65a0fc7df2c878cc601e4c0f4021cb264f051", "tree": "a8c288da5c4cf8ef658df6b81406dedf916a56ce", "parents": [ "7f7371ad2df83fe6a085089446575d0bcd24d59a" ], "author": { "name": "Pravat Dalbehera", "email": "pravat.dalbehera@sonyericsson.com", "time": "Wed Jan 05 09:02:51 2011 +0100" }, "committer": { "name": "Johan Redestig", "email": "johan.redestig@sonyericsson.com", "time": "Wed Jan 05 09:02:51 2011 +0100" }, "message": "Initial OMA DRM forward lock contribution\n\nOMA DRM forward lock agent is plugged into the\nOpen DRM framework. Forward lock agent implementation contains:\n- Forward lock engine to communicate with framework\n- Converter to encrypt the original file into a special format\n- Decoder to feed the decrypted data for rendering\n- Lightweight unique key-encryption mechanism\n- Documentation\n\nChange-Id: Id828ebc30b8147b58b14960a73571648bc01ae94\n" }, { "commit": "91dcf1510491c4128f506a0d28e64de5ecbf459d", "tree": "0886108cbd43dd72295de19b99d6fa204e797242", "parents": [ "0f01764099d7a65b8921725df3340140f9fc4cd5" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 04 17:34:44 2011 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Jan 04 17:34:44 2011 -0800" }, "message": "Suppress the recording sound in the recorded video\n\nbug - 3309194\n\nChange-Id: Ib8fb248943bc22f963d67537bfdbc6056c5a159b\n" }, { "commit": "74de24045c00d641e79483b459d7d00d3d5bffe3", "tree": "f827b14ba8b9bc8314e938b8d35aae7ee46e4664", "parents": [ "7d44e4da3bc3d56c6a9aed1f27f51cfd5b54108f", "0f01764099d7a65b8921725df3340140f9fc4cd5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Dec 16 16:05:16 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 16 16:05:16 2010 -0800" }, "message": "am 5a756fb0: Merge \"Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.\" into gingerbread\n\n* commit \u00275a756fb0f1f3f8cd7612284c889dfc69875577a8\u0027:\n Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.\n" }, { "commit": "0f01764099d7a65b8921725df3340140f9fc4cd5", "tree": "4804d04ee3b4e790731dcb6d90b3433d4945ac29", "parents": [ "e8079d0f6afcb138a0e5882ccbaf93647ea77c5b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 15 19:09:42 2010 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 15 19:09:42 2010 -0800" }, "message": "Fix issue 2712130: Sholes: problem when playing audio while recording over bluetooth SCO.\n\nThe problem is that when an input stream is opened for record over bluetooth SCO, the kernel\nmono audio device should be opened in RW mode to allow further use of this same device by an output stream\nalso routed to bluetooth SCO.\nThis does not happen because of a bug in AudioSystem::isBluetoothScoDevice() that does not return true\nwhen the device is DEVICE_IN_BLUETOOTH_SCO_HEADSET (input device for blurtooth SCO).\n\nChange-Id: Ic78bf324b4a68e65721d763dc7682ce7a8f14f75\n" }, { "commit": "7d44e4da3bc3d56c6a9aed1f27f51cfd5b54108f", "tree": "ae0c16de30dc7f65b849159024b38cae93718950", "parents": [ "df1f37adddb03227b63e2bb45887cbcf2bb56313", "e8079d0f6afcb138a0e5882ccbaf93647ea77c5b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 08 16:20:16 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 08 16:20:16 2010 -0800" }, "message": "am 1f5b133a: Merge \"When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again\" into gingerbread\n\n* commit \u00271f5b133ae29090f1807be392874f6b7a5d92c6d4\u0027:\n When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again\n" }, { "commit": "e8079d0f6afcb138a0e5882ccbaf93647ea77c5b", "tree": "d088895683a8145734d7d02040bf8a2399b060ad", "parents": [ "b3e40847bebc9acd035a1d693885fd14d58beaf2" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 08 15:28:42 2010 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Dec 08 15:37:14 2010 -0800" }, "message": "When INFO_FORMAT_CHANGED event comes in before the renderer was initialized, go back to read from source again\n\nbug - 3264094\n\nChange-Id: I291a9b09b335d0eb4acf91f992e59fc44bc57d01\n" }, { "commit": "df1f37adddb03227b63e2bb45887cbcf2bb56313", "tree": "1825dd69ac78c821254eee01abf5b77a2d09d0a2", "parents": [ "5c2ccf1a4ff8465c076689b6c2d74f2cd4498df2", "b3e40847bebc9acd035a1d693885fd14d58beaf2" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 06 15:36:04 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Dec 06 15:36:04 2010 -0800" }, "message": "am d57fbe88: Fixed a race condition where some recording frames may not be released\n\n* commit \u0027d57fbe887fabd027e644caeaa2139c863143a786\u0027:\n Fixed a race condition where some recording frames may not be released\n" }, { "commit": "b3e40847bebc9acd035a1d693885fd14d58beaf2", "tree": "4fb4f086e8b4317060ee1c92b44113c67f92e565", "parents": [ "d28b0e7057ea1b85d70f6aa25415655eb67ca126" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 06 15:02:28 2010 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Dec 06 15:05:06 2010 -0800" }, "message": "Fixed a race condition where some recording frames may not be released\n\nbug - 3258924\n\nChange-Id: I4f30d04a713676f5da40e6a7dd861510cc041f9b\n" }, { "commit": "5c2ccf1a4ff8465c076689b6c2d74f2cd4498df2", "tree": "20d8c331751e715721ae9562d7302924d94cf0eb", "parents": [ "aecdb70affacb10cde3e7fc22f30fc9fbf631fce", "d28b0e7057ea1b85d70f6aa25415655eb67ca126" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 02 10:21:06 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 02 10:21:06 2010 -0800" }, "message": "am d4c5478a: Merge \"Be conservative in estimating the file size limit.\" into gingerbread\n\n* commit \u0027d4c5478a8664f64ff66db9ae25250afac78b7a74\u0027:\n Be conservative in estimating the file size limit.\n" }, { "commit": "d28b0e7057ea1b85d70f6aa25415655eb67ca126", "tree": "75c2fc9fccfa83931f7ca5015922aef4de0a59d3", "parents": [ "ed7c671a57f89d389c9d6cd67e0698f160f69916", "acd234bba9f048971d66890009eeff9a8db94be3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Dec 02 10:13:36 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Dec 02 10:13:36 2010 -0800" }, "message": "Merge \"Be conservative in estimating the file size limit.\" into gingerbread" }, { "commit": "aecdb70affacb10cde3e7fc22f30fc9fbf631fce", "tree": "7a1bbc18334951108769ed119eccd5fbcda9e0e5", "parents": [ "9f9886c113a661b2e1784999a5876f7e47754bf4", "7f7371ad2df83fe6a085089446575d0bcd24d59a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Dec 02 07:59:49 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Dec 02 07:59:49 2010 -0800" }, "message": "am 077bc4ac: Merge from open-source master\n\n* commit \u0027077bc4ac019ad33abd613448e11d3ad501218991\u0027:\n Fix HTTP redirect missing statuscode 303 and 307\n" }, { "commit": "7f7371ad2df83fe6a085089446575d0bcd24d59a", "tree": "a017cf53f00999690df527f76a6e0ba16ff926c0", "parents": [ "e81e8153c85fa0b0aebae686f6ba51ed2c3a2d11", "3967a2a353436941277dcffc3babec209ac5d812" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Dec 02 07:54:49 2010 -0800" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Dec 02 07:54:57 2010 -0800" }, "message": "Merge from open-source master\n\nChange-Id: Ie45ea6581abd02be0cd7cffed05c0a0b6e65c338\n" }, { "commit": "9f9886c113a661b2e1784999a5876f7e47754bf4", "tree": "7a1bbc18334951108769ed119eccd5fbcda9e0e5", "parents": [ "1110ebc912bf2d8c072d1e4bc3688a52674e708c", "ed7c671a57f89d389c9d6cd67e0698f160f69916" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 01 16:04:09 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 01 16:04:09 2010 -0800" }, "message": "am 78d81851: Merge \"Fix issue 2641884: Bluetooth volume is dependent on in call volume.\" into gingerbread\n\n* commit \u002778d81851a8ef6691541215afb19e5bc690a4c3c0\u0027:\n Fix issue 2641884: Bluetooth volume is dependent on in call volume.\n" }, { "commit": "ed7c671a57f89d389c9d6cd67e0698f160f69916", "tree": "db18d745439110927961642e9256101b8ed9ff39", "parents": [ "075a1f660b77fe47b165db1aff97cdd05e300391" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 01 14:25:39 2010 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 01 14:25:39 2010 -0800" }, "message": "Fix issue 2641884: Bluetooth volume is dependent on in call volume.\n\nThe problem is that the code in AudioPolicyManagerBase::checkAndSetVolume() that forces\nvoice volume to max when setting bluetooth SCO volume is not called if the bluetooth stream\nvolume did not actually change. So even if we re apply volumes when switching to bluetooth\ndevice, the volume voice volume is not changed and remains what it was when routed to earpiece\nWhat makes things worse on Passion is that stream volumes are limited when connected to bluetooth\nand their actual value does not change as soon as they exceed the limit threshold.\n\nChange-Id: Id7c317db45b392a1c20dca2859678e3c64a371ed\n" }, { "commit": "1110ebc912bf2d8c072d1e4bc3688a52674e708c", "tree": "7bbdf4677ace7017af9fc2bf590447c2a9673ccd", "parents": [ "899ed7543ad9bb82f9d31f8b03ab2215c8c9cd2c", "075a1f660b77fe47b165db1aff97cdd05e300391" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 01 11:28:54 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Dec 01 11:28:54 2010 -0800" }, "message": "am e23212bc: Merge \"Fix issue 3142808.\" into gingerbread\n\n* commit \u0027e23212bc89bfcb3afbf8fdb5504556ead890e1a8\u0027:\n Fix issue 3142808.\n" }, { "commit": "075a1f660b77fe47b165db1aff97cdd05e300391", "tree": "0e02b17b5a8e2803b93293005c3157a0d05a310c", "parents": [ "03b55cc9d3529995925c8df0d4a35269e591188c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Nov 02 12:02:20 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Dec 01 09:45:33 2010 -0800" }, "message": "Fix issue 3142808.\n\nThere is a bug in the way audio policy manager handles A2DP interface suspend/restore\nwhen SCO is used. This bug is not new but has been triggered by a change in the timing\nof the events received by audio policy manager when a call is setup and torn down\nintroduced by commit 164a8f86c7e48992691368c4895709c3bdb835a4.\n\nThe fix consists in grouping the control of A2DP suspended state in a single function\nthat is called systematically when conditions affecting this state are changed:\n- call state change\n- device connection/disconnection\n- change in forced usage.\n\nChange-Id: I46ee2399ee5547b60511fc6cfd32e2720091b0f8\n" }, { "commit": "acd234bba9f048971d66890009eeff9a8db94be3", "tree": "e7cadaf62d1afeb15a5e776737c3985b08ad7fc1", "parents": [ "03b55cc9d3529995925c8df0d4a35269e591188c" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 30 18:18:08 2010 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 30 18:18:08 2010 -0800" }, "message": "Be conservative in estimating the file size limit.\n\nbug - 3045580\n\nChange-Id: Ifdffa354b9433639c3f246a0eb581ef14af1e797\n" }, { "commit": "899ed7543ad9bb82f9d31f8b03ab2215c8c9cd2c", "tree": "b3f330674d34d2dd7738370b96af4365bc27427e", "parents": [ "8e37a5c7b8c9be46e3068d43e6caf7e81036a363", "03b55cc9d3529995925c8df0d4a35269e591188c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 14:32:09 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 30 14:32:09 2010 -0800" }, "message": "am 30c81844: Merge \"DO NOT MERGE Support for \"chunked\" HTTP transfer encoding.\" into gingerbread\n\n* commit \u002730c818444d876dd868b84adec2416308c90f32e3\u0027:\n DO NOT MERGE Support for \"chunked\" HTTP transfer encoding.\n" }, { "commit": "03b55cc9d3529995925c8df0d4a35269e591188c", "tree": "e54e98713d8eaa4b86fcc2aac3241c84c4a1b852", "parents": [ "8cb5a643fe566acb720aab0bde6fead6e75ef8bc", "462b1d71866fd53564e15db699eff47ad99915d1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 14:30:00 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 30 14:30:00 2010 -0800" }, "message": "Merge \"DO NOT MERGE Support for \"chunked\" HTTP transfer encoding.\" into gingerbread" }, { "commit": "8e37a5c7b8c9be46e3068d43e6caf7e81036a363", "tree": "068b38e8a4773bdef6c02bf0a2fe83d1372df9e4", "parents": [ "acd441dd1f44a5c6c3702dbafe3f82d52dd83d67", "8cb5a643fe566acb720aab0bde6fead6e75ef8bc" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 14:08:56 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 30 14:08:56 2010 -0800" }, "message": "am a41c1e1d: Merge \"DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.\" into gingerbread\n\n* commit \u0027a41c1e1de0d5fac57842ffe73e0a4f575fcc73fb\u0027:\n DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.\n" }, { "commit": "8cb5a643fe566acb720aab0bde6fead6e75ef8bc", "tree": "c832a56e33613020d3fdf581df0ea0f30462d842", "parents": [ "09b3581ef7ddba70c5d89d252de3a15d512aa49b", "8ba606c3b8a807058c92d95dcd7bcfdbc28147ae" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 14:06:26 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Nov 30 14:06:26 2010 -0800" }, "message": "Merge \"DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.\" into gingerbread" }, { "commit": "8ba606c3b8a807058c92d95dcd7bcfdbc28147ae", "tree": "7e4895a761539c00e017f992b78ac62f334a06d9", "parents": [ "ce0febae177d1816ee7a6750ed9fba52472b9a71" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 28 10:50:47 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 13:42:50 2010 -0800" }, "message": "DO NOT MERGE Upgrade to the latest version of libwebm to fix YouTube webm playback.\n\nDO NOT MERGE\nrelated-to-bug: 3141937\n\nChange-Id: Iaf1b0c5d45a6b5bb7624a59747041c27b4dde83b\n" }, { "commit": "462b1d71866fd53564e15db699eff47ad99915d1", "tree": "282c042e705730ac55e6c64916aa20e40e30c5f7", "parents": [ "09b3581ef7ddba70c5d89d252de3a15d512aa49b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 18 11:03:48 2010 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 13:37:01 2010 -0800" }, "message": "DO NOT MERGE Support for \"chunked\" HTTP transfer encoding.\n\nDO NOT MERGE\n\nChange-Id: I253d48ea69f239a6d3d0bb7e0d31eef5c773a9d6\nrelated-to-bug: 3205131\n" }, { "commit": "acd441dd1f44a5c6c3702dbafe3f82d52dd83d67", "tree": "6ea5fda739692a98e50bdf22d158863cc3944d75", "parents": [ "2d6dbfb5e3f16d800d2e0b5da283001e53e72768", "09b3581ef7ddba70c5d89d252de3a15d512aa49b" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 13:07:56 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 30 13:07:56 2010 -0800" }, "message": "am 567b2bd1: Merge \"After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.\" into gingerbread\n\n* commit \u0027567b2bd1469b1c37e6249637d313253b7d84971e\u0027:\n After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.\n" }, { "commit": "2d6dbfb5e3f16d800d2e0b5da283001e53e72768", "tree": "a730ae940cef153c23c09a070ff58cae36f97dba", "parents": [ "ecd0a4f0b5bdd51bc35097b402202d6349f016ba", "4d0565de200e61f457e4d97fcfbc4c9ccd81bdad" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 11:53:01 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 30 11:53:01 2010 -0800" }, "message": "am b690e55d: Merge \"DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.\" into gingerbread\n\n* commit \u0027b690e55d3f713d68c6ed9654a05a5370bda731d5\u0027:\n DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.\n" }, { "commit": "09b3581ef7ddba70c5d89d252de3a15d512aa49b", "tree": "0b199015fa3f564580355088031819c7b775069a", "parents": [ "4d0565de200e61f457e4d97fcfbc4c9ccd81bdad" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 29 15:47:52 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 11:46:38 2010 -0800" }, "message": "After seeking display the first new video frame right away without concern for A/V sync. This looks much more responsive to the user.\n\nChange-Id: Ifb1f8c91e95a5cafe30ae1035973316c210b98a5\nrelated-to-bug: 3152363\n" }, { "commit": "ecd0a4f0b5bdd51bc35097b402202d6349f016ba", "tree": "4db64af200c0be90a7938d47df543e49ac70bb04", "parents": [ "e81e8153c85fa0b0aebae686f6ba51ed2c3a2d11", "879e9cb6b4e8b09a5c7d4942ce36125193deadde" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Tue Nov 30 11:45:54 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 30 11:45:54 2010 -0800" }, "message": "am 683a7ff9: Merge \"Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.\" into gingerbread\n\n* commit \u0027683a7ff922409d2aa6c944bc4e08de32029e80e5\u0027:\n Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.\n" }, { "commit": "4d0565de200e61f457e4d97fcfbc4c9ccd81bdad", "tree": "7c043fece3ff9b46584213219ea176f2d810f00a", "parents": [ "879e9cb6b4e8b09a5c7d4942ce36125193deadde" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Nov 12 08:57:12 2010 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Nov 30 10:50:25 2010 -0800" }, "message": "DO NOT MERGE - Instead of asserting that ISurface successfully registered buffers, report an error and propagate it up to the java client.\n\nChange-Id: Ibb14e5aff20920da4917d85de38ba3a8ee71d0bd\nrelated-to-bug: 3188835\n" }, { "commit": "c618b5af98dec06d49374a61a5a94016f9fec2d3", "tree": "a33e45ff0d2cd56b47da6fced34e898950ca08b2", "parents": [ "c533edc9c70dd9434e2e496dc0d52f534472c7e0" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 30 16:27:42 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 30 16:27:42 2010 +0900" }, "message": "DRM Framework bug fixes.\n\n- Make sure to clean-up obsolete listeners.\n- Close cursor after using it.\n- Add virtual destructor to the base class of OnInfoListener.\n\nChanges are made by SEMC and Sony.\n\nChange-Id: Ibb6dd625ef48e3597188f0d7c90f9d4c780b6139\n" }, { "commit": "879e9cb6b4e8b09a5c7d4942ce36125193deadde", "tree": "5d62a0440aee987552a01ced8d3ad7d549749c0f", "parents": [ "c2c8868e59bde7f48998e1d89a0d77217bc64767", "6b6a736ec71c692c165952fe653a7766075e94bb" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Mon Nov 29 22:56:56 2010 -0800" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Nov 29 22:56:56 2010 -0800" }, "message": "Merge \"Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.\" into gingerbread" }, { "commit": "3967a2a353436941277dcffc3babec209ac5d812", "tree": "cb568c30e65a248887c3743160ef708710033172", "parents": [ "c533edc9c70dd9434e2e496dc0d52f534472c7e0" ], "author": { "name": "Per Osbäck", "email": "per@osbeck.com", "time": "Mon Nov 29 15:59:12 2010 +0100" }, "committer": { "name": "Per Osbäck", "email": "per@osbeck.com", "time": "Mon Nov 29 15:59:12 2010 +0100" }, "message": "Fix HTTP redirect missing statuscode 303 and 307\n\nChange-Id: I1c5f3a9f348a05d0558b31f912e10a59382eb24c\n" }, { "commit": "e81e8153c85fa0b0aebae686f6ba51ed2c3a2d11", "tree": "a017cf53f00999690df527f76a6e0ba16ff926c0", "parents": [ "f798e438c3997fd3fb39538bf3e958cfdc7a477c", "c533edc9c70dd9434e2e496dc0d52f534472c7e0" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Nov 22 21:26:13 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 22 21:26:13 2010 -0800" }, "message": "am 4da48ec8: Merge \"Notify the playback status to DRM agents before the playback starts\"\n\n* commit \u00274da48ec88338af2df6f9abba850fb4c65918bb82\u0027:\n Notify the playback status to DRM agents before the playback starts\n" }, { "commit": "f798e438c3997fd3fb39538bf3e958cfdc7a477c", "tree": "1dbe76860fa450e714c4ca4a73b4935c47b40dcb", "parents": [ "42005680c0817a786f07712ffa359f0883944120", "14db41b80c75fd4edfa6c5ed4c776d3537eefb41" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Nov 22 21:25:56 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 22 21:25:56 2010 -0800" }, "message": "am d9334934: Merge \"Update of DRM Framework.\"\n\n* commit \u0027d93349342a89a25c7a884e8543c6adc048c5f86d\u0027:\n Update of DRM Framework.\n" }, { "commit": "c533edc9c70dd9434e2e496dc0d52f534472c7e0", "tree": "5ab623fd214e20ac188f0b2979983ad990e68257", "parents": [ "14db41b80c75fd4edfa6c5ed4c776d3537eefb41", "c130b5bf563d049bd391ccd96985ac278ef8ff8d" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Nov 22 21:15:07 2010 -0800" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Mon Nov 22 21:15:07 2010 -0800" }, "message": "Merge \"Notify the playback status to DRM agents before the playback starts\"" }, { "commit": "14db41b80c75fd4edfa6c5ed4c776d3537eefb41", "tree": "53ac60f6a91a63abb99211e5d4a42bd48c47767e", "parents": [ "6ed70d2d41f9929d1c3f5179d947766495f9efe5", "3473846f64f5b28e1cbeb70ef5867073fc93159e" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Nov 22 21:14:09 2010 -0800" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Mon Nov 22 21:14:09 2010 -0800" }, "message": "Merge \"Update of DRM Framework.\"" }, { "commit": "c130b5bf563d049bd391ccd96985ac278ef8ff8d", "tree": "e01b6bc5aa1a703a3d6eb03e1bcd4dec3076c289", "parents": [ "6ed70d2d41f9929d1c3f5179d947766495f9efe5" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Nov 04 17:38:39 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Nov 22 11:03:51 2010 -0800" }, "message": "Notify the playback status to DRM agents before the playback starts\n\nChange-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a\n" }, { "commit": "42005680c0817a786f07712ffa359f0883944120", "tree": "b99cbd27ab1d554954f237e70a9d29bf7dbae604", "parents": [ "97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807", "c2c8868e59bde7f48998e1d89a0d77217bc64767" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Nov 19 18:17:24 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 19 18:17:24 2010 -0800" }, "message": "am 589e8381: Merge \"Improve camera documentation.\" into gingerbread\n\n* commit \u0027589e838116b0dffa696fa39336d0588124877f98\u0027:\n Improve camera documentation.\n" }, { "commit": "97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807", "tree": "ef4b95d5a0084d141be9865de1ef0b1f1d3b5e07", "parents": [ "a9a25c3113b0c744f7d4e69c55fcd7a661ae4cfd", "6ed70d2d41f9929d1c3f5179d947766495f9efe5" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Nov 19 16:21:31 2010 -0800" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Nov 19 16:21:31 2010 -0800" }, "message": "resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp\n\nChange-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf\n" }, { "commit": "a9a25c3113b0c744f7d4e69c55fcd7a661ae4cfd", "tree": "193af386d2c7874b5a4058ef27f6ab1d84206ff9", "parents": [ "beda607a0b2775484b10d7e6a15eec1e956b3cec", "cf6a8d23345a6e54834e53b1eb7e465f3cb5e914" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Nov 19 10:24:51 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Nov 19 10:24:51 2010 -0800" }, "message": "am 14ac9546: Merge \"build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*\"\n\n* commit \u002714ac9546367d4df37eead55f6762b944b49f33b2\u0027:\n build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*\n" }, { "commit": "3473846f64f5b28e1cbeb70ef5867073fc93159e", "tree": "9651de1dd360d8d77d9d4a53a23ed1181845b93c", "parents": [ "cf6a8d23345a6e54834e53b1eb7e465f3cb5e914" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 16 13:56:11 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Fri Nov 19 22:02:51 2010 +0900" }, "message": "Update of DRM Framework.\n\n-Access permission handling\n Introduce an internal function which allows the desired process to\n access decryption flow. This new function is just for reference and\n each OEM manufacturer should implement/replace with their solutions.\n-New API, getMetadata()\n This API is for retrieving media metadata from container-based DRM,\n such as OMA forward-lock content. This API asks DRM agent to retrieve\n media metadata hiddein inside of DRM special container.\n-New API, acquireRights()\n This API wraps acquireDrmInfo() and processDrmInfo().\n If DRM agent has valid implementation of both APIs,\n Application can acquire DrmRights only by calling this API.\n-Bug fix in event loop of OnInfoListener.\n Separate OnInfo event loop from mail thread loop so as to avoid\n the issue that message is not dispatched when mail thread is busy.\n\nChanges are made by SEMC and Sony.\n\nChange-Id: I04ee3e0988152a71e221f2256d83253749a29da0\n" }, { "commit": "c2c8868e59bde7f48998e1d89a0d77217bc64767", "tree": "bffc3c9c96072ce21e9c55372b4b39fa8ed991bc", "parents": [ "ce0febae177d1816ee7a6750ed9fba52472b9a71" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Nov 19 15:56:16 2010 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Nov 19 16:20:04 2010 +0800" }, "message": "Improve camera documentation.\n\nbug:3212606\nChange-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce\n" }, { "commit": "6ed70d2d41f9929d1c3f5179d947766495f9efe5", "tree": "fc66bda3fac2b194c64b19ba4747d0408f011e43", "parents": [ "cf6a8d23345a6e54834e53b1eb7e465f3cb5e914" ], "author": { "name": "Hiroshi Takekawa", "email": "sian@big.or.jp", "time": "Sat Nov 06 18:28:11 2010 +0900" }, "committer": { "name": "Hiroshi Takekawa", "email": "sian@big.or.jp", "time": "Fri Nov 19 12:14:37 2010 +0900" }, "message": "StagefrightMediaScanner: Call endFile() for MIDI and OGG files.\n\naddStringTag() caches non-ascii metadata strings for later\nprocessing, and then endFile() will be called at the end of\nprocessFile() to convert non-ascii strings from locale\u0027s charset\nto utf-8 if required.\n\nStagefright\u0027s processFile() failed to call endFile() when the\nprocessing file is a MIDI file or an OGG file. This patch fixes\nthis problem to populate metadata correctly.\n\nReviewed by: Brad Fitzpatrick, Marco Nelissen.\n\nChange-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e\n" }, { "commit": "cf6a8d23345a6e54834e53b1eb7e465f3cb5e914", "tree": "03970c471ae0321c1faff333e53e886c97e35f7d", "parents": [ "bf955268acc4a5a73632cb5f64093d1796c769df" ], "author": { "name": "Matthias Bady", "email": "aegirxx@googlemail.com", "time": "Thu Nov 18 00:22:48 2010 +0100" }, "committer": { "name": "Matthias Bady", "email": "aegirxx@googlemail.com", "time": "Thu Nov 18 00:22:48 2010 +0100" }, "message": "build failed with g++ v. 4.4.5\nerr msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’\nstrrchr provides two prototypes. the one used returns const char* instead of char*\n\nChange-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac\n" }, { "commit": "beda607a0b2775484b10d7e6a15eec1e956b3cec", "tree": "c75159315c73565b84c6db9203902a8aeed475ed", "parents": [ "3baff73198ce852fa60080bd32703028298b4d65", "ce0febae177d1816ee7a6750ed9fba52472b9a71" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 08 18:19:40 2010 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Nov 08 18:19:40 2010 -0800" }, "message": "am d2d62d04: Merge \"Support extracting thumbnail from rotated video tracks\" into gingerbread\n\n* commit \u0027d2d62d04fc387e2f51d414e101a3e8e3c45f415e\u0027:\n Support extracting thumbnail from rotated video tracks\n" }, { "commit": "ce0febae177d1816ee7a6750ed9fba52472b9a71", "tree": "6e6283e217fc18d53b63652e1d3fe9da2487919f", "parents": [ "85d9b4225d024bb0d602b48bd6d5219cbebd7b8e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 08 16:04:27 2010 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Nov 08 16:52:59 2010 -0800" }, "message": "Support extracting thumbnail from rotated video tracks\n\nChange-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c\n" }, { "commit": "3baff73198ce852fa60080bd32703028298b4d65", "tree": "91c41492bf470b1a3facc7da5b3dad6d97ffbd6c", "parents": [ "4974d5eaf838d893c418b85bd47f6f114d9b5aaa", "85d9b4225d024bb0d602b48bd6d5219cbebd7b8e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 08 11:50:14 2010 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Nov 08 11:56:08 2010 -0800" }, "message": "resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp\n\nChange-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f\n" }, { "commit": "4974d5eaf838d893c418b85bd47f6f114d9b5aaa", "tree": "16d68331d5b8c4f308e1f4a4f474a0f5676a0c34", "parents": [ "6d80795874f85b4dbd4f8425ea3326f65ea8abb0", "aca1fe35480ae76dd6bae167ade40adc955e2d0d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sat Nov 06 14:22:05 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Nov 06 14:22:05 2010 -0700" }, "message": "am 1653e261: Merge \"Rotation support\" into gingerbread\n\n* commit \u00271653e261e84922facfe27d3d8acc455ed2b6b6da\u0027:\n Rotation support\n" }, { "commit": "85d9b4225d024bb0d602b48bd6d5219cbebd7b8e", "tree": "4d9ebf6a8b1ecfe51c312d7f2cfa7b2eda6fe5cf", "parents": [ "aca1fe35480ae76dd6bae167ade40adc955e2d0d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Nov 04 11:50:27 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Nov 05 17:03:17 2010 -0700" }, "message": "Support post-decode video rotation.\n\nChange-Id: Ia371316e73a57e44610de86adce3eaa560afbf84\n" }, { "commit": "aca1fe35480ae76dd6bae167ade40adc955e2d0d", "tree": "ed1cb95800d38e5937ae59d01dc60cbdf3803a3a", "parents": [ "ff5bfcf19da45e6bb0136ef818b7c4bf8fd8db3d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Aug 16 18:39:28 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Nov 05 15:47:52 2010 -0700" }, "message": "Rotation support\n\n- We only support 0, 90, 180, and 270 degree clockwise rotation\n\n- Some players are known to ignore composition matrix in the MP4 file,\n although this is part of the MP4 file standard.\n Both QT and YT are supporting the rotation\n\nChange-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4\n" }, { "commit": "6d80795874f85b4dbd4f8425ea3326f65ea8abb0", "tree": "5bda6ee67deb1d40786012aa4540ce6037724d15", "parents": [ "c59e5f5b601db3b7b8217474ac644a0e600a84df", "ff5bfcf19da45e6bb0136ef818b7c4bf8fd8db3d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 03 19:44:45 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 03 19:44:45 2010 -0700" }, "message": "am c0fa1d47: Merge \"Revert \"Support rotation in media recorder\"\" into gingerbread\n\n* commit \u0027c0fa1d4791667ee8d1a9685749e42426fe8bd38b\u0027:\n Revert \"Support rotation in media recorder\"\n" }, { "commit": "ff5bfcf19da45e6bb0136ef818b7c4bf8fd8db3d", "tree": "6570f16d47ea2bd28364eccb3dd0b08353eb125e", "parents": [ "5b6edb79827a910d8e677e35e77bc12fdc7772b9" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 03 19:22:47 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 03 19:22:47 2010 -0700" }, "message": "Revert \"Support rotation in media recorder\"\n\nThis reverts commit f1febe470ac30f8992066cb263c10f58493c4c34.\n" }, { "commit": "c59e5f5b601db3b7b8217474ac644a0e600a84df", "tree": "655ef0af9198c4517f357ee66e5b5d8038665ee4", "parents": [ "26490f71a5a50b2200d60de28ad0ea6b1d0a1847", "5b6edb79827a910d8e677e35e77bc12fdc7772b9" ], "author": { "name": "Hiroshi Lockheimer", "email": "hiroshi@google.com", "time": "Wed Nov 03 17:59:43 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 03 17:59:43 2010 -0700" }, "message": "am c181a082: Merge \"Support rotation in media recorder\" into gingerbread\n\n* commit \u0027c181a08209dc85c80e4da5d20cd3980998def40d\u0027:\n Support rotation in media recorder\n" }, { "commit": "5b6edb79827a910d8e677e35e77bc12fdc7772b9", "tree": "1e6cc110b0ada374d30d740cc2facac87f59c137", "parents": [ "63a0a11e8b3292253b3d3bf3a7f7dc733cf6762f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 03 17:27:58 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 03 17:49:55 2010 -0700" }, "message": "Support rotation in media recorder\n\no needs to be tested with camera hal and camcorder application\n\nChange-Id: Ie343185c8ad3ec55da8850efbdcf19cf98993232\n" }, { "commit": "26490f71a5a50b2200d60de28ad0ea6b1d0a1847", "tree": "5bda6ee67deb1d40786012aa4540ce6037724d15", "parents": [ "3041096d137144d9d1ebdd6df88ebe8e85133c05", "63a0a11e8b3292253b3d3bf3a7f7dc733cf6762f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Nov 03 09:25:08 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Nov 03 09:25:08 2010 -0700" }, "message": "am f3847e87: Merge \"DO NOT MERGE\" into gingerbread\n\n* commit \u0027f3847e875eb1c58094a2d159a2a6f3f0b381d77a\u0027:\n DO NOT MERGE\n" }, { "commit": "63a0a11e8b3292253b3d3bf3a7f7dc733cf6762f", "tree": "6570f16d47ea2bd28364eccb3dd0b08353eb125e", "parents": [ "64c3bdea8cba454d4404baded584ea0f0611b3ee" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 02 18:43:03 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Nov 02 19:30:01 2010 -0700" }, "message": "DO NOT MERGE\n\nFix premature release of recording frames when physical address or metadata is stored in input video buffers\n\n- bug 3158459\n\nChange-Id: If297189d2a87fc3abfda68c29ac75b490b30a902\n" }, { "commit": "3041096d137144d9d1ebdd6df88ebe8e85133c05", "tree": "8bce55a67fc892803bb40a4655472c2cfba6ea92", "parents": [ "606649635ecb5a7f1378f2538a25fee64214ff42", "bf955268acc4a5a73632cb5f64093d1796c769df" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 14:59:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Nov 02 14:59:51 2010 -0700" }, "message": "am ef8a810b: Merge \"Update of DRM framework\"\n\n* commit \u0027ef8a810b3b11d177a64111125eaa44bb76624414\u0027:\n Update of DRM framework\n" }, { "commit": "bf955268acc4a5a73632cb5f64093d1796c769df", "tree": "e724c5ba98ae8acc0d4cbce86513cde475908272", "parents": [ "55426ce7eded04c9993149edd86f861cfccb4d19", "e943f84129326ab885cc7a69dcfa17f766b72b89" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 14:45:02 2010 -0700" }, "committer": { "name": "Android Code Review", "email": "code-review@android.com", "time": "Tue Nov 02 14:45:02 2010 -0700" }, "message": "Merge \"Update of DRM framework\"" }, { "commit": "606649635ecb5a7f1378f2538a25fee64214ff42", "tree": "a5309fe2c66eeb7ae5ed6a7a10fd01ab73cd29e1", "parents": [ "2726a0ff895ecc0eac3ea5dbc04f407b008cc7f0", "55426ce7eded04c9993149edd86f861cfccb4d19" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 14:02:59 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Nov 02 14:02:59 2010 -0700" }, "message": "resolved conflicts for merge of c1c45a4d to gingerbread-plus-aosp\n\nChange-Id: I5411eaa0426cf208c6db3570f707d1b6b4baf455\n" }, { "commit": "55426ce7eded04c9993149edd86f861cfccb4d19", "tree": "50766a0758a529a2658f1a8d7c3abeccbbd2fcc7", "parents": [ "dcd25efb46c41c8d24a0a9cf61fb57f84149709e" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Fri Oct 29 10:09:47 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Nov 01 16:12:16 2010 -0700" }, "message": "- Move the business rule management down to DRM agents.\n- Do not register DRM sniffer because drmserver is not enabled.\n\nChange-Id: I7a1052fe406f5087051a482b7e85a458f3ec7b8f\n" }, { "commit": "e943f84129326ab885cc7a69dcfa17f766b72b89", "tree": "45602605772fcd85d240cbfd900b82e0067453e9", "parents": [ "dcd25efb46c41c8d24a0a9cf61fb57f84149709e" ], "author": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Fri Oct 08 23:05:49 2010 +0900" }, "committer": { "name": "Takeshi Aimi", "email": "aimitakeshi@gmail.com", "time": "Tue Nov 02 08:06:06 2010 +0900" }, "message": "Update of DRM framework\n\n - Overload openDecryptSession() with uri parameter\n in order to accept URI of DRM content,\n Following API is added,\n DecryptHandle*openDecryptSession(const char* uri);.\n - Unify texisting three event types of processDrmInfo()\n so that caller of DRM framework does not have to handle many event types.\n - Let DrmManagerService call load/unload plugins API so that\n client of DRM framework does not have to manage plug-in load/unload.\n - Trivial fix in DrmManagerClient.java is also incorporated.\n\nChanges are made by Sony Corporation.\n\nChange-Id: If62b47fa0360718fdc943e6e6143671d7db26adc\n" }, { "commit": "6b6a736ec71c692c165952fe653a7766075e94bb", "tree": "2000c38c45f45551faa3a78de14f7f7f387b0f80", "parents": [ "64c3bdea8cba454d4404baded584ea0f0611b3ee" ], "author": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Mon Nov 01 10:56:45 2010 +0800" }, "committer": { "name": "Chia-chi Yeh", "email": "chiachi@android.com", "time": "Mon Nov 01 10:56:45 2010 +0800" }, "message": "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.\n\nChange-Id: Ie6d77b0f61a37333e05cdcdb6ef29d6f6c345a9d\n" }, { "commit": "2726a0ff895ecc0eac3ea5dbc04f407b008cc7f0", "tree": "287385df2f7379831d68040ab238cc5393ba5fdb", "parents": [ "7b74bba58149afe9ff4c67cd508928c303851cc3", "64c3bdea8cba454d4404baded584ea0f0611b3ee" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Oct 27 11:08:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 27 11:08:14 2010 -0700" }, "message": "am 67c7a4ae: Merge \"Fix off-by-two and other bugs in the visualization code. b/3137511\" into gingerbread\n" }, { "commit": "64c3bdea8cba454d4404baded584ea0f0611b3ee", "tree": "96b7ede041d48ff8932c8e3fedf6ae72a9396c88", "parents": [ "53409d6fe668e695e92479371f0ec162723feed5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Oct 27 09:06:01 2010 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Oct 27 10:23:59 2010 -0700" }, "message": "Fix off-by-two and other bugs in the visualization code.\nb/3137511\n\nChange-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6\n" }, { "commit": "7b74bba58149afe9ff4c67cd508928c303851cc3", "tree": "289036f84173eff804d5a85975cc4944ce9d4af8", "parents": [ "a9741a9232c81eaf59179acef91f5be46c42264e", "53409d6fe668e695e92479371f0ec162723feed5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 26 16:23:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 26 16:23:54 2010 -0700" }, "message": "am 2088e371: Merge \"Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.\" into gingerbread\n" }, { "commit": "53409d6fe668e695e92479371f0ec162723feed5", "tree": "a1dc60a6bd38819ab63f41cd80efd72d10d0100d", "parents": [ "b2ee05b6c453b7da24b23139489ad92bb2c79621" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 26 15:01:03 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 26 15:06:44 2010 -0700" }, "message": "Assume that all of the decoded vorbis audio data is valid unless the source indicates otherwise.\n\nChange-Id: Iea88e3f09955d82a9a11fbcc075db8d9c4007490\n" }, { "commit": "a9741a9232c81eaf59179acef91f5be46c42264e", "tree": "9a66416b42a28ec2ad4fa2ec520c42d976046aec", "parents": [ "d8cba5371423841e6a85816ad4a7fd88d3a60b12", "dcd25efb46c41c8d24a0a9cf61fb57f84149709e" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 15:23:04 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 16:11:18 2010 -0700" }, "message": "resolved conflicts for merge of 9084631d to gingerbread-plus-aosp\n\nChange-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472\n" }, { "commit": "dcd25efb46c41c8d24a0a9cf61fb57f84149709e", "tree": "6b6d165ba952924f1cd1b77f3a0903e5da31445a", "parents": [ "2272ee27d9022d173b6eab45c409b3c3f57f30ec" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Tue Jun 22 13:55:38 2010 -0700" }, "committer": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Mon Oct 25 12:16:56 2010 -0700" }, "message": "DRM framework support:\n- add a sniffer for DRM files\n- add DRMSource and DRMExtractor for es_based DRM\n- add pread in FileSource.cpp for container_based DRM\n- add native DRM framework API calls in the player for\n DRM audio/video playback\n\nChange-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f\n" }, { "commit": "d8cba5371423841e6a85816ad4a7fd88d3a60b12", "tree": "3be3d9aaea10c35268be8e2f5f989b645dcb99e5", "parents": [ "315940bf8ab4b49a49ff986afaf4775a2cacc381", "b2ee05b6c453b7da24b23139489ad92bb2c79621" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Mon Oct 25 09:09:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 25 09:09:26 2010 -0700" }, "message": "am 89821204: Merge \"Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge\" into gingerbread\n\nMerge commit \u002789821204379816f6bee6902c4f132c014700c3b0\u0027 into gingerbread-plus-aosp\n\n* commit \u002789821204379816f6bee6902c4f132c014700c3b0\u0027:\n Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge\n" }, { "commit": "b2ee05b6c453b7da24b23139489ad92bb2c79621", "tree": "c87270874c46e1835b4c825bdd78109006856d3a", "parents": [ "12ac08f2e1ffb74fd4efdc726066db15e6d3d50d" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Thu Oct 21 12:50:37 2010 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Mon Oct 25 14:56:22 2010 +0800" }, "message": "Remove the FLIP_H/ROT_90 workaround from CameraService.do not merge\n\nNow overlay does flip before rotation.\nbug:3114236\nChange-Id: I1780e56154566435a0ceeb2f101de7ed0a0613cb\n" }, { "commit": "315940bf8ab4b49a49ff986afaf4775a2cacc381", "tree": "f558c125cbffc52506854e65e677f5421a261f6d", "parents": [ "ddcd04f2b3fef095e9f4020d5f87b7259e6921e9" ], "author": { "name": "Mike Lockwood", "email": "lockwood@android.com", "time": "Thu Jul 15 14:58:25 2010 -0400" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Sun Oct 24 08:52:08 2010 -0700" }, "message": "Fixes for simulator build on lucid\n\nstrchr and strrchr now return const char* instead of char*\n\nChange-Id: Idc013222e86c80b1e91d5aeb09a1a24809a82358\n" }, { "commit": "ddcd04f2b3fef095e9f4020d5f87b7259e6921e9", "tree": "2d0c7d4c0e48f2e0e3989406d4bd9f683ec961b3", "parents": [ "8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb", "12ac08f2e1ffb74fd4efdc726066db15e6d3d50d" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 21 20:18:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 20:18:16 2010 -0700" }, "message": "am 1bd8a8c8: Merge \"Turn the media time adjustment in file writer back on\" into gingerbread\n\nMerge commit \u00271bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410\u0027 into gingerbread-plus-aosp\n\n* commit \u00271bd8a8c8acdb7c3aa875ea62ccf0b9111f1c9410\u0027:\n Turn the media time adjustment in file writer back on\n" }, { "commit": "12ac08f2e1ffb74fd4efdc726066db15e6d3d50d", "tree": "1bf87d26b4f07bb74eabde355b010ee012cada77", "parents": [ "04e410dac8a4e69cff7aaa78c2c0871ce0b027ca", "5b6a01e65aa4129a9226667536d1bc1dad5980d8" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 21 20:06:59 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 21 20:06:59 2010 -0700" }, "message": "Merge \"Turn the media time adjustment in file writer back on\" into gingerbread" }, { "commit": "5b6a01e65aa4129a9226667536d1bc1dad5980d8", "tree": "3cc13ca4e8575aa462cffdb3ae174c35d3801513", "parents": [ "78a1a286f736888ae7af8860b2c424af0d978848" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 21 17:58:14 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 21 18:41:31 2010 -0700" }, "message": "Turn the media time adjustment in file writer back on\n\no This was turned off to unblock the tests on some device\no The adjustment duration is increased to suppress fluctuations observed on some device\n\nbug - 3058745\n\nChange-Id: Iaeeb1c1c52783f5c679305645c995e57b4b2a573\n" }, { "commit": "8f0c48b306f98ac572ecc3c0f64b8e38db6d01eb", "tree": "439fb2a8af1defe105de3dacb718c58ddbc74e70", "parents": [ "9acb8a2030444c46f9c4fa55e1f6137058cf46f8", "04e410dac8a4e69cff7aaa78c2c0871ce0b027ca" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Oct 21 16:26:02 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 21 16:26:02 2010 -0700" }, "message": "am 0c636055: Merge \"Mirror the preview for front-facing cameras. do not merge\" into gingerbread\n\nMerge commit \u00270c636055351f2e1d26138cf7b3bf3c82553e68c4\u0027 into gingerbread-plus-aosp\n\n* commit \u00270c636055351f2e1d26138cf7b3bf3c82553e68c4\u0027:\n Mirror the preview for front-facing cameras. do not merge\n" }, { "commit": "04e410dac8a4e69cff7aaa78c2c0871ce0b027ca", "tree": "49747338316aeec63662284d566ce3793593430f", "parents": [ "78a1a286f736888ae7af8860b2c424af0d978848", "95b18cb9224f79a781c827e0da45c58a644acece" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Oct 21 16:20:07 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 21 16:20:07 2010 -0700" }, "message": "Merge \"Mirror the preview for front-facing cameras. do not merge\" into gingerbread" } ], "next": "9acb8a2030444c46f9c4fa55e1f6137058cf46f8" }