)]}' { "log": [ { "commit": "8ac0cb9dc8a46f9b2badabc91cb5f7871e2215a9", "tree": "5ba561315eff765e4a434ae56c55c3648defe5ec", "parents": [ "3e00cc070090fa3eab16792da90aa33823cd6db1", "06fa2bcce5dd80b406a23f980d8c9fac1524ebfd" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 18 08:33:38 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Oct 18 08:33:38 2010 -0700" }, "message": "Merge fb474872 from gingerbread-plus-aosp\n\nChange-Id: I1bbb845a86a7b7df44ea175df3af22e5f47c44e3\n" }, { "commit": "3e00cc070090fa3eab16792da90aa33823cd6db1", "tree": "7418eedd47a1cc84b79266abed5b81b55c2207bf", "parents": [ "b0d62457a9630b144187dcd5b143ee9c91f591d0", "30550ba7a19372daa7424710ca1367bb7299e459" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 18 08:05:09 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 18 08:05:09 2010 -0700" }, "message": "am 746c6a1c: am ff7a7a45: Merge \"Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\" into gingerbread\n\nMerge commit \u0027746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4\u0027\n\n* commit \u0027746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4\u0027:\n Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\n" }, { "commit": "b0d62457a9630b144187dcd5b143ee9c91f591d0", "tree": "63a601d4d34d33e8f265a82d668080ee6f87ab69", "parents": [ "3e8742fa4a5f0f8b185274763f6ec4e6c3a89344", "d804a1a27b42541157fddf725593d4e2ccaa6ad5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sat Oct 16 09:14:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sat Oct 16 09:14:06 2010 -0700" }, "message": "am cb90947b: am e1f3976b: Merge \"Make sure we cache the sampleTable again if using the caching datasource.\" into gingerbread\n\nMerge commit \u0027cb90947bf8ed2c898c1b7e529dd0c99d112ed611\u0027\n\n* commit \u0027cb90947bf8ed2c898c1b7e529dd0c99d112ed611\u0027:\n Make sure we cache the sampleTable again if using the caching datasource.\n" }, { "commit": "06fa2bcce5dd80b406a23f980d8c9fac1524ebfd", "tree": "340fd639cd8c487e65c47e4d44ee66974d8a9b85", "parents": [ "30550ba7a19372daa7424710ca1367bb7299e459", "56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 18:25:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:25:14 2010 -0700" }, "message": "am b04f356d: Merge \"Include the framework copy of the OpenMAX headers instead of referencing external/opencore.\" into gingerbread\n\nMerge commit \u0027b04f356d86eec74217fca8e3b85d801c4fcaa678\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b04f356d86eec74217fca8e3b85d801c4fcaa678\u0027:\n Include the framework copy of the OpenMAX headers instead of referencing external/opencore.\n" }, { "commit": "30550ba7a19372daa7424710ca1367bb7299e459", "tree": "87b3131d309faba7e3a4befb63d6968679661133", "parents": [ "d804a1a27b42541157fddf725593d4e2ccaa6ad5", "b10d28f233bb881cc12260c320892e5feb198e9a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 18:24:56 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 18:24:56 2010 -0700" }, "message": "am ff7a7a45: Merge \"Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\" into gingerbread\n\nMerge commit \u0027ff7a7a455c15077e2b691efa370619f06058f697\u0027 into gingerbread-plus-aosp\n\n* commit \u0027ff7a7a455c15077e2b691efa370619f06058f697\u0027:\n Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\n" }, { "commit": "56cfa2376ae87cba730ea7ce4a9e0ca4f0d07627", "tree": "c5909cd90e35e198a801abf6cff6d924a73b8011", "parents": [ "b10d28f233bb881cc12260c320892e5feb198e9a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 13:31:29 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 13:31:29 2010 -0700" }, "message": "Include the framework copy of the OpenMAX headers instead of referencing external/opencore.\n\nChange-Id: I762f59acf5e1f770e4d7c2d89af362bfffebefa6\nrelated-to-bug: 3101573\n" }, { "commit": "b10d28f233bb881cc12260c320892e5feb198e9a", "tree": "187930b69fae31448522edf8d2e2c351e10796a0", "parents": [ "b9d3038ec950665639e26acd51329ebc800e780d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 13:30:27 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 13:30:27 2010 -0700" }, "message": "Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.\n\nChange-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c\nrelated-to-bug: 3101573\n" }, { "commit": "d804a1a27b42541157fddf725593d4e2ccaa6ad5", "tree": "0b8b7c7a30cbdf27ae48aa58a44277f35aec13a1", "parents": [ "8cde59da2dd8540466aff5e94e9a6e5f74df1f10", "b9d3038ec950665639e26acd51329ebc800e780d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 08:54:17 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 08:54:17 2010 -0700" }, "message": "am e1f3976b: Merge \"Make sure we cache the sampleTable again if using the caching datasource.\" into gingerbread\n\nMerge commit \u0027e1f3976bb4eab0d7c46bc8596679d4d00695148c\u0027 into gingerbread-plus-aosp\n\n* commit \u0027e1f3976bb4eab0d7c46bc8596679d4d00695148c\u0027:\n Make sure we cache the sampleTable again if using the caching datasource.\n" }, { "commit": "b9d3038ec950665639e26acd51329ebc800e780d", "tree": "d04faaa2cb0d75227b3d53c4529ec7156414e999", "parents": [ "2959a5a5b4d151e14da3abe0289c15693409eb84" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 08:38:49 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 08:38:49 2010 -0700" }, "message": "Make sure we cache the sampleTable again if using the caching datasource.\n\nQA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position.\n\nChange-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5\nrelated-to-bug: 3098873\n" }, { "commit": "3e8742fa4a5f0f8b185274763f6ec4e6c3a89344", "tree": "e7fe850b1e78f29434d2f0226830b3d763ebc5f7", "parents": [ "6fed68ded4ab2c042b7ca14409a24aee916313d5", "8cde59da2dd8540466aff5e94e9a6e5f74df1f10" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 08:33:23 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 08:33:23 2010 -0700" }, "message": "am 27c7fb1a: am 90d59d18: Merge \"Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.\" into gingerbread\n\nMerge commit \u002727c7fb1a861776b4fdc2632697e4e25eee83617f\u0027\n\n* commit \u002727c7fb1a861776b4fdc2632697e4e25eee83617f\u0027:\n Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.\n" }, { "commit": "6fed68ded4ab2c042b7ca14409a24aee916313d5", "tree": "95818c6ea5f9e4988449d166bbec31251030b46e", "parents": [ "a44501ea0896c2508bd6b807185d9049be6752f3", "0b5181ddfdde400f9cac6db239cf97ced3b67e22" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 08:32:06 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 08:32:06 2010 -0700" }, "message": "am bb5d7c21: am 5f423917: Merge \"Attempt to derive the avg. bitrate of the entire stream from metadata.\" into gingerbread\n\nMerge commit \u0027bb5d7c21615128630fc9d08274bb14ca01e2124b\u0027\n\n* commit \u0027bb5d7c21615128630fc9d08274bb14ca01e2124b\u0027:\n Attempt to derive the avg. bitrate of the entire stream from metadata.\n" }, { "commit": "a44501ea0896c2508bd6b807185d9049be6752f3", "tree": "afc26c0ad587682bb9db239654f23cc478df1cd3", "parents": [ "f9f083e2853740c97588f4db82c24645ae5880e4", "217c81ec709f657bc2817b2083e400946b13e9d8" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 15 00:08:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 15 00:08:35 2010 -0700" }, "message": "am 8e4f3c76: am 646e0d5a: Merge \"Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these...\" into gingerbread\n\nMerge commit \u00278e4f3c76dd7f5596fa2fe10bdf008d4c02353160\u0027\n\n* commit \u00278e4f3c76dd7f5596fa2fe10bdf008d4c02353160\u0027:\n Some webcams output rtp streams but never send any rtcp data in violation of\n" }, { "commit": "f9f083e2853740c97588f4db82c24645ae5880e4", "tree": "5d045dddcf9e85e4826286c28662050b9d4a935d", "parents": [ "d6119356f45c9c57cac812357d969ecc3001087e", "e4edd632d48720b44f7878273f46d192d5703150" ], "author": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Oct 14 23:58:41 2010 -0700" }, "committer": { "name": "Kenny Root", "email": "kroot@google.com", "time": "Thu Oct 14 23:58:41 2010 -0700" }, "message": "resolved conflicts for merge of a127c07c to master\n\nChange-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086\n" }, { "commit": "d6119356f45c9c57cac812357d969ecc3001087e", "tree": "571a3fd12bab8ff32a863507d4e907e750456af9", "parents": [ "11b72e19970f620adfb1aa458b45ff06cec77f10", "43024e1f4953d9b8891b7b72f10e76f11812e772" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 14 23:22:21 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 14 23:22:21 2010 -0700" }, "message": "am 28b93967: am 165c6579: Merge \"HTTP Live content that are tagged as complete are now seekable.\" into gingerbread\n\nMerge commit \u002728b93967d0e702304c7edec854a29d5ab88bfce0\u0027\n\n* commit \u002728b93967d0e702304c7edec854a29d5ab88bfce0\u0027:\n HTTP Live content that are tagged as complete are now seekable.\n" }, { "commit": "8cde59da2dd8540466aff5e94e9a6e5f74df1f10", "tree": "633d6ce67a785ba813c1f9c79917ec6c40e56fee", "parents": [ "0b5181ddfdde400f9cac6db239cf97ced3b67e22", "2959a5a5b4d151e14da3abe0289c15693409eb84" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 15:50:27 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 15:50:27 2010 -0700" }, "message": "am 90d59d18: Merge \"Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.\" into gingerbread\n\nMerge commit \u002790d59d180bd963f00161e6bfaabfda432960cab6\u0027 into gingerbread-plus-aosp\n\n* commit \u002790d59d180bd963f00161e6bfaabfda432960cab6\u0027:\n Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.\n" }, { "commit": "2959a5a5b4d151e14da3abe0289c15693409eb84", "tree": "bcdb8b57d72e5d1f8ca30cf79aafde419c610cc9", "parents": [ "a82c3c631a9c0bb721e35d03714715ffe3b0b0c3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 15:12:08 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 15:12:08 2010 -0700" }, "message": "Metadata.cpp and Metadata.java had drifted out of sync. This change remedies that.\n\nChange-Id: I48175666857ab0fb1519777bdb6f7f0b6b5cc599\nrelated-to-bug: 3073955\n" }, { "commit": "0b5181ddfdde400f9cac6db239cf97ced3b67e22", "tree": "fe886eb741a742dfa054b884b0def6cfec92d887", "parents": [ "217c81ec709f657bc2817b2083e400946b13e9d8", "a82c3c631a9c0bb721e35d03714715ffe3b0b0c3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 14:28:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 14:28:52 2010 -0700" }, "message": "am 5f423917: Merge \"Attempt to derive the avg. bitrate of the entire stream from metadata.\" into gingerbread\n\nMerge commit \u00275f42391701c0657d520d00f62a4c061b18ba1280\u0027 into gingerbread-plus-aosp\n\n* commit \u00275f42391701c0657d520d00f62a4c061b18ba1280\u0027:\n Attempt to derive the avg. bitrate of the entire stream from metadata.\n" }, { "commit": "a82c3c631a9c0bb721e35d03714715ffe3b0b0c3", "tree": "8ea9541e1f5cdf42314785413f3716f935ae05a3", "parents": [ "f61551f4fc79e7da879802e3974afa9b03ffb5d0", "7fbdb0903dfbf70b314a74e64e28fb880cdb9247" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 14:25:32 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 14:25:32 2010 -0700" }, "message": "Merge \"Attempt to derive the avg. bitrate of the entire stream from metadata.\" into gingerbread" }, { "commit": "217c81ec709f657bc2817b2083e400946b13e9d8", "tree": "3658ee951c88875f235c8094508894fe85c5b26c", "parents": [ "e4edd632d48720b44f7878273f46d192d5703150", "f61551f4fc79e7da879802e3974afa9b03ffb5d0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 14:22:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 14:22:57 2010 -0700" }, "message": "am 646e0d5a: Merge \"Some webcams output rtp streams but never send any rtcp data in violation of the specs. Attempt to use fake timestamps to be able to play these...\" into gingerbread\n\nMerge commit \u0027646e0d5ab342f414f556574f2d078bd6deb22ed3\u0027 into gingerbread-plus-aosp\n\n* commit \u0027646e0d5ab342f414f556574f2d078bd6deb22ed3\u0027:\n Some webcams output rtp streams but never send any rtcp data in violation of\n" }, { "commit": "11b72e19970f620adfb1aa458b45ff06cec77f10", "tree": "fb5165e1e4ee98471b902cd2dd8f33de5750f13a", "parents": [ "43a2b3b5fd4e15ffed4235f348d5eba168e8432c" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 13 12:34:04 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 13 12:34:47 2010 -0700" }, "message": "Remove hard-coded color format for Nvidia\u0027s video encoder\n\no camera would query the color format if camera source is used\no if camera source is not used, a MetaData can be passed to do the same.\n\nChange-Id: Iff1f802cc4974b286085473e5384bd88e04fa05d\n" }, { "commit": "f61551f4fc79e7da879802e3974afa9b03ffb5d0", "tree": "4feb3e5d3d1897681129d5f5c44ff16fe25cfa11", "parents": [ "5cb77e080ced5362b5f047e107327b3cb6ece6c9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 12:15:03 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 12:15:03 2010 -0700" }, "message": "Some webcams output rtp streams but never send any rtcp data in violation of\nthe specs. Attempt to use fake timestamps to be able to play these...\n\nChange-Id: Ia7a926616fb764e972955df4acdb59d85cdd93df\nrelated-to-bug: 3087310\n" }, { "commit": "7fbdb0903dfbf70b314a74e64e28fb880cdb9247", "tree": "fc9511b938ec6183dcf9d41d5f892bee2e8d85de", "parents": [ "5cb77e080ced5362b5f047e107327b3cb6ece6c9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 16:55:11 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 10:39:41 2010 -0700" }, "message": "Attempt to derive the avg. bitrate of the entire stream from metadata.\n\nrelated-to-bug: 3093224\nChange-Id: I4726b023373e04468cc12fd64f7fe6ee923add95\n" }, { "commit": "e4edd632d48720b44f7878273f46d192d5703150", "tree": "4dc92f8f6371da457d7c20e59194e73cf66d3659", "parents": [ "43024e1f4953d9b8891b7b72f10e76f11812e772", "5cb77e080ced5362b5f047e107327b3cb6ece6c9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 09:19:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 09:19:28 2010 -0700" }, "message": "am 312644cd: Merge \"Support for writing to MPEG2 transport stream files.\" into gingerbread\n\nMerge commit \u0027312644cdbb39522fe9cac028b15b907ce0e8e0f7\u0027 into gingerbread-plus-aosp\n\n* commit \u0027312644cdbb39522fe9cac028b15b907ce0e8e0f7\u0027:\n Support for writing to MPEG2 transport stream files.\n" }, { "commit": "43024e1f4953d9b8891b7b72f10e76f11812e772", "tree": "a4495b728b7f580bfc023aac30fb2341d67f1b67", "parents": [ "a543d453047fbc09e11c38d1597ae2c71d9a02d9", "bff07d0b22a5ee2d9f044f6cb5e4be1532017ab0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 09:17:13 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 13 09:17:13 2010 -0700" }, "message": "am 165c6579: Merge \"HTTP Live content that are tagged as complete are now seekable.\" into gingerbread\n\nMerge commit \u0027165c6579660c22edafb61fee2a0cf39334a2a905\u0027 into gingerbread-plus-aosp\n\n* commit \u0027165c6579660c22edafb61fee2a0cf39334a2a905\u0027:\n HTTP Live content that are tagged as complete are now seekable.\n" }, { "commit": "5cb77e080ced5362b5f047e107327b3cb6ece6c9", "tree": "cd1aeadc0d0dd75c669aa26ece9ce9252e83bdee", "parents": [ "bff07d0b22a5ee2d9f044f6cb5e4be1532017ab0", "59b7dc39ea8332d3418a599e51447d7edb612ac4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 13 09:14:40 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 13 09:14:40 2010 -0700" }, "message": "Merge \"Support for writing to MPEG2 transport stream files.\" into gingerbread" }, { "commit": "59b7dc39ea8332d3418a599e51447d7edb612ac4", "tree": "30d77dd5cca3f58b3902df86e7df1dab42abc0f2", "parents": [ "2bc940b4f961e588459c83862b2c6bea314a4027" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 14:17:45 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 16:05:23 2010 -0700" }, "message": "Support for writing to MPEG2 transport stream files.\n\nChange-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97\n" }, { "commit": "bff07d0b22a5ee2d9f044f6cb5e4be1532017ab0", "tree": "3377ef036c87095609a0969dbf0b5c93450b8903", "parents": [ "2bc940b4f961e588459c83862b2c6bea314a4027" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 11:34:37 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 14:32:10 2010 -0700" }, "message": "HTTP Live content that are tagged as complete are now seekable.\n\nChange-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde\nrelated-to-bug: 2368598\n" }, { "commit": "43a2b3b5fd4e15ffed4235f348d5eba168e8432c", "tree": "6535b1799368edc6fe35342e770d5c7b6d709d4b", "parents": [ "012716a857641a977afd16ff6be4bf66fc403884", "a543d453047fbc09e11c38d1597ae2c71d9a02d9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 12 11:51:01 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 12 11:51:01 2010 -0700" }, "message": "am 5b0d0630: am 1010da2e: Merge \"Just in case we\\\u0027re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.\" into gingerbread\n\nMerge commit \u00275b0d063010b364102ffb7a533e2b76ecfd9636d5\u0027\n\n* commit \u00275b0d063010b364102ffb7a533e2b76ecfd9636d5\u0027:\n Just in case we\u0027re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.\n" }, { "commit": "012716a857641a977afd16ff6be4bf66fc403884", "tree": "99310083065ae33d75b6b5c87a45a9b2dab096fc", "parents": [ "23d2071ab44d7b5e3b16e8a81e11884faf01092f" ], "author": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Fri Oct 08 22:04:43 2010 +0800" }, "committer": { "name": "Wu-cheng Li", "email": "wuchengli@google.com", "time": "Tue Oct 12 15:52:44 2010 +0800" }, "message": "Fix camera display orientation.\n\nbug:3036262\nChange-Id: I6fc3dc381fcfaceba09fd5bd14afb85045b3d676\n" }, { "commit": "23d2071ab44d7b5e3b16e8a81e11884faf01092f", "tree": "a726f3622522b474b0567d956007cc4d93f756d2", "parents": [ "250e051e564e3b6f5a88314379d5e145a2b5615f" ], "author": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 11 17:31:44 2010 -0400" }, "committer": { "name": "Mike Lockwood", "email": "lockwood@google.com", "time": "Mon Oct 11 17:33:52 2010 -0400" }, "message": "MTP: Include size of 12 byte header in packet size for GetObject data packet\n\nFixes file transfer from device to host with libmtp.\n\nChange-Id: Ifb304c1f106e94b2710ee5c11816b83cf5f25478\nSigned-off-by: Mike Lockwood \u003clockwood@google.com\u003e\n" }, { "commit": "a543d453047fbc09e11c38d1597ae2c71d9a02d9", "tree": "0acc7c7e87ca6652f49729536516823f8b6c7931", "parents": [ "b4ff90196e0bff3d80bb922933cd646381c2d1b4", "2bc940b4f961e588459c83862b2c6bea314a4027" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 11 12:37:50 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 11 12:37:50 2010 -0700" }, "message": "am 1010da2e: Merge \"Just in case we\\\u0027re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.\" into gingerbread\n\nMerge commit \u00271010da2e02216b2f94fbe763a82d53201b340217\u0027 into gingerbread-plus-aosp\n\n* commit \u00271010da2e02216b2f94fbe763a82d53201b340217\u0027:\n Just in case we\u0027re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.\n" }, { "commit": "2bc940b4f961e588459c83862b2c6bea314a4027", "tree": "53dd017ef6b9e961b885159a4cbb3d6efecac053", "parents": [ "0dcd837af4169bdb6fb2a0c384722dc4f57433c6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 11 11:05:52 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 11 11:30:30 2010 -0700" }, "message": "Just in case we\u0027re behind a NAT router/firewall, attempt to poke holes into it for future incoming RTP/RTCP packets to pass through.\n\nChange-Id: Idd47968d4027f357222f19f15eecfd70fdec3282\nrelated-to-bug: 3073813\n" }, { "commit": "250e051e564e3b6f5a88314379d5e145a2b5615f", "tree": "a74d98e42412b7b1b75df245c06087d1b3a05856", "parents": [ "e31aa743466972764f9db5a88a713621ff0a29ae", "b4ff90196e0bff3d80bb922933cd646381c2d1b4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 19:13:48 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 19:13:48 2010 -0700" }, "message": "am cac43e8a: am beffefa2: Merge \"RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.\" into gingerbread\n\nMerge commit \u0027cac43e8a2ce59c1151d5a2028330b2a769591d22\u0027\n\n* commit \u0027cac43e8a2ce59c1151d5a2028330b2a769591d22\u0027:\n RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.\n" }, { "commit": "e31aa743466972764f9db5a88a713621ff0a29ae", "tree": "55e218856d9e5aede7ecb0eb790572be6441ac91", "parents": [ "9086ce254ac8769dbe90afd5146fce509a86418f", "3ec866c1ea1a9b254bb41383311887b53dc418d4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 17:45:58 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 17:45:58 2010 -0700" }, "message": "am e0c8545a: am 0fd4e216: Merge \"Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.\" into gingerbread\n\nMerge commit \u0027e0c8545a2369881fe09582337a9de3db2db1a951\u0027\n\n* commit \u0027e0c8545a2369881fe09582337a9de3db2db1a951\u0027:\n Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.\n" }, { "commit": "9086ce254ac8769dbe90afd5146fce509a86418f", "tree": "839b677b53471d46e2d976aa21c64dd3083e4b3e", "parents": [ "f0dee1c7bb5ed2b90b2207bde7552d0f9ce2c3b1", "abc40fd3f7effc025ccad91d05f5d6bb2a4c857c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 17:14:53 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 17:14:53 2010 -0700" }, "message": "am 2b4f1f4c: am f72dd019: Merge \"Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\" into gingerbread\n\nMerge commit \u00272b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7\u0027\n\n* commit \u00272b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7\u0027:\n Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\n" }, { "commit": "f0dee1c7bb5ed2b90b2207bde7552d0f9ce2c3b1", "tree": "7a35122c7cc40689f5458d6c02eb6648b971964e", "parents": [ "d10091147c620aab1ca8da97a3c55e1644859cb1", "c7e61d5e67a8218d33835a1b5ca0256b30699ae7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 17:14:35 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 17:14:35 2010 -0700" }, "message": "am 5dcf588a: am b9bf5457: Merge \"Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.\" into gingerbread\n\nMerge commit \u00275dcf588a81a59142985736d8bb0430586f68ec08\u0027\n\n* commit \u00275dcf588a81a59142985736d8bb0430586f68ec08\u0027:\n Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.\n" }, { "commit": "d10091147c620aab1ca8da97a3c55e1644859cb1", "tree": "16888ec4f7500f31b1838e62ed68756e43c3a6fb", "parents": [ "1c8ef86f2c25272488c171f1469f996ebf335edc", "6a3bc8ca890fae9019c668c9f6262403f0769d44" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Oct 10 17:13:51 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 17:13:51 2010 -0700" }, "message": "am d31fc239: am 6dcdfdb4: Merge \"Name the writer threads\" into gingerbread\n\nMerge commit \u0027d31fc2397a494fc54679ac8fdb52983b60287183\u0027\n\n* commit \u0027d31fc2397a494fc54679ac8fdb52983b60287183\u0027:\n Name the writer threads\n" }, { "commit": "1c8ef86f2c25272488c171f1469f996ebf335edc", "tree": "988609d64f7ff8e853540cf96a2a5c73c1a64461", "parents": [ "2eeadf9ded4b5770a713496e9887d668889987bc", "a5412b0431a22e52a4cc1623b92eb48fcd4d985c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 17:13:28 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 17:13:28 2010 -0700" }, "message": "am 14ea1048: am c5912acc: Merge \"Disable the access unit timeout temporarily while a seek operation is in progress.\" into gingerbread\n\nMerge commit \u002714ea1048e7e8a4b40836b5601bc86b91663525cb\u0027\n\n* commit \u002714ea1048e7e8a4b40836b5601bc86b91663525cb\u0027:\n Disable the access unit timeout temporarily while a seek operation is in progress.\n" }, { "commit": "2eeadf9ded4b5770a713496e9887d668889987bc", "tree": "94815ad41dce013a8d793d9e70d21f330573bd2b", "parents": [ "0714c8262054cb6a532025feb082b21b502a128b", "74684081846ee6e68325fa5aba5c45b7447fd368" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sun Oct 10 16:06:04 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 16:06:04 2010 -0700" }, "message": "am 4f21e517: am b37fcbfd: Merge \"Added getter for session Id to AudioSink\" into gingerbread\n\nMerge commit \u00274f21e517d09b9d793d20d64547df330fba705b3c\u0027\n\n* commit \u00274f21e517d09b9d793d20d64547df330fba705b3c\u0027:\n Added getter for session Id to AudioSink\n" }, { "commit": "0714c8262054cb6a532025feb082b21b502a128b", "tree": "b4167b30ded9ae12485d7052629fa9affdc876b6", "parents": [ "14d23de89e24f7725eb2b68322e40f94951813c4", "4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 16:05:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 16:05:44 2010 -0700" }, "message": "am d96a068c: am bb245d35: Merge \"Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.\" into gingerbread\n\nMerge commit \u0027d96a068cc7b3519a5b7d122a12025684b6f28c76\u0027\n\n* commit \u0027d96a068cc7b3519a5b7d122a12025684b6f28c76\u0027:\n Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.\n" }, { "commit": "14d23de89e24f7725eb2b68322e40f94951813c4", "tree": "98b3b70ca7986023d5c74983bb6f1ac540a5a963", "parents": [ "0e4d896cb9ab813131c45b3b1fcd4cc66d341468", "fbc504d6a8ec1204b5fa203924f8324ff4aa0e74" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Sun Oct 10 12:51:00 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 12:51:00 2010 -0700" }, "message": "am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp\n\nMerge commit \u00279580b8ce6553ddde03db594fd4fd4f59ca61c382\u0027\n\n* commit \u00279580b8ce6553ddde03db594fd4fd4f59ca61c382\u0027:\n Update of DRM framework.\n" }, { "commit": "0e4d896cb9ab813131c45b3b1fcd4cc66d341468", "tree": "d06b31cc078a484621958c43c1e098e8696b9c1a", "parents": [ "79e0ac144ca9bb771e2c6b1954c882da12a4bea8", "da91f0b87bded1e4ebc9cc1a1712c7a0d44fba84" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 11:25:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 11:25:54 2010 -0700" }, "message": "am bb708373: am 949f7d90: Merge \"Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\" into gingerbread\n\nMerge commit \u0027bb70837397e3fb437b7b4443b37d7a83c11e6e43\u0027\n\n* commit \u0027bb70837397e3fb437b7b4443b37d7a83c11e6e43\u0027:\n Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\n" }, { "commit": "79e0ac144ca9bb771e2c6b1954c882da12a4bea8", "tree": "6c2597e62ec99a3dcbb9f80d884dd87f1f1cf6e3", "parents": [ "2b37ced30f89437c804c3945b901019b86d210ae", "712a002fa3a507158c9ae3435b843edd3a69d7e8" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Sun Oct 10 11:16:01 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 10 11:16:01 2010 -0700" }, "message": "am 45bd1159: am 02654f01: Merge \"On this particular device the hardware video decoder spits out buffers that don\\\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\" into gingerbread\n\nMerge commit \u002745bd1159fa34b51ba077e0cde760d171ca092552\u0027\n\n* commit \u002745bd1159fa34b51ba077e0cde760d171ca092552\u0027:\n On this particular device the hardware video decoder spits out buffers that don\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\n" }, { "commit": "2b37ced30f89437c804c3945b901019b86d210ae", "tree": "dedc3b20bb9d067758e5e87bdf957bc7801c86cd", "parents": [ "54ff19ac69ace7c05ea90d225e26dab3b133f487" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sat Oct 09 01:16:58 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Sat Oct 09 01:21:20 2010 -0700" }, "message": "0-memcpy video recording framework\n\nPart III: Move startRecording() call earlier, asking camera hal\nto allocate video buffers before CameraSource.start() is called.\n\nChange-Id: I3f1d7d5636ca2644fe52af61f297d48c6b1ce89d\n" }, { "commit": "54ff19ac69ace7c05ea90d225e26dab3b133f487", "tree": "abf0b910f9a40a2409d7e725c99c6144238d0625", "parents": [ "fa6a5d481474ba11517c8d0eb6431595d387b81e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Oct 08 11:59:32 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Oct 08 18:32:43 2010 -0700" }, "message": "Move Camera specific logic out from StagefrightRecorder to CameraSource\n\no updated comments and streamlined the logic in\n checkVideoSize() and checkFrameRate() as suggested\n\nChange-Id: I49d04ac7998d4a215997aa63555dfb6e814e38d3\n" }, { "commit": "b4ff90196e0bff3d80bb922933cd646381c2d1b4", "tree": "f0433f593bfc135e69753a49579b7d3f6aae1ca3", "parents": [ "3ec866c1ea1a9b254bb41383311887b53dc418d4", "0dcd837af4169bdb6fb2a0c384722dc4f57433c6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 15:55:44 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 15:55:44 2010 -0700" }, "message": "am beffefa2: Merge \"RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.\" into gingerbread\n\nMerge commit \u0027beffefa24f398b610d58dd583d9f5613dc529c28\u0027 into gingerbread-plus-aosp\n\n* commit \u0027beffefa24f398b610d58dd583d9f5613dc529c28\u0027:\n RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.\n" }, { "commit": "0dcd837af4169bdb6fb2a0c384722dc4f57433c6", "tree": "44e53d1d603e1d52315add06cc998c2e9fbecc7b", "parents": [ "c68a48c474f609df3eeb7d9738675d6ac8835e0a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 15:21:08 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 15:25:19 2010 -0700" }, "message": "RTSP seeking is now asynchronous, MediaPlayer is not notified that the seek is complete until it actually is. Ignore seek requests on live streams.\n\nChange-Id: Ie61230cd60dd6c682baf72529100369ad6291189\nrelated-to-bug: 3073955\n" }, { "commit": "3ec866c1ea1a9b254bb41383311887b53dc418d4", "tree": "2a1035c99a0e1592e7df08bf2ab536f47e533c55", "parents": [ "abc40fd3f7effc025ccad91d05f5d6bb2a4c857c", "c68a48c474f609df3eeb7d9738675d6ac8835e0a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 12:54:32 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 12:54:32 2010 -0700" }, "message": "am 0fd4e216: Merge \"Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.\" into gingerbread\n\nMerge commit \u00270fd4e216e7d6045528d5d1010f8b5f01581efb10\u0027 into gingerbread-plus-aosp\n\n* commit \u00270fd4e216e7d6045528d5d1010f8b5f01581efb10\u0027:\n Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.\n" }, { "commit": "c68a48c474f609df3eeb7d9738675d6ac8835e0a", "tree": "4513bc3b15dc583bbca45db9c67f4d0aba8b1172", "parents": [ "6f3cba53efdd985ab13734c7ad90eb373ae9b9f7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 12:06:27 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 12:06:27 2010 -0700" }, "message": "Refactor some more h.264 utility code out into avc_utils. Work around a hardware decoder issue by making sure the first access unit submitted to a decoder at startup or after seek is an IDR.\n\nChange-Id: I61936601e55df7e4c23a8c13087579a4f85bd6e6\n" }, { "commit": "abc40fd3f7effc025ccad91d05f5d6bb2a4c857c", "tree": "91a79c33daecf61915236eb503fcaa8ceb39c7b5", "parents": [ "c7e61d5e67a8218d33835a1b5ca0256b30699ae7", "6f3cba53efdd985ab13734c7ad90eb373ae9b9f7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 11:18:03 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 11:18:03 2010 -0700" }, "message": "am f72dd019: Merge \"Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\" into gingerbread\n\nMerge commit \u0027f72dd0190ee64914161d361be1213eda8cab7b90\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f72dd0190ee64914161d361be1213eda8cab7b90\u0027:\n Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\n" }, { "commit": "6f3cba53efdd985ab13734c7ad90eb373ae9b9f7", "tree": "7cc426c49690a424cb2aa9dcbe9bfbe50e0c93a3", "parents": [ "e6d26450e5a01be5b7f1343578e7237e68db7737", "70f521de2675ce6eedf4b22beed94ea1289b0f38" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 11:16:07 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 08 11:16:07 2010 -0700" }, "message": "Merge \"Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\" into gingerbread" }, { "commit": "c7e61d5e67a8218d33835a1b5ca0256b30699ae7", "tree": "ea075851f690c181dcc312227aa317e40e5c5d2e", "parents": [ "6a3bc8ca890fae9019c668c9f6262403f0769d44", "e6d26450e5a01be5b7f1343578e7237e68db7737" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 11:05:10 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 11:05:10 2010 -0700" }, "message": "am b9bf5457: Merge \"Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.\" into gingerbread\n\nMerge commit \u0027b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b9bf545774b1f1dbd35c34c4060a6ebdd2bc843c\u0027:\n Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.\n" }, { "commit": "e6d26450e5a01be5b7f1343578e7237e68db7737", "tree": "cba10f376c16c13bb5008a5511ad3e9e83e36ca5", "parents": [ "cb71fba37c51352d6e980bfe1f3e93ff803d550e", "2d511ff0eb4c6127659795b642825c55879a15bc" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:59:52 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 08 10:59:52 2010 -0700" }, "message": "Merge \"Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.\" into gingerbread" }, { "commit": "2d511ff0eb4c6127659795b642825c55879a15bc", "tree": "5cfaf37477930356da3fd16015bba54d731cc28d", "parents": [ "f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:38:39 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:38:39 2010 -0700" }, "message": "Respect the cropping rectangle when extracting the video dimensions from the sequence parameter set of H.264 streams.\n\nChange-Id: Id7f21d5ab8533b4e17ceaa8619a39c27f0306150\n" }, { "commit": "6a3bc8ca890fae9019c668c9f6262403f0769d44", "tree": "15bd69f77212fde2d20868c3ea0b28fa097c01d2", "parents": [ "a5412b0431a22e52a4cc1623b92eb48fcd4d985c", "cb71fba37c51352d6e980bfe1f3e93ff803d550e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Oct 08 10:35:57 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 10:35:57 2010 -0700" }, "message": "am 6dcdfdb4: Merge \"Name the writer threads\" into gingerbread\n\nMerge commit \u00276dcdfdb42a562747dceb1e9fb2aa10c67d18959f\u0027 into gingerbread-plus-aosp\n\n* commit \u00276dcdfdb42a562747dceb1e9fb2aa10c67d18959f\u0027:\n Name the writer threads\n" }, { "commit": "a5412b0431a22e52a4cc1623b92eb48fcd4d985c", "tree": "8a145c9978c5a22510c967ea53df92751d94736b", "parents": [ "74684081846ee6e68325fa5aba5c45b7447fd368", "80d41229f6207602b298cb3de89af2ee5e776bee" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:35:53 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 10:35:53 2010 -0700" }, "message": "am c5912acc: Merge \"Disable the access unit timeout temporarily while a seek operation is in progress.\" into gingerbread\n\nMerge commit \u0027c5912acc04226a8f9377d1aad50de8d3f883854c\u0027 into gingerbread-plus-aosp\n\n* commit \u0027c5912acc04226a8f9377d1aad50de8d3f883854c\u0027:\n Disable the access unit timeout temporarily while a seek operation is in progress.\n" }, { "commit": "70f521de2675ce6eedf4b22beed94ea1289b0f38", "tree": "fe477ecc5b9fbec01d41a458cc17bcf867f9809d", "parents": [ "f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:16:24 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:16:24 2010 -0700" }, "message": "Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.\n\nChange-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2\nrelated-to-bug: 3073955\n" }, { "commit": "cb71fba37c51352d6e980bfe1f3e93ff803d550e", "tree": "d211ba305a4dd96e0fe9b4e3f8c3910f0b84aa05", "parents": [ "80d41229f6207602b298cb3de89af2ee5e776bee", "a6f61fc8e3d06373c17f0a38ff600e2b71c414fa" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Oct 08 10:06:22 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 08 10:06:22 2010 -0700" }, "message": "Merge \"Name the writer threads\" into gingerbread" }, { "commit": "80d41229f6207602b298cb3de89af2ee5e776bee", "tree": "0722c18deebdca1ff04449e4b313905eef57b92d", "parents": [ "bea16187c176837d35e7294f1f14ac195c5d5cad", "a9d9dd2425c32f6868c35f49a3e8f29aafba931a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 10:01:37 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 08 10:01:37 2010 -0700" }, "message": "Merge \"Disable the access unit timeout temporarily while a seek operation is in progress.\" into gingerbread" }, { "commit": "a9d9dd2425c32f6868c35f49a3e8f29aafba931a", "tree": "9afebd98b75d4fda40c7f79c7f6c7a81989d161d", "parents": [ "f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 09:04:25 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 09:04:25 2010 -0700" }, "message": "Disable the access unit timeout temporarily while a seek operation is in progress.\n\nChange-Id: I116cb76342aae4168f34ebae49ecb2301702a0ea\nrelated-to-bug: 3073955\n" }, { "commit": "74684081846ee6e68325fa5aba5c45b7447fd368", "tree": "4f2710d354acd31694fd8bbbaa07fade7f254cc6", "parents": [ "4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1", "bea16187c176837d35e7294f1f14ac195c5d5cad" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 08 08:30:03 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 08:30:03 2010 -0700" }, "message": "am b37fcbfd: Merge \"Added getter for session Id to AudioSink\" into gingerbread\n\nMerge commit \u0027b37fcbfd7f9d65b90b43e0242903030c5a6517b5\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b37fcbfd7f9d65b90b43e0242903030c5a6517b5\u0027:\n Added getter for session Id to AudioSink\n" }, { "commit": "bea16187c176837d35e7294f1f14ac195c5d5cad", "tree": "6a64df89a04c9530a512d2523a9d1560db620de5", "parents": [ "f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c", "8c563ed9ca8a863a66965330b5d14bb4b4ab59d4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Oct 08 08:28:08 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 08 08:28:08 2010 -0700" }, "message": "Merge \"Added getter for session Id to AudioSink\" into gingerbread" }, { "commit": "4b43c1f169ab29b2d4dd058573668f7f4ffb8ca1", "tree": "8846045a48cee8a846bb8e830a0e5975d817772d", "parents": [ "fbc504d6a8ec1204b5fa203924f8324ff4aa0e74", "f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Oct 08 08:17:54 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 08 08:17:54 2010 -0700" }, "message": "am bb245d35: Merge \"Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.\" into gingerbread\n\nMerge commit \u0027bb245d35b6e81d750a91815543973b0a5976352b\u0027 into gingerbread-plus-aosp\n\n* commit \u0027bb245d35b6e81d750a91815543973b0a5976352b\u0027:\n Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.\n" }, { "commit": "a6f61fc8e3d06373c17f0a38ff600e2b71c414fa", "tree": "0199c90919fe72ea0166d8b4a40aeb5d5e073171", "parents": [ "2a4d22d79e927f2245537921e10fc5fda1c47a29" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 07 20:20:59 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 07 20:20:59 2010 -0700" }, "message": "Name the writer threads\n\nChange-Id: I51461c3800ac5850e21ff398e80eb20b562264b3\n" }, { "commit": "8c563ed9ca8a863a66965330b5d14bb4b4ab59d4", "tree": "b2d2e571aa8618456b27e1cb67a717ca80340e3e", "parents": [ "2a4d22d79e927f2245537921e10fc5fda1c47a29" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 07 18:23:03 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 07 18:23:03 2010 -0700" }, "message": "Added getter for session Id to AudioSink\n\nAdded a method to expose the audio session id at AudioSink interface\nso that the AudioPlayer in stagefright can retrieve it.\n\nAlso:\n- Fixed audio effect send level not being initialized in mediaplayer.\n- Fixed compilation error when LOGV is enabled in mediaplayer JNI\n\nChange-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb\n" }, { "commit": "f4ea1f92bc56a8ffceddba0dbd3979fe0219b13c", "tree": "8f0773e9d8a4cee272ec1efbdd6dfa41679af9d3", "parents": [ "2a4d22d79e927f2245537921e10fc5fda1c47a29" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 16:48:50 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 16:52:42 2010 -0700" }, "message": "Increase scratch buffers sizes in mp3 software decoder, this integrates a PV master/opensource patch.\n\nChange-Id: I5a637f1b380e44c94040ec507843d58a1f5a9b61\nrelated-to-bug: 3065605\n" }, { "commit": "fbc504d6a8ec1204b5fa203924f8324ff4aa0e74", "tree": "c4e6adc37469742e2288bbf902b3059cb926c48a", "parents": [ "da91f0b87bded1e4ebc9cc1a1712c7a0d44fba84", "2272ee27d9022d173b6eab45c409b3c3f57f30ec" ], "author": { "name": "Gloria Wang", "email": "gwang@google.com", "time": "Thu Oct 07 15:27:17 2010 -0700" }, "committer": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Oct 07 15:27:17 2010 -0700" }, "message": "resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aosp\n\nChange-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76\n" }, { "commit": "da91f0b87bded1e4ebc9cc1a1712c7a0d44fba84", "tree": "6345839c3d83daea788ff7ed31d5e0469bcfcc49", "parents": [ "712a002fa3a507158c9ae3435b843edd3a69d7e8", "2a4d22d79e927f2245537921e10fc5fda1c47a29" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 14:02:26 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 14:02:26 2010 -0700" }, "message": "am 949f7d90: Merge \"Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\" into gingerbread\n\nMerge commit \u0027949f7d9066e09768e570686a5695aaba4a1dafd0\u0027 into gingerbread-plus-aosp\n\n* commit \u0027949f7d9066e09768e570686a5695aaba4a1dafd0\u0027:\n Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\n" }, { "commit": "712a002fa3a507158c9ae3435b843edd3a69d7e8", "tree": "c8e6f853f8baf4d9466c1979efc85d127c8c2370", "parents": [ "8746c2cf3192033237b465a2834817bf473b9583", "2b82e9652ba049e754c2cc74e381282f231d5fbf" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 14:02:01 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 14:02:01 2010 -0700" }, "message": "am 02654f01: Merge \"On this particular device the hardware video decoder spits out buffers that don\\\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\" into gingerbread\n\nMerge commit \u002702654f01bc6bd2e581b4a1d2409ecea217294fa2\u0027 into gingerbread-plus-aosp\n\n* commit \u002702654f01bc6bd2e581b4a1d2409ecea217294fa2\u0027:\n On this particular device the hardware video decoder spits out buffers that don\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\n" }, { "commit": "fa6a5d481474ba11517c8d0eb6431595d387b81e", "tree": "d801228880aa603b27a73dd6a7d26cd269ae671e", "parents": [ "173e75df12ad5398f3650a30e430dcac0cbcf278", "a240812f10335fe4c8677da824293b7e04aad7e9" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 13:57:08 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 07 13:57:08 2010 -0700" }, "message": "Merge \"Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback.\"" }, { "commit": "a240812f10335fe4c8677da824293b7e04aad7e9", "tree": "f6f63dc11e2ae1a9e14613118f9926093198d5c3", "parents": [ "fff59460a567a96ffc8d946bf6f477b4570080a1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 13:48:34 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 13:48:34 2010 -0700" }, "message": "Some instrumentation of OMXCodec for future investigation and a possibly temporary fix for the green tinge on video playback.\n\nChange-Id: Iee9cd7b0c326bac96382007b4ea077d4368d7d01\nrelated-to-bug: 3051572\n" }, { "commit": "173e75df12ad5398f3650a30e430dcac0cbcf278", "tree": "7d56796ba185ac2d4b93fbca152f656331f16b48", "parents": [ "2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc", "8746c2cf3192033237b465a2834817bf473b9583" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Oct 07 12:23:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 12:23:39 2010 -0700" }, "message": "am ce2e2184: am 37947afe: Merge \"Fixed AudioFlinger not always pausing tracks\" into gingerbread\n\nMerge commit \u0027ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3\u0027\n\n* commit \u0027ce2e2184bbc5530f4fac3220fdf3d1b3fc08a4c3\u0027:\n Fixed AudioFlinger not always pausing tracks\n" }, { "commit": "2eb16c2250c57a8009ab58e9aeb1606ab62bbbbc", "tree": "9a9d97d42b7c495876a9f87d2a709926118c197c", "parents": [ "fff59460a567a96ffc8d946bf6f477b4570080a1", "a782d22f3eacd337c135feb12362934fc0adb6ca" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 12:21:33 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 07 12:21:33 2010 -0700" }, "message": "am 56ee1080: am 17bc4f65: Merge \"Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\" into gingerbread\n\nMerge commit \u002756ee1080f004110bff622e5b60c243d9cabfe120\u0027\n\n* commit \u002756ee1080f004110bff622e5b60c243d9cabfe120\u0027:\n Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\n" }, { "commit": "2a4d22d79e927f2245537921e10fc5fda1c47a29", "tree": "1452ec4c157a5f701d4aea84f2107477d5324d94", "parents": [ "2b82e9652ba049e754c2cc74e381282f231d5fbf" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 08 14:32:20 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 11:41:43 2010 -0700" }, "message": "Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.\n\nChange-Id: I7150e5e7342e1117c524856b204aadcb763e06ed\nrelated-to-bug: 2368598\n" }, { "commit": "fff59460a567a96ffc8d946bf6f477b4570080a1", "tree": "457ebf8157f926222ae97ad38c3536cbcd457a4b", "parents": [ "51a7ac55e98dea42ccd2b358b114f0a761bbc63e", "c97a1325466bb0e6cee884ec24a04b65082b853a" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 07 11:00:25 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 07 11:00:25 2010 -0700" }, "message": "Merge \"Add two more options to \"recordvideo\" utility\"" }, { "commit": "2b82e9652ba049e754c2cc74e381282f231d5fbf", "tree": "8b4d7249f6a0ae009088918f19d17be00d36ea10", "parents": [ "0bcae473ba1cd1d72e7cef8fbab449db060dc8d7" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Oct 06 16:43:57 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Oct 07 09:19:25 2010 -0700" }, "message": "On this particular device the hardware video decoder spits out buffers that don\u0027t actually contain our video data, so we cannot use them to restore the video frame after suspend/resume.\n\nChange-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c\nrelated-to-bug: 3070094\n" }, { "commit": "51a7ac55e98dea42ccd2b358b114f0a761bbc63e", "tree": "e4b186a882d7648d280c53e8a9c46a4acd1c5a58", "parents": [ "7874f08d41f8bd02e2cd52d260ff7bfd80167477", "a9424e227d90eff8ac387c1810a642b33d22e2c7" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 07 08:11:26 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 07 08:11:26 2010 -0700" }, "message": "Merge \"0-memcpy video recording framework\"" }, { "commit": "a9424e227d90eff8ac387c1810a642b33d22e2c7", "tree": "4c9c12a32d4c89526798530476ae8833a226c0f9", "parents": [ "8805043df9bba6206839b3a754f2bca4f62a1721" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 06 18:11:23 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Oct 07 02:09:03 2010 -0700" }, "message": "0-memcpy video recording framework\n\nPart II: proposed camera hal change\n\nChange-Id: I51663cf5de2b00f71e4ff1828080094676065444\n" }, { "commit": "c97a1325466bb0e6cee884ec24a04b65082b853a", "tree": "01ac5e13dfb4ba6b0533cbc0ddb0c448658c7a41", "parents": [ "8805043df9bba6206839b3a754f2bca4f62a1721" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 06 18:55:05 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 06 19:07:40 2010 -0700" }, "message": "Add two more options to \"recordvideo\" utility\n\no also removed unused code\n\nChange-Id: I49471b0ac1cf70b5eedcde78a21e7770c312c5d6\n" }, { "commit": "7874f08d41f8bd02e2cd52d260ff7bfd80167477", "tree": "0675113ab695ef0c44f8d2229670719df448f0f0", "parents": [ "eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946", "b0ade8a64d3b3bee75b544313d2047efbb9604f7" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Wed Oct 06 17:07:39 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 06 17:07:39 2010 -0700" }, "message": "am ff04e97f: am f4619308: Merge \"fix [2835280] Add support for cancelling buffers to ANativeWindow\" into gingerbread\n\nMerge commit \u0027ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb\u0027\n\n* commit \u0027ff04e97faf75c435e453d4c1caf7eeac8b9c1ceb\u0027:\n fix [2835280] Add support for cancelling buffers to ANativeWindow\n" }, { "commit": "eba2d0611923ad75c3b894ebe5ce3d5fc7f6a946", "tree": "10a20b23aecb65c2e05adb4c9fe634c0699aec04", "parents": [ "8805043df9bba6206839b3a754f2bca4f62a1721", "11e69dea99ca2ace7bf8eb56ce6f6528fc906813" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Oct 06 16:17:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 06 16:17:14 2010 -0700" }, "message": "am a86a6c4e: am 6f1c7bda: Merge \"Fixed an issue where the reserved free space in the file writer was larger than intended\" into gingerbread\n\nMerge commit \u0027a86a6c4e326bfdfc351dacca95b23bb78f78efbe\u0027\n\n* commit \u0027a86a6c4e326bfdfc351dacca95b23bb78f78efbe\u0027:\n Fixed an issue where the reserved free space in the file writer was larger than intended\n" }, { "commit": "8805043df9bba6206839b3a754f2bca4f62a1721", "tree": "9809661daa0462bebebec1c30df2662d203f17e5", "parents": [ "185a9a54fb29d3d691c6ec16a7403af194a023b9", "5f4d93467a03b3a38320416f8cc2c2c2c94bf3fc" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Oct 05 19:01:10 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 05 19:01:10 2010 -0700" }, "message": "Merge \"Use setVideoSize API in StagefrightRecorder\"" }, { "commit": "8746c2cf3192033237b465a2834817bf473b9583", "tree": "d5a9c667ab9ea782f20b3c53ac9b989790c884b7", "parents": [ "a782d22f3eacd337c135feb12362934fc0adb6ca", "0bcae473ba1cd1d72e7cef8fbab449db060dc8d7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 05 17:10:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 05 17:10:59 2010 -0700" }, "message": "am 37947afe: Merge \"Fixed AudioFlinger not always pausing tracks\" into gingerbread\n\nMerge commit \u002737947afe904220bdf0a1a85a22824d8619be8e36\u0027 into gingerbread-plus-aosp\n\n* commit \u002737947afe904220bdf0a1a85a22824d8619be8e36\u0027:\n Fixed AudioFlinger not always pausing tracks\n" }, { "commit": "0bcae473ba1cd1d72e7cef8fbab449db060dc8d7", "tree": "6ce584158c0eb6cf4b5bc956e976f7c40f26eb39", "parents": [ "b2e3954c94717e43b3dc9b880564f166cfbbc0a2", "af59ce2407fa4e6e5d8f1664a4df2daf1badd407" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 05 17:06:16 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Oct 05 17:06:16 2010 -0700" }, "message": "Merge \"Fixed AudioFlinger not always pausing tracks\" into gingerbread" }, { "commit": "185a9a54fb29d3d691c6ec16a7403af194a023b9", "tree": "ebed46062f43630a90c8e8260bbb00a731a2ad54", "parents": [ "05425bc043f6dc45cc093065d5270b70100681b5", "deed343476e45165ed176c036c8f77b170bacfeb" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Oct 05 15:17:29 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 05 15:17:29 2010 -0700" }, "message": "am 6a02ba01: am b99f0c7e: Merge \"Resilent media time stamp adjustment\" into gingerbread\n\nMerge commit \u00276a02ba0100e030e0b8bf2b6f195eabac1f1812db\u0027\n\n* commit \u00276a02ba0100e030e0b8bf2b6f195eabac1f1812db\u0027:\n Resilent media time stamp adjustment\n" }, { "commit": "af59ce2407fa4e6e5d8f1664a4df2daf1badd407", "tree": "6a7eacbbcc46026be5fa06535c80e3de357c4e79", "parents": [ "50817931e4cb4ae0019fd13c831a2839349834c5" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 05 14:41:42 2010 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 05 14:41:42 2010 -0700" }, "message": "Fixed AudioFlinger not always pausing tracks\n\nIf the pause request is received before the AudioTrack buffer was\ncompletelly filled and the track ready for mixing, the pause is\nnot executed: the track just underruns and stays in pausing state.\n\nThe fix consists in considering the track ready for mixing immediately\nif pausing.\n\nChange-Id: Ia6cb4703fee2126e41011a6400ea8eeb3a3e5456\n" }, { "commit": "a782d22f3eacd337c135feb12362934fc0adb6ca", "tree": "73939ca570485beda8d81191f3f44637ce019bc6", "parents": [ "b0ade8a64d3b3bee75b544313d2047efbb9604f7", "b2e3954c94717e43b3dc9b880564f166cfbbc0a2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 05 14:13:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 05 14:13:16 2010 -0700" }, "message": "am 17bc4f65: Merge \"Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\" into gingerbread\n\nMerge commit \u002717bc4f65324a823598e7671256c815bf32ddcc95\u0027 into gingerbread-plus-aosp\n\n* commit \u002717bc4f65324a823598e7671256c815bf32ddcc95\u0027:\n Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\n" }, { "commit": "b2e3954c94717e43b3dc9b880564f166cfbbc0a2", "tree": "3ebd2a7b944856cd2048a05aec0c11b4e639a9ee", "parents": [ "50817931e4cb4ae0019fd13c831a2839349834c5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 05 10:25:34 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Oct 05 13:53:39 2010 -0700" }, "message": "Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after submitting all samples to AudioTrack to make sure those remaining samples are actually played out.\n\nChange-Id: Id574a0203efcb5e565f1b0fe77869fc33b9a9d56\n" }, { "commit": "b0ade8a64d3b3bee75b544313d2047efbb9604f7", "tree": "f486e2888984afdbab713ba0ae3cd8b660e00633", "parents": [ "11e69dea99ca2ace7bf8eb56ce6f6528fc906813", "50817931e4cb4ae0019fd13c831a2839349834c5" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 04 20:21:14 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 20:21:14 2010 -0700" }, "message": "am f4619308: Merge \"fix [2835280] Add support for cancelling buffers to ANativeWindow\" into gingerbread\n\nMerge commit \u0027f461930872beb4362998642c115691bdd2e94617\u0027 into gingerbread-plus-aosp\n\n* commit \u0027f461930872beb4362998642c115691bdd2e94617\u0027:\n fix [2835280] Add support for cancelling buffers to ANativeWindow\n" }, { "commit": "50817931e4cb4ae0019fd13c831a2839349834c5", "tree": "1492e3966d068becf59073b25ab7c23366dbbdeb", "parents": [ "a007e8229fb2be4866c483f9cd6c4af238a2da5e" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Oct 01 16:22:41 2010 -0700" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Mon Oct 04 20:10:11 2010 -0700" }, "message": "fix [2835280] Add support for cancelling buffers to ANativeWindow\n\nThere is a new ANativeWindow::cancelBuffer() API that can be used to\ncancel any dequeued buffer, BEFORE it\u0027s been enqueued. The buffer is\nreturned to the list of availlable buffers. dequeue and cancel are not\nmutually thread safe, they must be called from the same thread or\nexternal synchronization must be used.\n\nChange-Id: I86cc7985bace8b6a93ad2c75d2bef5c3c2cb4d61\n" }, { "commit": "11e69dea99ca2ace7bf8eb56ce6f6528fc906813", "tree": "2153c97b42fad60828fa79a30bcbf3a53751689d", "parents": [ "deed343476e45165ed176c036c8f77b170bacfeb", "a007e8229fb2be4866c483f9cd6c4af238a2da5e" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 18:39:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 18:39:52 2010 -0700" }, "message": "am 6f1c7bda: Merge \"Fixed an issue where the reserved free space in the file writer was larger than intended\" into gingerbread\n\nMerge commit \u00276f1c7bda39774fe3a1febf72b03c8ad481c1ea54\u0027 into gingerbread-plus-aosp\n\n* commit \u00276f1c7bda39774fe3a1febf72b03c8ad481c1ea54\u0027:\n Fixed an issue where the reserved free space in the file writer was larger than intended\n" }, { "commit": "a007e8229fb2be4866c483f9cd6c4af238a2da5e", "tree": "48ef6f33a27a4cdba76218932db8ade197ae190e", "parents": [ "3754a7901b6bed448eaecfbd29a4705b30a6b656" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 16:41:53 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 16:54:59 2010 -0700" }, "message": "Fixed an issue where the reserved free space in the file writer was larger than intended\n\nThe problem was that even though user does not explicitly request the max file size\nlimit via MediaRecorder.setMaxFileSize(), the file writer sets an implicit file\nsize limit if 32-bit file offset is used on user\u0027s behalf. The reserved free space\nis estimated based on the file size, if the file size limit is set by the user.\n\nThe fix is to add an extra bool to tell the difference between an\nexplit requested file size and an implicit file limit and use that\nto set the estimated moov box size accordingly.\n\nChange-Id: I731aca6c7833aa764ed7b905edb77721577471b3\n" }, { "commit": "deed343476e45165ed176c036c8f77b170bacfeb", "tree": "28cdb014b5126c76b3f3e9638370e077628d2dc4", "parents": [ "8b62c6ae868e01f4c5783566fe2fa20408b61caf", "3754a7901b6bed448eaecfbd29a4705b30a6b656" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 15:48:59 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 15:48:59 2010 -0700" }, "message": "am b99f0c7e: Merge \"Resilent media time stamp adjustment\" into gingerbread\n\nMerge commit \u0027b99f0c7eae365f788a21944fef28de580c7f5f92\u0027 into gingerbread-plus-aosp\n\n* commit \u0027b99f0c7eae365f788a21944fef28de580c7f5f92\u0027:\n Resilent media time stamp adjustment\n" }, { "commit": "3754a7901b6bed448eaecfbd29a4705b30a6b656", "tree": "41cb42b8bd8be0d6c8368c77982786307cba7070", "parents": [ "83977eb230d829cfe520f55d7977037a904ce548", "872a481558350634a3fd5cb67939de288af00ecb" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 15:35:40 2010 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 04 15:35:40 2010 -0700" }, "message": "Merge \"Resilent media time stamp adjustment\" into gingerbread" }, { "commit": "872a481558350634a3fd5cb67939de288af00ecb", "tree": "8b3f5ec0bfa93323084e677dd1aa715e3e1b7d64", "parents": [ "1fd01cbce6edb54334579f89e49a679207204619" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Oct 03 10:59:26 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 15:11:19 2010 -0700" }, "message": "Resilent media time stamp adjustment\n\nChange-Id: I13ab87c05f26bb11a3cc9bf8559f98e6ea0752db\n" }, { "commit": "5f4d93467a03b3a38320416f8cc2c2c2c94bf3fc", "tree": "096ebecff6d3483fe96bc504d584fb5837011c90", "parents": [ "0d14c25355b7807b88fcdc76040ef986aa754815" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Oct 03 22:08:23 2010 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Oct 04 13:14:22 2010 -0700" }, "message": "Use setVideoSize API in StagefrightRecorder\n\nChange-Id: Ia7ddf5e8d2b931453d2cb801169906191349ca07\n" }, { "commit": "05425bc043f6dc45cc093065d5270b70100681b5", "tree": "50316f537529d6c4d64dac6d69b5b3fa7ee2bb04", "parents": [ "0074d69add482a351b4e0004d62b1cb8ed475505", "8b62c6ae868e01f4c5783566fe2fa20408b61caf" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 04 11:51:55 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 11:51:55 2010 -0700" }, "message": "am dfd03fe9: am aa1a694d: Merge \"Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.\" into gingerbread\n\nMerge commit \u0027dfd03fe99336792b6dae6c4c9fd5f5ba157e054c\u0027\n\n* commit \u0027dfd03fe99336792b6dae6c4c9fd5f5ba157e054c\u0027:\n Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.\n" }, { "commit": "8b62c6ae868e01f4c5783566fe2fa20408b61caf", "tree": "267d82161d660a6622be0ae6abc538d4e7d5d106", "parents": [ "66e3c30dc6c6e46bd56cb3dcd9fbd732c517a887", "83977eb230d829cfe520f55d7977037a904ce548" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 04 11:47:52 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 11:47:52 2010 -0700" }, "message": "am aa1a694d: Merge \"Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.\" into gingerbread\n\nMerge commit \u0027aa1a694dc78e5201fc83fe3d710a6e43eb62831a\u0027 into gingerbread-plus-aosp\n\n* commit \u0027aa1a694dc78e5201fc83fe3d710a6e43eb62831a\u0027:\n Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.\n" }, { "commit": "83977eb230d829cfe520f55d7977037a904ce548", "tree": "e22b71a92ede66fbf60655026135ba5a02e10f7a", "parents": [ "6954535ba64374e4e941cd83019a7af53edfb098" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 04 11:36:39 2010 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 04 11:36:39 2010 -0700" }, "message": "Make sure to finish the preparation phase even EOS occurs before we consider the cache to be completely filled up.\n\nChange-Id: I29143e357fb6ea7b860636100e010f2ea7436798\nrelated-to-bug: 3037389\n" }, { "commit": "0074d69add482a351b4e0004d62b1cb8ed475505", "tree": "07624bc79143ac6f9b5148fc43ce70c427eec63f", "parents": [ "0d14c25355b7807b88fcdc76040ef986aa754815", "66e3c30dc6c6e46bd56cb3dcd9fbd732c517a887" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Oct 04 11:26:16 2010 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 04 11:26:16 2010 -0700" }, "message": "am bb506dab: am 7fa69374: Merge \"Don\\\u0027t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.\" into gingerbread\n\nMerge commit \u0027bb506dab1ff10e6939fcd0457571e0b46793dd80\u0027\n\n* commit \u0027bb506dab1ff10e6939fcd0457571e0b46793dd80\u0027:\n Don\u0027t retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.\n" } ], "next": "66e3c30dc6c6e46bd56cb3dcd9fbd732c517a887" }