)]}' { "log": [ { "commit": "482989a7c92215953f25293c92b3d0fe2e87cb41", "tree": "ca3c9b5b8dc18051d001a8c9b172150eabda7306", "parents": [ "628335809726683ce13d49d51ab51ef984933a13", "d71866b18e387ddcff6ff8128866ecae45ec1606" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 17 14:44:15 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 14:44:15 2012 -0700" }, "message": "am 9568b4cd: am 376074ed: Fixed a native crash due to deref of a NULL pointer\n\n* commit \u00279568b4cdc8d2a7896e9c031f2b6cdf6f18210de1\u0027:\n Fixed a native crash due to deref of a NULL pointer\n" }, { "commit": "628335809726683ce13d49d51ab51ef984933a13", "tree": "fb79d9200fb1ed6646451be888e69227973005b1", "parents": [ "30fe5bade008909e907aca9ce2eba408ca01e859", "66fe313df7c31dee554265a3d7799123b889e532" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 11:09:21 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 11:09:21 2012 -0700" }, "message": "am 92908745: am b845c6b0: Merge \"Revert \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\"\" into jb-mr1-dev\n\n* commit \u002792908745a52989339dc5b9ebf3d402607ea09b24\u0027:\n Revert \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\"\n" }, { "commit": "30fe5bade008909e907aca9ce2eba408ca01e859", "tree": "200eb54abf0e65432e5ccc8346296cb5db5f291e", "parents": [ "9266af58d9cbc2514087bfe1eb688cbe35c22132", "6155cfea03102079abdcea1cd81296c5394bea0a" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 10:28:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 10:28:46 2012 -0700" }, "message": "am d31bdeca: am e44e90c8: Merge \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\" into jb-mr1-dev\n\n* commit \u0027d31bdeca545a0da00c1f8d29fa47cb725c67c21f\u0027:\n Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\n" }, { "commit": "9266af58d9cbc2514087bfe1eb688cbe35c22132", "tree": "fb79d9200fb1ed6646451be888e69227973005b1", "parents": [ "45fb44687dd9d02490120d0d104a65e21d342402", "5fd32bb261a16c8f1e298ae64f7d61e00a6324cf" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 17 10:28:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 10:28:45 2012 -0700" }, "message": "am 40be0709: am dcd76da5: Merge \"Make a small correction in terms of GOP structure in the recorded video\" into jb-mr1-dev\n\n* commit \u002740be070922721b285a9436ec49e5d438ba322133\u0027:\n Make a small correction in terms of GOP structure in the recorded video\n" }, { "commit": "45fb44687dd9d02490120d0d104a65e21d342402", "tree": "f120c3e4b19e9341bd130ffdb9354e7d44480b11", "parents": [ "090e36d882bd9306bb9c5b4fdd33af85e5810eb2", "bbf46f38178098f6c4692b612dd4ccdaa9b3c5ca" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 17 10:28:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 10:28:44 2012 -0700" }, "message": "am fff97293: am cb66d22f: Merge \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\" into jb-mr1-dev\n\n* commit \u0027fff97293d56ca9869004f89ce46c2b337d7f57e7\u0027:\n Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\n" }, { "commit": "090e36d882bd9306bb9c5b4fdd33af85e5810eb2", "tree": "ef3070a18e1121fd7a2fe3fc4735ee3868932a0e", "parents": [ "6ed5f6d1bf1072fe57eb20c5c41c051af7dd2c46", "0563d23ed3d73f59f486eafe5406249ed289f33f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 17 10:28:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 10:28:11 2012 -0700" }, "message": "am 660b7ad3: am 2637cb17: Merge \"Allow OMXCodec to specify an output color format for OMX decoder component\" into jb-mr1-dev\n\n* commit \u0027660b7ad3bee04640500e6af071182603f0b52000\u0027:\n Allow OMXCodec to specify an output color format for OMX decoder component\n" }, { "commit": "d71866b18e387ddcff6ff8128866ecae45ec1606", "tree": "58e1f1953719d5ff164fb5184999ae01aa1ae59b", "parents": [ "66fe313df7c31dee554265a3d7799123b889e532", "9f235b58cd6dbee74d091e437d520306977daac9" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Sep 16 10:35:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Sep 16 10:35:45 2012 -0700" }, "message": "am 376074ed: Fixed a native crash due to deref of a NULL pointer\n\n* commit \u0027376074ed1c3c368aeb336954a07632cd806288e2\u0027:\n Fixed a native crash due to deref of a NULL pointer\n" }, { "commit": "9f235b58cd6dbee74d091e437d520306977daac9", "tree": "58e1f1953719d5ff164fb5184999ae01aa1ae59b", "parents": [ "482136a5f977056eeffe2aa58d31ce395be562a3" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 15:34:35 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 15:34:35 2012 -0700" }, "message": "Fixed a native crash due to deref of a NULL pointer\n\nWe only checked the mNativeWindow against NULL, but did not check the native window object itself against NULL.\n\no related-to-bug: 7153683\n\nChange-Id: I430d344dc09a2fc337bf51001551627056713773\n" }, { "commit": "66fe313df7c31dee554265a3d7799123b889e532", "tree": "f31a99a6cb8ed323b38ff5f710ea17c5396dbfa3", "parents": [ "6155cfea03102079abdcea1cd81296c5394bea0a", "482136a5f977056eeffe2aa58d31ce395be562a3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 14 12:11:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 12:11:33 2012 -0700" }, "message": "am b845c6b0: Merge \"Revert \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\"\" into jb-mr1-dev\n\n* commit \u0027b845c6b0c3066d6791973be830f0953477461a65\u0027:\n Revert \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\"\n" }, { "commit": "482136a5f977056eeffe2aa58d31ce395be562a3", "tree": "f31a99a6cb8ed323b38ff5f710ea17c5396dbfa3", "parents": [ "ac7ba271fc74fe149679fdaf990fa0e19263f05e", "d697d5c780b61d121249c51eeddd4b36cae877fb" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 14 12:10:07 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 14 12:10:07 2012 -0700" }, "message": "Merge \"Revert \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\"\" into jb-mr1-dev" }, { "commit": "d697d5c780b61d121249c51eeddd4b36cae877fb", "tree": "361325889a328603194423eb396890b922467665", "parents": [ "b362ce8130a345c3675f985e00411bb8fcbdc55e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 14 11:37:13 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 14 11:37:13 2012 -0700" }, "message": "Revert \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\"\n\nThe changes this commit depends on are now submitted.\n\nThis reverts commit f54b1459cda7f585b4896671643b33bab8290964\n\nChange-Id: If7f146ab7968d50fffd2174c2c5792bdc9d7724c\n" }, { "commit": "6155cfea03102079abdcea1cd81296c5394bea0a", "tree": "7a8f920b7db8d1e5b947a6f2290168d51a739c67", "parents": [ "5fd32bb261a16c8f1e298ae64f7d61e00a6324cf", "ac7ba271fc74fe149679fdaf990fa0e19263f05e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 14 11:20:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 11:20:03 2012 -0700" }, "message": "am e44e90c8: Merge \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\" into jb-mr1-dev\n\n* commit \u0027e44e90c82d75b806e89f751a61dc7e54d0144338\u0027:\n Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\n" }, { "commit": "ac7ba271fc74fe149679fdaf990fa0e19263f05e", "tree": "7a8f920b7db8d1e5b947a6f2290168d51a739c67", "parents": [ "c8e3174133b0ac2609abcdf7c53ee59c8d887058", "b362ce8130a345c3675f985e00411bb8fcbdc55e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 14 11:17:32 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 14 11:17:33 2012 -0700" }, "message": "Merge \"Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\" into jb-mr1-dev" }, { "commit": "5fd32bb261a16c8f1e298ae64f7d61e00a6324cf", "tree": "f31a99a6cb8ed323b38ff5f710ea17c5396dbfa3", "parents": [ "bbf46f38178098f6c4692b612dd4ccdaa9b3c5ca", "c8e3174133b0ac2609abcdf7c53ee59c8d887058" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 11:17:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 11:17:30 2012 -0700" }, "message": "am dcd76da5: Merge \"Make a small correction in terms of GOP structure in the recorded video\" into jb-mr1-dev\n\n* commit \u0027dcd76da55f1f8a77dec07bb7e080ed3488f2ae83\u0027:\n Make a small correction in terms of GOP structure in the recorded video\n" }, { "commit": "b362ce8130a345c3675f985e00411bb8fcbdc55e", "tree": "5e7eb603591ba815f633ba7a934d2f48c99100b0", "parents": [ "06068bffa9d226ab578e8dea5540179da89aebf9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 14 11:16:11 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 14 11:16:11 2012 -0700" }, "message": "Revert \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\"\n\nThis reverts commit 8a3016613dc684a6be11fdf643f9cc5cad817e8f\n\nChange-Id: I3f1d4e9c13df838b8b6aa5696a6494140eac3e04\n" }, { "commit": "bbf46f38178098f6c4692b612dd4ccdaa9b3c5ca", "tree": "9af7e4dcd3c7133ca49e89af8d0db841cdb4c163", "parents": [ "0563d23ed3d73f59f486eafe5406249ed289f33f", "cfc68d5e907528581a2e84a822812b848429ad83" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 14 11:16:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 11:16:03 2012 -0700" }, "message": "am cb66d22f: Merge \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\" into jb-mr1-dev\n\n* commit \u0027cb66d22f2e3727ca858bb578c1d18956da1a9c2b\u0027:\n Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\n" }, { "commit": "c8e3174133b0ac2609abcdf7c53ee59c8d887058", "tree": "f31a99a6cb8ed323b38ff5f710ea17c5396dbfa3", "parents": [ "cfc68d5e907528581a2e84a822812b848429ad83", "bcb54a4662bf8659762db59cd66ae3c06382fd4b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 11:15:44 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 14 11:15:45 2012 -0700" }, "message": "Merge \"Make a small correction in terms of GOP structure in the recorded video\" into jb-mr1-dev" }, { "commit": "cfc68d5e907528581a2e84a822812b848429ad83", "tree": "9af7e4dcd3c7133ca49e89af8d0db841cdb4c163", "parents": [ "afcb6aec27a52b87f3990691698ebe6b62e7a7bf", "06068bffa9d226ab578e8dea5540179da89aebf9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 14 11:14:29 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 14 11:14:29 2012 -0700" }, "message": "Merge \"Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\" into jb-mr1-dev" }, { "commit": "bcb54a4662bf8659762db59cd66ae3c06382fd4b", "tree": "7a8f920b7db8d1e5b947a6f2290168d51a739c67", "parents": [ "afcb6aec27a52b87f3990691698ebe6b62e7a7bf" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 10:36:53 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 10:36:53 2012 -0700" }, "message": "Make a small correction in terms of GOP structure in the recorded video\n\nWhen we have a 30 fps frame rate, and one second key-frame or I-frame interval,\nwe really would like to have for each second, 29 P-frames + 1 I-frame. Thus,\nwe should calculate the number of P frames so that it is equal to\nframe_rate * I_frame_interval - 1\n\nChange-Id: I5b9be6e4c101e7a6b718015aa4041496961c0f19\n" }, { "commit": "6ed5f6d1bf1072fe57eb20c5c41c051af7dd2c46", "tree": "43a78f597d041c844159c1adaa854b9a6023e347", "parents": [ "1cbb9253100d428e52330cc71f09db08cfdcf6ae", "79f26ec2aec87d525c5bdfba9abae3b8f5a5bdf6" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Fri Sep 14 10:29:21 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 10:29:21 2012 -0700" }, "message": "am 5b5ad707: am d8421c54: Merge \"Support IDR requests in wifi display, MediaCodec and ACodec.\" into jb-mr1-dev\n\n* commit \u00275b5ad707a1ada46906dd30efb4708487d66e7405\u0027:\n Support IDR requests in wifi display, MediaCodec and ACodec.\n" }, { "commit": "1cbb9253100d428e52330cc71f09db08cfdcf6ae", "tree": "909fdecf47fc74e1438fb6ab88790ada301d1cb3", "parents": [ "550f0bc9cbe8ea44b380eafa2ee674c62d10b819", "a04d79e542e36bd99a47b51ab3741c97cb764401" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 14 10:28:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 10:28:40 2012 -0700" }, "message": "am 01dcf4de: am 896adcd3: audioflinger: send priority request from a thread\n\n* commit \u002701dcf4de81ed0f9b6942dea2787463bf9c945a37\u0027:\n audioflinger: send priority request from a thread\n" }, { "commit": "550f0bc9cbe8ea44b380eafa2ee674c62d10b819", "tree": "0e6dee26ccced2d12c24b5321ced5ec550feb7d9", "parents": [ "0bcf32db8661ab2da377843af2aefb0ac8fd878a", "d48e84c2aa9728c347e9e46f26883c160372e6d8" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Sep 14 10:28:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 10:28:26 2012 -0700" }, "message": "am 868bb58e: am 4362f530: Handle audio HAL returning 0 bytes in record thread\n\n* commit \u0027868bb58ed5873edb1d138f82d4751823ef433ebb\u0027:\n Handle audio HAL returning 0 bytes in record thread\n" }, { "commit": "0563d23ed3d73f59f486eafe5406249ed289f33f", "tree": "fa2736c30c7d5576a3e0206262a3704324ddb0ca", "parents": [ "79f26ec2aec87d525c5bdfba9abae3b8f5a5bdf6", "afcb6aec27a52b87f3990691698ebe6b62e7a7bf" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 10:07:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 14 10:07:35 2012 -0700" }, "message": "am 2637cb17: Merge \"Allow OMXCodec to specify an output color format for OMX decoder component\" into jb-mr1-dev\n\n* commit \u00272637cb172105939052d8a02f4eea693a90549518\u0027:\n Allow OMXCodec to specify an output color format for OMX decoder component\n" }, { "commit": "afcb6aec27a52b87f3990691698ebe6b62e7a7bf", "tree": "fa2736c30c7d5576a3e0206262a3704324ddb0ca", "parents": [ "84cd5d18cf3f6b13295e233f96662978295eea9b", "2020801209f7f0f82ddd7635daf2c371b46ea6d6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Sep 14 10:05:51 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 14 10:05:52 2012 -0700" }, "message": "Merge \"Allow OMXCodec to specify an output color format for OMX decoder component\" into jb-mr1-dev" }, { "commit": "79f26ec2aec87d525c5bdfba9abae3b8f5a5bdf6", "tree": "3fb9e3bd7537dff147570fd5f952631ee5ce9891", "parents": [ "a04d79e542e36bd99a47b51ab3741c97cb764401", "84cd5d18cf3f6b13295e233f96662978295eea9b" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Thu Sep 13 19:02:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 19:02:38 2012 -0700" }, "message": "am d8421c54: Merge \"Support IDR requests in wifi display, MediaCodec and ACodec.\" into jb-mr1-dev\n\n* commit \u0027d8421c54dc00d637e41689004edcb06caaa40b62\u0027:\n Support IDR requests in wifi display, MediaCodec and ACodec.\n" }, { "commit": "84cd5d18cf3f6b13295e233f96662978295eea9b", "tree": "3fb9e3bd7537dff147570fd5f952631ee5ce9891", "parents": [ "ef6be0bb71c08db7e9e9274d70edffb95f0da25f", "03e2ffa64470eec4e886614a4fa4facbae58a862" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Thu Sep 13 19:00:26 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 13 19:00:27 2012 -0700" }, "message": "Merge \"Support IDR requests in wifi display, MediaCodec and ACodec.\" into jb-mr1-dev" }, { "commit": "a04d79e542e36bd99a47b51ab3741c97cb764401", "tree": "feda8b0cdaa60a4845f6f6a311c3ddbb4c9811a6", "parents": [ "d48e84c2aa9728c347e9e46f26883c160372e6d8", "ef6be0bb71c08db7e9e9274d70edffb95f0da25f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 13 17:07:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 17:07:46 2012 -0700" }, "message": "am 896adcd3: audioflinger: send priority request from a thread\n\n* commit \u0027896adcd3ae6a1c7010e526327eff54e16179987b\u0027:\n audioflinger: send priority request from a thread\n" }, { "commit": "ef6be0bb71c08db7e9e9274d70edffb95f0da25f", "tree": "feda8b0cdaa60a4845f6f6a311c3ddbb4c9811a6", "parents": [ "89b4470bc926c4b5de59deaff2b6a4993ab6cab7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 13 11:18:23 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 13 17:03:00 2012 -0700" }, "message": "audioflinger: send priority request from a thread\n\nWhen creating a fast AudioTrack, a request is sent to SchedulingPolicyService\nto elevate the requesting thread priority. This generates a binder\ncall into system_server process and to a JAVA service via JNI.\nIf the thread from which the track was created is in the system_server\nprocess and does not have the \"can call java\" attribute, a crash occurs because\nthe binder optimization reuses the same thread to process the returning binder\ncall and no JNI env is present.\n\nThe fix consists in sending the priority change request from the AudioFlinger\nmixer thread, not from the binder thread.\n\nThis also reverts the workaround in commit 73431968\n\nBug 7126707.\n\nChange-Id: I3347adf71ffbb56ed8436506d4357eab693078a3\n" }, { "commit": "03e2ffa64470eec4e886614a4fa4facbae58a862", "tree": "3e5ba613092116e78284cdfaaf306260d0e0dab0", "parents": [ "f8c5023fd3200aaf79293bdbab264d09b0936d54" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 16:43:51 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 16:43:51 2012 -0700" }, "message": "Support IDR requests in wifi display, MediaCodec and ACodec.\n\nChange-Id: I596cf8dd61b63465437f78413186fad2be287244\n" }, { "commit": "06068bffa9d226ab578e8dea5540179da89aebf9", "tree": "361325889a328603194423eb396890b922467665", "parents": [ "ae4b97ac25c1a1a5846731962c246c9811fb041f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 13 16:29:45 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 13 16:43:35 2012 -0700" }, "message": "Camera2: Use FORMAT_ZSL until transition to new gralloc scheme.\n\nUntil all HAL implementations move to the new format negotiation\nscheme, use CAMERA2_HAL_PIXEL_FORMAT_ZSL to indicate ZSL mode.\n\nBug: 6243944\nChange-Id: Idf5d9f42e203903ba906d5df156100646b27404c\n" }, { "commit": "d48e84c2aa9728c347e9e46f26883c160372e6d8", "tree": "be8150e982c53419fdb3d5ca2047fcdc344877c4", "parents": [ "6a1d8d93f83d9723b11ac5d0d36ec3dd91891f3f", "89b4470bc926c4b5de59deaff2b6a4993ab6cab7" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 16:32:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 16:32:30 2012 -0700" }, "message": "am 4362f530: Handle audio HAL returning 0 bytes in record thread\n\n* commit \u00274362f5300162ed55f56cf167eccf7f2e5b89d435\u0027:\n Handle audio HAL returning 0 bytes in record thread\n" }, { "commit": "0bcf32db8661ab2da377843af2aefb0ac8fd878a", "tree": "9f17057c0168be90fbc3deb6029c7b1ee4de9804", "parents": [ "3fc73b477cba93ff74e46d93ed40ebe1cfced138", "6a1d8d93f83d9723b11ac5d0d36ec3dd91891f3f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 14:12:08 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:12:08 2012 -0700" }, "message": "am 0adb0641: am 66466087: Merge \"Workaround for track recreation bug\" into jb-mr1-dev\n\n* commit \u00270adb0641d8fce8e4a032a1d26cec445bb4cbadc0\u0027:\n Workaround for track recreation bug\n" }, { "commit": "3fc73b477cba93ff74e46d93ed40ebe1cfced138", "tree": "bf9783e51b89fa00e908b30f7444d12a1a77e3aa", "parents": [ "209132cebb721486e04b0e4686985e0e73502fc3", "a71ee31e562d5663fa768f705ccecf965e012f2e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 13 14:11:56 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:11:56 2012 -0700" }, "message": "am 6777e539: am f4bca03d: Merge \"Don\\\u0027t deadlock on AudioRecord start when reads return 0\" into jb-mr1-dev\n\n* commit \u00276777e539f0479ed8ca13bfeed63edf9402b00655\u0027:\n Don\u0027t deadlock on AudioRecord start when reads return 0\n" }, { "commit": "209132cebb721486e04b0e4686985e0e73502fc3", "tree": "df045460b87ea570b22520f41312139b2b8ee5e8", "parents": [ "94b803e8cac1c8efaa4e4c4b21859de67bb0e7d8", "0af80a133bf101921cbdd66b263bddbcdae33542" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 14:11:56 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:11:56 2012 -0700" }, "message": "am 0798b252: am dca35288: Better video bandwidth utilization by not lying about the frame rate.\n\n* commit \u00270798b25256cf2780fb72c74ef9063f499deca1d4\u0027:\n Better video bandwidth utilization by not lying about the frame rate.\n" }, { "commit": "94b803e8cac1c8efaa4e4c4b21859de67bb0e7d8", "tree": "9e1e90d63e8fa654bbefb5789dd60df89b064203", "parents": [ "5d4342c1fa81345593a5688e5410bf5f6cd638d8", "3219d4b20366578e5a93177324afe069a229d4be" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 14:11:55 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:11:55 2012 -0700" }, "message": "am acbd105f: am a438123b: Various improvements to cleanly shutdown a wfd session.\n\n* commit \u0027acbd105f183d2b66cc5c2bd36da14a6ee4032ecf\u0027:\n Various improvements to cleanly shutdown a wfd session.\n" }, { "commit": "5d4342c1fa81345593a5688e5410bf5f6cd638d8", "tree": "d82830f95429233b2578a7de3833c2a14d8cc1b3", "parents": [ "6c3cc51272739470404a20b4a0183a434574dd18", "62b78184294f33b7259336532bb594965775a355" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 14:11:54 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:11:54 2012 -0700" }, "message": "am 6b37cd72: am 6701a449: Merge \"Audio and video bitrate are now configurable through system properties\" into jb-mr1-dev\n\n* commit \u00276b37cd72a80db71c39ff90d2aaaf8e483cc84fad\u0027:\n Audio and video bitrate are now configurable through system properties\n" }, { "commit": "6c3cc51272739470404a20b4a0183a434574dd18", "tree": "f362a2da1b5ebf6ec5e75be6292ebc5abbe2b616", "parents": [ "e1ebd755e7625dc810e36a787ee6f475ef848ea7", "08160d2dd91fc12c1ef9e03d3d56331903e38d3e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 14:11:53 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:11:53 2012 -0700" }, "message": "am 96a66153: am d168b19b: Merge \"Use proper number of video buffers to be acquired simultaneously from\" into jb-mr1-dev\n\n* commit \u002796a661537520b1879f63cde45b2f1405f4d08fca\u0027:\n Use proper number of video buffers to be acquired simultaneously from\n" }, { "commit": "e1ebd755e7625dc810e36a787ee6f475ef848ea7", "tree": "413cc617f52c7edd3ecb42c79d715ffead77d789", "parents": [ "95fa0dd131b625e73c8a18c95a252e5eabbfe1a5", "eab594adcb69a027ce8213457bca793d37f18a6c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 14:11:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:11:51 2012 -0700" }, "message": "am f0dd1115: am 00f41327: Throttle SurfaceMediaSource.\n\n* commit \u0027f0dd1115d87d5f73392dec630856a028f78ab81c\u0027:\n Throttle SurfaceMediaSource.\n" }, { "commit": "95fa0dd131b625e73c8a18c95a252e5eabbfe1a5", "tree": "12c1a27dedfe925794dcfe6c35926d12f16a61ed", "parents": [ "063c1eac60d7cee5d6f1ee61a10f0b6027782357", "9733d4fe2d1443c20dcfb6f8cff144df9d04055f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 13 14:04:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 14:04:33 2012 -0700" }, "message": "am d021c2f3: am bdde5f88: Camera2: Fix ZSL bugs.\n\n* commit \u0027d021c2f390ecedae498233679659c37cfde8e8fb\u0027:\n Camera2: Fix ZSL bugs.\n" }, { "commit": "89b4470bc926c4b5de59deaff2b6a4993ab6cab7", "tree": "be8150e982c53419fdb3d5ca2047fcdc344877c4", "parents": [ "ae4b97ac25c1a1a5846731962c246c9811fb041f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 11:44:00 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 12:02:15 2012 -0700" }, "message": "Handle audio HAL returning 0 bytes in record thread\n\nEnter standby when HAL returns an error, but also consider 0 bytes\n returned as NOT_ENOUGH_DATA.\n\nChange-Id: Ica83142310e9c176f936e0440571a6034cbc575f\n" }, { "commit": "063c1eac60d7cee5d6f1ee61a10f0b6027782357", "tree": "bee6aa994964f31537714cdf3a054107e829158e", "parents": [ "cd0817e208a5420cf6787e766ec017676cbe4e72" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 11:08:37 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 11:08:37 2012 -0700" }, "message": "Fix build in AudioFlinger/FastMixer\n\nCommit was missing some changes to modifications to send session ID\n from AudioFlinger to AudioMixer.\n\nChange-Id: I7daeaf4eff243b5287bef63be86a87acf408374a\n" }, { "commit": "6a1d8d93f83d9723b11ac5d0d36ec3dd91891f3f", "tree": "5e7eb603591ba815f633ba7a934d2f48c99100b0", "parents": [ "a71ee31e562d5663fa768f705ccecf965e012f2e", "ae4b97ac25c1a1a5846731962c246c9811fb041f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 10:25:28 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 10:25:28 2012 -0700" }, "message": "am 66466087: Merge \"Workaround for track recreation bug\" into jb-mr1-dev\n\n* commit \u002766466087f464b641c8c09b195891a9713a554900\u0027:\n Workaround for track recreation bug\n" }, { "commit": "cd0817e208a5420cf6787e766ec017676cbe4e72", "tree": "ccfc6febe907c09e633986c90f6f08c14d8c6d67", "parents": [ "9675d585ff0de1228cf79fa96b64ea402950ca1a", "a59d27196cc411331efbcce5dde817c7273a64c3" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 10:24:20 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 13 10:24:21 2012 -0700" }, "message": "Merge \"Communicate audio session ID to downmixer\"" }, { "commit": "ae4b97ac25c1a1a5846731962c246c9811fb041f", "tree": "5e7eb603591ba815f633ba7a934d2f48c99100b0", "parents": [ "f8c5023fd3200aaf79293bdbab264d09b0936d54", "8645717388acc74efd9127b84da121be8bf733ba" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Thu Sep 13 10:23:34 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 13 10:23:35 2012 -0700" }, "message": "Merge \"Workaround for track recreation bug\" into jb-mr1-dev" }, { "commit": "a71ee31e562d5663fa768f705ccecf965e012f2e", "tree": "4fbaa3dfaae09044735fdc00cba3f33da57ff002", "parents": [ "0af80a133bf101921cbdd66b263bddbcdae33542", "f8c5023fd3200aaf79293bdbab264d09b0936d54" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 13 09:39:59 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 09:39:59 2012 -0700" }, "message": "am f4bca03d: Merge \"Don\\\u0027t deadlock on AudioRecord start when reads return 0\" into jb-mr1-dev\n\n* commit \u0027f4bca03d996b584030a80268f58cdb29dc7b7cde\u0027:\n Don\u0027t deadlock on AudioRecord start when reads return 0\n" }, { "commit": "f8c5023fd3200aaf79293bdbab264d09b0936d54", "tree": "4fbaa3dfaae09044735fdc00cba3f33da57ff002", "parents": [ "b5d99d162f4e82d7d1786506ec557c406f470b76", "607364600e4f6ef8bebec8958e16e7fb0bcb7d25" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 13 09:37:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 13 09:37:39 2012 -0700" }, "message": "Merge \"Don\u0027t deadlock on AudioRecord start when reads return 0\" into jb-mr1-dev" }, { "commit": "0af80a133bf101921cbdd66b263bddbcdae33542", "tree": "98248d7d05fce547a48b271c0fa7ca811d938e1e", "parents": [ "3219d4b20366578e5a93177324afe069a229d4be", "b5d99d162f4e82d7d1786506ec557c406f470b76" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:35:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 09:35:26 2012 -0700" }, "message": "am dca35288: Better video bandwidth utilization by not lying about the frame rate.\n\n* commit \u0027dca352880e210e0ca0ff39de074540d3640ecfab\u0027:\n Better video bandwidth utilization by not lying about the frame rate.\n" }, { "commit": "b5d99d162f4e82d7d1786506ec557c406f470b76", "tree": "98248d7d05fce547a48b271c0fa7ca811d938e1e", "parents": [ "596b4cde38b9fe18d21b4ed20dbdba909514a457" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 16:48:23 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:33:00 2012 -0700" }, "message": "Better video bandwidth utilization by not lying about the frame rate.\n\nlog network bandwidth used (for data traffic).\n\nChange-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab\n" }, { "commit": "3219d4b20366578e5a93177324afe069a229d4be", "tree": "020b692a47dba87be00502bae6c4e7498d249c6d", "parents": [ "62b78184294f33b7259336532bb594965775a355", "596b4cde38b9fe18d21b4ed20dbdba909514a457" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:28:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 09:28:49 2012 -0700" }, "message": "am a438123b: Various improvements to cleanly shutdown a wfd session.\n\n* commit \u0027a438123bd96c7faf145683876702387efe5628d9\u0027:\n Various improvements to cleanly shutdown a wfd session.\n" }, { "commit": "62b78184294f33b7259336532bb594965775a355", "tree": "f2f5b73da153b666310c03b582cdee57b78a6d1d", "parents": [ "08160d2dd91fc12c1ef9e03d3d56331903e38d3e", "c049afa039bee54629c30871eefffa17b403cdb5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:27:24 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 09:27:24 2012 -0700" }, "message": "am 6701a449: Merge \"Audio and video bitrate are now configurable through system properties\" into jb-mr1-dev\n\n* commit \u00276701a4492350169aa41f66c9c79ece0ba0b280b7\u0027:\n Audio and video bitrate are now configurable through system properties\n" }, { "commit": "08160d2dd91fc12c1ef9e03d3d56331903e38d3e", "tree": "121e11f35af3cfcfbcf7db50399c69d2da7949df", "parents": [ "eab594adcb69a027ce8213457bca793d37f18a6c", "ab43b2cecf0b45b6e4db99b0f9f49f6f97dae66a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:27:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 09:27:23 2012 -0700" }, "message": "am d168b19b: Merge \"Use proper number of video buffers to be acquired simultaneously from\" into jb-mr1-dev\n\n* commit \u0027d168b19bc716bf04a35c380af250e1974d0aecd2\u0027:\n Use proper number of video buffers to be acquired simultaneously from\n" }, { "commit": "596b4cde38b9fe18d21b4ed20dbdba909514a457", "tree": "020b692a47dba87be00502bae6c4e7498d249c6d", "parents": [ "c049afa039bee54629c30871eefffa17b403cdb5" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 16:25:14 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 13 09:27:03 2012 -0700" }, "message": "Various improvements to cleanly shutdown a wfd session.\n\nChange-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13\n" }, { "commit": "c049afa039bee54629c30871eefffa17b403cdb5", "tree": "f2f5b73da153b666310c03b582cdee57b78a6d1d", "parents": [ "ab43b2cecf0b45b6e4db99b0f9f49f6f97dae66a", "13da4ed2926946d1249e645b6d29f61bf362387c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:26:34 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 13 09:26:34 2012 -0700" }, "message": "Merge \"Audio and video bitrate are now configurable through system properties\" into jb-mr1-dev" }, { "commit": "ab43b2cecf0b45b6e4db99b0f9f49f6f97dae66a", "tree": "121e11f35af3cfcfbcf7db50399c69d2da7949df", "parents": [ "b62f95145293bf1a39959166a4964088bb413224", "8bcc1a1ce7dab4479b36fb274ed66eaf687d1eac" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:26:19 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 13 09:26:19 2012 -0700" }, "message": "Merge \"Use proper number of video buffers to be acquired simultaneously from\" into jb-mr1-dev" }, { "commit": "eab594adcb69a027ce8213457bca793d37f18a6c", "tree": "4ee9c19ac6d89e2640eb964e95dec87553ae9d13", "parents": [ "9733d4fe2d1443c20dcfb6f8cff144df9d04055f", "b62f95145293bf1a39959166a4964088bb413224" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:24:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 09:24:31 2012 -0700" }, "message": "am 00f41327: Throttle SurfaceMediaSource.\n\n* commit \u002700f41327264fa2e59cc05abaa5c554b2a32938e1\u0027:\n Throttle SurfaceMediaSource.\n" }, { "commit": "13da4ed2926946d1249e645b6d29f61bf362387c", "tree": "c05adf62f3ca544b6815ac5418d694525fa6c9fd", "parents": [ "2954fe9a1cf578c2ad54c2fefb79aeb2a3d220eb" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 14:06:17 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:23:45 2012 -0700" }, "message": "Audio and video bitrate are now configurable through system properties\n\nadb shell setprop media.wfd.audio-bitrate 64000\nadb shell setprop media.wfd.video-bitrate 10000000\n\nare the defaults.\n\nChange-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0\n" }, { "commit": "8bcc1a1ce7dab4479b36fb274ed66eaf687d1eac", "tree": "de1333a67335914f6e26f77e7a5997b77d9a2560", "parents": [ "2954fe9a1cf578c2ad54c2fefb79aeb2a3d220eb" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 12:15:18 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:22:49 2012 -0700" }, "message": "Use proper number of video buffers to be acquired simultaneously from\n\nSurfaceMediaSource, this should match the number of encoder input buffers.\n\nChange-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0\n" }, { "commit": "b62f95145293bf1a39959166a4964088bb413224", "tree": "4ee9c19ac6d89e2640eb964e95dec87553ae9d13", "parents": [ "2954fe9a1cf578c2ad54c2fefb79aeb2a3d220eb" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 12:08:55 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 09:21:02 2012 -0700" }, "message": "Throttle SurfaceMediaSource.\n\nChange-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb\n" }, { "commit": "9675d585ff0de1228cf79fa96b64ea402950ca1a", "tree": "ebe009f7a83e20aa2b5973b0604f02751a6e656c", "parents": [ "593fecf6c18d060dd659d3995da505a8857b5254", "2557a8cb327156701d042243ba3db6cf79fab818" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Sep 13 03:21:28 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 13 03:21:28 2012 -0700" }, "message": "am 0f211cf8: am 359cf1ca: am a923dd4e: am 1b0ae9e4: Merge \"avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\"\n\n* commit \u00270f211cf85537b0f3992b15cfda984d48840d9f22\u0027:\n avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\n" }, { "commit": "8645717388acc74efd9127b84da121be8bf733ba", "tree": "3095c0e54e9590755cf83d3fb94e51ebe35982a3", "parents": [ "71ea9f024c3943160110d9aa15b082b66516f72e" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Sep 12 19:42:34 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Sep 12 19:42:34 2012 -0700" }, "message": "Workaround for track recreation bug\n\nIgnore thread can call Java parameter to work around bug where\n AudioTrack instance gets recreated when key clicks are enabled\n and WFD gets turned on, with the wrong parameters.\n\nChange-Id: Ia42c8704b46fe3ffea560b05b60939fa2e4b29e1\n" }, { "commit": "607364600e4f6ef8bebec8958e16e7fb0bcb7d25", "tree": "dd7c19507d39379c06116e54c6e2de979ef90956", "parents": [ "71ea9f024c3943160110d9aa15b082b66516f72e" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Sep 12 18:48:33 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Sep 12 19:40:30 2012 -0700" }, "message": "Don\u0027t deadlock on AudioRecord start when reads return 0\n\nWhen calling start() on an AudioRecord with a HAL that\n returns 0 on a read() operation, the start blocking\n condition was never unblocked.\nAdd a boolean to track the first read operation so the returned\n number of bytes (mBytesRead) is only evaluated after that\n first read.\n\nChange-Id: I8c735a00d48cd6a0da467ccdf75d3616b38f6afa\n" }, { "commit": "9733d4fe2d1443c20dcfb6f8cff144df9d04055f", "tree": "c202fea6439d44227018f3f12d79053bf38ac1ec", "parents": [ "2557a8cb327156701d042243ba3db6cf79fab818", "2954fe9a1cf578c2ad54c2fefb79aeb2a3d220eb" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 12 18:00:01 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 18:00:01 2012 -0700" }, "message": "am bdde5f88: Camera2: Fix ZSL bugs.\n\n* commit \u0027bdde5f884eaf270ab4b806849f3122a46cd872ce\u0027:\n Camera2: Fix ZSL bugs.\n" }, { "commit": "2954fe9a1cf578c2ad54c2fefb79aeb2a3d220eb", "tree": "c202fea6439d44227018f3f12d79053bf38ac1ec", "parents": [ "71ea9f024c3943160110d9aa15b082b66516f72e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 12 10:42:10 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 12 17:57:53 2012 -0700" }, "message": "Camera2: Fix ZSL bugs.\n\nThe ZSL processor was discarding buffers too often, and waiting for\nnew buffers with mutexes held.\n\nAlso adds basic fallback to regular capture in case the ZSL queue\ndoesn\u0027t contain a suitable buffer.\n\nBug: 7147043\n\nChange-Id: I5721267ef08dbc87ef9d8ec47f333db5f67e41c1\n" }, { "commit": "593fecf6c18d060dd659d3995da505a8857b5254", "tree": "39c534b6b0a609b2cde7aa6b78f76a1f8060bd69", "parents": [ "bb5027b0d47a6d46bb401a27b8fa35dbbbad5d0f", "d1b04f79d33079d1961c2f163f05ac5456d5839e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 17:02:32 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 17:02:32 2012 -0700" }, "message": "am b030d656: am e891a788: Merge \"Various improvements to the wifi display implementation.\" into jb-mr1-dev\n\n* commit \u0027b030d65670fa236e09f91f5ef62ac6863d6600d4\u0027:\n Various improvements to the wifi display implementation.\n" }, { "commit": "bb5027b0d47a6d46bb401a27b8fa35dbbbad5d0f", "tree": "15f0e411baa81e960bfd38956425eaad1600091c", "parents": [ "ac745bebfa0a78629f0b0cdb85faf7f07d59a0ae", "d74f96c8e75003d80f1861f31fa58be815a103b1" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Sep 12 17:02:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 17:02:04 2012 -0700" }, "message": "am 198c9b9b: am 02f7a784: am fd07d616: am fbe1cc92: Merge \"Don\\\u0027t include \u003clinux/socket.h\u003e directly.\"\n\n* commit \u0027198c9b9be771a5b6f0bc1d5590eef1f0cd5dd08c\u0027:\n Don\u0027t include \u003clinux/socket.h\u003e directly.\n" }, { "commit": "ac745bebfa0a78629f0b0cdb85faf7f07d59a0ae", "tree": "911710dee598658a6e7d702782495e70e54802b4", "parents": [ "4808377df5087b93352e82f640fe37e3a1a48746", "9a2280701b1d5f453a6b935a41b315698b0fd005" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Sep 12 16:59:02 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 16:59:02 2012 -0700" }, "message": "am b988e54a: (-s ours) Reconcile with jb-mr1-release - do not merge\n\n* commit \u0027b988e54aa5085479db1a54008f7264c859b2b900\u0027:\n Camera2: Sanity check inputs better.\n" }, { "commit": "a59d27196cc411331efbcce5dde817c7273a64c3", "tree": "e97e28ac0352ef4c73fb79339820d8b434443bf8", "parents": [ "fd6e3ac0f85e288247b1783a17cc5b3110c35a89" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Sep 12 15:47:07 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Sep 12 15:49:56 2012 -0700" }, "message": "Communicate audio session ID to downmixer\n\nThe audio downmixer effect might need the audio session Id, pass it\n from the track creation in AudioFlinger to the downmix effect\n creation in AudioMixer.\n\nChange-Id: I836873eebd6711f1048fce81cd2eb29b94f0ad0c\n" }, { "commit": "2557a8cb327156701d042243ba3db6cf79fab818", "tree": "52148c366012fc3b92347dfbb69af97f128f076a", "parents": [ "d1b04f79d33079d1961c2f163f05ac5456d5839e", "71ea9f024c3943160110d9aa15b082b66516f72e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Sep 12 15:44:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:44:51 2012 -0700" }, "message": "am 359cf1ca: am a923dd4e: am 1b0ae9e4: Merge \"avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\"\n\n* commit \u0027359cf1cac2a7851a59dfe4960a1a5992ac6fdb84\u0027:\n avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\n" }, { "commit": "71ea9f024c3943160110d9aa15b082b66516f72e", "tree": "52148c366012fc3b92347dfbb69af97f128f076a", "parents": [ "036012b9209d3614cbc3c0a96cece5776c45e77d", "a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Sep 12 15:42:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:42:30 2012 -0700" }, "message": "am a923dd4e: am 1b0ae9e4: Merge \"avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\"\n\n* commit \u0027a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d\u0027:\n avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\n" }, { "commit": "4808377df5087b93352e82f640fe37e3a1a48746", "tree": "911710dee598658a6e7d702782495e70e54802b4", "parents": [ "f0372bb34036da279322117532b5800f5b19fba2", "f64285c5884a08788101b62398b899ba0957ae67" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 12 15:35:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:35:44 2012 -0700" }, "message": "am f1e354df: am d067489a: Merge \"Camera2: Use full pixel array for ZSL stream\" into jb-mr1-dev\n\n* commit \u0027f1e354df16ad01542b06f8f14d7d47dae5fd381e\u0027:\n Camera2: Use full pixel array for ZSL stream\n" }, { "commit": "f0372bb34036da279322117532b5800f5b19fba2", "tree": "29d58600eefaa7f67d1bdcc989e4e2c3f82216f9", "parents": [ "034f561dd843afbe148477889e6acf71333fcc8a", "b7ad9e4ac0ec896f6df5c771ed648bea6919a688" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 12 15:35:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:35:43 2012 -0700" }, "message": "am 8bb57472: am 2552036a: Merge \"Camera2: Configure ZSL at the right time.\" into jb-mr1-dev\n\n* commit \u00278bb574725ea880c53986c8d66eeb090731ecd6d5\u0027:\n Camera2: Configure ZSL at the right time.\n" }, { "commit": "034f561dd843afbe148477889e6acf71333fcc8a", "tree": "da152aff5a79f3564255b21becccadc1eb6590e8", "parents": [ "fe9938f7f39f62a8ece1dc29196943761165383a", "8bc201983c46396a049cac5c94abc169461f7d47" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Wed Sep 12 15:35:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:35:26 2012 -0700" }, "message": "am 21a22a9a: am 64d6c687: Merge \"Add getError and setError to propagate error code from WVMMediaExtractor up to player.\" into jb-mr1-dev\n\n* commit \u002721a22a9a8dcffc461837d673973976bdbb2c164c\u0027:\n Add getError and setError to propagate error code from WVMMediaExtractor up to player.\n" }, { "commit": "a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d", "tree": "d312c1551b90ea09a2ebd28af151340eb6165014", "parents": [ "fd07d61614e4b358349d1d46a32f9477784404c4", "1b0ae9e47273357e19a9beb22466319753e8242d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Sep 12 15:26:28 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:26:28 2012 -0700" }, "message": "am 1b0ae9e4: Merge \"avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\"\n\n* commit \u00271b0ae9e47273357e19a9beb22466319753e8242d\u0027:\n avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\n" }, { "commit": "fe9938f7f39f62a8ece1dc29196943761165383a", "tree": "cc2f3dcbadc7591d5c0179ed55c5cf9e0638d36f", "parents": [ "f96ceae7fbd2a46b5cc85e76be108086c5b7e639", "2bbda71148e97f2c411d4272e96f075b99da7c1c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 12 15:14:10 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:14:10 2012 -0700" }, "message": "am 2664dab4: am b063cb62: Merge \"Camera1: Fix enable shutter sound command error handling.\" into jb-mr1-dev\n\n* commit \u00272664dab44dd61fde35be6806b0a4d5f1eb523df2\u0027:\n Camera1: Fix enable shutter sound command error handling.\n" }, { "commit": "f96ceae7fbd2a46b5cc85e76be108086c5b7e639", "tree": "a04e8c97e5ca25a66c4e5c337c3efdad727eab1b", "parents": [ "c34845af8ac5229eef167a05bbd187c663b5774a", "9d4fc60df8e7d96a91c4fc1a0bf26ee043289cc9" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 12 15:14:02 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:14:02 2012 -0700" }, "message": "am 2155e050: am 831c7139: Merge \"Camera: Add HDR scene mode constants.\" into jb-mr1-dev\n\n* commit \u00272155e050dbf993c894b534a5e9387ebe47b41657\u0027:\n Camera: Add HDR scene mode constants.\n" }, { "commit": "c34845af8ac5229eef167a05bbd187c663b5774a", "tree": "2b56660ab14387b0d96df53198bd38c82028faff", "parents": [ "fd6e3ac0f85e288247b1783a17cc5b3110c35a89", "40b5e8fa8ad661c0250e2a269d082171be9aea18" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Wed Sep 12 15:13:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 15:13:16 2012 -0700" }, "message": "am 9adefeaf: (-s ours) am 498a274c: Merge \"Communicate audio session ID to downmixer\" into jb-mr1-dev\n\n* commit \u00279adefeaf3a03082aca0297eba0c3b57d1d2f8b1a\u0027:\n Communicate audio session ID to downmixer\n" }, { "commit": "1b0ae9e47273357e19a9beb22466319753e8242d", "tree": "424aac930319540e2f53b2c0ed574ad7dc5d6331", "parents": [ "fbe1cc92d9e8930700c15f68717dd66fc1523177", "f547a36c8f0fe11c4c425168037e3ce1d1a697df" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Sep 12 14:24:19 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 12 14:24:20 2012 -0700" }, "message": "Merge \"avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame\"" }, { "commit": "fd6e3ac0f85e288247b1783a17cc5b3110c35a89", "tree": "2b56660ab14387b0d96df53198bd38c82028faff", "parents": [ "504965625902835fa43edd36d62be906560ccb59", "854c07e2ff10d510fc175bf46ba82f0628074665" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Sep 12 13:18:14 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 13:18:14 2012 -0700" }, "message": "am 543d7b33: am 37171b9d: am ed757e97: am 290ac693: Merge \"Stop building the unused host libmtp static library.\"\n\n* commit \u0027543d7b33b5260edf4f51c7bbc0054d34af34bcb3\u0027:\n Stop building the unused host libmtp static library.\n" }, { "commit": "504965625902835fa43edd36d62be906560ccb59", "tree": "daa56e071b96c7ba369295773fc87946812e2195", "parents": [ "5ca0bc5a1c2cd4a59af56791fb5908618b95794a", "5de854eae155937457248591bf132af7a1385c1f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Sep 12 13:17:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 13:17:58 2012 -0700" }, "message": "am 66a702f4: am 8a9e791c: Merge \"Limit maximum equalizer gain.\" into jb-mr1-dev\n\n* commit \u002766a702f42c7d2a393ba4c055500b785038aa297f\u0027:\n Limit maximum equalizer gain.\n" }, { "commit": "d1b04f79d33079d1961c2f163f05ac5456d5839e", "tree": "dd2541aee20da59212f77e8648ac7cabe1d1e0d2", "parents": [ "d74f96c8e75003d80f1861f31fa58be815a103b1", "036012b9209d3614cbc3c0a96cece5776c45e77d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 10:55:21 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 10:55:21 2012 -0700" }, "message": "am e891a788: Merge \"Various improvements to the wifi display implementation.\" into jb-mr1-dev\n\n* commit \u0027e891a7888141fcd3e7956bf80425c885992fa2bf\u0027:\n Various improvements to the wifi display implementation.\n" }, { "commit": "036012b9209d3614cbc3c0a96cece5776c45e77d", "tree": "dd2541aee20da59212f77e8648ac7cabe1d1e0d2", "parents": [ "7276779bbda6fc2e8ae83ae9c9eaa842137b379c", "eb29bae4b8ae270e656b6fcd5216fa86e9f1d8d0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 10:54:33 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 12 10:54:34 2012 -0700" }, "message": "Merge \"Various improvements to the wifi display implementation.\" into jb-mr1-dev" }, { "commit": "eb29bae4b8ae270e656b6fcd5216fa86e9f1d8d0", "tree": "199594f6f59d7469833cfca70b9ba0dad72f6215", "parents": [ "fa030e2bde158d357ea92eb10f2206ca76eb7e04" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 10:19:54 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 12 10:19:54 2012 -0700" }, "message": "Various improvements to the wifi display implementation.\n\nUsing a MediaPuller now, audio and video on their separate threads.\nNo more flushing the RTP stream on audio tracks, since it wastes too much\nof a full size UDP packet.\n\nChange-Id: I53346b4aea739c3142da13bd179428503a3c98b0\n" }, { "commit": "d74f96c8e75003d80f1861f31fa58be815a103b1", "tree": "0044b83c3340c0374836dc2866ad9d784a064339", "parents": [ "9a2280701b1d5f453a6b935a41b315698b0fd005", "7276779bbda6fc2e8ae83ae9c9eaa842137b379c" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Sep 12 09:00:56 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 09:00:56 2012 -0700" }, "message": "am 02f7a784: am fd07d616: am fbe1cc92: Merge \"Don\\\u0027t include \u003clinux/socket.h\u003e directly.\"\n\n* commit \u002702f7a7847bbad970885ec52d9629fe21689e1a46\u0027:\n Don\u0027t include \u003clinux/socket.h\u003e directly.\n" }, { "commit": "7276779bbda6fc2e8ae83ae9c9eaa842137b379c", "tree": "0044b83c3340c0374836dc2866ad9d784a064339", "parents": [ "2fd313002a0e987ac01c037d5357e1572c4522c6", "fd07d61614e4b358349d1d46a32f9477784404c4" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Sep 12 08:59:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 08:59:26 2012 -0700" }, "message": "am fd07d616: am fbe1cc92: Merge \"Don\\\u0027t include \u003clinux/socket.h\u003e directly.\"\n\n* commit \u0027fd07d61614e4b358349d1d46a32f9477784404c4\u0027:\n Don\u0027t include \u003clinux/socket.h\u003e directly.\n" }, { "commit": "fd07d61614e4b358349d1d46a32f9477784404c4", "tree": "8bdd168c74fc2034c7b7ef96e44b3c7c35c4ab16", "parents": [ "ed757e9729b325f00e70f506ad6e217910563d0a", "fbe1cc92d9e8930700c15f68717dd66fc1523177" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Sep 12 08:55:32 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 12 08:55:32 2012 -0700" }, "message": "am fbe1cc92: Merge \"Don\\\u0027t include \u003clinux/socket.h\u003e directly.\"\n\n* commit \u0027fbe1cc92d9e8930700c15f68717dd66fc1523177\u0027:\n Don\u0027t include \u003clinux/socket.h\u003e directly.\n" }, { "commit": "fbe1cc92d9e8930700c15f68717dd66fc1523177", "tree": "0945efcd310fd65e90fc39f2ea796b619d74a7f4", "parents": [ "290ac69379e649a2fed1d9441a17e39c6a912d8c", "e5167f88f3734a048dc44199f3fff0432589db43" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Wed Sep 12 08:50:35 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Sep 12 08:50:35 2012 -0700" }, "message": "Merge \"Don\u0027t include \u003clinux/socket.h\u003e directly.\"" }, { "commit": "9a2280701b1d5f453a6b935a41b315698b0fd005", "tree": "9cde09bbe7dfec9ba7f87608cc72afedbde2bba3", "parents": [ "f64285c5884a08788101b62398b899ba0957ae67", "d5b9f5aa084b3435b6cc814c1f51aacc1cc546f7" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Sep 12 07:40:29 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Sep 12 07:40:29 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I94d9dadde4adb1039e5e5b2cf9167184af9cec49\n" }, { "commit": "d5b9f5aa084b3435b6cc814c1f51aacc1cc546f7", "tree": "9cde09bbe7dfec9ba7f87608cc72afedbde2bba3", "parents": [ "2fd313002a0e987ac01c037d5357e1572c4522c6", "5a2eb334a75fbf71918238965e1be1c035650d23" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Sep 12 06:59:36 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Sep 12 06:59:36 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "e5167f88f3734a048dc44199f3fff0432589db43", "tree": "0945efcd310fd65e90fc39f2ea796b619d74a7f4", "parents": [ "290ac69379e649a2fed1d9441a17e39c6a912d8c" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Sep 11 18:47:53 2012 -0700" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Tue Sep 11 18:47:53 2012 -0700" }, "message": "Don\u0027t include \u003clinux/socket.h\u003e directly.\n\nIn newer versions of Linux, stuff you need isn\u0027t in that file any more.\n\nChange-Id: I62923ed2d92a75ff3182ba2ae27578ce7bde8356\n" }, { "commit": "f64285c5884a08788101b62398b899ba0957ae67", "tree": "9cde09bbe7dfec9ba7f87608cc72afedbde2bba3", "parents": [ "b7ad9e4ac0ec896f6df5c771ed648bea6919a688", "2fd313002a0e987ac01c037d5357e1572c4522c6" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 18:26:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 11 18:26:38 2012 -0700" }, "message": "am d067489a: Merge \"Camera2: Use full pixel array for ZSL stream\" into jb-mr1-dev\n\n* commit \u0027d067489a23640a107e0a86f6de9b467d509deb36\u0027:\n Camera2: Use full pixel array for ZSL stream\n" }, { "commit": "b7ad9e4ac0ec896f6df5c771ed648bea6919a688", "tree": "b54e913138919694e1000efb4977ad2e2c8a0b1f", "parents": [ "8bc201983c46396a049cac5c94abc169461f7d47", "c4cb95449426b5715c6f737abb7eb95945f87166" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 18:26:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 11 18:26:35 2012 -0700" }, "message": "am 2552036a: Merge \"Camera2: Configure ZSL at the right time.\" into jb-mr1-dev\n\n* commit \u00272552036ac67472411082d894eb6e11623799d277\u0027:\n Camera2: Configure ZSL at the right time.\n" }, { "commit": "2fd313002a0e987ac01c037d5357e1572c4522c6", "tree": "9cde09bbe7dfec9ba7f87608cc72afedbde2bba3", "parents": [ "c4cb95449426b5715c6f737abb7eb95945f87166", "efd69bc6740cb20a9d8bf58ecdf16f411573c100" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 18:25:27 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 11 18:25:28 2012 -0700" }, "message": "Merge \"Camera2: Use full pixel array for ZSL stream\" into jb-mr1-dev" }, { "commit": "c4cb95449426b5715c6f737abb7eb95945f87166", "tree": "b54e913138919694e1000efb4977ad2e2c8a0b1f", "parents": [ "0eecaad0f873bdd50cb9dd6485ce584da57f0548", "c33e4b59c48aff4c531ba33d03066b0fe101b8bf" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 18:25:17 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 11 18:25:18 2012 -0700" }, "message": "Merge \"Camera2: Configure ZSL at the right time.\" into jb-mr1-dev" }, { "commit": "8bc201983c46396a049cac5c94abc169461f7d47", "tree": "ee189912af5c8bc79169b4e1c722a803d1a62b35", "parents": [ "2bbda71148e97f2c411d4272e96f075b99da7c1c", "0eecaad0f873bdd50cb9dd6485ce584da57f0548" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Sep 11 17:55:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 11 17:55:36 2012 -0700" }, "message": "am 64d6c687: Merge \"Add getError and setError to propagate error code from WVMMediaExtractor up to player.\" into jb-mr1-dev\n\n* commit \u002764d6c687e75b93c0c8372ed3807e1bb68c1f09ed\u0027:\n Add getError and setError to propagate error code from WVMMediaExtractor up to player.\n" }, { "commit": "0eecaad0f873bdd50cb9dd6485ce584da57f0548", "tree": "ee189912af5c8bc79169b4e1c722a803d1a62b35", "parents": [ "eb37db0ff21ab89d9870099d8fe7c073d58f1c6e", "ac1b71664dbdba1379f00fad2dcc3baa5f734d6b" ], "author": { "name": "Edwin Wong", "email": "edwinwong@google.com", "time": "Tue Sep 11 17:52:59 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 11 17:53:00 2012 -0700" }, "message": "Merge \"Add getError and setError to propagate error code from WVMMediaExtractor up to player.\" into jb-mr1-dev" }, { "commit": "efd69bc6740cb20a9d8bf58ecdf16f411573c100", "tree": "327d8efa14dc8be4eca91862ec49d9d23d14f2d1", "parents": [ "c33e4b59c48aff4c531ba33d03066b0fe101b8bf" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 17:23:48 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 17:23:48 2012 -0700" }, "message": "Camera2: Use full pixel array for ZSL stream\n\nFor efficiency, use full pixel array size for the ZSL output/input\nstreams, instead of the final picture size.\n\nBug: 7139362\nChange-Id: I98ad4f5a1ca283efe87ae60bf0cf39573e22d2f3\n" }, { "commit": "c33e4b59c48aff4c531ba33d03066b0fe101b8bf", "tree": "d4eb230d96437855d8d2f1e7f462a99f15f78795", "parents": [ "587879f29d1282f20f5043a840a40eefb68547c3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 16:51:32 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 16:51:32 2012 -0700" }, "message": "Camera2: Configure ZSL at the right time.\n\nZSL enable was too early in the camera startup sequence, resulting it\nbeing turned off most of the time.\n\nBug: 7148012\nChange-Id: Ie144dd960d018a34b0bc77c88208ca22b7112772\n" }, { "commit": "2bbda71148e97f2c411d4272e96f075b99da7c1c", "tree": "4ed13bd5c14d1f526bdbda067e900dc21ecca16a", "parents": [ "9d4fc60df8e7d96a91c4fc1a0bf26ee043289cc9", "eb37db0ff21ab89d9870099d8fe7c073d58f1c6e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 11:39:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 11 11:39:03 2012 -0700" }, "message": "am b063cb62: Merge \"Camera1: Fix enable shutter sound command error handling.\" into jb-mr1-dev\n\n* commit \u0027b063cb62ab371cced17a6288ebf54e7e6ca58982\u0027:\n Camera1: Fix enable shutter sound command error handling.\n" }, { "commit": "eb37db0ff21ab89d9870099d8fe7c073d58f1c6e", "tree": "4ed13bd5c14d1f526bdbda067e900dc21ecca16a", "parents": [ "b912ed80e19e3d95f670f33900e338691c05dc1e", "ccd795f3c52e626b6eb37a9b6c6ad4ca2f68aa03" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 11:37:17 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 11 11:37:18 2012 -0700" }, "message": "Merge \"Camera1: Fix enable shutter sound command error handling.\" into jb-mr1-dev" }, { "commit": "ccd795f3c52e626b6eb37a9b6c6ad4ca2f68aa03", "tree": "c1c8b88277fce8e502772fad1e05a15c31075349", "parents": [ "d6de933cfcc088d7c80e26bcca4d3b20b1573225" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 11:01:18 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 11 11:27:46 2012 -0700" }, "message": "Camera1: Fix enable shutter sound command error handling.\n\nReturn the error codes from calls to enableShutterSound to the caller,\nand don\u0027t call the HAL with the enable shutter sound command.\n\nChange-Id: Ibe4943bd1cd0fcd1832fd904f12dd2f78fec06a5\n" } ], "next": "9d4fc60df8e7d96a91c4fc1a0bf26ee043289cc9" }