)]}' { "log": [ { "commit": "40659dea8eefaa9d7f5b742e3333d68b6f0dd89c", "tree": "53a621f8f1b314c07c0ffff156c25b3981813ab0", "parents": [ "51b7125bd0e2127f1d57938e95523dcc61e657ef", "47ef192f0296642b901e82d0c72c5a1a0d08f4df" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Mar 07 02:18:42 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:18:42 2014 +0000" }, "message": "am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev\n\n* commit \u002747ef192f0296642b901e82d0c72c5a1a0d08f4df\u0027:\n DO NOT MERGE: Camera: fix focusArea wrong indexing issue\n DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.\n DO NOT MERGE: camera2/3: Add protection for still capture path\n" }, { "commit": "47ef192f0296642b901e82d0c72c5a1a0d08f4df", "tree": "c5f4c0f2f679652f37926469de0c180bb1fbd2b5", "parents": [ "bfc260667e566d4ea29c8b1d089b95ce2c11890c", "a11111f9135c98cf4247bbd1a61d7df3053e549e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Mar 07 02:00:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:00:59 2014 +0000" }, "message": "am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev\n\n* commit \u0027a11111f9135c98cf4247bbd1a61d7df3053e549e\u0027:\n DO NOT MERGE: Camera: fix focusArea wrong indexing issue\n DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.\n DO NOT MERGE: camera2/3: Add protection for still capture path\n" }, { "commit": "51b7125bd0e2127f1d57938e95523dcc61e657ef", "tree": "0934f4f7e4c545ff9917648b508eb4aa7da45b1b", "parents": [ "8f379f63a525a82965e5926490747db9f7241e8f", "bfc260667e566d4ea29c8b1d089b95ce2c11890c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Mar 07 01:51:35 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 01:51:35 2014 +0000" }, "message": "am bfc26066: am ed4d8b28: Merge \"stagefright: do not offload LD-AAC decoding\" into klp-dev\n\n* commit \u0027bfc260667e566d4ea29c8b1d089b95ce2c11890c\u0027:\n stagefright: do not offload LD-AAC decoding\n" }, { "commit": "a11111f9135c98cf4247bbd1a61d7df3053e549e", "tree": "e0603972793777c7a190dd2a1c3c76336098a064", "parents": [ "ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258", "a413dd621966044753a8fa1f57c76d847b6f4bec" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Mar 07 01:40:59 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 01:40:59 2014 +0000" }, "message": "Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev\n\n* changes:\n DO NOT MERGE: Camera: fix focusArea wrong indexing issue\n DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.\n DO NOT MERGE: camera2/3: Add protection for still capture path\n" }, { "commit": "bfc260667e566d4ea29c8b1d089b95ce2c11890c", "tree": "7d76411d84042df31ead958df240e461620f3f37", "parents": [ "4ed0b0b6f1fb1adab5df6342d03a695545a18be3", "ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Mar 07 01:35:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 01:35:41 2014 +0000" }, "message": "am ed4d8b28: Merge \"stagefright: do not offload LD-AAC decoding\" into klp-dev\n\n* commit \u0027ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258\u0027:\n stagefright: do not offload LD-AAC decoding\n" }, { "commit": "ed4d8b28b8ee5a3e4ebc8f73bf4dc86c75a74258", "tree": "93a6b8673072ca56e0e42e67859a7943915cd016", "parents": [ "880413f7923ec77467243e15dc34d4af4f8064f9", "f590f948e6c0fe3c54008dd7802fd513f127792d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Mar 07 01:09:33 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 01:09:34 2014 +0000" }, "message": "Merge \"stagefright: do not offload LD-AAC decoding\" into klp-dev" }, { "commit": "8f379f63a525a82965e5926490747db9f7241e8f", "tree": "0934f4f7e4c545ff9917648b508eb4aa7da45b1b", "parents": [ "afa5263f7f29affc77ff05d9c0a1b53e598531fa", "4ed0b0b6f1fb1adab5df6342d03a695545a18be3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Mar 06 22:41:24 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 06 22:41:24 2014 +0000" }, "message": "am 4ed0b0b6: am 880413f7: Merge \"stagefright: fix offloading HE-AAC sampling rate.\" into klp-dev\n\n* commit \u00274ed0b0b6f1fb1adab5df6342d03a695545a18be3\u0027:\n stagefright: fix offloading HE-AAC sampling rate.\n" }, { "commit": "afa5263f7f29affc77ff05d9c0a1b53e598531fa", "tree": "0934f4f7e4c545ff9917648b508eb4aa7da45b1b", "parents": [ "eff98ddea36264d028c0811c96b112a52977b51c", "395c2fc0c422c9218f39f6ed2040e90b1cc9920a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Mar 06 21:59:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 06 21:59:23 2014 +0000" }, "message": "am 395c2fc0: Merge \"audioflinger: Fix for a deadlock in track creation\"\n\n* commit \u0027395c2fc0c422c9218f39f6ed2040e90b1cc9920a\u0027:\n audioflinger: Fix for a deadlock in track creation\n" }, { "commit": "4ed0b0b6f1fb1adab5df6342d03a695545a18be3", "tree": "7d76411d84042df31ead958df240e461620f3f37", "parents": [ "2b6191fddb1f4a750ad03792d09d4b8efdeeb35a", "880413f7923ec77467243e15dc34d4af4f8064f9" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Mar 06 21:58:27 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 06 21:58:27 2014 +0000" }, "message": "am 880413f7: Merge \"stagefright: fix offloading HE-AAC sampling rate.\" into klp-dev\n\n* commit \u0027880413f7923ec77467243e15dc34d4af4f8064f9\u0027:\n stagefright: fix offloading HE-AAC sampling rate.\n" }, { "commit": "eff98ddea36264d028c0811c96b112a52977b51c", "tree": "0934f4f7e4c545ff9917648b508eb4aa7da45b1b", "parents": [ "fbae2674688c6dc0a267d4da139061d7abc287fd", "2b6191fddb1f4a750ad03792d09d4b8efdeeb35a" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Mar 06 19:50:41 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 06 19:50:41 2014 +0000" }, "message": "am 2b6191fd: am 3b7ddf83: set AAC MPEG version to MPEG-2\n\n* commit \u00272b6191fddb1f4a750ad03792d09d4b8efdeeb35a\u0027:\n set AAC MPEG version to MPEG-2\n" }, { "commit": "880413f7923ec77467243e15dc34d4af4f8064f9", "tree": "c7171f3ba21757ed6bfd545bfd0967610f18ab4e", "parents": [ "3b7ddf83db2d11c08116a6476c0f11e71bd72ba4", "3c836e7882e88de42e0e600627de433b61e78621" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Mar 06 19:21:49 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Mar 06 19:21:49 2014 +0000" }, "message": "Merge \"stagefright: fix offloading HE-AAC sampling rate.\" into klp-dev" }, { "commit": "f590f948e6c0fe3c54008dd7802fd513f127792d", "tree": "1bd64930d69158418ac7c54c9d9a9b3a16dab973", "parents": [ "3c836e7882e88de42e0e600627de433b61e78621" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Dec 06 11:51:42 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Mar 06 11:16:08 2014 -0800" }, "message": "stagefright: do not offload LD-AAC decoding\n\nFor now, do not offload LD and ELD AAC decoding because there\nis no way to know if it is supported by the audio DSP implementation.\nThe longer term fix will be to have mapMimeToAudioFormat() use the\naudio object type in track metadata to refine the AAC format and the\naudio HAL list supported AAC profiles.\n\nBug: 11697128.\n\nChange-Id: Iaa88ecf3f4ae42ad48c1b42a9b007dd80eb88147\n" }, { "commit": "395c2fc0c422c9218f39f6ed2040e90b1cc9920a", "tree": "90fa3e762bead3f0dca419b14ee992100ba4c454", "parents": [ "525b099ada155d6654300cb2e5d8c1a09f4eb8ba", "6cbccee701e74fa43a5ea49c15af7dd3267b6699" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Mar 06 19:08:44 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Mar 06 19:08:44 2014 +0000" }, "message": "Merge \"audioflinger: Fix for a deadlock in track creation\"" }, { "commit": "2b6191fddb1f4a750ad03792d09d4b8efdeeb35a", "tree": "7d76411d84042df31ead958df240e461620f3f37", "parents": [ "a4aa88b8a9eb4028120363f226f7df6dfc8871a0", "3b7ddf83db2d11c08116a6476c0f11e71bd72ba4" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Thu Mar 06 18:44:46 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Mar 06 18:44:46 2014 +0000" }, "message": "am 3b7ddf83: set AAC MPEG version to MPEG-2\n\n* commit \u00273b7ddf83db2d11c08116a6476c0f11e71bd72ba4\u0027:\n set AAC MPEG version to MPEG-2\n" }, { "commit": "6cbccee701e74fa43a5ea49c15af7dd3267b6699", "tree": "90fa3e762bead3f0dca419b14ee992100ba4c454", "parents": [ "525b099ada155d6654300cb2e5d8c1a09f4eb8ba" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Fri Dec 13 15:40:13 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Mar 06 10:44:13 2014 -0800" }, "message": "audioflinger: Fix for a deadlock in track creation\n\nAudioFlinger enters a deadlock (with itself) on trying to free a\nRecordTrack or Track object that failed initialization. Clear this\nbad object from the caller instead.\n\nBug: 12423233\nChange-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16\n" }, { "commit": "3b7ddf83db2d11c08116a6476c0f11e71bd72ba4", "tree": "3e3ef2a9bdadd3c7df3de6ea47921588b90c7a84", "parents": [ "d812fc012298470a1b8120e6d60a24b0b1d48047" ], "author": { "name": "Chong Zhang", "email": "chz@google.com", "time": "Fri Feb 07 12:05:34 2014 -0800" }, "committer": { "name": "Vineeta Srivastava", "email": "vsrivastava@google.com", "time": "Thu Mar 06 09:22:51 2014 -0800" }, "message": "set AAC MPEG version to MPEG-2\n\nwifi display play spec only allows MPEG-2 AAC.\n\nBug: 12747927\nChange-Id: Ic96d27ce57f5c8e7da55e43b38f629b5c7333817\n" }, { "commit": "3c836e7882e88de42e0e600627de433b61e78621", "tree": "8ba46424c182f6d66927b3bd90a1ebfe4c30e3ab", "parents": [ "d812fc012298470a1b8120e6d60a24b0b1d48047" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Dec 06 11:16:54 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 18:44:16 2014 -0800" }, "message": "stagefright: fix offloading HE-AAC sampling rate.\n\nFix HE AAC SBR sampling rate reading for explicit\nsignaling.\n\nBug: 11697128.\nChange-Id: Ifec0ab9d48d9293f6774ec1efd9da9445994cb7c\n" }, { "commit": "fbae2674688c6dc0a267d4da139061d7abc287fd", "tree": "f08061b883bc7f4e2d67f1c62b9eceddb2557fc2", "parents": [ "c1e06f692cf16a8c9f5ae921ab4d642f7a082877", "a4aa88b8a9eb4028120363f226f7df6dfc8871a0" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 05 23:54:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:54:01 2014 +0000" }, "message": "am a4aa88b8: am 9e64cd42: am d812fc01: Increase kFastTrackMultiplier from 1 to 2\n\n* commit \u0027a4aa88b8a9eb4028120363f226f7df6dfc8871a0\u0027:\n Increase kFastTrackMultiplier from 1 to 2\n" }, { "commit": "c1e06f692cf16a8c9f5ae921ab4d642f7a082877", "tree": "f08061b883bc7f4e2d67f1c62b9eceddb2557fc2", "parents": [ "5d3e310a847d090b7f79554154d25c70be8fd594", "09e45992067f03a05f82400a6cacf16bb8018f16" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:54:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:54:00 2014 +0000" }, "message": "am 09e45992: am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculation\n\n* commit \u002709e45992067f03a05f82400a6cacf16bb8018f16\u0027:\n AudioTrack: fix obtainBuffer timeout calculation\n" }, { "commit": "5d3e310a847d090b7f79554154d25c70be8fd594", "tree": "b5c507e70c853037602d4e898b75c2d307ae2c4d", "parents": [ "40e95fe9aafc71832ac2878275c3e4eb2a72f1c7", "44130bf528842445254537604ed628ad4ac1507b" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 23:53:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:53:59 2014 +0000" }, "message": "am 44130bf5: am 994d9bad: am 145b727b: libstagefright: Delay release of wakelock in TimedEventQueue\n\n* commit \u002744130bf528842445254537604ed628ad4ac1507b\u0027:\n libstagefright: Delay release of wakelock in TimedEventQueue\n" }, { "commit": "40e95fe9aafc71832ac2878275c3e4eb2a72f1c7", "tree": "b5c507e70c853037602d4e898b75c2d307ae2c4d", "parents": [ "8984577e0f2389a8763bdbcab6c5979d21038b4b", "5248efb0eecb20b2d5c02aa844c4dc7aeb925c16" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:53:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:53:59 2014 +0000" }, "message": "am 5248efb0: am 4f4c9a22: am 281dd4e1: audioflinger: fix static track end detection\n\n* commit \u00275248efb0eecb20b2d5c02aa844c4dc7aeb925c16\u0027:\n audioflinger: fix static track end detection\n" }, { "commit": "8984577e0f2389a8763bdbcab6c5979d21038b4b", "tree": "b5c507e70c853037602d4e898b75c2d307ae2c4d", "parents": [ "25bebdf9a8d3b6ddb37882994b2800c3e15b60f5", "854e547d219ea4c7258d72442052f744dc7fc0f4" ], "author": { "name": "Gaurav Kumar", "email": "gaurav.kumar@broadcom.com", "time": "Wed Mar 05 23:53:58 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:53:58 2014 +0000" }, "message": "am 854e547d: am c7753b12: am abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp\n\n* commit \u0027854e547d219ea4c7258d72442052f744dc7fc0f4\u0027:\n AudioMixer: Remove tracks from enabledTracks after reseting outTemp\n" }, { "commit": "25bebdf9a8d3b6ddb37882994b2800c3e15b60f5", "tree": "b5c507e70c853037602d4e898b75c2d307ae2c4d", "parents": [ "0c937b4946fae178447d9f8d29200fa2798c05f9", "1de5c060ea60f2fa982cfb340686deb158c9154a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:53:57 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:53:57 2014 +0000" }, "message": "am 1de5c060: am ec94f7a6: am d0115d8c: update offloaded audio track sampling rate\n\n* commit \u00271de5c060ea60f2fa982cfb340686deb158c9154a\u0027:\n update offloaded audio track sampling rate\n" }, { "commit": "a4aa88b8a9eb4028120363f226f7df6dfc8871a0", "tree": "d1e14669866cb1c726d69e53b9cd615e824e8847", "parents": [ "09e45992067f03a05f82400a6cacf16bb8018f16", "9e64cd42032665c90c52804c1042b3671621cda5" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 05 23:51:03 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:51:03 2014 +0000" }, "message": "am 9e64cd42: am d812fc01: Increase kFastTrackMultiplier from 1 to 2\n\n* commit \u00279e64cd42032665c90c52804c1042b3671621cda5\u0027:\n Increase kFastTrackMultiplier from 1 to 2\n" }, { "commit": "09e45992067f03a05f82400a6cacf16bb8018f16", "tree": "d1e14669866cb1c726d69e53b9cd615e824e8847", "parents": [ "44130bf528842445254537604ed628ad4ac1507b", "25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:51:02 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:51:02 2014 +0000" }, "message": "am 25a86930: am 88876fb4: AudioTrack: fix obtainBuffer timeout calculation\n\n* commit \u002725a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf\u0027:\n AudioTrack: fix obtainBuffer timeout calculation\n" }, { "commit": "44130bf528842445254537604ed628ad4ac1507b", "tree": "31046a75b4fa9c71beada015ff1230bbf811e7f2", "parents": [ "5248efb0eecb20b2d5c02aa844c4dc7aeb925c16", "994d9bad4c545cc8861e971f9dbcb4c061ee19ed" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 23:51:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:51:01 2014 +0000" }, "message": "am 994d9bad: am 145b727b: libstagefright: Delay release of wakelock in TimedEventQueue\n\n* commit \u0027994d9bad4c545cc8861e971f9dbcb4c061ee19ed\u0027:\n libstagefright: Delay release of wakelock in TimedEventQueue\n" }, { "commit": "5248efb0eecb20b2d5c02aa844c4dc7aeb925c16", "tree": "31046a75b4fa9c71beada015ff1230bbf811e7f2", "parents": [ "854e547d219ea4c7258d72442052f744dc7fc0f4", "4f4c9a22f4676c65bcae77f0805dcd699b3ba475" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:51:01 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:51:01 2014 +0000" }, "message": "am 4f4c9a22: am 281dd4e1: audioflinger: fix static track end detection\n\n* commit \u00274f4c9a22f4676c65bcae77f0805dcd699b3ba475\u0027:\n audioflinger: fix static track end detection\n" }, { "commit": "854e547d219ea4c7258d72442052f744dc7fc0f4", "tree": "6f5d14e566f9aa4064c7a96090b57050e5116c63", "parents": [ "1de5c060ea60f2fa982cfb340686deb158c9154a", "c7753b12a9c8c1cba69ba75bccc0083c37bc67f1" ], "author": { "name": "Gaurav Kumar", "email": "gaurav.kumar@broadcom.com", "time": "Wed Mar 05 23:50:55 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:50:55 2014 +0000" }, "message": "am c7753b12: am abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp\n\n* commit \u0027c7753b12a9c8c1cba69ba75bccc0083c37bc67f1\u0027:\n AudioMixer: Remove tracks from enabledTracks after reseting outTemp\n" }, { "commit": "1de5c060ea60f2fa982cfb340686deb158c9154a", "tree": "6f5d14e566f9aa4064c7a96090b57050e5116c63", "parents": [ "eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc", "ec94f7a6eba6f55175c39c3abcd64046ecd413ad" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:50:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:50:49 2014 +0000" }, "message": "am ec94f7a6: am d0115d8c: update offloaded audio track sampling rate\n\n* commit \u0027ec94f7a6eba6f55175c39c3abcd64046ecd413ad\u0027:\n update offloaded audio track sampling rate\n" }, { "commit": "9e64cd42032665c90c52804c1042b3671621cda5", "tree": "ffc379029cf2e53932f46375efc61363fb0f1a6e", "parents": [ "25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf", "d812fc012298470a1b8120e6d60a24b0b1d48047" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 05 23:47:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:47:20 2014 +0000" }, "message": "am d812fc01: Increase kFastTrackMultiplier from 1 to 2\n\n* commit \u0027d812fc012298470a1b8120e6d60a24b0b1d48047\u0027:\n Increase kFastTrackMultiplier from 1 to 2\n" }, { "commit": "25a86930ac0ccf4750ad2fb0c2f5a4a122d24ecf", "tree": "ffc379029cf2e53932f46375efc61363fb0f1a6e", "parents": [ "994d9bad4c545cc8861e971f9dbcb4c061ee19ed", "88876fb4eb8365343f2a9ca0e8f53148ca38b845" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:47:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:47:20 2014 +0000" }, "message": "am 88876fb4: AudioTrack: fix obtainBuffer timeout calculation\n\n* commit \u002788876fb4eb8365343f2a9ca0e8f53148ca38b845\u0027:\n AudioTrack: fix obtainBuffer timeout calculation\n" }, { "commit": "994d9bad4c545cc8861e971f9dbcb4c061ee19ed", "tree": "4e7e9f1ab7238a965949fec8ea62a28d4e7ae8ec", "parents": [ "4f4c9a22f4676c65bcae77f0805dcd699b3ba475", "145b727b4cce8b1b8d161612f30d12bbdfc8d134" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 23:47:18 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:47:18 2014 +0000" }, "message": "am 145b727b: libstagefright: Delay release of wakelock in TimedEventQueue\n\n* commit \u0027145b727b4cce8b1b8d161612f30d12bbdfc8d134\u0027:\n libstagefright: Delay release of wakelock in TimedEventQueue\n" }, { "commit": "4f4c9a22f4676c65bcae77f0805dcd699b3ba475", "tree": "4e7e9f1ab7238a965949fec8ea62a28d4e7ae8ec", "parents": [ "c7753b12a9c8c1cba69ba75bccc0083c37bc67f1", "281dd4e13309973dbb85bce531f884237e0d8fb0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:47:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:47:17 2014 +0000" }, "message": "am 281dd4e1: audioflinger: fix static track end detection\n\n* commit \u0027281dd4e13309973dbb85bce531f884237e0d8fb0\u0027:\n audioflinger: fix static track end detection\n" }, { "commit": "c7753b12a9c8c1cba69ba75bccc0083c37bc67f1", "tree": "afcb2b29c856c84809893e5dda8a68f68054ed75", "parents": [ "ec94f7a6eba6f55175c39c3abcd64046ecd413ad", "abab1c33caf0982c11713e6d64d60105dcbc8ab7" ], "author": { "name": "Gaurav Kumar", "email": "gaurav.kumar@broadcom.com", "time": "Wed Mar 05 23:47:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:47:17 2014 +0000" }, "message": "am abab1c33: AudioMixer: Remove tracks from enabledTracks after reseting outTemp\n\n* commit \u0027abab1c33caf0982c11713e6d64d60105dcbc8ab7\u0027:\n AudioMixer: Remove tracks from enabledTracks after reseting outTemp\n" }, { "commit": "ec94f7a6eba6f55175c39c3abcd64046ecd413ad", "tree": "afcb2b29c856c84809893e5dda8a68f68054ed75", "parents": [ "7028a2c8106ee5a22db88da5dad581820ee07254", "d0115d8c4db2f337030dea706bc0a434c4a03ed6" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 23:47:16 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 23:47:16 2014 +0000" }, "message": "am d0115d8c: update offloaded audio track sampling rate\n\n* commit \u0027d0115d8c4db2f337030dea706bc0a434c4a03ed6\u0027:\n update offloaded audio track sampling rate\n" }, { "commit": "a413dd621966044753a8fa1f57c76d847b6f4bec", "tree": "3205bb3eb789cc21cf2b7f5d1344c21d61e86d2b", "parents": [ "6706009fa8294c8cdab1cdab4585f00d42df483e" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Wed Jan 29 08:52:01 2014 -0800" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Mar 05 15:10:43 2014 -0800" }, "message": "DO NOT MERGE: Camera: fix focusArea wrong indexing issue\n\nBug: 12304559\nChange-Id: Id28b35fdd9697c1ec3365f617996801965de8bd0\n" }, { "commit": "0c937b4946fae178447d9f8d29200fa2798c05f9", "tree": "b5c507e70c853037602d4e898b75c2d307ae2c4d", "parents": [ "57f87026a30f3e461f6a804e94b6dab7b385f3ca", "eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 22:48:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 22:48:11 2014 +0000" }, "message": "am eb16bb5d: am 7028a2c8: am 7e92abea: audioflinger: fix offload write buffer offset\n\n* commit \u0027eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc\u0027:\n audioflinger: fix offload write buffer offset\n" }, { "commit": "eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc", "tree": "6f5d14e566f9aa4064c7a96090b57050e5116c63", "parents": [ "97504893a3ee96f612e0e1b47d331583a88e289b", "7028a2c8106ee5a22db88da5dad581820ee07254" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 22:44:59 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 22:44:59 2014 +0000" }, "message": "am 7028a2c8: am 7e92abea: audioflinger: fix offload write buffer offset\n\n* commit \u00277028a2c8106ee5a22db88da5dad581820ee07254\u0027:\n audioflinger: fix offload write buffer offset\n" }, { "commit": "7028a2c8106ee5a22db88da5dad581820ee07254", "tree": "afcb2b29c856c84809893e5dda8a68f68054ed75", "parents": [ "6b2604259c12ee28b49f26ab2adac96eefe30934", "7e92abeafb184e8a34213d7149592e95a72601b0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 22:41:53 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 22:41:53 2014 +0000" }, "message": "am 7e92abea: audioflinger: fix offload write buffer offset\n\n* commit \u00277e92abeafb184e8a34213d7149592e95a72601b0\u0027:\n audioflinger: fix offload write buffer offset\n" }, { "commit": "6706009fa8294c8cdab1cdab4585f00d42df483e", "tree": "55fcdca48c005adaa2d25cc3e87715345e31e5ce", "parents": [ "81d754306ecd4a587459015da5168270c2a5c167" ], "author": { "name": "Ruben Brunk", "email": "rubenbrunk@google.com", "time": "Thu Dec 05 11:00:37 2013 -0800" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Mar 05 14:31:30 2014 -0800" }, "message": "DO NOT MERGE: camera2: Fix race with stream deletion during disconnect.\n\nBug: 11856804\n\n- Shutdown order in Camera2Client allows a stream to be\n deleted before the corresponding processing thread has\n quit. This can result in updates being called on the\n processor thread without a valid stream.\n\nChange-Id: Ie4e649771f4321498659211f2a37ed89a6d956c4\n" }, { "commit": "81d754306ecd4a587459015da5168270c2a5c167", "tree": "40e203771b86181b96aaf6022532e7aadf71e238", "parents": [ "85b3013e06e8fe7802fe6259ecac80261e834332" ], "author": { "name": "Zhijun He", "email": "zhijunhe@google.com", "time": "Tue Nov 26 15:11:05 2013 -0800" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Mar 05 14:29:40 2014 -0800" }, "message": "DO NOT MERGE: camera2/3: Add protection for still capture path\n\nJpeg stream in JpegProcessor could be deleted while process new capture is\nongoing, which unsafe to access a dead consumer endpoint.\nBug: 9316454\nChange-Id: I2950f31ea28d0ba01f08502e2e3ba452bf8bb818\n" }, { "commit": "d812fc012298470a1b8120e6d60a24b0b1d48047", "tree": "bf3c68ea3a908a0792e766714cd9d54f98ebfb46", "parents": [ "88876fb4eb8365343f2a9ca0e8f53148ca38b845" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Dec 03 09:06:43 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 14:10:41 2014 -0800" }, "message": "Increase kFastTrackMultiplier from 1 to 2\n\nBug: 11967381\nChange-Id: Iedec06280aa745d9df5d661f4916940cede9c191\n" }, { "commit": "88876fb4eb8365343f2a9ca0e8f53148ca38b845", "tree": "7891ad7f6e93d856f4fc8b5184bf2d8c95a84ead", "parents": [ "145b727b4cce8b1b8d161612f30d12bbdfc8d134" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jan 27 18:13:39 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 14:07:43 2014 -0800" }, "message": "AudioTrack: fix obtainBuffer timeout calculation\n\nAudioTrack::obtainBuffer() passes a pointer to a timeout\nvariable that has gone out of scope when calling\nClientProxy::obtainBuffer().\n\nSame fix for AudioRecord.\n\nBug: 11968591.\nChange-Id: I5b3d0d86ed2bd8c0412eb2432b1ab519d70efce9\n" }, { "commit": "145b727b4cce8b1b8d161612f30d12bbdfc8d134", "tree": "96caa4aef35c2d016a89fbf6a8a509fc2aa10906", "parents": [ "281dd4e13309973dbb85bce531f884237e0d8fb0" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Fri Dec 06 11:31:57 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 14:05:27 2014 -0800" }, "message": "libstagefright: Delay release of wakelock in TimedEventQueue\n\nDelay release of wakelock in the TimedEventQueue to\nafter an event has been processed.\nThis ensures AP shutdown does not happen while an event\nis ready but hasn\u0027t been processed yet.\n\nBug: 11976087.\nChange-Id: I9bce83b9ff0f2b4d174a53c95e5b0f135b5ccc70\n" }, { "commit": "281dd4e13309973dbb85bce531f884237e0d8fb0", "tree": "f58a048f67a81b56c07593f727c92a445b249f4b", "parents": [ "abab1c33caf0982c11713e6d64d60105dcbc8ab7" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Dec 20 17:36:01 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 14:03:30 2014 -0800" }, "message": "audioflinger: fix static track end detection\n\nIf a static track is not a fast track,\nprepareTracks_l() must rely on framesReady() to\ndetect end of buffer and remove the track from the active\ntrack list.\nFailing to do so results in the track staying active but\nnot processed by the mixer because in underrun. This leaves the\nmix buffer content uninitialized and causes the effect process\nfunction to accumulate its output onto undefined data.\n\nBug: 12013676.\nChange-Id: I4b0819a9d93141ac3307b8786fc6a451dd585220\n" }, { "commit": "abab1c33caf0982c11713e6d64d60105dcbc8ab7", "tree": "fed18cdc3a9543b56ffeaf73db55d0d20ee937e9", "parents": [ "d0115d8c4db2f337030dea706bc0a434c4a03ed6" ], "author": { "name": "Gaurav Kumar", "email": "gaurav.kumar@broadcom.com", "time": "Mon Jan 06 10:57:18 2014 +0530" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 13:59:28 2014 -0800" }, "message": "AudioMixer: Remove tracks from enabledTracks after reseting outTemp\n\nIf any track goes through AudioMixer::process__genericNoResampling, and\nits getnextbuffer returns NULL, Then that track is removed by AudioMixer\nfrom enabledTracks.\n\nThus if all tracks getnextbuffer return NULL, Then this function doesn\u0027t\nreset outTemp and last buffer in AudioFlinger\u0027s mMixBuffer will be\nrepeated and noise is observed.\n\nRemove tracks from enabledTracks after reseting outTemp to zero, so that\nprocess__genericNoResampling will reset outTemp and noise won\u0027t appear.\n\nBug: 12450065\n\nChange-Id: I28996d425838728955f01eb1a00acf6e6dc2dea1\nSigned-off-by: Gaurav Kumar \u003cgaurav.kumar@broadcom.com\u003e\nSigned-off-by: Pierre Couillaud \u003cpierre@broadcom.com\u003e\n" }, { "commit": "d0115d8c4db2f337030dea706bc0a434c4a03ed6", "tree": "239450c60bc4cb8519edeb8985dbc601fe51c652", "parents": [ "7e92abeafb184e8a34213d7149592e95a72601b0" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Jul 26 17:16:50 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 12:17:54 2014 -0800" }, "message": "update offloaded audio track sampling rate\n\nAudioPlayer must read the sampling rate from offloaded audio sinks\nwhenever a new time position is computed as the decoder can update\nthe sampling rate on the fly.\n\nBug: 12823955.\n\nChange-Id: I997e5248cfd4017aeceb4e11689324ded2a5bc88\n" }, { "commit": "7e92abeafb184e8a34213d7149592e95a72601b0", "tree": "09ec6f7fdfdc0b9564660f134bd6a460a4480d85", "parents": [ "85b3013e06e8fe7802fe6259ecac80261e834332" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Nov 22 09:29:56 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Mar 05 12:12:01 2014 -0800" }, "message": "audioflinger: fix offload write buffer offset\n\nFix current audio HAL write buffer offset calculation\nwhich assumes that the frame size is a multiple of 2.\n\u0027\nBug: 12823725.\n\nChange-Id: I0195ed5cfef225a6f114e7dd405a02680bb7254e\n" }, { "commit": "57f87026a30f3e461f6a804e94b6dab7b385f3ca", "tree": "3fad07457b2212da593c80bd278cb7660ce53d6a", "parents": [ "40e01b4395ee2d8569fc392e889decc365b78288", "97504893a3ee96f612e0e1b47d331583a88e289b" ], "author": { "name": "jpadmana", "email": "jayashree.r.padmanaban@intel.com", "time": "Wed Mar 05 20:01:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 20:01:15 2014 +0000" }, "message": "am 97504893: am 6b260425: am 85b3013e: fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds\n\n* commit \u002797504893a3ee96f612e0e1b47d331583a88e289b\u0027:\n fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds\n" }, { "commit": "40e01b4395ee2d8569fc392e889decc365b78288", "tree": "3fad07457b2212da593c80bd278cb7660ce53d6a", "parents": [ "0504a198d6595e29e58d1d66ae59fac1d662384a", "4287b41411b40415b4186babf5763c3cfa0391ef" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 20:01:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 20:01:15 2014 +0000" }, "message": "am 4287b414: am fc04776a: am 50c3157c: audioflinger: check for condition before waiting\n\n* commit \u00274287b41411b40415b4186babf5763c3cfa0391ef\u0027:\n audioflinger: check for condition before waiting\n" }, { "commit": "0504a198d6595e29e58d1d66ae59fac1d662384a", "tree": "3fad07457b2212da593c80bd278cb7660ce53d6a", "parents": [ "d384a2c44810ce1b51277cc4ab4c5415ff7de6ee", "632c3790523896260dc43fd6cd40a158765cdb15" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 20:01:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 20:01:14 2014 +0000" }, "message": "am 632c3790: am 7c206e5b: am e0cd1051: audioflinger: update track ready condition\n\n* commit \u0027632c3790523896260dc43fd6cd40a158765cdb15\u0027:\n audioflinger: update track ready condition\n" }, { "commit": "d384a2c44810ce1b51277cc4ab4c5415ff7de6ee", "tree": "c020402fdf9734df5c77b93058b841d9c501a4ef", "parents": [ "3cd7a13a7926e210bd8dff65d6f43a257f5235e5", "4f9e38c60cc79407a8b2966b3b9780a3e395b017" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 20:01:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 20:01:11 2014 +0000" }, "message": "am 4f9e38c6: am 21e81bca: am e010f65e: audioflinger: Fix for a deadlock in track creation\n\n* commit \u00274f9e38c60cc79407a8b2966b3b9780a3e395b017\u0027:\n audioflinger: Fix for a deadlock in track creation\n" }, { "commit": "97504893a3ee96f612e0e1b47d331583a88e289b", "tree": "521cd011b61b31841956c143fbaec0ef94856662", "parents": [ "4287b41411b40415b4186babf5763c3cfa0391ef", "6b2604259c12ee28b49f26ab2adac96eefe30934" ], "author": { "name": "jpadmana", "email": "jayashree.r.padmanaban@intel.com", "time": "Wed Mar 05 19:26:49 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 19:26:49 2014 +0000" }, "message": "am 6b260425: am 85b3013e: fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds\n\n* commit \u00276b2604259c12ee28b49f26ab2adac96eefe30934\u0027:\n fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds\n" }, { "commit": "4287b41411b40415b4186babf5763c3cfa0391ef", "tree": "7c7ce2a57a7fb0870c3550efe5c3365d9577cebe", "parents": [ "632c3790523896260dc43fd6cd40a158765cdb15", "fc04776adc5572fcc323b1dca66dee27a537c619" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 19:26:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 19:26:48 2014 +0000" }, "message": "am fc04776a: am 50c3157c: audioflinger: check for condition before waiting\n\n* commit \u0027fc04776adc5572fcc323b1dca66dee27a537c619\u0027:\n audioflinger: check for condition before waiting\n" }, { "commit": "632c3790523896260dc43fd6cd40a158765cdb15", "tree": "7c7ce2a57a7fb0870c3550efe5c3365d9577cebe", "parents": [ "4f9e38c60cc79407a8b2966b3b9780a3e395b017", "7c206e5bd24b5ae4565d0e60b637458a1054dfcf" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 19:26:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 19:26:47 2014 +0000" }, "message": "am 7c206e5b: am e0cd1051: audioflinger: update track ready condition\n\n* commit \u00277c206e5bd24b5ae4565d0e60b637458a1054dfcf\u0027:\n audioflinger: update track ready condition\n" }, { "commit": "4f9e38c60cc79407a8b2966b3b9780a3e395b017", "tree": "b07ed634c827653777e61c498f83e63058c08170", "parents": [ "d26e652226b5e589d6784bd01f2c5fc381dc6e2c", "21e81bca4d1e6f7d1ccac61b65da7c7a4a121064" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 19:26:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 19:26:47 2014 +0000" }, "message": "am 21e81bca: am e010f65e: audioflinger: Fix for a deadlock in track creation\n\n* commit \u002721e81bca4d1e6f7d1ccac61b65da7c7a4a121064\u0027:\n audioflinger: Fix for a deadlock in track creation\n" }, { "commit": "6b2604259c12ee28b49f26ab2adac96eefe30934", "tree": "1515124f74fdbc0d3544034568a784155690e185", "parents": [ "fc04776adc5572fcc323b1dca66dee27a537c619", "85b3013e06e8fe7802fe6259ecac80261e834332" ], "author": { "name": "jpadmana", "email": "jayashree.r.padmanaban@intel.com", "time": "Wed Mar 05 01:24:11 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 01:24:11 2014 +0000" }, "message": "am 85b3013e: fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds\n\n* commit \u002785b3013e06e8fe7802fe6259ecac80261e834332\u0027:\n fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds\n" }, { "commit": "fc04776adc5572fcc323b1dca66dee27a537c619", "tree": "316b886b5c436f5cfa9d14cecab3d42013ca0b88", "parents": [ "7c206e5bd24b5ae4565d0e60b637458a1054dfcf", "50c3157c5a3e0617be77716beff1ae8801d8a72f" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 01:24:10 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 01:24:10 2014 +0000" }, "message": "am 50c3157c: audioflinger: check for condition before waiting\n\n* commit \u002750c3157c5a3e0617be77716beff1ae8801d8a72f\u0027:\n audioflinger: check for condition before waiting\n" }, { "commit": "7c206e5bd24b5ae4565d0e60b637458a1054dfcf", "tree": "316b886b5c436f5cfa9d14cecab3d42013ca0b88", "parents": [ "21e81bca4d1e6f7d1ccac61b65da7c7a4a121064", "e0cd1051ed9fea0629745c29020516ae62298461" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 01:24:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 01:24:09 2014 +0000" }, "message": "am e0cd1051: audioflinger: update track ready condition\n\n* commit \u0027e0cd1051ed9fea0629745c29020516ae62298461\u0027:\n audioflinger: update track ready condition\n" }, { "commit": "21e81bca4d1e6f7d1ccac61b65da7c7a4a121064", "tree": "25ed8460e9719f09063932ecd1297bc7f99c3b0c", "parents": [ "571596564f4b818b8e89c4bbe824e557e8e00075", "e010f65e6337267cb15f8894c950a3f64370dd36" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Mar 05 01:24:09 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Mar 05 01:24:09 2014 +0000" }, "message": "am e010f65e: audioflinger: Fix for a deadlock in track creation\n\n* commit \u0027e010f65e6337267cb15f8894c950a3f64370dd36\u0027:\n audioflinger: Fix for a deadlock in track creation\n" }, { "commit": "85b3013e06e8fe7802fe6259ecac80261e834332", "tree": "477c3b2bddfc872ba4f012796f0e3a8d5448f059", "parents": [ "50c3157c5a3e0617be77716beff1ae8801d8a72f" ], "author": { "name": "jpadmana", "email": "jayashree.r.padmanaban@intel.com", "time": "Thu Nov 14 17:20:52 2013 +0530" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Mar 04 16:10:47 2014 -0800" }, "message": "fix deadlock issues that arise when there are simultaneous\neffect control interface calls to proxy and to\nnon sub-effect wrappers(eg., bundlewrapper) from audioflinger\nAlso, return NO_ERROR when CMD_OFFLOAD succeeds\n\nWhenever there are parallel calls to proxy and non sub-effects wrappers,\nsome of the calls are not completed. This is due to deadlock arsing out\nof Proxy waiting for the subeffect call to return and subeffect waiting\nfor proxy to release lock.\nThe call flow is changed to a cleaner and simple one - Proxy gets the\naeli(effect library info) of subeffects during the EffectGetSubEffects()\ncall. Therby, proxy will manage the sub effects by itself rather than\ngoing through effects factory.\n\nChange-Id: If4b259da5776f151c1e81a78a0239d342046d923\nSigned-off-by: jpadmana \u003cjayashree.r.padmanaban@intel.com\u003e\nBug: 12424044\n" }, { "commit": "50c3157c5a3e0617be77716beff1ae8801d8a72f", "tree": "7b550f2609351c85fc70658220f14e3a5737288e", "parents": [ "e0cd1051ed9fea0629745c29020516ae62298461" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Tue Dec 03 21:26:02 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Mar 04 16:03:12 2014 -0800" }, "message": "audioflinger: check for condition before waiting\n\nAsyncCallbackThread must check for any condition that\nwas already been satisfied before waiting.\n\nBug: 11824817\nChange-Id: I04683a1f355de4f440106cab47fd916aa39d5e35\n" }, { "commit": "e0cd1051ed9fea0629745c29020516ae62298461", "tree": "03273a98e8fc21f916bd0de1163913c51171b953", "parents": [ "e010f65e6337267cb15f8894c950a3f64370dd36" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Fri Dec 27 16:09:28 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Mar 04 15:58:25 2014 -0800" }, "message": "audioflinger: update track ready condition\n\nSignal track ready if the track isStopping().\n\nBug: 12423190\nChange-Id: I95e14905df10ebf301e398263478c8ca25d7e2ce\n" }, { "commit": "e010f65e6337267cb15f8894c950a3f64370dd36", "tree": "e631dc8a6690f18c6b977272404abe1df70cc30c", "parents": [ "a4f24ff9b239300b4bb2098c1413c0a60edc2d7e" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Fri Dec 13 15:40:13 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Mar 04 15:36:20 2014 -0800" }, "message": "audioflinger: Fix for a deadlock in track creation\n\nAudioFlinger enters a deadlock (with itself) on trying to free a\nRecordTrack or Track object that failed initialization. Clear this\nbad object from the caller instead.\n\nBug: 12423233\nChange-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16\n" }, { "commit": "3cd7a13a7926e210bd8dff65d6f43a257f5235e5", "tree": "9ba29205b411c279c75bf9700984dc5220bee865", "parents": [ "62a897c6c44d82fc19207fd95692a9c93ded458f", "d26e652226b5e589d6784bd01f2c5fc381dc6e2c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Mar 04 23:24:15 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 04 23:24:15 2014 +0000" }, "message": "am d26e6522: am 57159656: am a4f24ff9: AudioTrack: fix position callback after restore\n\n* commit \u0027d26e652226b5e589d6784bd01f2c5fc381dc6e2c\u0027:\n AudioTrack: fix position callback after restore\n" }, { "commit": "d26e652226b5e589d6784bd01f2c5fc381dc6e2c", "tree": "7bb327e63a80d6726f4015b19681f22b59f46855", "parents": [ "0105027f2a385ecb29a64b055f3046fb01ca2803", "571596564f4b818b8e89c4bbe824e557e8e00075" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Mar 04 23:21:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 04 23:21:48 2014 +0000" }, "message": "am 57159656: am a4f24ff9: AudioTrack: fix position callback after restore\n\n* commit \u0027571596564f4b818b8e89c4bbe824e557e8e00075\u0027:\n AudioTrack: fix position callback after restore\n" }, { "commit": "571596564f4b818b8e89c4bbe824e557e8e00075", "tree": "8955825ac7bd77217744b35ad071a7c950e5f539", "parents": [ "d2dc66a223b611142da8a019ebde79e3f8dc18f5", "a4f24ff9b239300b4bb2098c1413c0a60edc2d7e" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Mar 04 23:17:47 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Mar 04 23:17:47 2014 +0000" }, "message": "am a4f24ff9: AudioTrack: fix position callback after restore\n\n* commit \u0027a4f24ff9b239300b4bb2098c1413c0a60edc2d7e\u0027:\n AudioTrack: fix position callback after restore\n" }, { "commit": "62a897c6c44d82fc19207fd95692a9c93ded458f", "tree": "9ba29205b411c279c75bf9700984dc5220bee865", "parents": [ "e276aef8779a7763b318ebd3e8c09f35ff37a95c", "525b099ada155d6654300cb2e5d8c1a09f4eb8ba" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 03 11:11:48 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Mar 03 11:11:48 2014 +0000" }, "message": "am 525b099a: Merge \"Fix ALOGVs for 64bit\"\n\n* commit \u0027525b099ada155d6654300cb2e5d8c1a09f4eb8ba\u0027:\n Fix ALOGVs for 64bit\n" }, { "commit": "525b099ada155d6654300cb2e5d8c1a09f4eb8ba", "tree": "f1e258a941e7370622d2a215896c7d793ba3cf65", "parents": [ "0cf1633922f970caee19e2cc2f5c042ca30b4aa6", "2b4e26aae2ecd6337add3f20974afa784371e386" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Mon Mar 03 11:08:27 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Mar 03 11:08:28 2014 +0000" }, "message": "Merge \"Fix ALOGVs for 64bit\"" }, { "commit": "e276aef8779a7763b318ebd3e8c09f35ff37a95c", "tree": "2d8a4db1ff2230e8b0d8f8bd28d0dc7b5d5a716f", "parents": [ "d4c6052dd41dd5b942295cea5568783da7670eb4", "0cf1633922f970caee19e2cc2f5c042ca30b4aa6" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Feb 28 17:16:26 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Feb 28 17:16:26 2014 +0000" }, "message": "am 0cf16339: Merge \"Fix preventing from heap overwrite in capture command\"\n\n* commit \u00270cf1633922f970caee19e2cc2f5c042ca30b4aa6\u0027:\n Fix preventing from heap overwrite in capture command\n" }, { "commit": "0cf1633922f970caee19e2cc2f5c042ca30b4aa6", "tree": "3f8355c7cd43d30fa29b1e49e33d909c75dfe337", "parents": [ "096d72a32824a0a8c86a716ba44d589183b2b0b3", "abb7b17613fff41433cda94207eb535c9fed8fba" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Fri Feb 28 17:12:12 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 28 17:12:13 2014 +0000" }, "message": "Merge \"Fix preventing from heap overwrite in capture command\"" }, { "commit": "2b4e26aae2ecd6337add3f20974afa784371e386", "tree": "95adeeb9d2378974ef70a64b6d85af413f7cacdf", "parents": [ "096d72a32824a0a8c86a716ba44d589183b2b0b3" ], "author": { "name": "Kévin PETIT", "email": "kevin.petit@arm.com", "time": "Fri Feb 28 10:48:38 2014 +0000" }, "committer": { "name": "Kévin PETIT", "email": "kevin.petit@arm.com", "time": "Fri Feb 28 11:02:16 2014 +0000" }, "message": "Fix ALOGVs for 64bit\n\nChange-Id: I556f90f9e6ace1a897d24326e5c14e7bf1e9fe29\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\n" }, { "commit": "d4c6052dd41dd5b942295cea5568783da7670eb4", "tree": "580e53a71306fccc2105d22ebcf9c2d45bafbd22", "parents": [ "e0a76795125a81471c408d4a23112e98ae2f0ae3", "096d72a32824a0a8c86a716ba44d589183b2b0b3" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Feb 27 13:54:51 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 27 13:54:51 2014 +0000" }, "message": "am 096d72a3: Merge \"AArch64: Correction for LP64\"\n\n* commit \u0027096d72a32824a0a8c86a716ba44d589183b2b0b3\u0027:\n AArch64: Correction for LP64\n" }, { "commit": "096d72a32824a0a8c86a716ba44d589183b2b0b3", "tree": "66cccadf91eeb0fbf21e8a7d2720b0e123e304be", "parents": [ "5969b40858d2046aa2b8481926e34c4cb9062a4a", "1f797f960412b5a50bf8e92a0c8b460f30e947d7" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Thu Feb 27 13:18:33 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 27 13:18:34 2014 +0000" }, "message": "Merge \"AArch64: Correction for LP64\"" }, { "commit": "e0a76795125a81471c408d4a23112e98ae2f0ae3", "tree": "2bd39d197a043fed362f6e903348e8c6fa64f318", "parents": [ "ed773ea8db3d4ea828f1220e234922a987fefb3b", "5969b40858d2046aa2b8481926e34c4cb9062a4a" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 19:24:40 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Feb 26 19:24:40 2014 +0000" }, "message": "am 5969b408: Merge \"Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\"\n\n* commit \u00275969b40858d2046aa2b8481926e34c4cb9062a4a\u0027:\n Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\n" }, { "commit": "5969b40858d2046aa2b8481926e34c4cb9062a4a", "tree": "69d36b08bcac8aea963c5f6b022b8438b714d126", "parents": [ "8fc4d57d41f532b90187b9404a8ac705770d75b4", "f2d170f6790329dd73c61b8704055e1dff4112a2" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 19:18:45 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Feb 26 19:18:45 2014 +0000" }, "message": "Merge \"Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\"" }, { "commit": "f2d170f6790329dd73c61b8704055e1dff4112a2", "tree": "69d36b08bcac8aea963c5f6b022b8438b714d126", "parents": [ "8fc4d57d41f532b90187b9404a8ac705770d75b4" ], "author": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "committer": { "name": "Ying Wang", "email": "wangying@google.com", "time": "Wed Feb 26 11:07:24 2014 -0800" }, "message": "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH\n\nChange-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6\n" }, { "commit": "1f797f960412b5a50bf8e92a0c8b460f30e947d7", "tree": "1d53e27a031db01729d13b66b0c04cbcfdf662e0", "parents": [ "8fc4d57d41f532b90187b9404a8ac705770d75b4" ], "author": { "name": "Marcus Oakland", "email": "marcus.oakland@arm.com", "time": "Mon Feb 17 08:28:25 2014 +0000" }, "committer": { "name": "Ashok Bhat", "email": "ashok.bhat@arm.com", "time": "Wed Feb 26 16:53:52 2014 +0000" }, "message": "AArch64: Correction for LP64\n\nIn the Intra16x16PlanePrediction function, a u32 (unsigned 32-bit\ninteger) was being used for the \"i\" variable, and being used with a\nvalue of 7 in the loop \"for (i \u003d 0, b \u003d 0; i \u003c 8; i++)\" to access the\n\"above[6-i]\" location where \"above\" is defined as \"u8 *\". Because \"i\"\nwas unsigned there was no sign extension on use with the __LP64__\n64-bit pointer, so rather than 0xFFFFFFFF being treated as -1, it was\ntreated as 4,292,967,295 and that resulted in a SIGSEGV at an invalid\naddress. By changing the type of \"i\" to an i32 (signed 32-bit integer)\nthe expected sign extension occurs and the value is treated as -1.\n\nThis change fixes android.media.cts.DecoderTest#testCodeBasicH264 on\n64-bit platforms\n\nChange-Id: I85df58b0dc1d39f89ab421d04ab5481356520f0c\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n" }, { "commit": "ed773ea8db3d4ea828f1220e234922a987fefb3b", "tree": "1da046728199392a29c7c54883c83978f25d02c9", "parents": [ "aa0390b77cf068eda8e7bdf94348625db0c12144", "8fc4d57d41f532b90187b9404a8ac705770d75b4" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Tue Feb 25 19:41:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 25 19:41:19 2014 +0000" }, "message": "am 8fc4d57d: Merge \"Avoid a building error\"\n\n* commit \u00278fc4d57d41f532b90187b9404a8ac705770d75b4\u0027:\n Avoid a building error\n" }, { "commit": "8fc4d57d41f532b90187b9404a8ac705770d75b4", "tree": "6fa63a63d790ed9a8401f60d5473c21ae2f9fc52", "parents": [ "4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae", "a93c8c9c89ba679cf312c7d082913121bb5543c2" ], "author": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Tue Feb 25 19:36:22 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 25 19:36:23 2014 +0000" }, "message": "Merge \"Avoid a building error\"" }, { "commit": "aa0390b77cf068eda8e7bdf94348625db0c12144", "tree": "aa74eecfc384795dc4968bde326ce0fdbf96c5be", "parents": [ "8dad284a8ac588ef0be92c6a467e525f07c164cd", "4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Feb 20 17:27:17 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 20 17:27:17 2014 +0000" }, "message": "am 4ee5d2b9: Merge \"LiveSession: Use the actual, possibly redirected url as base in the M3U\"\n\n* commit \u00274ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae\u0027:\n LiveSession: Use the actual, possibly redirected url as base in the M3U\n" }, { "commit": "4ee5d2b9d0cdaf936bd5fecd670e5f38da63e4ae", "tree": "2c461bbda16e9421eb55d3b2e37af6b2eff981c3", "parents": [ "80b72e6f4202ce26facbe51b8739814bca198a2c", "784faaf1d76902be6b36d3af01fb5325f0d45a04" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Thu Feb 20 17:21:06 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 20 17:21:06 2014 +0000" }, "message": "Merge \"LiveSession: Use the actual, possibly redirected url as base in the M3U\"" }, { "commit": "abb7b17613fff41433cda94207eb535c9fed8fba", "tree": "1ccb9a72843f7b023cbd9b5365fc6c424b672dc7", "parents": [ "80b72e6f4202ce26facbe51b8739814bca198a2c" ], "author": { "name": "Ryszard Grzesica", "email": "ryszard.grzesica@sonymobile.com", "time": "Fri Jan 17 11:40:16 2014 +0100" }, "committer": { "name": "Takeshi Aimi", "email": "takeshi.aimi@sonymobile.com", "time": "Thu Feb 20 02:01:35 2014 +0900" }, "message": "Fix preventing from heap overwrite in capture command\n\nThere was heap usage error in case of stop of audio framework while\ncapturePoint was negative. Pointer to reply data was moved but\nfinal silence write was done using original buffer size.\nNow silence set is done at the beginning under the condition\nthat framework has stopped.\n\nChange-Id: I7dab1e922f1813e5fbfd4a64c8b0d15d9465520c\n" }, { "commit": "8dad284a8ac588ef0be92c6a467e525f07c164cd", "tree": "08bf343e39bc9388318a12f24a0d981074b40595", "parents": [ "7a8e31460649a6fa76b757949f18d586a62b53a2", "80b72e6f4202ce26facbe51b8739814bca198a2c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Feb 14 01:08:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Feb 14 01:08:20 2014 +0000" }, "message": "am 80b72e6f: Merge \"libeffects: don\\\u0027t set module path\"\n\n* commit \u002780b72e6f4202ce26facbe51b8739814bca198a2c\u0027:\n libeffects: don\u0027t set module path\n" }, { "commit": "80b72e6f4202ce26facbe51b8739814bca198a2c", "tree": "8ed9e71e0cb8e8f67d161569f7039f263f41fd40", "parents": [ "af191eb4feac513d17dc0362e0cea5bc9e0ffe9d", "6c44568b8f065ae06556ba6a9b3c725d9b416857" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Feb 14 01:04:44 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 14 01:04:45 2014 +0000" }, "message": "Merge \"libeffects: don\u0027t set module path\"" }, { "commit": "6c44568b8f065ae06556ba6a9b3c725d9b416857", "tree": "8ed9e71e0cb8e8f67d161569f7039f263f41fd40", "parents": [ "af191eb4feac513d17dc0362e0cea5bc9e0ffe9d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Feb 13 16:39:11 2014 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Feb 13 16:40:36 2014 -0800" }, "message": "libeffects: don\u0027t set module path\n\nSetting the module path breaks multilib builds where there may\nbe two different module paths for 32-bit and 64-bit, and there\nis no need to set it to the default.\n\nChange-Id: I95d62b5573a0bb0ab6c97649041dfc4309cbc8b9\n" }, { "commit": "7a8e31460649a6fa76b757949f18d586a62b53a2", "tree": "52200557bce1487b5991529aae0869d4214ffe7b", "parents": [ "499608075bce8a8bc649519687b28c99a0523839", "af191eb4feac513d17dc0362e0cea5bc9e0ffe9d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 13 17:15:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 13 17:15:19 2014 +0000" }, "message": "am af191eb4: Merge \"Replace size_t in shared memory by uint32_t\"\n\n* commit \u0027af191eb4feac513d17dc0362e0cea5bc9e0ffe9d\u0027:\n Replace size_t in shared memory by uint32_t\n" }, { "commit": "af191eb4feac513d17dc0362e0cea5bc9e0ffe9d", "tree": "2148da61941d0a19ba1b2118158dfb7d98d6a010", "parents": [ "7eacea1156a3896ee7813cd9a06c535e63c95f6a", "751a9c8cbc391a91604dd1052fb95d3e4d278c2f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 13 15:59:58 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Feb 13 15:59:58 2014 +0000" }, "message": "Merge \"Replace size_t in shared memory by uint32_t\"" }, { "commit": "751a9c8cbc391a91604dd1052fb95d3e4d278c2f", "tree": "2148da61941d0a19ba1b2118158dfb7d98d6a010", "parents": [ "7eacea1156a3896ee7813cd9a06c535e63c95f6a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Jan 28 11:03:28 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@android.com", "time": "Thu Feb 13 07:57:20 2014 -0800" }, "message": "Replace size_t in shared memory by uint32_t\n\nEventually we may want to use uint64_t, but will need to confirm atomicity.\n\nBug: 12381724\nChange-Id: Ia2c591d262d22b47b6f7dab4b9d9faa14b86d865\n" }, { "commit": "499608075bce8a8bc649519687b28c99a0523839", "tree": "8b63a92f28908a84e4ef6821a495b22a8bebe0ab", "parents": [ "1c178d3e7b8d037ac8d348922ba841b28eee662f", "0105027f2a385ecb29a64b055f3046fb01ca2803" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Thu Feb 13 03:00:06 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Feb 13 03:00:06 2014 +0000" }, "message": "am 0105027f: Fix wrong channel table in ESQueue according to the A/52 table 5.8\n\n* commit \u00270105027f2a385ecb29a64b055f3046fb01ca2803\u0027:\n Fix wrong channel table in ESQueue according to the A/52 table 5.8\n" }, { "commit": "1c178d3e7b8d037ac8d348922ba841b28eee662f", "tree": "e53e1a633e239f954672bb5d1642cd083bb83e6c", "parents": [ "566be7c33fc56ae4c34168ecbee5316374f7e3c5", "7eacea1156a3896ee7813cd9a06c535e63c95f6a" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Feb 11 21:45:21 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 11 21:45:21 2014 +0000" }, "message": "am 7eacea11: Merge \"avcenc: Only do startcode escaping if the next byte requires it\"\n\n* commit \u00277eacea1156a3896ee7813cd9a06c535e63c95f6a\u0027:\n avcenc: Only do startcode escaping if the next byte requires it\n" }, { "commit": "7eacea1156a3896ee7813cd9a06c535e63c95f6a", "tree": "36555accf4f0edec68e16bd3b5b8e00c1a784448", "parents": [ "3c9130a8a12ce962dc8d22e04243b135b9e98b01", "04ed61b1004282a632cdc1277d93183e15a8df93" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Feb 11 21:31:40 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 11 21:31:40 2014 +0000" }, "message": "Merge \"avcenc: Only do startcode escaping if the next byte requires it\"" }, { "commit": "04ed61b1004282a632cdc1277d93183e15a8df93", "tree": "fea7e72e3e4396de890ebfc6a16a05dd7959fb76", "parents": [ "5930e8ebdacf3a59c13eef11fd03658ba58b443e" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Wed Aug 07 14:57:20 2013 +0300" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Tue Feb 11 21:05:39 2014 +0100" }, "message": "avcenc: Only do startcode escaping if the next byte requires it\n\nSection 7.4.1 in the H.264 standard says that the only valid bytes\nto follow a sequence that starts with 0x000003 are 0x00, 0x01,\n0x02 or 0x03.\n\nThis makes EncodeDecodeTest pass properly when decoding using\nOMX.google.h264.decoder, which is strict about the forbidden\nescape sequences.\n\nChange-Id: Ice113d9b934015003ea9cb10d0b21cee4d18d774\n" }, { "commit": "566be7c33fc56ae4c34168ecbee5316374f7e3c5", "tree": "6a7f5163818f67bee2bcbeffc5f9c2f12e9aa49d", "parents": [ "66e05682e4e5d52673b11e7950c0559532f4b6cb", "3c9130a8a12ce962dc8d22e04243b135b9e98b01" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:41:54 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Feb 11 13:41:54 2014 +0000" }, "message": "am 3c9130a8: Merge \"Make frameworks/av 64-bit compatible\"\n\n* commit \u00273c9130a8a12ce962dc8d22e04243b135b9e98b01\u0027:\n Make frameworks/av 64-bit compatible\n" }, { "commit": "3c9130a8a12ce962dc8d22e04243b135b9e98b01", "tree": "b938e1d75a1beefae86244f287ca22f4a277740d", "parents": [ "cdda7bf4d3ca9cad6979374a18dd5be79ea83d80", "377b2ec9a2885f9b6405b07ba900a9e3f4349c38" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:35:01 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 11 13:35:02 2014 +0000" }, "message": "Merge \"Make frameworks/av 64-bit compatible\"" }, { "commit": "377b2ec9a2885f9b6405b07ba900a9e3f4349c38", "tree": "b938e1d75a1beefae86244f287ca22f4a277740d", "parents": [ "cdda7bf4d3ca9cad6979374a18dd5be79ea83d80" ], "author": { "name": "Kévin PETIT", "email": "kevin.petit@arm.com", "time": "Mon Feb 03 12:35:36 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 11:40:06 2014 +0000" }, "message": "Make frameworks/av 64-bit compatible\n\nContains the necessary changes to make frameworks/av build and work\non a 64-bit machine.\n\nSigned-off-by: Craig Barber \u003ccraig.barber@arm.com\u003e\nSigned-off-by: Kévin PETIT \u003ckevin.petit@arm.com\u003e\nSigned-off-by: Ashok Bhat \u003cashok.bhat@arm.com\u003e\nSigned-off-by: Marcus Oakland \u003cmarcus.oakland@arm.com\u003e\n\nChange-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43\n" }, { "commit": "0105027f2a385ecb29a64b055f3046fb01ca2803", "tree": "7bb327e63a80d6726f4015b19681f22b59f46855", "parents": [ "dd432ce03eccf280d83672f95076b6fbd561047f" ], "author": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Tue Feb 11 18:26:40 2014 +0900" }, "committer": { "name": "Dongwon Kang", "email": "dwkang@google.com", "time": "Tue Feb 11 18:27:00 2014 +0900" }, "message": "Fix wrong channel table in ESQueue according to the A/52 table 5.8\n\nReference: http://www.atsc.org/cms/standards/A52-2012(12-17).pdf\nBug: 12950777\nChange-Id: Ic60033170b21e67408a3b3444507f6528946bdd0\n" }, { "commit": "66e05682e4e5d52673b11e7950c0559532f4b6cb", "tree": "04d704ace7016a11cd9288ef71e2dbb9f9d92d67", "parents": [ "5a458ede3b7d303723fde4b856532bdc3b94971b", "cdda7bf4d3ca9cad6979374a18dd5be79ea83d80" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Feb 10 22:40:05 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Feb 10 22:40:05 2014 +0000" }, "message": "am cdda7bf4: Merge \"frameworks/av: fix errors inside ALOGV\"\n\n* commit \u0027cdda7bf4d3ca9cad6979374a18dd5be79ea83d80\u0027:\n frameworks/av: fix errors inside ALOGV\n" }, { "commit": "cdda7bf4d3ca9cad6979374a18dd5be79ea83d80", "tree": "0923073e3d925812d8bfac9b350aab42a45fb17a", "parents": [ "5930e8ebdacf3a59c13eef11fd03658ba58b443e", "26a995d192b5e8d41c70f189b585b36a29721362" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Feb 10 22:34:16 2014 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 10 22:34:16 2014 +0000" }, "message": "Merge \"frameworks/av: fix errors inside ALOGV\"" }, { "commit": "26a995d192b5e8d41c70f189b585b36a29721362", "tree": "40c32fde2f2cd2702933fe3d2f3d3c795221452f", "parents": [ "e2307ccbab9c32a7806f15c2572cfe6ec428f2f5" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Feb 06 20:29:44 2014 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Mon Feb 10 14:33:33 2014 -0800" }, "message": "frameworks/av: fix errors inside ALOGV\n\nFix errors exposed by adding compile-time checking to disabled ALOGVs.\n\nChange-Id: Ie06db81d422bb4eee7dfc10abb8d03001627af4c\n" } ], "next": "5a458ede3b7d303723fde4b856532bdc3b94971b" }