)]}' { "log": [ { "commit": "a476c9e2d59048928ce50d273a8b31e723fcc492", "tree": "1f2585355ee371fb495e5ff4be8c87765937b6f9", "parents": [ "30ae899f684e0ddc31576ed67bf5ef41eaffd01f", "a290191b7b9846ae5648e74bf8df8f496484cea3" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 13:15:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 13:15:44 2012 -0700" }, "message": "am a761686d: am 4c9aeb21: Merge \"Camera2: Fix Parameters#setZoom off by 1 validation error\" into jb-mr1-dev\n\n* commit \u0027a761686d14ff8abd704a4802ca6ea0b801a9a32d\u0027:\n Camera2: Fix Parameters#setZoom off by 1 validation error\n" }, { "commit": "07cc78fe7dee9a96cd33865de890d0890fe752d7", "tree": "46509c08c174610e98893ffa5a35e71b3fdf9354", "parents": [ "8ada0bf772354a1d31361d3b4f49efd36d8a6e6e", "cfdd84284394cecdb33cf121fe6d4205da84c761" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 13:10:48 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 13:10:49 2012 -0700" }, "message": "Merge \"Camera2: Fix Parameters#setZoom off by 1 validation error\" into jb-mr1-dev" }, { "commit": "30ae899f684e0ddc31576ed67bf5ef41eaffd01f", "tree": "f6d427cfdd14e1e08d65f9c570acfd895a4fafe8", "parents": [ "00614a72a47a0a34ad0c6f17d9442332b431ae77", "8aad5495823d489401df8b8b6f4d32aad683f16f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 12:23:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 12:23:34 2012 -0700" }, "message": "am c7ee4fda: am b8f0090a: Merge \"Camera2: On stopping preview, wait until captures are completed.\" into jb-mr1-dev\n\n* commit \u0027c7ee4fda96539815e877cf035c9984f6009c4875\u0027:\n Camera2: On stopping preview, wait until captures are completed.\n" }, { "commit": "8ada0bf772354a1d31361d3b4f49efd36d8a6e6e", "tree": "8a22116a9416e1f38aa779ce0f6fc0132b8ed1d2", "parents": [ "193c13fa1615ad5130b6d75dc05e50468e1c585c", "e049384cdd0f728c45955d65cae754c46aac18cf" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 08 12:17:36 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 12:17:37 2012 -0700" }, "message": "Merge \"Camera2: On stopping preview, wait until captures are completed.\" into jb-mr1-dev" }, { "commit": "cfdd84284394cecdb33cf121fe6d4205da84c761", "tree": "38eae54ffb921348fd9ee68cadef1fd1ccf52165", "parents": [ "193c13fa1615ad5130b6d75dc05e50468e1c585c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 11:16:03 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 11:22:37 2012 -0700" }, "message": "Camera2: Fix Parameters#setZoom off by 1 validation error\n\nBug: 7298683\nChange-Id: If79ac6396379593eb852f041ca7d5a20ad2f9e6d\n" }, { "commit": "00614a72a47a0a34ad0c6f17d9442332b431ae77", "tree": "1eea3b6ddcdad79ad2d4a39aa412511c588fe178", "parents": [ "9c54cca8444bd00bba5173815d3029d45f244960", "ceea0c8dd91e889b5e4b7d852ce0330e435c9981" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 10:57:20 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 08 10:57:20 2012 -0700" }, "message": "am 97f00a6b: am e18c1cce: Merge \"Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\" into jb-mr1-dev\n\n* commit \u002797f00a6b6cde4837e0ab3751d7cfd2921c11f9b4\u0027:\n Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\n" }, { "commit": "193c13fa1615ad5130b6d75dc05e50468e1c585c", "tree": "2ad4f1423aef8c1f145e2ff8066237186d3a5cd1", "parents": [ "2b5232dd49d006a08c35ba865a6801acdb15483c", "572bf9a00204ac91de8c5347d793891c6a4bf1d7" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Oct 08 10:23:06 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Oct 08 10:23:07 2012 -0700" }, "message": "Merge \"Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\" into jb-mr1-dev" }, { "commit": "9c54cca8444bd00bba5173815d3029d45f244960", "tree": "40308d772774197953c694c0768ba0df517a4c94", "parents": [ "5b9c992c7128bf857e82d42ac8027285ad86b1e0", "577e9cbdc02ae2daa84a608ea2d92a55754dfd99" ], "author": { "name": "ty.lee", "email": "ty.lee@lge.com", "time": "Sun Oct 07 23:43:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 07 23:43:45 2012 -0700" }, "message": "am 6f45866e: am c8823995: audioflinger/resampler: add build source for libaudio-resampler\n\n* commit \u00276f45866e8a942b2a8a21c75708a717b0c8a8f120\u0027:\n audioflinger/resampler: add build source for libaudio-resampler\n" }, { "commit": "e049384cdd0f728c45955d65cae754c46aac18cf", "tree": "f88834b61cb119a10285a5324e772ccf6fca7f58", "parents": [ "2b5232dd49d006a08c35ba865a6801acdb15483c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 12:03:10 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sun Oct 07 22:06:15 2012 -0700" }, "message": "Camera2: On stopping preview, wait until captures are completed.\n\nIf preview is stopped while a still capture or a video snapshot is\nunderway, wait until the capture completes before stopping preview.\n\nAlso use the same behavior for disconnect - do not shut down the\ncamera device until captures are complete.\n\nThis works around HAL implementations which report to be done\n(get_in_progress_count returns 0) even when a capture is still\noutstanding.\n\nBug: 7276954\n\nChange-Id: I66290acf1740cc330eadecbcded0c59fa9c5d2fd\n" }, { "commit": "2b5232dd49d006a08c35ba865a6801acdb15483c", "tree": "24ad1d26999191a5502627a2b9737c013a39a85d", "parents": [ "3d33019b95439ba8cc062633168ec8fe51ef6ad4" ], "author": { "name": "ty.lee", "email": "ty.lee@lge.com", "time": "Mon Oct 01 13:54:14 2012 +0900" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Sun Oct 07 12:05:27 2012 -0700" }, "message": "audioflinger/resampler: add build source for libaudio-resampler\n\nBug: 7229644\nChange-Id: I93bde36be1c3ec84174a4c98423e28f8b3d8782f\nSigned-off-by: ty.lee \u003cty.lee@lge.com\u003e\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "5b9c992c7128bf857e82d42ac8027285ad86b1e0", "tree": "b91c3b361865033e3d471860ac5374304c059515", "parents": [ "056a76e1b9275833ec8134a5ff56a4489e86d952", "196438b3ad32da3607517f7dc1650ff8c017cc81" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sun Oct 07 09:10:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Oct 07 09:10:36 2012 -0700" }, "message": "am 3576742a: am 4d410ede: Camera2: Fix off-by-one error in ZSL selection.\n\n* commit \u00273576742a2bb3dc10bf8256579d600d85f17c3835\u0027:\n Camera2: Fix off-by-one error in ZSL selection.\n" }, { "commit": "3d33019b95439ba8cc062633168ec8fe51ef6ad4", "tree": "a1d40db6aa60ba5adbf280e23f655f0b39d50536", "parents": [ "3dcdc3d056c8756d690a6fa719d50aae2e4299d4" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sat Oct 06 13:50:31 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Sat Oct 06 13:50:31 2012 -0700" }, "message": "Camera2: Fix off-by-one error in ZSL selection.\n\nBug: 7258126\nChange-Id: Ie6da4645c46a7bb0dbd11d7c6183e904f41f74fd\n" }, { "commit": "056a76e1b9275833ec8134a5ff56a4489e86d952", "tree": "65a5a175ca1cb339f38c2dccc592fecd3697e994", "parents": [ "649254536988be71fd77e7b98782d7d26843344f", "6c8d48e913812f61125094e4bc71c26e5e833779" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 21:50:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 21:50:38 2012 -0700" }, "message": "am 4d85afad: am f6e09d20: Camera2: Unconditionally shut down streams on disconnect.\n\n* commit \u00274d85afad335ded1019ec7697b9f37241a839efa1\u0027:\n Camera2: Unconditionally shut down streams on disconnect.\n" }, { "commit": "572bf9a00204ac91de8c5347d793891c6a4bf1d7", "tree": "0b7c23325fb97da27961cdad3ece9c0b0362688f", "parents": [ "3a6e45320685b36bb266bbf8fa548f4474d90d6c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 17:09:09 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 17:09:09 2012 -0700" }, "message": "Camera2: Report getMaxNumFocusAreas 0 for fixed focus cameras\n\nBug: 7298805\nChange-Id: I7499b80a9416bf454c8ea80c31ea4fdd3c4ee2d7\n" }, { "commit": "3dcdc3d056c8756d690a6fa719d50aae2e4299d4", "tree": "c124bb15eb655f8e4479bd68c4b3d5e4e0dd457e", "parents": [ "3a6e45320685b36bb266bbf8fa548f4474d90d6c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 17:01:25 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 05 16:14:48 2012 -0700" }, "message": "Camera2: Unconditionally shut down streams on disconnect.\n\nstopPreviewL may do nothing in certain states. Stop streams directly\nto avoid those failures, so that we always maintain the HAL interface\ninvariant that streams referenced by in-flight requests are never\ndeleted.\n\nBug: 7276954\nChange-Id: Ic4cffc43036f4944684d941981a43d6dd1dce7af\n" }, { "commit": "649254536988be71fd77e7b98782d7d26843344f", "tree": "b111baeb1fecbde30e94ac9a01772f70d40e42f5", "parents": [ "970fb1e0b4eb08ae825047b9b2100e7db9341b4f", "b589f3489c195aabab3a9fbf7eccafc1c6db74c3" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 13:56:41 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 13:56:41 2012 -0700" }, "message": "am de434d89: am 7373cbe8: Camera2: Fix metering regions to take into account the current zoom/crop region\n\n* commit \u0027de434d8969bd02ffd7cdfdd39577dd59f6a71e9d\u0027:\n Camera2: Fix metering regions to take into account the current zoom/crop region\n" }, { "commit": "3a6e45320685b36bb266bbf8fa548f4474d90d6c", "tree": "cb47eafd11367f2b71c12c841ad715b7c4333e37", "parents": [ "63dc19921f2770f07bf976bb7573a1133d6548f9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Sep 28 15:30:03 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 13:32:07 2012 -0700" }, "message": "Camera2: Fix metering regions to take into account the current zoom/crop region\n\nAlso adds a quirk to disable this fix to work around for incompliant HALs\n\nBug: 7246065\nChange-Id: I80bad25e56ba59149270238e5639bb33cae495ae\n" }, { "commit": "970fb1e0b4eb08ae825047b9b2100e7db9341b4f", "tree": "6fb5833b9c525ab433081e323106fc198618f31a", "parents": [ "ccd9808cec4b17ee37be0173e35fbc3d9caf2718", "4db789cf989719eacf46b13f38cf5fb0524e16f8" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 12:17:02 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 12:17:02 2012 -0700" }, "message": "am 9be4d65d: am af3d2887: Camera2: Change policy for calculating previewFpsRange from previewFps\n\n* commit \u00279be4d65d73bb8db98bf1f53e8c47ff3e3546a144\u0027:\n Camera2: Change policy for calculating previewFpsRange from previewFps\n" }, { "commit": "63dc19921f2770f07bf976bb7573a1133d6548f9", "tree": "741bd2c00e3eabbe058bcddfa4c6f5ee0d5ddbb5", "parents": [ "0feea710e236ad90eea73110414ea5d3555fcdfd" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Oct 04 14:22:18 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 05 12:05:07 2012 -0700" }, "message": "Camera2: Change policy for calculating previewFpsRange from previewFps\n\nBug: 7259959\nChange-Id: I759a559d7115201264f88db1f23edc2d6aef6c43\n" }, { "commit": "ccd9808cec4b17ee37be0173e35fbc3d9caf2718", "tree": "de73321fc74d9aaf9a6b6e04ffdc93369c82fd96", "parents": [ "cc1abea590b8d3f9b9707b3442aea02cd2b4fcef", "2c6f6509e18426290b9476a0d85f673ceeab8c1a" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 11:42:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 11:42:44 2012 -0700" }, "message": "am 7ca6460d: am becb0bc4: Merge \"Camera2: Don\\\u0027t promote weak IBinder ptrs to strong ones\" into jb-mr1-dev\n\n* commit \u00277ca6460d06144d76460c8d43128bd338839d9501\u0027:\n Camera2: Don\u0027t promote weak IBinder ptrs to strong ones\n" }, { "commit": "0feea710e236ad90eea73110414ea5d3555fcdfd", "tree": "f1397774f933b76d22e937497c9bdf09b42d515e", "parents": [ "4c843702c7c2d2ca951e25bc54787c68c2071a8b", "507994d0312f89127562a1401f118439f810e751" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 11:35:53 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Oct 05 11:35:54 2012 -0700" }, "message": "Merge \"Camera2: Don\u0027t promote weak IBinder ptrs to strong ones\" into jb-mr1-dev" }, { "commit": "cc1abea590b8d3f9b9707b3442aea02cd2b4fcef", "tree": "5b5346eed27b3a188ba118f076edd8ecd779b071", "parents": [ "3b716883db5fb5e2cae20ad4c3f1c6ff445a7371", "ee5293f8dc1d438873fdefa19d3842e2889f1029" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 11:24:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 11:24:09 2012 -0700" }, "message": "am e5f4024b: am 95069fef: Camera2: Use the triggerAfWithAuto quirk\n\n* commit \u0027e5f4024bad9875e96cefbe3fe81172d166d52154\u0027:\n Camera2: Use the triggerAfWithAuto quirk\n" }, { "commit": "3b716883db5fb5e2cae20ad4c3f1c6ff445a7371", "tree": "c3046d8658db86f585350e017d53aab30009446b", "parents": [ "8db937f2ed3b6336f61404150307030020a272fe", "7bdb77b2d886630f606a373fa6e1f1b10b4a6169" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Oct 05 11:24:08 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 05 11:24:08 2012 -0700" }, "message": "am 577ac8a7: am 4865c526: Camera2: Synchronize mode changes and triggers\n\n* commit \u0027577ac8a74e8af7fcc7bc714874b8da21f57989b5\u0027:\n Camera2: Synchronize mode changes and triggers\n" }, { "commit": "507994d0312f89127562a1401f118439f810e751", "tree": "4edcc4b9233439a909714e077763c3e5b6866731", "parents": [ "1daada32f8eefd8951541ba243969b341deaaba5" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 10:44:57 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Oct 05 10:44:57 2012 -0700" }, "message": "Camera2: Don\u0027t promote weak IBinder ptrs to strong ones\n\nThe Binder driver does not support promoting weak pointers into strong\npointers. Occassionally the system would lock up when trying to do this\n(when closing the camera app).\n\nBug: 7289040\nChange-Id: I8bc0b5c48616bf0b7f4eed1878ad4994ee635871\n" }, { "commit": "4bfc4a67d4f7d5a9b6cbe5a39d4b599e8ceb505b", "tree": "4fb36e836895f3f42b3608a7050da63cd65ed96f", "parents": [ "b6c9eeb6baef17366d54a7bb6cd024d80a85e690", "61ebd5e3e28372e497a5bcf7cc8212007d38e5a6" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 16:35:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 04 16:35:51 2012 -0700" }, "message": "am e68eb9b8: am 9942f62d: Merge \"Camera2: Include JPEG settings in ZSL requests.\" into jb-mr1-dev\n\n* commit \u0027e68eb9b82d0371324add708e2b2eb45a99ddbd70\u0027:\n Camera2: Include JPEG settings in ZSL requests.\n" }, { "commit": "4c843702c7c2d2ca951e25bc54787c68c2071a8b", "tree": "1aa06e8b460e2cba635e5da7760101dc64d5338d", "parents": [ "4c9eb718352697cd75269752344c0bcc6b05e708" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 00:56:40 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 16:34:11 2012 -0700" }, "message": "Camera2: Use the triggerAfWithAuto quirk\n\nWhen this quirk is set, and a scene mode is enabled, do AF calls with\nAF mode AUTO instead of whatever the scene more override AF mode is.\n\nBug: 7159577\nChange-Id: I3ea6b8386abc0968047fc9bba3a35c5db5bdcfd3\n" }, { "commit": "4c9eb718352697cd75269752344c0bcc6b05e708", "tree": "fdc28a651a64b53e4cc14e3543347a2e64a80f38", "parents": [ "1daada32f8eefd8951541ba243969b341deaaba5" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 13:30:28 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 16:31:05 2012 -0700" }, "message": "Camera2: Synchronize mode changes and triggers\n\nMake sure that changes to various parameters have reached the HAL\nbefore triggering asynchronous events like autofocus or precapture\nmetering.\n\nBug: 7107220\nChange-Id: I3c50038de1671968eb32004ce538435121934e7e\n" }, { "commit": "1daada32f8eefd8951541ba243969b341deaaba5", "tree": "38aabd506f2c732e9d863c8bebc98b6bab51c6f6", "parents": [ "6ec0f94d606d57db57c8866b0e38ec96f1979413", "db30e68be637ca85da238c1e8e3534ec07919985" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 16:30:46 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 16:30:47 2012 -0700" }, "message": "Merge \"Camera2: Include JPEG settings in ZSL requests.\" into jb-mr1-dev" }, { "commit": "db30e68be637ca85da238c1e8e3534ec07919985", "tree": "3f617891c1325d20ed708aff9fad7aac892c64c7", "parents": [ "5e8e66f369fd2f1918495380ed1886e50818e95e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 13:21:08 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Oct 04 14:06:41 2012 -0700" }, "message": "Camera2: Include JPEG settings in ZSL requests.\n\nBug: 7287743\nChange-Id: I1aba81b228451c3df712ce1f42b7aab79cac575f\n" }, { "commit": "ea967355de0b985c8111abd57a23f566fe355260", "tree": "f1ee479e635cc32949f88728e9a3391bb65e88ff", "parents": [ "08102ee8425e39282893c2e84d2914e867124310", "3dde1669eaa212c4da725e9d2fe899452d022760" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 04 12:05:44 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 04 12:05:44 2012 -0700" }, "message": "resolved conflicts for merge of f12b1c81 to master\n\nChange-Id: I914a11706bd01a198e2137e0c12af0fc92ffa02b\n" }, { "commit": "ef7fdc2224eb2e8a2b220ef51b5dc3ce25b807ba", "tree": "b2df11565c73aea22de56096f199f996b56a333e", "parents": [ "5e8e66f369fd2f1918495380ed1886e50818e95e", "a6d41334d25ffde12484eb28301352560a063ef6" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 04 11:16:36 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 11:16:36 2012 -0700" }, "message": "Merge \"Integrate improved coefficient sinc resampler: VHQ\" into jb-mr1-dev" }, { "commit": "08102ee8425e39282893c2e84d2914e867124310", "tree": "bc1de52ecfe02e9ead371433348af2c760b0087a", "parents": [ "9f9d1efd436dd6fe4bb1a34e7cecc9292bd43697", "557f7dc7c73f187e1ba4b2bee605b8c368cc4a64" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Oct 04 10:02:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 04 10:02:40 2012 -0700" }, "message": "am d6e8c5b1: am f66cc52c: Merge \"Camera2: Fix deadlock while zooming during record\" into jb-mr1-dev\n\n* commit \u0027d6e8c5b187225c55a279bc40f262fe137f2ef508\u0027:\n Camera2: Fix deadlock while zooming during record\n" }, { "commit": "5e8e66f369fd2f1918495380ed1886e50818e95e", "tree": "2981393cca96745a0028c5cb519820333d9885c6", "parents": [ "95f24dacbde69295fd21bbf683281b277e097bb1", "05dd06eb54a4e15352405a3a5cedce6a7940b96b" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Oct 04 09:56:44 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Oct 04 09:56:44 2012 -0700" }, "message": "Merge \"Camera2: Fix deadlock while zooming during record\" into jb-mr1-dev" }, { "commit": "a6d41334d25ffde12484eb28301352560a063ef6", "tree": "4d8df3822f93824ada324d5038ab0b4cd27ce77b", "parents": [ "95f24dacbde69295fd21bbf683281b277e097bb1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Oct 01 14:04:31 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 04 09:44:04 2012 -0700" }, "message": "Integrate improved coefficient sinc resampler: VHQ\n\nSummary:\nVery high quality is enabled only for 44.1 -\u003e 48 or 48 -\u003e 44.1,\n and uses low quality for all other use cases.\nTrack estimated CPU load and throttles the quality based on load;\n as currently configured it should allow up to 2 instances of very high quality.\nMedium quality and high quality are currently disabled unless explicitly requested.\n\nDetails:\nOnly load .so the first time it is needed.\nCleanup code style: formatting, indentation, whitespace.\nRestore medium quality resampler, but it is not used (see next line).\nFix memory leak for sinc resampler.\nCheck sample rate in resampler constructor.\nAdd logs for debugging.\nRename DEFAULT to DEFAULT_QUALITY for consistency with other quality levels.\nRenumber VERY_HIGH_QUALITY from 255 to 4.\nUse enum src_quality consistently.\nImprove parsing of property af.resampler.quality.\nFix reentrancy bug - allow an instance of high quality and an instance\n of very high quality to both be active concurrently.\n\nBug: 7229644\nChange-Id: I0ce6b913b05038889f50462a38830b61a602a9f7\n" }, { "commit": "05dd06eb54a4e15352405a3a5cedce6a7940b96b", "tree": "0dd9ab6857e0084f875cee411e06b40f956c96a1", "parents": [ "311f69f18c41909e3087e4205548095762a2ecb7" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 16:02:09 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 16:48:48 2012 -0700" }, "message": "Camera2: Fix deadlock while zooming during record\n\nAcquired SharedParameters before mMutex in StreamingProcessor,\nthis avoids any potential deadlocks since Camera2Client code would\nalways acquire SharedParameters first before invoking StreamingProcessor.\n\nBug: 7275259\nChange-Id: Ia741162c455300378bee049f063590ece5328b95\n" }, { "commit": "f3c7f03eaefc2a89ce28b5ee1abf4056643546e8", "tree": "407c73da7372199c6bf4c7c1be0dac064348a8c6", "parents": [ "acd69364cac252c9ec0c4aaa48ad8e8f01d11662", "d83c791239fba8780d4593528f50d21cb50eba7e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 15:25:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 15:25:45 2012 -0700" }, "message": "am a9438d09: am ce953ce4: Merge \"Camera2: Properly update FPS range when FPS is set.\" into jb-mr1-dev\n\n* commit \u0027a9438d09fb44f6c95a558accd05711600cc4b2bf\u0027:\n Camera2: Properly update FPS range when FPS is set.\n" }, { "commit": "b2e7a84664f3dcca774c754092ed8f390295ab15", "tree": "690f5a07f4cc4150a541d7f33907a8b41f473aab", "parents": [ "311f69f18c41909e3087e4205548095762a2ecb7", "02b62d3672ebb0761752ba6c841b2cc469c59ed3" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 15:20:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 03 15:20:38 2012 -0700" }, "message": "Merge \"Camera2: Properly update FPS range when FPS is set.\" into jb-mr1-dev" }, { "commit": "02b62d3672ebb0761752ba6c841b2cc469c59ed3", "tree": "a87f8ed2ba3b62e1ebef2f28b641febfaf933622", "parents": [ "a1e5dccf73c0b734204b0094241e4a6a0752a67e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 14:59:29 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 14:59:29 2012 -0700" }, "message": "Camera2: Properly update FPS range when FPS is set.\n\nOtherwise a getParameters followed by setParameters will trigger an\nincorrect reversion in FPS parameters.\n\nBug: 7279267\nChange-Id: I7426860f05497dbdf4245c34cef1b38f2f5a1832\n" }, { "commit": "acd69364cac252c9ec0c4aaa48ad8e8f01d11662", "tree": "20b38dbe833dc083454c600542a3e7d6ca916bf6", "parents": [ "744c170d80ffa6a6b20c78daa2c312b6773539b5", "f20b1f3d7a056c590da8e8bf43a18ab589bb8d4b" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Wed Oct 03 14:34:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 14:34:25 2012 -0700" }, "message": "am b08633fc: am c2063056: Camera2: Fix prematurely clearing stream request\n\n* commit \u0027b08633fc95947173ba3f68627728a8c5f12ef72f\u0027:\n Camera2: Fix prematurely clearing stream request\n" }, { "commit": "744c170d80ffa6a6b20c78daa2c312b6773539b5", "tree": "980f83967ca252509aafe7062f8587ed45297894", "parents": [ "cce7ab7a04880b0a9c7a03097775a22999f37160", "6dfef0b6a220ed2b1f0bd65e87eb806b696bd884" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 14:04:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 14:04:47 2012 -0700" }, "message": "am 7fd4e2a8: am b3e97b34: Camera2: Fix trying to release HAL stream twice\n\n* commit \u00277fd4e2a8f4d57d20e679e5321f34cc09245d82a1\u0027:\n Camera2: Fix trying to release HAL stream twice\n" }, { "commit": "311f69f18c41909e3087e4205548095762a2ecb7", "tree": "107f74f86852a9680da654ed02bc968d54fa5522", "parents": [ "a1e5dccf73c0b734204b0094241e4a6a0752a67e" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Tue Oct 02 23:30:07 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 03 13:58:19 2012 -0700" }, "message": "Camera2: Fix prematurely clearing stream request\n\nZsl handling was clearing the stream request before a capture request\nwas ready to be sent to the HAL, which would cause capture delays and\ntimeouts in certain conditions.\n\nBug: 7259520\nChange-Id: Idde8bc4fc58b8b426c6985feac87759740e338ea\n" }, { "commit": "cce7ab7a04880b0a9c7a03097775a22999f37160", "tree": "6e3a9724eb3efccc73a6ce7199165f1086741828", "parents": [ "b34304a14dc89944f6dc7ee41cf1381d656f1c75", "b96540c42dff4193665cdf4abc5f8e9d635e9180" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 12:00:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 12:00:44 2012 -0700" }, "message": "am 5f49d702: am ecf17e82: Camera2: Handle client processes dying by closing camera resources\n\n* commit \u00275f49d702fe25fe3a6752be438db6bf006840e41f\u0027:\n Camera2: Handle client processes dying by closing camera resources\n" }, { "commit": "a1e5dccf73c0b734204b0094241e4a6a0752a67e", "tree": "94f5f98a460f6aa156447c64d2f16e289c74e793", "parents": [ "8dcdb9553defafa1166c64b496e1ee390e4eadfa" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 02 15:21:31 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 03 11:40:46 2012 -0700" }, "message": "Camera2: Fix trying to release HAL stream twice\n\nWhen we fail to disconnect the native window, StreamAdapter::release\nwould fail and remain in the old (ALLOCATED) state, thus it thinks that\nwe haven\u0027t released the HAL stream yet.\n\nWith this change, ignore DEAD_OBJECT native window disconnect failures,\nso the state transitions to RELEASED and we don\u0027t double release HAL\nstreams.\n\nBug: 7258314\nChange-Id: I524893e4b4d6463d7b0a7ce32fb6f658afba8e11\n" }, { "commit": "b34304a14dc89944f6dc7ee41cf1381d656f1c75", "tree": "79c223099d758ae556128a65fef85ca41b4a0d46", "parents": [ "17d2941401cac57ef551e579687a30d518afc3c4", "039a6da866ecaccb983bd3fd0121198ed75988f2" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Oct 03 11:40:39 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 11:40:39 2012 -0700" }, "message": "am ad93604d: am 22d58d37: Camera2: Don\\\u0027t change state when reconnect is called\n\n* commit \u0027ad93604d802c7f726f3bdb83ed14412b26a5c809\u0027:\n Camera2: Don\u0027t change state when reconnect is called\n" }, { "commit": "8dcdb9553defafa1166c64b496e1ee390e4eadfa", "tree": "4aa76e6945e95aac4538a1b49475efc932fb114c", "parents": [ "0cb290b2304ef582a5afa9a45a4594944e89156e" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 02 16:05:11 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 03 11:39:08 2012 -0700" }, "message": "Camera2: Handle client processes dying by closing camera resources\n\nCameraService now subscribes to binder death notifications\nfor each client, and disconnects the client if the death happened\nwithout cleanly shutting down the client first.\n\nBug: 7258314\nChange-Id: I7803836b589fd8f0dfe00f6c28a707b82012e751\n" }, { "commit": "0cb290b2304ef582a5afa9a45a4594944e89156e", "tree": "d113224080a9a8c44150bbda2002750f7fd1edde", "parents": [ "ab2918efe97fd08d44ee85e9c59f4099cca3e7dd" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Oct 02 19:07:14 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 03 11:28:40 2012 -0700" }, "message": "Camera2: Don\u0027t change state when reconnect is called\n\nBug: 7252802\nChange-Id: Ibed4f59a96bef75bf84b1aaf1235fb87e94102ef\n" }, { "commit": "94f21649c0505bfecdb673fd407ef3ad8478440b", "tree": "8a5cd529898cd3bc5fe1fc9c9d7883cae7460bc5", "parents": [ "2d6ba111cd53722357608226dbaa4446ac988fa1", "c96da326a598093e02e29a8b279e831a29ef4f32" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Oct 03 10:58:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Oct 03 10:58:49 2012 -0700" }, "message": "am db6ead4f: am 1bac8972: Merge \"Camera2: Use ZSL format quirk.\" into jb-mr1-dev\n\n* commit \u0027db6ead4fd0d8bbe3df6ede6727927830727cfa30\u0027:\n Camera2: Use ZSL format quirk.\n" }, { "commit": "596cb97dff006229f10db8bd7306f4d228f96dfd", "tree": "a867402bb629e58587213ca3c4d288bb9aa0d299", "parents": [ "c85f826e7b67bdf159a3f1b01bc9f1f33d05aaff" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 18:14:49 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 18:47:07 2012 -0700" }, "message": "Camera2: Use ZSL format quirk.\n\nSwitch service to using HAL_PIXEL_FORMAT_IMPLEMENTATION_DEFINED,\nunless ZSL quirk is set.\n\nThis is important for compatibility across multiple implementations.\n\nBug: 6243944\nChange-Id: Iea74671cbb44890a07e4f99cd757b0a5423d447a\n" }, { "commit": "f93992e4b0dce1755ef4d2571b0930ef3a1107f0", "tree": "ee8f63ebf9000acbad626c8d336fc73b60a58411", "parents": [ "f94abc50fb0bed3cac3b9e6ce2b35dff1cf14045", "2cde1722cdda85b38ca95badbb2e2700dacd3be6" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 18:04:23 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 18:04:23 2012 -0700" }, "message": "resolved conflicts for merge of 9bf263b2 to master\n\nChange-Id: I28da6f16a1d044864c81d5f1dcf6543169c09460\n" }, { "commit": "c85f826e7b67bdf159a3f1b01bc9f1f33d05aaff", "tree": "f0cf42050d9745e077a1020f2ccd538fa4bb03de", "parents": [ "b6e88c841f3e76d3fbc206c6fff0edac8cafb363" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 13:30:04 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Oct 02 14:55:35 2012 -0700" }, "message": "Camera2: Use scene mode override parameter\n\n- Read in SCENE_MODE_OVERRIDES static parameter if available.\n Use it to select AF/AE/AWB modes when a scene mode is set.\n- Add quirks structure to parameters; not yet used\n- Fix desynchronization between range and single FPS value.\n Still need to sort out best way to convert from one to another.\n\nBug: 7259959\nBug: 7159577\nBug: 7172543\n\nChange-Id: I0d07c31d5f21fbc4b0ec2fa23f7f778073d2d6e0\n" }, { "commit": "c704ce6c0101f4933587fb2799618fb55e80f69a", "tree": "5a4a741b2f6913cf3bef7dd7742d270e1c18d8bd", "parents": [ "1103c305367d0c2494ae2f5ecb122871a8ef0cac", "6dff81c4bc955ca12cfe8c8a115ebbde359bc5eb" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Oct 01 11:15:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 01 11:15:51 2012 -0700" }, "message": "am 14bab416: am 087dd8e7: Disable audio watchdog\n\n* commit \u002714bab41620ed8e667c79242e5ad0f4bd84264758\u0027:\n Disable audio watchdog\n" }, { "commit": "0033ac1b0c2258077ad60792b5c60807b359fd0e", "tree": "6eecde7f75480730b1582c9eb04ea77a858452dd", "parents": [ "f8e2c9821075156651254661a7ccbe5faeec45d4", "fdcd4f6c2086fc66e325808707cd85810a91ea4f" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Oct 01 11:15:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 01 11:15:50 2012 -0700" }, "message": "am 7fff6091: am 7165491b: Merge \"bug 7253033 clean up before closing an output\" into jb-mr1-dev\n\n* commit \u00277fff6091174451170912099954725c8109f4c559\u0027:\n bug 7253033 clean up before closing an output\n" }, { "commit": "63c2a38a3c0be207306073c9196ab76cd9df4b2a", "tree": "87d2fdf3b25b9c026cac925869c023cd51d482d0", "parents": [ "7a687ad245b2ec2d4232a21e358fa097c6fc94a4", "55b32791d7467017518b949734e21619459e5e56" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Oct 01 11:15:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Oct 01 11:15:48 2012 -0700" }, "message": "am 700a4cdc: am 73bbd1f1: Camera2: Refactor preview/recording management to separate class.\n\n* commit \u0027700a4cdc50b07dc75bb8103e55cc227b6cfa1fc7\u0027:\n Camera2: Refactor preview/recording management to separate class.\n" }, { "commit": "02e5dbb025bf164f0b273f01a114ddc497798823", "tree": "b300f58fd59db71f26aba84f6d8603bdc965b868", "parents": [ "6756203ec80f7640f743d8cc9d8799302d9513b6" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Sep 27 13:49:02 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Sun Sep 30 13:13:11 2012 -0700" }, "message": "Disable audio watchdog\n\nIt\u0027s not critical, and is wasting power\n\nBug: 7241714\nChange-Id: I6ad4375f0000c92529688723dbe0ff0caa809c5d\n" }, { "commit": "b82cf1e21d2bd3792382c6ed0f19b10cb0e8f482", "tree": "6cfe1f518fea615c4332fcb7ba02805e53e0bac2", "parents": [ "b5c8c18649ed651dcddbda0b160bc5decc250d26", "2fa114de80a5f6afd2055054a163c6d7e2ef71bc" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Sun Sep 30 11:57:35 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Sep 30 11:57:36 2012 -0700" }, "message": "Merge \"bug 7253033 clean up before closing an output\" into jb-mr1-dev" }, { "commit": "2fa114de80a5f6afd2055054a163c6d7e2ef71bc", "tree": "d899700feaafc73126d80a4e0c7f9dab75d6c2c8", "parents": [ "9bb6e65def86afb36a03643c50456e646cdf98a8" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Sep 28 14:49:39 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Sun Sep 30 11:11:26 2012 -0700" }, "message": "bug 7253033 clean up before closing an output\n\nAn output can only be closed if there is no lock contention that\n prevents ThreadBase::exit() from being blocked. If an output\n device is waiting for an operation to complete (here a write\n in the remote_submix module, because the pipe is full), signal\n the module that it\u0027s entering the \"exiting\" state.\n\nChange-Id: I8248add60da543e90c25a4c809866cdb26255651\n" }, { "commit": "43cbdc5b5545d3344c556014b9afe8249add91e4", "tree": "4e1b7524d0e46944703c63fa2d739ffd711b92cf", "parents": [ "2e63d52ea03e0a9d098759cf4689691809f44ceb" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Sep 26 10:45:47 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 28 17:56:48 2012 -0700" }, "message": "Camera2: Refactor preview/recording management to separate class.\n\nUntangle preview/recording management from main class to simplify\ncallpaths; in preparation for fixing several HAL/app interactions\nbugs.\n\nBug: 7172543\nBug: 7159577\nBug: 7107220\nChange-Id: Iab5503f66b35d88a1524111536a484c9e33fd934\n" }, { "commit": "2e63d52ea03e0a9d098759cf4689691809f44ceb", "tree": "ff8d85da78be3fa61de5753d697e0377a218565f", "parents": [ "d1805ebb0ff7694441fd95b5801fbce222849b6f" ], "author": { "name": "James Painter", "email": "jpainter@google.com", "time": "Fri Sep 28 00:09:12 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 28 17:26:55 2012 -0700" }, "message": "DO NOT MERGE: Remove experimental parameters for burst mode\n\nBug: 7248756\nChange-Id: I3aaf2da4791b2a13e1e788b2914e4c51c529a75d\n" }, { "commit": "f7bdda5e5dad9ebfa6b3277f257041c83f70aeb9", "tree": "e871b573b2b811f07025e7dfcefcce357550c2f4", "parents": [ "081a56cb3a970c8189bb39d16be4a991dbf32563", "c018d7dde402b29481777dded782b31917f07730" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Fri Sep 28 13:17:03 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 28 13:17:03 2012 -0700" }, "message": "am 927a8010: am 23f74017: Merge \"Camera2: Use new JPEG transport header\" into jb-mr1-dev\n\n* commit \u0027927a801071f2e89868c69b05a300bba74ac5d674\u0027:\n Camera2: Use new JPEG transport header\n" }, { "commit": "0c0cfd7fb8042b63f0ffebd2de563f2ef733526f", "tree": "d7948c8cbfbfa7c7ce01118828e85624fb79a1a8", "parents": [ "13315ce05fbee1e1f5b920cfe4217c3a30167023", "6751c093886112f4774bc3de514268e7b85ea417" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Fri Sep 28 13:12:28 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 28 13:12:29 2012 -0700" }, "message": "Merge \"Camera2: Use new JPEG transport header\" into jb-mr1-dev" }, { "commit": "0cb271c4768fa9ab93528f016956a8882d7e06a4", "tree": "c0db36d8595b58551b6bb4ec4a8c175b0e6facf9", "parents": [ "949fc1b96ededf46de2620f3910e4ede4b90a345", "fea14ab0bc8d117ed748bdfda5cbfacd1920538e" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Fri Sep 28 10:35:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 28 10:35:05 2012 -0700" }, "message": "am 7c0f1b36: am 24dfc952: Merge \"Camera2: Re-entering preview state on v2 Device\" into jb-mr1-dev\n\n* commit \u00277c0f1b36ec676d7358bb440640e32a2b04564c12\u0027:\n Camera2: Re-entering preview state on v2 Device\n" }, { "commit": "d0dad6ece142f132f5d295330bfe386c2c28de46", "tree": "eac5c11c085ad1468e4337e49655e4375cf9f7d0", "parents": [ "823b786e8558b7e73d9096cdd629e8896226e422", "71d6454cc20b7a3bbe0cfd375c778c5fcc54795a" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Fri Sep 28 10:30:38 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 28 10:30:39 2012 -0700" }, "message": "Merge \"Camera2: Re-entering preview state on v2 Device\" into jb-mr1-dev" }, { "commit": "949fc1b96ededf46de2620f3910e4ede4b90a345", "tree": "9cd8cdc26b359315317976f01a4aa59653d63431", "parents": [ "3c054c7c17505acf5af034658a254bcf45bbcf95", "234b9b346edcc053a455ee120bc5f7b6485e1fed" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 28 00:37:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 28 00:37:05 2012 -0700" }, "message": "am 0c6bd60f: am d0cec0cb: Camera2: Only _some_ FPS values in the old API are scaled.\n\n* commit \u00270c6bd60f30da59271a9f3e93b3259cd7cb22bac7\u0027:\n Camera2: Only _some_ FPS values in the old API are scaled.\n" }, { "commit": "3c054c7c17505acf5af034658a254bcf45bbcf95", "tree": "50a00c150631c48814220c895e8b2661905b4758", "parents": [ "9d77abf3383b1b7ee2a4cf5143c058ada9ba0f4d", "cf71c743e58015966b4750ebc53e2a7672cf080c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Sep 28 00:35:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 28 00:35:35 2012 -0700" }, "message": "am f4ffb508: am 12d3e887: Merge \"Camera2: Fix FPS value scaling between HAL2 and API\" into jb-mr1-dev\n\n* commit \u0027f4ffb508cafaa94ce470cf5a8c29b98d3d38e7eb\u0027:\n Camera2: Fix FPS value scaling between HAL2 and API\n" }, { "commit": "6751c093886112f4774bc3de514268e7b85ea417", "tree": "8c73c60ef23cdcd24829933f2956d2d48ff0ba14", "parents": [ "823b786e8558b7e73d9096cdd629e8896226e422" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Thu Sep 27 16:06:48 2012 -0700" }, "committer": { "name": "Alex Ray", "email": "aray@google.com", "time": "Thu Sep 27 22:55:55 2012 -0700" }, "message": "Camera2: Use new JPEG transport header\n\nCheck for new JPEG transport header at the end of the stream buffer\ninstead of at the beginning.\n\nBug: 7108816\nChange-Id: I26c52267cb406dae50c9d0ee01e6c26359ba84aa\n" }, { "commit": "823b786e8558b7e73d9096cdd629e8896226e422", "tree": "fb1eb0f89c8e87bdbd76b1806d7da57f754e94a6", "parents": [ "a7bf9305a27c22c6fd1f8a3037c2ccdfd274cf72" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 27 18:08:20 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 27 18:08:20 2012 -0700" }, "message": "Camera2: Only _some_ FPS values in the old API are scaled.\n\nThe (deprecated) single-FPS parameter is not scaled by 1000.\n\nBug: 7230239\nChange-Id: I5664cce90f9cb01e57e39f1a1f7c8eb730501da3\n" }, { "commit": "a7bf9305a27c22c6fd1f8a3037c2ccdfd274cf72", "tree": "3ba10ad5e7818db58d05890f879bfc28e8a3e387", "parents": [ "8397243efdd4e70ba75a9cf50d882c24dad250a2", "b5d91138fddcb1c4acdc91ddc68a9f4097da5b40" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 27 16:36:15 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 27 16:36:16 2012 -0700" }, "message": "Merge \"Camera2: Fix FPS value scaling between HAL2 and API\" into jb-mr1-dev" }, { "commit": "b5d91138fddcb1c4acdc91ddc68a9f4097da5b40", "tree": "f483004bb421e7ce7f44e04181280b759e4e1b16", "parents": [ "8000e368cbdcb8a2a712c9c92f6c97526b36f0ed" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 27 14:18:13 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Sep 27 14:18:13 2012 -0700" }, "message": "Camera2: Fix FPS value scaling between HAL2 and API\n\nAPI assumes FPS values are in fixed-point with LSB 0.001; HAL2 just\nuses ints with no fractional part.\n\nHAL should probably use floats or something similar, but for now, fix\nscaling so the two agree on FPS values.\n\nBug: 7230239\nChange-Id: Ie18a4f11fc9d17d9ae2d04781511a273213eda55\n" }, { "commit": "71d6454cc20b7a3bbe0cfd375c778c5fcc54795a", "tree": "938076b1d9616b2df878bd085db46fb486857043", "parents": [ "2a81a1519382e658941fdabe73a94a64d0b6f115" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Wed Sep 26 15:52:50 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 23:32:26 2012 -0700" }, "message": "Camera2: Re-entering preview state on v2 Device\n\nBug: 7240891\nChange-Id: I6a01b27197b4ee89a68f06f4375d315a716b67ae\n" }, { "commit": "395f2c8dd0d4b87c5b31cfa838885ae8169adff8", "tree": "4eaf1b617d73506981c589d2968a96543fcb6c3c", "parents": [ "97ec89096a31fbdacf01743b1c979c29fdc9e923", "035bf1d19f2617029c94f0d3336b06a2cac65ea0" ], "author": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Wed Sep 26 20:27:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 20:27:11 2012 -0700" }, "message": "am 33afc99b: am 6d6a4d3f: Merge changes Ia4414241,I34f5d36a into jb-mr1-dev\n\n* commit \u002733afc99b78977ab94ba3fe86f485c6e2a33563aa\u0027:\n audioflinger: use resample coefficients from audio-resampler library.\n audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler\n" }, { "commit": "41dfd129a181a5b0b62628733cf96e0ce11d64d7", "tree": "4614b6808b79cb3e84d5d5b6dbce9275ca89de98", "parents": [ "f818ccfbbfc574d179c4639af6b41c83c368a699" ], "author": { "name": "SathishKumar Mani", "email": "smani@codeaurora.org", "time": "Tue Jan 17 10:49:47 2012 -0800" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Wed Sep 26 18:48:44 2012 -0700" }, "message": "audioflinger: use resample coefficients from audio-resampler library.\n\n-Add a separate quality VERY_HIGH_QUALITY in resampler\n-Use resample coefficients audio-resampler library for\n quality VERY_HIGH_QUALITY.\n-This improves the quality of resampled output.\n\nBug: 7024293\nChange-Id: Ia44142413bed5f5963d7eab7846eec877a2415e4\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "f818ccfbbfc574d179c4639af6b41c83c368a699", "tree": "9bd280bb488507f32db92c24e3fe9c837b1290cd", "parents": [ "8000e368cbdcb8a2a712c9c92f6c97526b36f0ed" ], "author": { "name": "SathishKumar Mani", "email": "smani@codeaurora.org", "time": "Mon Sep 24 11:48:11 2012 -0700" }, "committer": { "name": "Iliyan Malchev", "email": "malchev@google.com", "time": "Wed Sep 26 18:48:34 2012 -0700" }, "message": "audioflinger/resampler: Add VERY_HIGH_QUALITY audio-resampler\n\nChange-Id: I34f5d36ae60010ec64222d6660d10a84da3bf566\nBug: 7024293\nSigned-off-by: Iliyan Malchev \u003cmalchev@google.com\u003e\n" }, { "commit": "1a796b62e169662802369ace8ba378756dd71f02", "tree": "65740f0de7b9971c3ff3b194d64f8e605f0f74e6", "parents": [ "be46b706c5f7778f0fbb7b6b4a91ed0ff93fd378", "a564060c486503c96dd728a1cf85116b2e402bd0" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Wed Sep 26 11:56:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 11:56:04 2012 -0700" }, "message": "am 23520044: am eb8a42b9: Camera2: Fix JPEG Transport Header offset\n\n* commit \u002723520044cfcb78db77950abc41c27e11b0d0f7db\u0027:\n Camera2: Fix JPEG Transport Header offset\n" }, { "commit": "b991ed9ec044ece45e433e1ac0fbb84b9ed7e871", "tree": "6c3712ca0876d8b5736f6692d97ea6bb27207f8e", "parents": [ "d8717323119c085d30d575df5a638ed4b25528c7" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Tue Sep 25 12:37:14 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Sep 26 11:11:43 2012 -0700" }, "message": "Camera2: Fix JPEG Transport Header offset\n\nUse offset into start of buffer after transport header\n\nBug: 7108816\nChange-Id: I6f9778db313856eaeee31f6999e4e55678b09b26\n" }, { "commit": "7ab148fd703107f8f4d64483d1f03986bed3f38d", "tree": "3d38aa6ee13d0fe457817520736ff6ce8687aa48", "parents": [ "2cc7525074d0784b75c9464ff3ab324f091b9428", "69fe8f3d3ac51f9f577418f3d209799fd86311d7" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 26 10:14:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 26 10:14:45 2012 -0700" }, "message": "am 070936d0: am 842c5d95: Revert \"Don\\\u0027t wait for presentation complete if terminated\"\n\n* commit \u0027070936d0530b535ccc9b404872f8333368bbfb02\u0027:\n Revert \"Don\u0027t wait for presentation complete if terminated\"\n" }, { "commit": "52013e7ad02bd22b19a64bdccaa953c7b4b4d448", "tree": "68c0baa1e4d15d5fed04fb49a56660d08db3a216", "parents": [ "4c6db4ce1e2760682d1c9e66448dbb39bb5d14d8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 26 08:34:10 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 26 08:55:08 2012 -0700" }, "message": "Revert \"Don\u0027t wait for presentation complete if terminated\"\n\nThis reverts commit 44cda3a4e7ca3de0db9cb49145def3803b03ebb4\n\nChange-Id: I7fd29b77690dab057ac966a42fb198b2772f092c\n" }, { "commit": "2de3067ebf718007c4bacd3df4fba6f070c1538b", "tree": "67a4a1dd702fd26f58898084c8349d7139c05e0a", "parents": [ "034be0f7cf4df557efc60d2791cf413765926d4c", "7dc8a62de457d1b6c70ecb4f264ccad9c6eb73c1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Sep 25 17:26:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 25 17:26:25 2012 -0700" }, "message": "am 512ba315: am cc0f1cfb: Implement android.media.AudioManager.getProperty()\n\n* commit \u0027512ba3150d45803ebadbefe45977a5eeed323540\u0027:\n Implement android.media.AudioManager.getProperty()\n" }, { "commit": "4c6db4ce1e2760682d1c9e66448dbb39bb5d14d8", "tree": "a8ffad6bc9f78c05eefc85cbfdb782eb40b50b4b", "parents": [ "64f935ebeae38828b3704e93fa5e7113f7839110" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 24 11:27:18 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Sep 25 17:13:18 2012 -0700" }, "message": "Implement android.media.AudioManager.getProperty()\n\nBug: 6635041\nChange-Id: I3386a4a6c226bc4eceaf65556119e4fb15f73224\n" }, { "commit": "1f10d46fc742790c094107c6e33fca4813f41ae8", "tree": "72cae50f227ec0a3bdfeba10fbdd174f409ecb89", "parents": [ "bd9388b7e77a4474b670e72ef21b25936f0f22e1", "478eb5e350e15996c4cb3e0c5e0ff6565a9c24a0" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 25 12:35:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 25 12:35:25 2012 -0700" }, "message": "am 0c82e022: am c7d9afdc: Camera2: Make sure to clean out reprocess streams on shutdown as well.\n\n* commit \u00270c82e02258cf31347b16d1c1c305bb31490098bb\u0027:\n Camera2: Make sure to clean out reprocess streams on shutdown as well.\n" }, { "commit": "bd9388b7e77a4474b670e72ef21b25936f0f22e1", "tree": "4745b4af642ba42674ab3ac801777c7eba99b7f0", "parents": [ "aeda50a708e41a000c509ee52cc6876ec48c191c", "56f6dbaa557dc01fd2cc9ef3be497f5c13ec1852" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 25 12:35:24 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 25 12:35:24 2012 -0700" }, "message": "am d2b4224e: am 4bb81188: Camera2: Debug and logging fixes.\n\n* commit \u0027d2b4224e356e363bf753d246d805da4cf7481097\u0027:\n Camera2: Debug and logging fixes.\n" }, { "commit": "aeda50a708e41a000c509ee52cc6876ec48c191c", "tree": "986d5276959b4585b5574778cc73b5368276b1c8", "parents": [ "4eec6571e73c484990900c9e9f99a233827d73bb", "925bed5fbf5f6e15ef0292fd4845b190af0027dd" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 25 12:35:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 25 12:35:23 2012 -0700" }, "message": "am 4680802d: am b6ba2fd0: audioflinger: improve record start and thread exit\n\n* commit \u00274680802d540379fda8a831167d8e7f2067327d90\u0027:\n audioflinger: improve record start and thread exit\n" }, { "commit": "c62bb787e53fc4b400219567585b365a5792412c", "tree": "819f2acbf132ef789148d1b15422235b62f7f81d", "parents": [ "852c381dbd1a9f86e6759201b50ac8847a1c3e3c" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 24 13:44:07 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 25 12:12:40 2012 -0700" }, "message": "Camera2: Make sure to clean out reprocess streams on shutdown as well.\n\nOtherwise, streams may persist past expected lifetime.\n\nBug: 6243944\nChange-Id: I901971b78baf9d577ea3812588dec3885232e7ef\n" }, { "commit": "852c381dbd1a9f86e6759201b50ac8847a1c3e3c", "tree": "5e88063cfbedff931e367ded1286ad12d5c78a15", "parents": [ "67d8ac3a8b49b114366684cd6310493423581056" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 24 09:46:53 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Sep 25 10:35:28 2012 -0700" }, "message": "Camera2: Debug and logging fixes.\n\n- Fix LOG_TAGs to work with standard logcat filtering.\n- Add ATRACE to Camera2Device\n- Shorten thread names to fit in 16 characters\n- Remove some ATRACEs to avoid flooding trace unnecessarily\n\nBug: 7220520\nChange-Id: Ief8d677b5c8bb35d94e0f21b11b86505e83169ea\n" }, { "commit": "67d8ac3a8b49b114366684cd6310493423581056", "tree": "2e44b42fa993f87681218453705dc0b67da25c24", "parents": [ "2eddc1d2f99fb280786e30ec91f3c5df78556166" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 24 15:02:17 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Sep 25 09:40:00 2012 -0700" }, "message": "audioflinger: improve record start and thread exit\n\nUse broadcast() instead of signal() on the\nthread wake up condition when starting record or requesting thread\nexit to make sure that if another thread is waiting for the same\ncondition (e.g binder thread calling setParameters()) the mixer\nthread will be woken up.\n\nBug 7184317.\n\nChange-Id: I3154a4509ca7af6ffae5236e522b0fab8e75ed06\n" }, { "commit": "d950d6b8eb6a76e6c3ec97550e7a73fac0e58e27", "tree": "20e0aea5f76fea9d399d52aa35ed90efce37e166", "parents": [ "fdaa846779f01007d7cdd79482721657def971ef", "261f112dfbaf6190d9de83b620042935e8fd1963" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 24 15:23:55 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 15:23:55 2012 -0700" }, "message": "am 08e12910: am 9a2e4fa6: Merge \"Camera2: Emit ShutterCallback/RawCallback events after takePicture\" into jb-mr1-dev\n\n* commit \u002708e129101318a2618ff624e3de742dc9ead01bcf\u0027:\n Camera2: Emit ShutterCallback/RawCallback events after takePicture\n" }, { "commit": "fdaa846779f01007d7cdd79482721657def971ef", "tree": "b2e093beb09f7a6edece2c6a347f407f8d7b2f85", "parents": [ "ca301b7ec0a2a005a924d1cc7a4e988843722055", "5c82cfcecb48848ef71264f9b91a4c5202322291" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 24 15:23:54 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 15:23:54 2012 -0700" }, "message": "am d4722b87: am aae1de9e: Merge \"Camera2: Fix cropRegion sometimes exceeding the sensor array size\" into jb-mr1-dev\n\n* commit \u0027d4722b8761ea3579e9412001bfe7f1ba8a989389\u0027:\n Camera2: Fix cropRegion sometimes exceeding the sensor array size\n" }, { "commit": "f83e2b4fcff8298432dc75d9808aa05331b23bb1", "tree": "6c999602bb00c6b859625db14087df16e3aed5da", "parents": [ "2e57a199f302446957eec3fd1a603129fd03e1d4", "707c3e34b067064f45c1b50919e88080fcdb5e77" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 24 15:19:04 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 24 15:19:05 2012 -0700" }, "message": "Merge \"Camera2: Emit ShutterCallback/RawCallback events after takePicture\" into jb-mr1-dev" }, { "commit": "2e57a199f302446957eec3fd1a603129fd03e1d4", "tree": "24494fc7ed91f187dd1bc57ac765cf1b129bf9a2", "parents": [ "7ca821d51972bb83fa900cf2206ae98f29b33ca9", "e500bc25cb801e69b4193b2863ec40bb3de04db9" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 24 15:18:41 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Sep 24 15:18:42 2012 -0700" }, "message": "Merge \"Camera2: Fix cropRegion sometimes exceeding the sensor array size\" into jb-mr1-dev" }, { "commit": "ca301b7ec0a2a005a924d1cc7a4e988843722055", "tree": "dc673f5ab0fb81da37d7df3dd44207a6c59115a7", "parents": [ "b777b2757b299c5fdb26d729ce405ab5b1c698ec", "1ee422d344174d387f45d5cdc366cb9a0cd71b85" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Sep 24 13:55:37 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 13:55:37 2012 -0700" }, "message": "am 6aee72a4: am 8d452f1c: Merge \"Check clock_gettime(CLOCK_MONOTONIC) for failure\" into jb-mr1-dev\n\n* commit \u00276aee72a479afb15498a4dc31327c5d5ff7ee4294\u0027:\n Check clock_gettime(CLOCK_MONOTONIC) for failure\n" }, { "commit": "7ca821d51972bb83fa900cf2206ae98f29b33ca9", "tree": "717661c94824cf168da0c4b93394d21972bda419", "parents": [ "595f54fd2d4990b2ff311314b76a224969d7e79e", "99ae06be60d7ccd753a0808191583225e5533f3a" ], "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": "707c3e34b067064f45c1b50919e88080fcdb5e77", "tree": "837ce084ffd01a34d5240c1efab2ebc5effb4db4", "parents": [ "595f54fd2d4990b2ff311314b76a224969d7e79e" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Thu Sep 20 15:18:50 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 24 12:30:03 2012 -0700" }, "message": "Camera2: Emit ShutterCallback/RawCallback events after takePicture\n\nBug: 7176692\nChange-Id: I50e8f9511f1770d97a42d1fa208c04b1bbcfba6b\n" }, { "commit": "e500bc25cb801e69b4193b2863ec40bb3de04db9", "tree": "b1aacecfa630b67ae5756efd0bfc28d7c4713e47", "parents": [ "595f54fd2d4990b2ff311314b76a224969d7e79e" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Sep 18 18:23:49 2012 -0700" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 24 12:26:50 2012 -0700" }, "message": "Camera2: Fix cropRegion sometimes exceeding the sensor array size\n\nBug: 7155264\nBug: 7120431\nChange-Id: I92a9c695b97ec40acf26dbdaa877964e41a9fd4c\n" }, { "commit": "99ae06be60d7ccd753a0808191583225e5533f3a", "tree": "dbffc4a569cf43347fb77e37e8f718546b838770", "parents": [ "4bf45909bcccb46acac61c155edd031e85b9dc12" ], "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": "b777b2757b299c5fdb26d729ce405ab5b1c698ec", "tree": "8e8308ca79aab87ba18d8e239c4a6eb6f5a465ad", "parents": [ "eec1151f216f980c78927478311ed12e59f60760", "3995ba03ea7075707be7269c766adacf0dc2b483" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 24 10:41:17 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 10:41:17 2012 -0700" }, "message": "am 842feefd: am c0c3b298: Merge \"fix end of track presentation on suspended output\" into jb-mr1-dev\n\n* commit \u0027842feefd25f3ac03de3cd9bcc5bc7627abec6ebc\u0027:\n fix end of track presentation on suspended output\n" }, { "commit": "595f54fd2d4990b2ff311314b76a224969d7e79e", "tree": "5de5f954888faa0ccabfdb272c347702571c6303", "parents": [ "50fa4c194a548502c7c365ea9a94bc51ca152f4d", "6090a17389fc86ec6d7b16b358c540fa6627923f" ], "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": "eec1151f216f980c78927478311ed12e59f60760", "tree": "e0e55c14143d81dde172fdb1071870b74d1ad4a4", "parents": [ "e291cf44d2125300b8141deb87337a9d714d449e", "41fdd4a19f89318ebad87bb470d4d624b7be72f9" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Mon Sep 24 10:37:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 10:37:50 2012 -0700" }, "message": "am 2355f172: am 53787020: Merge \"Camera2: Truncate JPEG images\" into jb-mr1-dev\n\n* commit \u00272355f172c80b32d205faad7a59f5410eb1198a80\u0027:\n Camera2: Truncate JPEG images\n" }, { "commit": "d18176804445bcc18ac9f39f73b54f5b420a20f6", "tree": "e43fc3f64b5c775c8038794fdbdadc61ff32fc17", "parents": [ "d41a238ada7ffe06e95c1971c066be94e58012cc", "9be73d34242fe83df0a32c5887f6e5eef623a0ad" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Mon Sep 24 09:36:22 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 09:36:22 2012 -0700" }, "message": "am 585549bc: am df2bc296: Merge \"Camera2: Don\\\u0027t use ZSL when flash is on force fire mode.\" into jb-mr1-dev\n\n* commit \u0027585549bc13dc03859d39f92f13e9da5e583b2d28\u0027:\n Camera2: Don\u0027t use ZSL when flash is on force fire mode.\n" }, { "commit": "12c5d13c644cef1774cec2aafcbfeb4b205ba70f", "tree": "88370c6afb8fd9aeaf3e7f877bc31fdb5dba8a58", "parents": [ "4bf45909bcccb46acac61c155edd031e85b9dc12" ], "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": "d41a238ada7ffe06e95c1971c066be94e58012cc", "tree": "13b12bd7a5182490ad9e6953fb0a8948c71a0ba5", "parents": [ "9234c190bf5cc94e677f915236dd2ebbfa35aac5", "8f851431ad7dedf8f7fc64a970c14db979039b83" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Mon Sep 24 00:50:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 24 00:50:11 2012 -0700" }, "message": "am 43d0199a: am 75dce94a: Merge \"Camera2: Emit FaceDetection events for all except repeating 0-face frames\" into jb-mr1-dev\n\n* commit \u002743d0199a5c89d756cb3ac3c0c0fa7afe421be28b\u0027:\n Camera2: Emit FaceDetection events for all except repeating 0-face frames\n" }, { "commit": "6090a17389fc86ec6d7b16b358c540fa6627923f", "tree": "8bd80fc89227fe62dcea06391b4e6c4395073866", "parents": [ "4bf45909bcccb46acac61c155edd031e85b9dc12" ], "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" } ], "next": "e7fc0ece01c9672629664c07108640f589034636" }