)]}' { "log": [ { "commit": "6aee72a479afb15498a4dc31327c5d5ff7ee4294", "tree": "0b31d36c3dbe51b243a707b29584bf9318e3825e", "parents": [ "842feefd25f3ac03de3cd9bcc5bc7627abec6ebc", "8d452f1c61aa70c4a86c4114532f2c0983120ef8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 24 13:53:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 13:53:33 2012 -0700" }, "message": "am 8d452f1c: Merge \"Check clock_gettime(CLOCK_MONOTONIC) for failure\" into jb-mr1-dev\n\n* commit \u00278d452f1c61aa70c4a86c4114532f2c0983120ef8\u0027:\n Check clock_gettime(CLOCK_MONOTONIC) for failure\n" }, { "commit": "8d452f1c61aa70c4a86c4114532f2c0983120ef8", "tree": "0b31d36c3dbe51b243a707b29584bf9318e3825e", "parents": [ "c0c3b298cbcf47feeeaa597a7621a0dd45f5a99e", "80b3273cea8660fe8a5868d024d2788a1e083ffc" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 24 13:51:58 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 24 13:51:58 2012 -0700" }, "message": "Merge \"Check clock_gettime(CLOCK_MONOTONIC) for failure\" into jb-mr1-dev" }, { "commit": "80b3273cea8660fe8a5868d024d2788a1e083ffc", "tree": "e9d4e782be64fe03b80331cf62f98ca27c16be6f", "parents": [ "94a68ecf2b56bd56994d0352cbaad56e58dcf0dc" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 24 11:29:00 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 24 11:48:20 2012 -0700" }, "message": "Check clock_gettime(CLOCK_MONOTONIC) for failure\n\nBug: 7100774\nChange-Id: I15a84a19bb6d6ef1d9dac4beaa03587638196404\n" }, { "commit": "842feefd25f3ac03de3cd9bcc5bc7627abec6ebc", "tree": "65b4b91a2aea14f71b46a3b6539c8d7cb7385315", "parents": [ "2355f172c80b32d205faad7a59f5410eb1198a80", "c0c3b298cbcf47feeeaa597a7621a0dd45f5a99e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 24 10:39:59 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 10:39:59 2012 -0700" }, "message": "am c0c3b298: Merge \"fix end of track presentation on suspended output\" into jb-mr1-dev\n\n* commit \u0027c0c3b298cbcf47feeeaa597a7621a0dd45f5a99e\u0027:\n fix end of track presentation on suspended output\n" }, { "commit": "c0c3b298cbcf47feeeaa597a7621a0dd45f5a99e", "tree": "65b4b91a2aea14f71b46a3b6539c8d7cb7385315", "parents": [ "53787020d2706a1ab04972213b586acaf757bd57", "1afc26db11b71c43f63a0f72a45a803f1a7910dd" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 24 10:38:23 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 24 10:38:23 2012 -0700" }, "message": "Merge \"fix end of track presentation on suspended output\" into jb-mr1-dev" }, { "commit": "2355f172c80b32d205faad7a59f5410eb1198a80", "tree": "b6449a2ce8472e6b6615d9cb8a6234c1deee2a09", "parents": [ "9c4fd9d35f5b74a0eb8e75fe6776302685de6f96", "53787020d2706a1ab04972213b586acaf757bd57" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Sep 24 10:35:29 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 10:35:29 2012 -0700" }, "message": "am 53787020: Merge \"Camera2: Truncate JPEG images\" into jb-mr1-dev\n\n* commit \u002753787020d2706a1ab04972213b586acaf757bd57\u0027:\n Camera2: Truncate JPEG images\n" }, { "commit": "53787020d2706a1ab04972213b586acaf757bd57", "tree": "b6449a2ce8472e6b6615d9cb8a6234c1deee2a09", "parents": [ "ea4bbfdcad9478ea19257fb19a32de68a2dfd958", "a6b4c40e70eafc5aba16163999de6d3e26667b89" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Sep 24 10:33:32 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 24 10:33:32 2012 -0700" }, "message": "Merge \"Camera2: Truncate JPEG images\" into jb-mr1-dev" }, { "commit": "9c4fd9d35f5b74a0eb8e75fe6776302685de6f96", "tree": "8e775ec4f40848819681f3ed4d5186cc7aa53a31", "parents": [ "015d1d67a2f6f7c39ce05ba01153898b8778bc1b", "ea4bbfdcad9478ea19257fb19a32de68a2dfd958" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 24 10:29:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 10:29:09 2012 -0700" }, "message": "am ea4bbfdc: Attempt an orderly shutdown of the wifi display connection if possible.\n\n* commit \u0027ea4bbfdcad9478ea19257fb19a32de68a2dfd958\u0027:\n Attempt an orderly shutdown of the wifi display connection if possible.\n" }, { "commit": "015d1d67a2f6f7c39ce05ba01153898b8778bc1b", "tree": "bbf52f1eb8428c0d1f30b28219a6b19f4df4ef62", "parents": [ "0ead0f50ac8a0fac329fdcb9b2d8fae74096b519", "46323541d634c881826040dece9e4891fdf0ae52" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Sep 24 10:12:05 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Sep 24 10:12:05 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I5428b18f029aa2d74cefe23e27eda2040d711778\n" }, { "commit": "ea4bbfdcad9478ea19257fb19a32de68a2dfd958", "tree": "8e775ec4f40848819681f3ed4d5186cc7aa53a31", "parents": [ "94a68ecf2b56bd56994d0352cbaad56e58dcf0dc" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 21 16:02:39 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 24 10:01:46 2012 -0700" }, "message": "Attempt an orderly shutdown of the wifi display connection if possible.\n\nShutdown the session if the encoder signals an error.\n\nrelated-to-bug:7207481\n\nChange-Id: Id78000a336f8bb8904e7d2102f8f81a4139cdd61\n" }, { "commit": "0ead0f50ac8a0fac329fdcb9b2d8fae74096b519", "tree": "bbf52f1eb8428c0d1f30b28219a6b19f4df4ef62", "parents": [ "585549bc13dc03859d39f92f13e9da5e583b2d28", "94a68ecf2b56bd56994d0352cbaad56e58dcf0dc" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Sep 24 09:26:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 09:26:16 2012 -0700" }, "message": "am 94a68ecf: Merge \"Bug fix: MediaPlayer\\\u0027s deselectTrack() for subtitle.\" into jb-mr1-dev\n\n* commit \u002794a68ecf2b56bd56994d0352cbaad56e58dcf0dc\u0027:\n Bug fix: MediaPlayer\u0027s deselectTrack() for subtitle.\n" }, { "commit": "585549bc13dc03859d39f92f13e9da5e583b2d28", "tree": "c0ac024b9f8158a5163ea86dd072d8a3099de1c7", "parents": [ "43d0199a5c89d756cb3ac3c0c0fa7afe421be28b", "df2bc29664d3bf80bed0012970608e5605acf7af" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 24 09:26:15 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 09:26:15 2012 -0700" }, "message": "am df2bc296: Merge \"Camera2: Don\\\u0027t use ZSL when flash is on force fire mode.\" into jb-mr1-dev\n\n* commit \u0027df2bc29664d3bf80bed0012970608e5605acf7af\u0027:\n Camera2: Don\u0027t use ZSL when flash is on force fire mode.\n" }, { "commit": "a6b4c40e70eafc5aba16163999de6d3e26667b89", "tree": "fdf489bb7518feaa8b693e7cdc1a6dc83c44db44", "parents": [ "94a68ecf2b56bd56994d0352cbaad56e58dcf0dc" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Fri Sep 21 00:58:03 2012 -0700" }, "committer": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Sep 24 05:18:14 2012 -0700" }, "message": "Camera2: Truncate JPEG images\n\nCheck for JPEG size hint from HAL, use if applicable. Otherwise\nread until end of JPEG image to find appropriate file size.\n\nBug: 7108816\nChange-Id: Idfd194133eb6c293ab08c9466f59606e62ba56b6\n" }, { "commit": "46323541d634c881826040dece9e4891fdf0ae52", "tree": "bbf52f1eb8428c0d1f30b28219a6b19f4df4ef62", "parents": [ "94a68ecf2b56bd56994d0352cbaad56e58dcf0dc", "a2161f8bb01815c30c57bdd604a5389c33269e2a" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Sep 23 18:59:44 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Sep 23 18:59:44 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "1afc26db11b71c43f63a0f72a45a803f1a7910dd", "tree": "7237e91d3b5ed733ab530046b81a350e4b732113", "parents": [ "94a68ecf2b56bd56994d0352cbaad56e58dcf0dc" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sun Sep 23 15:20:50 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sun Sep 23 15:20:50 2012 -0700" }, "message": "fix end of track presentation on suspended output\n\nThe code detecting the end of an audio track presentation before\nremoving it from the active track list is based on the\ncount of audio frames sent to audio HAL. When an output stream\nis suspended (e.g. A2DP when SCO is active), this count does not\nchange and a track in stopped state will never be removed from\nactive track list causing the mixer thread to never release\nthe wake lock.\n\nThe fix consists in incrementing the audio HAL frame count even\nif the output is suspended.\n\nAlso fix a problem in getRenderPosition() when the output is suspended.\n\nBug 7167534.\n\nChange-Id: I3be836cbbea29b65dc087199cac6a1cd84c0a41d\n" }, { "commit": "94a68ecf2b56bd56994d0352cbaad56e58dcf0dc", "tree": "bbf52f1eb8428c0d1f30b28219a6b19f4df4ef62", "parents": [ "df2bc29664d3bf80bed0012970608e5605acf7af", "23580bb8d6cafbc2b65dd0a4ce1acb52562d1b05" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Sep 23 10:01:19 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Sep 23 10:01:20 2012 -0700" }, "message": "Merge \"Bug fix: MediaPlayer\u0027s deselectTrack() for subtitle.\" into jb-mr1-dev" }, { "commit": "a2161f8bb01815c30c57bdd604a5389c33269e2a", "tree": "c0ac024b9f8158a5163ea86dd072d8a3099de1c7", "parents": [ "df2bc29664d3bf80bed0012970608e5605acf7af", "9565d8642490b8f222dcf56e80377602e105cd82" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sat Sep 22 09:41:41 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sat Sep 22 09:41:41 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "df2bc29664d3bf80bed0012970608e5605acf7af", "tree": "c0ac024b9f8158a5163ea86dd072d8a3099de1c7", "parents": [ "75dce94aca6203ada887b6c2d6a8a8130cdbfaca", "6b367f2a2bddfed60d63fa4da5e19ca13352a454" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 21 18:34:43 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 21 18:34:43 2012 -0700" }, "message": "Merge \"Camera2: Don\u0027t use ZSL when flash is on force fire mode.\" into jb-mr1-dev" }, { "commit": "6b367f2a2bddfed60d63fa4da5e19ca13352a454", "tree": "3b4d1ad3daad12351d967a6c42bc93013bee3d6f", "parents": [ "207e18540fefbaf530a4fdf506d266f34ddec84f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 21 16:30:42 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 21 16:30:42 2012 -0700" }, "message": "Camera2: Don\u0027t use ZSL when flash is on force fire mode.\n\nBug: 7213907\nChange-Id: I120b187c1886d85f4b2b5d3a6f28a28936424e8e\n" }, { "commit": "43d0199a5c89d756cb3ac3c0c0fa7afe421be28b", "tree": "060d762527d5b09d43c076ae4b3280f4d0d8b9b7", "parents": [ "32cc2d3a18cad9de4587ff6904b2b7e4d338db06", "75dce94aca6203ada887b6c2d6a8a8130cdbfaca" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 21 15:13:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 21 15:13:30 2012 -0700" }, "message": "am 75dce94a: Merge \"Camera2: Emit FaceDetection events for all except repeating 0-face frames\" into jb-mr1-dev\n\n* commit \u002775dce94aca6203ada887b6c2d6a8a8130cdbfaca\u0027:\n Camera2: Emit FaceDetection events for all except repeating 0-face frames\n" }, { "commit": "75dce94aca6203ada887b6c2d6a8a8130cdbfaca", "tree": "060d762527d5b09d43c076ae4b3280f4d0d8b9b7", "parents": [ "207e18540fefbaf530a4fdf506d266f34ddec84f", "e7f256a4b1d2037a67ab139fc8131a6ca97bd405" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 21 15:11:55 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 21 15:11:56 2012 -0700" }, "message": "Merge \"Camera2: Emit FaceDetection events for all except repeating 0-face frames\" into jb-mr1-dev" }, { "commit": "e7f256a4b1d2037a67ab139fc8131a6ca97bd405", "tree": "66fbcfb862f370f482c0dd65016e7f00cb52f057", "parents": [ "aa05a277e317ff224229c741bb97a6351d3c17db" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Sep 20 16:27:54 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 21 13:22:08 2012 -0700" }, "message": "Camera2: Emit FaceDetection events for all except repeating 0-face frames\n\nBug: 7205311\nChange-Id: I570209445acf3a26f2246c3fe886d56bb63bd2f8\n" }, { "commit": "32cc2d3a18cad9de4587ff6904b2b7e4d338db06", "tree": "d8e7d7db4c874aabfe35c5fdd4a5dcf7bf72047d", "parents": [ "a3cbff3238d06bf8b2c9273fab12a852b1ef4e24", "207e18540fefbaf530a4fdf506d266f34ddec84f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 21 09:29:07 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 21 09:29:07 2012 -0700" }, "message": "am 207e1854: Remove legacy code and APIs in wifi display related code.\n\n* commit \u0027207e18540fefbaf530a4fdf506d266f34ddec84f\u0027:\n Remove legacy code and APIs in wifi display related code.\n" }, { "commit": "207e18540fefbaf530a4fdf506d266f34ddec84f", "tree": "d8e7d7db4c874aabfe35c5fdd4a5dcf7bf72047d", "parents": [ "086f958a7e539acffb637b42f5a6998184544179" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 16:00:17 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Sep 21 09:24:08 2012 -0700" }, "message": "Remove legacy code and APIs in wifi display related code.\n\nChange-Id: Ia010e7a00534f9356b3247369d0ffd65591d91aa\n" }, { "commit": "9565d8642490b8f222dcf56e80377602e105cd82", "tree": "789f1f2a6287923afae97bd98aa52a50fe65e32f", "parents": [ "086f958a7e539acffb637b42f5a6998184544179", "6cdbe6639b21d5e7bbcba295d167c33a6c376c9e" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 21 06:59:33 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 21 06:59:33 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "a3cbff3238d06bf8b2c9273fab12a852b1ef4e24", "tree": "789f1f2a6287923afae97bd98aa52a50fe65e32f", "parents": [ "2e0001dd05258ad567c001537492bf26a8b8a5a7", "086f958a7e539acffb637b42f5a6998184544179" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Thu Sep 20 20:24:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 20:24:16 2012 -0700" }, "message": "am 086f958a: Tune video bitrate to 2.5 MBPS.\n\n* commit \u0027086f958a7e539acffb637b42f5a6998184544179\u0027:\n Tune video bitrate to 2.5 MBPS.\n" }, { "commit": "2e0001dd05258ad567c001537492bf26a8b8a5a7", "tree": "d026d20507eb0d7ddc1fa23f4cf3edeb38f7e7b1", "parents": [ "528854666ecb818c5098d6a200c7dd880afda06c", "437aa4c55fc010d738e7c3572778a2073590f30d" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 20 20:23:01 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 20:23:01 2012 -0700" }, "message": "am 437aa4c5: Merge \"Allow DRM client to pass the FD of an open file to the DRM server.\" into jb-mr1-dev\n\n* commit \u0027437aa4c55fc010d738e7c3572778a2073590f30d\u0027:\n Allow DRM client to pass the FD of an open file to the DRM server.\n" }, { "commit": "086f958a7e539acffb637b42f5a6998184544179", "tree": "789f1f2a6287923afae97bd98aa52a50fe65e32f", "parents": [ "437aa4c55fc010d738e7c3572778a2073590f30d" ], "author": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Thu Sep 20 20:12:52 2012 -0700" }, "committer": { "name": "Dave Burke", "email": "daveburke@google.com", "time": "Thu Sep 20 20:12:52 2012 -0700" }, "message": "Tune video bitrate to 2.5 MBPS.\n\nTemporary workaround for buggy firmware (desired is 5 MBPS).\n\nChange-Id: I9fb0af31ca07c9bfdc6f790b7c98ca546eaf2985\n" }, { "commit": "6cdbe6639b21d5e7bbcba295d167c33a6c376c9e", "tree": "3aa5832c6bf7984f0695a763402c364e011c6ca6", "parents": [ "6e81efd20830cab31c64a9679d380254d9ad65f1" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 14:44:20 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Sep 20 17:52:10 2012 -0700" }, "message": "Camera2: Clean up startup/shutdown sequences.\n\n- Close camera device on startup errors\n\n- Make sure all threads are shut down and the device is closed before\n returning from ICamera::disconnect.\n\nBug: 7172680\nChange-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988\n" }, { "commit": "437aa4c55fc010d738e7c3572778a2073590f30d", "tree": "d026d20507eb0d7ddc1fa23f4cf3edeb38f7e7b1", "parents": [ "8a6f0b1f6d91bbe9d2b2f732d731e5ccc741041e", "0abeaca9d1b53ee40ce9c9d2ef543dd83b5a4cc2" ], "author": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 20 17:11:52 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 17:11:52 2012 -0700" }, "message": "Merge \"Allow DRM client to pass the FD of an open file to the DRM server.\" into jb-mr1-dev" }, { "commit": "528854666ecb818c5098d6a200c7dd880afda06c", "tree": "a7b5361f1d0e0ea48b39db068101440c57a7b69e", "parents": [ "5819289db44c0c2ed9d5b06d1a90d6a521d80d15", "8a6f0b1f6d91bbe9d2b2f732d731e5ccc741041e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 15:26:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 15:26:44 2012 -0700" }, "message": "am 8a6f0b1f: Merge \"Code to support RTP retransmission according to rfc4585, rfc4588\" into jb-mr1-dev\n\n* commit \u00278a6f0b1f6d91bbe9d2b2f732d731e5ccc741041e\u0027:\n Code to support RTP retransmission according to rfc4585, rfc4588\n" }, { "commit": "8a6f0b1f6d91bbe9d2b2f732d731e5ccc741041e", "tree": "a7b5361f1d0e0ea48b39db068101440c57a7b69e", "parents": [ "75041228626439668b64c93eb7bb866b3f63c3fd", "efd9c63dc846dd3dea2c979fe2a9d6770e73f9ac" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 15:25:21 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 15:25:22 2012 -0700" }, "message": "Merge \"Code to support RTP retransmission according to rfc4585, rfc4588\" into jb-mr1-dev" }, { "commit": "5819289db44c0c2ed9d5b06d1a90d6a521d80d15", "tree": "b7a9674ab131f07fb909b2b9d17454a8aa25a0b2", "parents": [ "31c6f0647da02ed2110522225c9f304312930db1", "75041228626439668b64c93eb7bb866b3f63c3fd" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 15:15:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 15:15:26 2012 -0700" }, "message": "am 75041228: Merge \"Camera2: Clean up startup/shutdown sequences.\" into jb-mr1-dev\n\n* commit \u002775041228626439668b64c93eb7bb866b3f63c3fd\u0027:\n Camera2: Clean up startup/shutdown sequences.\n" }, { "commit": "31c6f0647da02ed2110522225c9f304312930db1", "tree": "97869f34cd8ffb0420fc4564b72ed64c51a772f7", "parents": [ "8c3d991efed8d22cccef53683a7910d51b1ae047", "4386b7c4b0f24aa634c0e33f69565bbaa1b2e072" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 15:15:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 15:15:25 2012 -0700" }, "message": "am 4386b7c4: Merge \"Camera2: Erase ZSL queue after each use.\" into jb-mr1-dev\n\n* commit \u00274386b7c4b0f24aa634c0e33f69565bbaa1b2e072\u0027:\n Camera2: Erase ZSL queue after each use.\n" }, { "commit": "75041228626439668b64c93eb7bb866b3f63c3fd", "tree": "b7a9674ab131f07fb909b2b9d17454a8aa25a0b2", "parents": [ "4386b7c4b0f24aa634c0e33f69565bbaa1b2e072", "98bb82d1bf7c94240956426812de6593801faad4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 15:12:56 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 15:12:57 2012 -0700" }, "message": "Merge \"Camera2: Clean up startup/shutdown sequences.\" into jb-mr1-dev" }, { "commit": "4386b7c4b0f24aa634c0e33f69565bbaa1b2e072", "tree": "97869f34cd8ffb0420fc4564b72ed64c51a772f7", "parents": [ "aa05a277e317ff224229c741bb97a6351d3c17db", "768cf093dade9085e0ad6305d9f7c16ae9ad9e26" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 15:12:24 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 15:12:25 2012 -0700" }, "message": "Merge \"Camera2: Erase ZSL queue after each use.\" into jb-mr1-dev" }, { "commit": "98bb82d1bf7c94240956426812de6593801faad4", "tree": "b941fa902105ed541c891aa7b2ae47559047a333", "parents": [ "aa05a277e317ff224229c741bb97a6351d3c17db" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 14:44:20 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 14:44:20 2012 -0700" }, "message": "Camera2: Clean up startup/shutdown sequences.\n\n- Close camera device on startup errors\n\n- Make sure all threads are shut down and the device is closed before\n returning from ICamera::disconnect.\n\nBug: 7172680\nChange-Id: I98611448ec5f2311e6604fa8ee5f9dde7bfdd988\n" }, { "commit": "efd9c63dc846dd3dea2c979fe2a9d6770e73f9ac", "tree": "78fe2b120e7c52bfa47b20e82e10384eef3299a2", "parents": [ "2761d21cf6ce4c0de63f5d9cbd920c57c7b2b213" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 13:09:22 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 13:10:27 2012 -0700" }, "message": "Code to support RTP retransmission according to rfc4585, rfc4588\n\nChange-Id: Idfb3c0935f28e4cbc2141f0903f0d3c4e95818a6\n" }, { "commit": "8c3d991efed8d22cccef53683a7910d51b1ae047", "tree": "3da6c58f6b49e460fceae06be97e31dbcc883abf", "parents": [ "a9654dd4c329a41df35d66972fe3b2afd115d4f9", "aa05a277e317ff224229c741bb97a6351d3c17db" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 12:51:06 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 12:51:06 2012 -0700" }, "message": "am aa05a277: Merge \"Camera2: State must be STOPPED before JPEG callback is fired.\" into jb-mr1-dev\n\n* commit \u0027aa05a277e317ff224229c741bb97a6351d3c17db\u0027:\n Camera2: State must be STOPPED before JPEG callback is fired.\n" }, { "commit": "0abeaca9d1b53ee40ce9c9d2ef543dd83b5a4cc2", "tree": "e17375f6532c5720d8b835cdf242e5016eb5a49f", "parents": [ "74e58c55bc5259b957a51f1bb44a5911ad1f8400" ], "author": { "name": "Gene Morgan", "email": "gmorgan@google.com", "time": "Fri Sep 14 13:35:39 2012 -0700" }, "committer": { "name": "Jeff Tinker", "email": "jtinker@google.com", "time": "Thu Sep 20 11:52:33 2012 -0700" }, "message": "Allow DRM client to pass the FD of an open file to the DRM server.\n\nPart of CL https://googleplex-android-review.googlesource.com/#/c/222797/\nThis modifies the marshall/unmarshall of IDrmManagerService::\nacquireDrmInfo() to watch for DrmInfoRequest tag \"FileDescriptorKey\".\nIf tag is present convert string to binary FD, then back to string\nafter passage through the interface\u0027s Binder.\n\nRelevant bug reports:\nbug: 6426185\n\nChange-Id: I63748b7c986ca0a89613ed3f1c81f24cffb7a9b2\n" }, { "commit": "a9654dd4c329a41df35d66972fe3b2afd115d4f9", "tree": "90a834a82532f75976f8f407605a47af290f20a2", "parents": [ "1702d331979e3af7e9f56e697ffc33cd251b2a83", "6e81efd20830cab31c64a9679d380254d9ad65f1" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Sep 20 10:35:42 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Sep 20 10:35:42 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I85bcd80a77b96e529e1ce20b36e56398b86e73a7\n" }, { "commit": "aa05a277e317ff224229c741bb97a6351d3c17db", "tree": "3da6c58f6b49e460fceae06be97e31dbcc883abf", "parents": [ "2761d21cf6ce4c0de63f5d9cbd920c57c7b2b213", "fe580e57081885dd6059e0d407a6cd96a1be7e51" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 10:34:48 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 10:34:48 2012 -0700" }, "message": "Merge \"Camera2: State must be STOPPED before JPEG callback is fired.\" into jb-mr1-dev" }, { "commit": "768cf093dade9085e0ad6305d9f7c16ae9ad9e26", "tree": "e612dae163ae054a48f678078ca82836d5515869", "parents": [ "fe580e57081885dd6059e0d407a6cd96a1be7e51" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 19 17:11:04 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 10:24:47 2012 -0700" }, "message": "Camera2: Erase ZSL queue after each use.\n\nSince preview stops after a capture is submitted, need to clear out\nthe ZSL queue to avoid using stale buffers when the preview starts up\nagain.\n\nBug: 7189765\nChange-Id: I9ae2382d0af132208aca5ccba49b5464d18a263e\n" }, { "commit": "1702d331979e3af7e9f56e697ffc33cd251b2a83", "tree": "90a834a82532f75976f8f407605a47af290f20a2", "parents": [ "858882f2e6bd18d3da1db5cd8731fe3691628fb1", "2761d21cf6ce4c0de63f5d9cbd920c57c7b2b213" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 09:42:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 09:42:36 2012 -0700" }, "message": "am 2761d21c: Merge \"Instantiate HDCP module, add PES_private_data for encrypted streams.\" into jb-mr1-dev\n\n* commit \u00272761d21cf6ce4c0de63f5d9cbd920c57c7b2b213\u0027:\n Instantiate HDCP module, add PES_private_data for encrypted streams.\n" }, { "commit": "858882f2e6bd18d3da1db5cd8731fe3691628fb1", "tree": "876b5b7f4586924f7b1f97db021f1aa35449e961", "parents": [ "720a153ceb6f27bec2912918bce094f5a63355aa", "b88516c4c0695c4b9ea2feccd3aafef654da62bd" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 09:42:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 09:42:35 2012 -0700" }, "message": "am b88516c4: Merge \"HDCP module binderized\" into jb-mr1-dev\n\n* commit \u0027b88516c4c0695c4b9ea2feccd3aafef654da62bd\u0027:\n HDCP module binderized\n" }, { "commit": "2761d21cf6ce4c0de63f5d9cbd920c57c7b2b213", "tree": "90a834a82532f75976f8f407605a47af290f20a2", "parents": [ "b88516c4c0695c4b9ea2feccd3aafef654da62bd", "b8c7bd418f0ee5b88923b0e0817e3a4acc53cf8d" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 09:30:25 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 09:30:25 2012 -0700" }, "message": "Merge \"Instantiate HDCP module, add PES_private_data for encrypted streams.\" into jb-mr1-dev" }, { "commit": "b88516c4c0695c4b9ea2feccd3aafef654da62bd", "tree": "876b5b7f4586924f7b1f97db021f1aa35449e961", "parents": [ "da1c5c15c2483cd41035e1a492c5963ac86bbcf5", "efbb781c15abf8e085f5ab8d39710bd58ea0b6e4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 20 09:30:11 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 20 09:30:11 2012 -0700" }, "message": "Merge \"HDCP module binderized\" into jb-mr1-dev" }, { "commit": "fe580e57081885dd6059e0d407a6cd96a1be7e51", "tree": "26fe49d76f46f6992e04cb4cb05a33609b378b1d", "parents": [ "da1c5c15c2483cd41035e1a492c5963ac86bbcf5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 19 17:09:15 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 09:19:16 2012 -0700" }, "message": "Camera2: State must be STOPPED before JPEG callback is fired.\n\nMove handling of JPEG callback to CaptureSequencer instead of\nJpegProcessor, so that we can be sure the camera state is updated to\nSTOPPED before the JPEG callback is sent to the application layer.\n\nBug: 7172743\nChange-Id: Ie8752d946d3eb8254230c77f10e5c38a83dc5371\n" }, { "commit": "720a153ceb6f27bec2912918bce094f5a63355aa", "tree": "185bf36804664cb9d75c9cb52936c987069bbf46", "parents": [ "554eb1f2e895ece43f7257658b738359653ebe17", "da1c5c15c2483cd41035e1a492c5963ac86bbcf5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 09:11:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 09:11:25 2012 -0700" }, "message": "am da1c5c15: Camera2: ZSL captures should also make some noise.\n\n* commit \u0027da1c5c15c2483cd41035e1a492c5963ac86bbcf5\u0027:\n Camera2: ZSL captures should also make some noise.\n" }, { "commit": "554eb1f2e895ece43f7257658b738359653ebe17", "tree": "62ef87db299344426a86301706adb8a7b81e33bf", "parents": [ "c28d5d24c98f50daa9fa31a8afaca6d6c50283cd", "c55311869f1853c6814c9bcda8a4b60e43091c1a" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 20 09:11:24 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 20 09:11:24 2012 -0700" }, "message": "am c5531186: Camera2: Increase max timeout for the precapture sequence.\n\n* commit \u0027c55311869f1853c6814c9bcda8a4b60e43091c1a\u0027:\n Camera2: Increase max timeout for the precapture sequence.\n" }, { "commit": "23580bb8d6cafbc2b65dd0a4ce1acb52562d1b05", "tree": "9674f693e29d36d50df581d61d7040e9b756dfa8", "parents": [ "74e58c55bc5259b957a51f1bb44a5911ad1f8400" ], "author": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Sep 20 21:03:44 2012 +0900" }, "committer": { "name": "Insun Kang", "email": "insun@google.com", "time": "Thu Sep 20 22:20:26 2012 +0900" }, "message": "Bug fix: MediaPlayer\u0027s deselectTrack() for subtitle.\n\no Previously, deselectTrack() actually doesn\u0027t work properly in\nTimedTextDriver / TimedTextPlayer.\no Ignores select track operation when the same track is selected in a\nrow.\n\nBug: 7200096\nTESTED\u003druntest -d cts-media -c android.media.cts.MediaPlayerTest\n\nChange-Id: If7feac294cf9b358f616be45574bc2e26001c887\n" }, { "commit": "da1c5c15c2483cd41035e1a492c5963ac86bbcf5", "tree": "185bf36804664cb9d75c9cb52936c987069bbf46", "parents": [ "c55311869f1853c6814c9bcda8a4b60e43091c1a" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 19 17:12:50 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 19 17:12:50 2012 -0700" }, "message": "Camera2: ZSL captures should also make some noise.\n\nChange-Id: If7aff7223db41b4b7edeeb4c32e40ef3197b180b\n" }, { "commit": "c55311869f1853c6814c9bcda8a4b60e43091c1a", "tree": "62ef87db299344426a86301706adb8a7b81e33bf", "parents": [ "74e58c55bc5259b957a51f1bb44a5911ad1f8400" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 19 16:12:18 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 19 16:12:18 2012 -0700" }, "message": "Camera2: Increase max timeout for the precapture sequence.\n\nIncrease maximum duration of the precapture sequence (final metering +\npreflash + redeye reduction) to 2 seconds before timing out.\n\nChange-Id: Ie1de4e96d46599eb53e1def9052b211e684f1fbc\n" }, { "commit": "b8c7bd418f0ee5b88923b0e0817e3a4acc53cf8d", "tree": "ddaddb13e3cb8036d14ff3931fb1a8a39b8f105b", "parents": [ "efbb781c15abf8e085f5ab8d39710bd58ea0b6e4" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 18 14:47:48 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 19 15:12:23 2012 -0700" }, "message": "Instantiate HDCP module, add PES_private_data for encrypted streams.\n\nChange-Id: I970f561a56a1d489a392c3480dec13f4ed7b43bd\n" }, { "commit": "efbb781c15abf8e085f5ab8d39710bd58ea0b6e4", "tree": "a2f28698970fc1b62495cee5d617e1037a0a957d", "parents": [ "74e58c55bc5259b957a51f1bb44a5911ad1f8400" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Sep 18 10:36:32 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Sep 19 09:28:08 2012 -0700" }, "message": "HDCP module binderized\n\nChange-Id: I866768b1e3f3b232f1934a35b65f66befc12f3f6\n" }, { "commit": "6e81efd20830cab31c64a9679d380254d9ad65f1", "tree": "6d8b2be02ef95ee91f60b0f391f95a405560c2ab", "parents": [ "74e58c55bc5259b957a51f1bb44a5911ad1f8400", "1c2b8d98a98ac02296fbd34ae7015f8ba9baf3f2" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Sep 19 07:01:35 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Sep 19 07:01:35 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "c28d5d24c98f50daa9fa31a8afaca6d6c50283cd", "tree": "6d8b2be02ef95ee91f60b0f391f95a405560c2ab", "parents": [ "0e004bd92d88540ead11f0b4728b7c0a0a11169c", "74e58c55bc5259b957a51f1bb44a5911ad1f8400" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 18:04:00 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 18 18:04:00 2012 -0700" }, "message": "am 74e58c55: Merge \"Camera2: Increase capture timeout.\" into jb-mr1-dev\n\n* commit \u002774e58c55bc5259b957a51f1bb44a5911ad1f8400\u0027:\n Camera2: Increase capture timeout.\n" }, { "commit": "74e58c55bc5259b957a51f1bb44a5911ad1f8400", "tree": "6d8b2be02ef95ee91f60b0f391f95a405560c2ab", "parents": [ "2f93127de30bbe17707ca8923c486d4494ffda37", "1f266efe8ce2976b6531fab8698716354b2247f8" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 17:58:26 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 18 17:58:26 2012 -0700" }, "message": "Merge \"Camera2: Increase capture timeout.\" into jb-mr1-dev" }, { "commit": "1f266efe8ce2976b6531fab8698716354b2247f8", "tree": "29c13da58238723dbf5fac01bffa6f589a31544a", "parents": [ "b845c6b0c3066d6791973be830f0953477461a65" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 16:01:11 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 17:57:46 2012 -0700" }, "message": "Camera2: Increase capture timeout.\n\nLow-light modes may take longer to capture a picture, so increase the\ntimeouts.\n\nChange-Id: Id50b1e4fd3186da4e75b2cc1c226ced2f8d394ac\n" }, { "commit": "0e004bd92d88540ead11f0b4728b7c0a0a11169c", "tree": "a44e33754655bb4d44a467e9eb4f0322cf44b107", "parents": [ "5daef98953509f699ca88419f4bb5be45e75716c", "2f93127de30bbe17707ca8923c486d4494ffda37" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 13:48:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 18 13:48:33 2012 -0700" }, "message": "am 2f93127d: Camera2: Enable ZSL by default.\n\n* commit \u00272f93127de30bbe17707ca8923c486d4494ffda37\u0027:\n Camera2: Enable ZSL by default.\n" }, { "commit": "5daef98953509f699ca88419f4bb5be45e75716c", "tree": "c7e6f55b471b5884fcdf4df9b25c63cf61c8f9c4", "parents": [ "d77ef508d0f4210a5f391538705f0737d1c1d26d", "9c6ec8213d8da486a61659b9c37b7a57a2c4bb1a" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 13:48:32 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 18 13:48:32 2012 -0700" }, "message": "am 9c6ec821: Merge \"Camera2: ZSL: Do regular capture if AE is not satisfied.\" into jb-mr1-dev\n\n* commit \u00279c6ec8213d8da486a61659b9c37b7a57a2c4bb1a\u0027:\n Camera2: ZSL: Do regular capture if AE is not satisfied.\n" }, { "commit": "2f93127de30bbe17707ca8923c486d4494ffda37", "tree": "a44e33754655bb4d44a467e9eb4f0322cf44b107", "parents": [ "9c6ec8213d8da486a61659b9c37b7a57a2c4bb1a" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 16:57:27 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 18 13:34:51 2012 -0700" }, "message": "Camera2: Enable ZSL by default.\n\nBug: 6910087\nChange-Id: Ie774f28fbb943b2ac2c856872fd4cae68b40430c\n" }, { "commit": "9c6ec8213d8da486a61659b9c37b7a57a2c4bb1a", "tree": "c7e6f55b471b5884fcdf4df9b25c63cf61c8f9c4", "parents": [ "fe5054c9cba7471c8580fe485ec5aaf12df459e8", "97b38a81ac989ccba02d726011a82541f14166df" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 13:34:31 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 18 13:34:32 2012 -0700" }, "message": "Merge \"Camera2: ZSL: Do regular capture if AE is not satisfied.\" into jb-mr1-dev" }, { "commit": "d77ef508d0f4210a5f391538705f0737d1c1d26d", "tree": "8bf1717df47feebb72eb102246e80d35fd9476dd", "parents": [ "6f76dbca21402053ab9cd0b0d748e0a58b0d756d", "fe5054c9cba7471c8580fe485ec5aaf12df459e8" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 18 12:15:30 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 18 12:15:30 2012 -0700" }, "message": "am fe5054c9: Merge \"Fix THD with max user EQ preset volume again\" into jb-mr1-dev\n\n* commit \u0027fe5054c9cba7471c8580fe485ec5aaf12df459e8\u0027:\n Fix THD with max user EQ preset volume again\n" }, { "commit": "fe5054c9cba7471c8580fe485ec5aaf12df459e8", "tree": "8bf1717df47feebb72eb102246e80d35fd9476dd", "parents": [ "0d61a78845d716411e7b94914ae29639a5710fd2", "c5cd686a83c6ea65a68d98023d5527fe4373d4e4" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 18 12:11:17 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 18 12:11:17 2012 -0700" }, "message": "Merge \"Fix THD with max user EQ preset volume again\" into jb-mr1-dev" }, { "commit": "97b38a81ac989ccba02d726011a82541f14166df", "tree": "d683f7f7e7a75db4da9d3745267cdb1ed303e1f0", "parents": [ "874a4618b645ab5c1faaa738a871f52492f28de3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 17:55:07 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 10:55:03 2012 -0700" }, "message": "Camera2: ZSL: Do regular capture if AE is not satisfied.\n\n- Check the AE state of the selected ZSL buffer; if it\u0027s not reporting\n as CONVERGED or LOCKED, fall back to normal capture sequence\n- Add more debugging for the ZSL queue.\n\nBug: 6910087\nChange-Id: I77a4287580aa9ddbd58438477c40ce829555d0ca\n" }, { "commit": "6f76dbca21402053ab9cd0b0d748e0a58b0d756d", "tree": "f8ac2ea4b30662d2a592364e9eee7199f05ac42a", "parents": [ "f6f87dd20c125762d8b13c0a829191e605dafbbf", "0d61a78845d716411e7b94914ae29639a5710fd2" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 10:31:55 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 18 10:31:55 2012 -0700" }, "message": "am 0d61a788: Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-dev\n\n* commit \u00270d61a78845d716411e7b94914ae29639a5710fd2\u0027:\n Camera2: Don\u0027t be bothered by lack of faces.\n Camera2: Filter out faces with 0 confidence.\n Camera2: Change face detect/scene mode priority.\n" }, { "commit": "0d61a78845d716411e7b94914ae29639a5710fd2", "tree": "f8ac2ea4b30662d2a592364e9eee7199f05ac42a", "parents": [ "c92bed3a73c06e90217f8f199ca0b517aa7595d2", "663c2cd909cb9c0699b4d58c1db7c6252afd77ea" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 18 10:28:35 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 18 10:28:36 2012 -0700" }, "message": "Merge changes Ibe5c08d5,I559f1281,I6f0f44fa into jb-mr1-dev\n\n* changes:\n Camera2: Don\u0027t be bothered by lack of faces.\n Camera2: Filter out faces with 0 confidence.\n Camera2: Change face detect/scene mode priority.\n" }, { "commit": "1c2b8d98a98ac02296fbd34ae7015f8ba9baf3f2", "tree": "c08fb0ec9bfef7a8d7493196a6892e8f754d5d43", "parents": [ "c92bed3a73c06e90217f8f199ca0b517aa7595d2", "0856beda56855af2472f4eeddbb386ea3707007d" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Sep 18 06:59:35 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Sep 18 06:59:35 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "c5cd686a83c6ea65a68d98023d5527fe4373d4e4", "tree": "4496f4c659bea583a12268d59e59ed6d976979bd", "parents": [ "b845c6b0c3066d6791973be830f0953477461a65" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 17 09:02:23 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 17 18:49:09 2012 -0700" }, "message": "Fix THD with max user EQ preset volume again\n\nThere was a problem with previous fix in 1b6c677c where\nthe THD was good for max volume but bad for intermediate\nhigh volume values.\n\nThis fix does not limit the band gains but apply a correction\nto the effect bundle volume to take into account not only the\nmaximum band gain but also the average band gains weighted\nby the proximity of each band to the max gain band.\n\nChange-Id: Ibedd8da7fce1e163117f29b3da332da0e4fe8889\n" }, { "commit": "663c2cd909cb9c0699b4d58c1db7c6252afd77ea", "tree": "f08901217ae2e2ad5aa918752af2b5f621f7708d", "parents": [ "a9f8d040146533a9c214473fd79cbd9dff44428d" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 18:25:29 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 18:25:29 2012 -0700" }, "message": "Camera2: Don\u0027t be bothered by lack of faces.\n\nSometimes, people might want to photograph scenes with no faces. And\nnot have their log fill with errors when they do.\n\nBug: 7078231\nChange-Id: Ibe5c08d51b49a3ea14203416fe7803a58de08dda\n" }, { "commit": "a9f8d040146533a9c214473fd79cbd9dff44428d", "tree": "9c5acf57dc0f278ef24e37659cd56ecd08861af1", "parents": [ "d14de47262340d70fc11fe56159462b9b981067f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 18:07:20 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 18:07:20 2012 -0700" }, "message": "Camera2: Filter out faces with 0 confidence.\n\nBug: 7078231\nChange-Id: I559f1281359835e0489456091a5409ebc8f73479\n" }, { "commit": "d14de47262340d70fc11fe56159462b9b981067f", "tree": "08c50921257f3c5f016ccdaf9ce4ba011e551c5d", "parents": [ "874a4618b645ab5c1faaa738a871f52492f28de3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 16:43:14 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 16:46:25 2012 -0700" }, "message": "Camera2: Change face detect/scene mode priority.\n\nExplicit scene modes should override the implicit face priority scene\nmode from enabling face detection, to match application/API\nexpectations.\n\nChange-Id: I6f0f44fadeacfdc0594dd2fdc280e294d2d87df6\n" }, { "commit": "f6f87dd20c125762d8b13c0a829191e605dafbbf", "tree": "c08fb0ec9bfef7a8d7493196a6892e8f754d5d43", "parents": [ "c78aeb62257f305bd64353113095dcf1561b6cd2", "c92bed3a73c06e90217f8f199ca0b517aa7595d2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 17 15:29:22 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 15:29:22 2012 -0700" }, "message": "am c92bed3a: Now we only support a single client connection\n\n* commit \u0027c92bed3a73c06e90217f8f199ca0b517aa7595d2\u0027:\n Now we only support a single client connection\n" }, { "commit": "c92bed3a73c06e90217f8f199ca0b517aa7595d2", "tree": "c08fb0ec9bfef7a8d7493196a6892e8f754d5d43", "parents": [ "bd08e2f93bafd02abf2c25d740e9fb8bce455a99" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 17 15:07:30 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 17 15:11:38 2012 -0700" }, "message": "Now we only support a single client connection\n\nand it cannot be initiated from the local interface address for security\nreasons.\nAlso, there\u0027s at most one playback session active at any time, and when\nit dies we shutdown the client connection altogether and signal an error\nto the listener.\n\nrelated-to-bug: 7139784\nChange-Id: Ia8d02bc994ce9986936947ddda1f2a3dddbf5714\n" }, { "commit": "c78aeb62257f305bd64353113095dcf1561b6cd2", "tree": "08966c6303473879c7b02bc78d4ae6c19d24feb0", "parents": [ "9486e8cac69e0a9bfc20aee148c515f8237a6b3e", "bd08e2f93bafd02abf2c25d740e9fb8bce455a99" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 17 11:24:57 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 11:24:57 2012 -0700" }, "message": "am bd08e2f9: Support for RTP/RTCP traffic over TCP sockets in wifi display code.\n\n* commit \u0027bd08e2f93bafd02abf2c25d740e9fb8bce455a99\u0027:\n Support for RTP/RTCP traffic over TCP sockets in wifi display code.\n" }, { "commit": "bd08e2f93bafd02abf2c25d740e9fb8bce455a99", "tree": "08966c6303473879c7b02bc78d4ae6c19d24feb0", "parents": [ "874a4618b645ab5c1faaa738a871f52492f28de3" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Sep 13 11:25:33 2012 -0700" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Sep 17 09:35:25 2012 -0700" }, "message": "Support for RTP/RTCP traffic over TCP sockets in wifi display code.\n\nThis is opt-in through\n\nadb shell setprop media.wfd.enable-tcp true\n\nChange-Id: I49ab22a8c8d62690065631e781a7f0057e5ce557\n" }, { "commit": "9486e8cac69e0a9bfc20aee148c515f8237a6b3e", "tree": "486c6875f3ca1109438de8284140bf95480b01b6", "parents": [ "9568b4cdc8d2a7896e9c031f2b6cdf6f18210de1", "874a4618b645ab5c1faaa738a871f52492f28de3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 08:38:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 17 08:38:48 2012 -0700" }, "message": "am 874a4618: Merge \"Camera2: Don\\\u0027t play shutter sound when doing a video snapshot\" into jb-mr1-dev\n\n* commit \u0027874a4618b645ab5c1faaa738a871f52492f28de3\u0027:\n Camera2: Don\u0027t play shutter sound when doing a video snapshot\n" }, { "commit": "874a4618b645ab5c1faaa738a871f52492f28de3", "tree": "486c6875f3ca1109438de8284140bf95480b01b6", "parents": [ "376074ed1c3c368aeb336954a07632cd806288e2", "efb039e07c688c21122c938b008457bd4f555898" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 17 08:37:25 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 17 08:37:25 2012 -0700" }, "message": "Merge \"Camera2: Don\u0027t play shutter sound when doing a video snapshot\" into jb-mr1-dev" }, { "commit": "0856beda56855af2472f4eeddbb386ea3707007d", "tree": "0e3fed53f5ab460e1a65a18a8826af1deea0267f", "parents": [ "376074ed1c3c368aeb336954a07632cd806288e2", "aaf9de4181e1ada862deac1d82c68cbfd984ff76" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Sep 16 17:12:14 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Sun Sep 16 17:12:14 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "9568b4cdc8d2a7896e9c031f2b6cdf6f18210de1", "tree": "0e3fed53f5ab460e1a65a18a8826af1deea0267f", "parents": [ "92908745a52989339dc5b9ebf3d402607ea09b24", "376074ed1c3c368aeb336954a07632cd806288e2" ], "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": "efb039e07c688c21122c938b008457bd4f555898", "tree": "2bd9620e9e9b8be3e76e0cd2d6d67b495b6fe94a", "parents": [ "b845c6b0c3066d6791973be830f0953477461a65" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sat Sep 15 13:27:52 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sat Sep 15 13:27:52 2012 -0700" }, "message": "Camera2: Don\u0027t play shutter sound when doing a video snapshot\n\nBug: 7171820\nChange-Id: I11ec0900aff3cdf4b57ae1bfc75f7acfecf95098\n" }, { "commit": "376074ed1c3c368aeb336954a07632cd806288e2", "tree": "0e3fed53f5ab460e1a65a18a8826af1deea0267f", "parents": [ "b845c6b0c3066d6791973be830f0953477461a65" ], "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": "aaf9de4181e1ada862deac1d82c68cbfd984ff76", "tree": "293ddb2751ef25614f2395d722020299d1dd0ccd", "parents": [ "b845c6b0c3066d6791973be830f0953477461a65", "830ed8ba5f978b067a271407e2995110c9f728aa" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 14 14:10:20 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 14 14:10:20 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "92908745a52989339dc5b9ebf3d402607ea09b24", "tree": "293ddb2751ef25614f2395d722020299d1dd0ccd", "parents": [ "d31bdeca545a0da00c1f8d29fa47cb725c67c21f", "b845c6b0c3066d6791973be830f0953477461a65" ], "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": "b845c6b0c3066d6791973be830f0953477461a65", "tree": "293ddb2751ef25614f2395d722020299d1dd0ccd", "parents": [ "e44e90c82d75b806e89f751a61dc7e54d0144338", "beb1416afd1d331b8e7e93d626f39267acce289a" ], "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": "beb1416afd1d331b8e7e93d626f39267acce289a", "tree": "bffddba5ecc9040f07ae0a465cb7a1da5a31e6a8", "parents": [ "f54b1459cda7f585b4896671643b33bab8290964" ], "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": "d31bdeca545a0da00c1f8d29fa47cb725c67c21f", "tree": "1f1776783eb72604cdffe5eb1728de132433fa67", "parents": [ "40be070922721b285a9436ec49e5d438ba322133", "e44e90c82d75b806e89f751a61dc7e54d0144338" ], "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": "e44e90c82d75b806e89f751a61dc7e54d0144338", "tree": "1f1776783eb72604cdffe5eb1728de132433fa67", "parents": [ "dcd76da55f1f8a77dec07bb7e080ed3488f2ae83", "f54b1459cda7f585b4896671643b33bab8290964" ], "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": "40be070922721b285a9436ec49e5d438ba322133", "tree": "293ddb2751ef25614f2395d722020299d1dd0ccd", "parents": [ "fff97293d56ca9869004f89ce46c2b337d7f57e7", "dcd76da55f1f8a77dec07bb7e080ed3488f2ae83" ], "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": "f54b1459cda7f585b4896671643b33bab8290964", "tree": "d206c9004c9c179d779d4c84f3328ca6818d4bee", "parents": [ "8a3016613dc684a6be11fdf643f9cc5cad817e8f" ], "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": "fff97293d56ca9869004f89ce46c2b337d7f57e7", "tree": "daf3b2710f6d52e230f5b42d1ec7cc2df65d8750", "parents": [ "660b7ad3bee04640500e6af071182603f0b52000", "cb66d22f2e3727ca858bb578c1d18956da1a9c2b" ], "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": "dcd76da55f1f8a77dec07bb7e080ed3488f2ae83", "tree": "293ddb2751ef25614f2395d722020299d1dd0ccd", "parents": [ "cb66d22f2e3727ca858bb578c1d18956da1a9c2b", "08654f9d7157f6d6ca0928cb438bbbed53fb0fd1" ], "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": "cb66d22f2e3727ca858bb578c1d18956da1a9c2b", "tree": "daf3b2710f6d52e230f5b42d1ec7cc2df65d8750", "parents": [ "2637cb172105939052d8a02f4eea693a90549518", "8a3016613dc684a6be11fdf643f9cc5cad817e8f" ], "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": "08654f9d7157f6d6ca0928cb438bbbed53fb0fd1", "tree": "1f1776783eb72604cdffe5eb1728de132433fa67", "parents": [ "2637cb172105939052d8a02f4eea693a90549518" ], "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": "660b7ad3bee04640500e6af071182603f0b52000", "tree": "a95a7a5257094bd303e184a2ab35cb9add4b462f", "parents": [ "5b5ad707a1ada46906dd30efb4708487d66e7405", "2637cb172105939052d8a02f4eea693a90549518" ], "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": "2637cb172105939052d8a02f4eea693a90549518", "tree": "a95a7a5257094bd303e184a2ab35cb9add4b462f", "parents": [ "d8421c54dc00d637e41689004edcb06caaa40b62", "8fa80e3be63ffde5ef029afa713877440856b663" ], "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": "830ed8ba5f978b067a271407e2995110c9f728aa", "tree": "6d4e455bc9ae39fb17930b241fb54ad0a08ef2e2", "parents": [ "d8421c54dc00d637e41689004edcb06caaa40b62", "ae254b02c5c325f7a9a8d0310c6949b0bc594588" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 14 07:11:39 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Sep 14 07:11:39 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "5b5ad707a1ada46906dd30efb4708487d66e7405", "tree": "6d4e455bc9ae39fb17930b241fb54ad0a08ef2e2", "parents": [ "01dcf4de81ed0f9b6942dea2787463bf9c945a37", "d8421c54dc00d637e41689004edcb06caaa40b62" ], "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": "d8421c54dc00d637e41689004edcb06caaa40b62", "tree": "6d4e455bc9ae39fb17930b241fb54ad0a08ef2e2", "parents": [ "896adcd3ae6a1c7010e526327eff54e16179987b", "496238cc7551d414067dcbbb4fe3bd801f205f95" ], "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" } ], "next": "01dcf4de81ed0f9b6942dea2787463bf9c945a37" }