)]}' { "log": [ { "commit": "1b24cf32e02a1372e57b3a2a432bc0adfe496e6d", "tree": "220f4583ae1081df62fa5c861eed3e9e90a24515", "parents": [ "4845b69f70ff457be8d8908f6eb61e2af67e00d3", "e80631aa1992ca50af679cd6a018c0ffda7f9b17" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 23:37:19 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 15 23:37:19 2014 +0000" }, "message": "am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027e80631aa1992ca50af679cd6a018c0ffda7f9b17\u0027:\n media: use size_t for integer iterator to Vector::size()\n media: 64 bit compile issues\n" }, { "commit": "e80631aa1992ca50af679cd6a018c0ffda7f9b17", "tree": "6b3fcc9fbb5b02976e4bb2163e994952303bead5", "parents": [ "d4a3cae8cc4cf924925ae57723e61c89f6c4fd51", "839d11d1f7be9dff2f06c7d30a9eb39cb6782078" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 22:35:00 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Apr 15 22:35:00 2014 +0000" }, "message": "am 839d11d1: Merge changes I0a744dc7,Id993a70d\n\n* commit \u0027839d11d1f7be9dff2f06c7d30a9eb39cb6782078\u0027:\n media: use size_t for integer iterator to Vector::size()\n media: 64 bit compile issues\n" }, { "commit": "3ab368e0810d894dcbc0971350c095049478a055", "tree": "a50053c391da8c02797158395f2ecfec83218855", "parents": [ "db43b34c3428e480f8c4c66e7e88f4001f37f91e" ], "author": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:55:53 2014 -0700" }, "committer": { "name": "Mark Salyzyn", "email": "salyzyn@google.com", "time": "Tue Apr 15 14:57:31 2014 -0700" }, "message": "media: use size_t for integer iterator to Vector::size()\n\nChange-Id: I0a744dc7815a86a993df9b0623440be620ec8903\n" }, { "commit": "adad3d7d935da176ff24941b4ae9edf7340e9b96", "tree": "7a8a2f8e31c7dd690805c1cfd9982d218c66296b", "parents": [ "1392eb3d1802e9f894f87d7a7387207d1b6faca1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 21 14:51:43 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Mar 26 14:46:28 2014 -0700" }, "message": "Use LOG_ALWAYS_FATAL instead of LOG_FATAL\n\nLOG_FATAL is compiled out in most builds, so the\nassertion checks were not being performed.\n\nChange-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35\n" }, { "commit": "2d3ca68363f723fbe269d3ce52dab4985dfc7154", "tree": "c1f8c7bbae0e128158ce90a9985d0219dd719182", "parents": [ "164985121796cf214c7a83d32005d9b01125b558" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Fri Mar 07 13:43:49 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Mar 17 18:32:07 2014 -0700" }, "message": "audioflinger: OffloadThread fix for resume underrun\n\nAudioFlinger can miss resuming h/w on a pause-\u003eresume transition\nif sufficient data isn\u0027t available\n\nBug: 11358524.\nChange-Id: Ic3c75256290d3515fd4a96dfcc900909fbe5bc15\n" }, { "commit": "164985121796cf214c7a83d32005d9b01125b558", "tree": "5e84c9a2511f94338b116962ef4eb7ba5903b708", "parents": [ "8d6c292a0bed3d63b5b7297d09a604af6327c663" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Mar 17 17:22:08 2014 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Mar 17 18:31:43 2014 -0700" }, "message": "AudioFlinger: Change track ready condition in STOPPING_1 state\n\nSet FS_FILLED only if framesReady() \u003e 0\n\nChange-Id: Ibb1d2e988ff17fcf3a7ab61031a3f85df82f18d5\n" }, { "commit": "8d6c292a0bed3d63b5b7297d09a604af6327c663", "tree": "344c2297ed00e1e10998490bc4e2f00358536133", "parents": [ "9ff25ced1404c896df9e6ed3a6ad289305559361" ], "author": { "name": "Krishnankutty Kolathappilly", "email": "kkolat@codeaurora.org", "time": "Tue Feb 04 16:23:42 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Mar 17 18:30:13 2014 -0700" }, "message": "audioflinger: Handle pause /resume in stopping state\n\n-Pre-requisite:\n Perform seek on the clip. After seek the data remaining till EOS\n is little more than the driver and common block buffering.\n-Framework state:\n Offload thread is waiting for signal from the HAL for a free\n buffer. Audio Player calls sink stop on reaching EOS. Audio\n track is waiting on obtain buffer for a free space in common\n block to send the last buffer. The track is moved to stopping\n state as input EOS is reached.\n-Issue:\n Perform pause/ resume in this state(STOPPING), Audio playback\n does not resume.\n-Fix\n Ensure resume is called in stopping state if frames ready is\n greater than zero.\n\nBug: 12870871\n\nChange-Id: Ib1378c4ee5ce4bea655691e93de0775f7b1d2804\nSigned-off-by: Glenn Kasten \u003cgkasten@google.com\u003e\n" }, { "commit": "3ef14ef30359376006a233f6a21a165d4b65a7df", "tree": "78947d5e8dee6f3942fdc7891dd40777b21dd7de", "parents": [ "15e5798908ccac14e10c84834eaf08c42931bd06" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Mar 13 15:08:51 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Mar 14 14:49:37 2014 -0700" }, "message": "Make error handling more similar for output and capture\n\nAnd simplify error case\n\nChange-Id: I0bb1ec252945d672cc4cef137977b912f1b23d51\n" }, { "commit": "05997e21af6c4517f375def6563af4b9ebe95f39", "tree": "6a0892e14e34751cd10e11f6f73e92401f540505", "parents": [ "0e0e846f3d86906ff990025981e514d6bcf44d8e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Mar 13 15:08:33 2014 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Mar 14 14:49:36 2014 -0700" }, "message": "Whitespace and comments\n\nChange-Id: I99752cca74a459c4746ea4718acb0115439e50bd\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": "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": "25f4aa83efaa9179e65a20583a6d441de2c3ff3f", "tree": "996653f52a07bb6dc99d058943f852f3182ea637", "parents": [ "deca2ae0a7cf8bc54ff3f30b7dc39bbc78b94c0d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 07 10:50:43 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 18 12:56:13 2014 -0800" }, "message": "Move handleSyncStartEvent and clearSyncStartEvent to RecordTrack\n\nChange-Id: I611a63e63acf3eb17e2072c1a77b91fe9e62e36a\n" }, { "commit": "6dd62fb91d82dedcfa3ab38c02eb0940b4ba932a", "tree": "5c463a944686864894c2be528a52df9d275dd221", "parents": [ "f3b785ae6ea135115b54ac58cedc12b444483902" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 05 16:35:58 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 18 12:52:35 2014 -0800" }, "message": "Multi-client recording\n\nSupports multiple clients both at native sample rate and with resampling.\n\nChange-Id: Icea55b4fd30751761b7debaa3ce016c79e712d8d\n" }, { "commit": "1d6fa7af1288b550faabe4ec2cf98684236723db", "tree": "a8801ca9a0925ba1faccf17acea4aa78d71a9d29", "parents": [ "b82a9f105f89d6b3684c9f626918042bd8977912", "566be7c33fc56ae4c34168ecbee5316374f7e3c5" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:47:53 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Tue Feb 11 13:53:20 2014 +0000" }, "message": "resolved conflicts for merge of 566be7c3 to master\n\nChange-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce\n" }, { "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": "9601c6efcb2552960d6f125d073525b581c1b7ec", "tree": "3f01719f2e687abdb58e0405413766ce25f6f362", "parents": [ "e175d77bb610675ba2f70f24449189995ddeaf5b", "b220884bf3129253cc5bc8d030bc475411ea4911" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Feb 10 17:14:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Feb 10 17:14:09 2014 +0000" }, "message": "Merge \"Pretty up audioflinger dumpsys\"" }, { "commit": "b220884bf3129253cc5bc8d030bc475411ea4911", "tree": "def105f8d0928679900588536f8b1911c3d179fa", "parents": [ "bbbb1e80f461616cd9814de125f95f5b89cf5870" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Feb 07 14:00:50 2014 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Feb 10 08:01:14 2014 -0800" }, "message": "Pretty up audioflinger dumpsys\n\nChange-Id: I57e44b4c36b99f7149542bbcf9645521c6152dfa\n" }, { "commit": "8f762d577f2dcf34357eb8731070ae465649ec9a", "tree": "dd74d379fd4067025aae50732e5964904132e903", "parents": [ "bbbb1e80f461616cd9814de125f95f5b89cf5870", "4944acb7355b3aa25748fd25945a363a69d65444" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 07 23:36:33 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 07 23:36:34 2014 +0000" }, "message": "Merge \"Fix whitespace\"" }, { "commit": "a793625031a3e326a261a0843598c35a5784bbde", "tree": "f18a01ac2ead0114a2a46783b3ef79a013fb85e7", "parents": [ "19f420ea68424a608e982d39ab76676a05337685", "6e0d67d7b496ce17c0970a4ffd3a6f808860949c" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 07 20:49:21 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 07 20:49:22 2014 +0000" }, "message": "Merge \"Use Format_isValid() and Format_isEqual() instead of direct comparison\"" }, { "commit": "4944acb7355b3aa25748fd25945a363a69d65444", "tree": "009b66c5edcb85e6974ee9462919fd72fba381c5", "parents": [ "f74f213c0cd0612101e00a73704429dac1a92fe3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 19 08:39:20 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 07 11:22:31 2014 -0800" }, "message": "Fix whitespace\n\nChange-Id: I9add0872030a26933f6b6dad1be299154611cc56\n" }, { "commit": "7844f679be8d94c5cdf017f53754cb68ee2f00da", "tree": "60b91c8d8d95f49d98b1c35110b6f4fe5498cb62", "parents": [ "0f02f265123b7ef2fd6ac09ff70cde26eb5559ad" ], "author": { "name": "Haynes Mathew George", "email": "hgeorge@codeaurora.org", "time": "Wed Jan 15 12:32:55 2014 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Feb 06 11:48:22 2014 -0800" }, "message": "AudioFlinger: Modify flush handling for offload path\n\nDo not allow an offload track to directly control the offload thread\nbehavior. OffloadThread can check for any pending flush reporting\nby its active tracks and decide to flush the HW or not.\n\nBug: 12530661\nChange-Id: Ib33f023c942f6c091b618004136b153c38a6eef6\n" }, { "commit": "6e0d67d7b496ce17c0970a4ffd3a6f808860949c", "tree": "e9d0c68908bcbbcb3eb5ef28b2b2c0db5488fa39", "parents": [ "cc1e0e807ee9a9f163a4685cbd6efd6ae55849cf" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 31 09:41:08 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Feb 03 17:10:57 2014 -0800" }, "message": "Use Format_isValid() and Format_isEqual() instead of direct comparison\n\nChange-Id: Ie87607aa514976947540a77775e6425c4e56e7d9\n" }, { "commit": "0f11b51a57bc9062c4fe8af73747319cedabc5d6", "tree": "3a9156d700b18a53f856ac8ae51a44604af36fe1", "parents": [ "0520e05f9083cf13fa7062629bc6606f4b39f08a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 31 16:18:54 2014 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Feb 03 07:48:43 2014 -0800" }, "message": "Fix unused parameter warnings in audio\n\nChange-Id: I665ba3358dd9502f0adec70d486e7bf8a2e1b0fe\n" }, { "commit": "f0002d142e6d24c5438600b2c259679de710f8ac", "tree": "20e5013fa14f2d5339868c1b08396f7b852a2123", "parents": [ "c69b91ceae6255e41c5413796fb0ed4f7af45b15", "74935e44734c1ec235c2b6677db3e0dbefa5ddb8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 24 16:13:50 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jan 24 16:13:51 2014 +0000" }, "message": "Merge \"Replace control block frameCount_ by explicit in/out parameter\"" }, { "commit": "0bcfa88149e2404b34d13c622e3921e1b846cdf8", "tree": "67d09151548315f58bda189ed8a6cc0ab75daff1", "parents": [ "3f65a84030c2ae95d72a9458ebfbb6d14e96daf5" ], "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": "Wed Jan 08 13:54:53 2014 -0800" }, "message": "audioflinger: update track ready condition\n\nSignal track ready if the track isStopping().\n\nBug: 12423190\nChange-Id: Ie279995d5f90fa8211a20dfbeacc1cf9b921d0bf\n" }, { "commit": "74935e44734c1ec235c2b6677db3e0dbefa5ddb8", "tree": "dc7bc2c9f496097e95ff36440fcd79886517ba53", "parents": [ "bd72d22097f78f5bd668b223bc8c94e351311e31" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Dec 19 08:56:45 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Dec 20 08:40:55 2013 -0800" }, "message": "Replace control block frameCount_ by explicit in/out parameter\n\nin IAudioFlinger::createTrack and IAudioFlinger::openRecord\n\nChange-Id: I09c644c80e92c8e744b1b99055988a2588b2a83d\n" }, { "commit": "663c2247b71086e30bfd3192979d1dd7f15c539e", "tree": "caedda5629d70de2fcab7506a81852e6c62ea473", "parents": [ "30ff92cba19c5acd747631365db1e1084e45ab34" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Sep 24 11:52:37 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 20 14:17:01 2013 -0800" }, "message": "Consistent error checking for sp\u003cIMemory\u003e and pointer()\n\nThere have been concerns that an sp\u003cIMemory\u003e could be non-0, but the\nassociated pointer() still be NULL. There are rumors this may happen\nwhen a non-0 sp\u003cIMemory\u003e is passed in by client but the shared memory cannot\nbe re-mapped into mediaserver.\n\nThere\u0027s also evidence in the early (2009/03/03) pre-git code of checking\npointer() for NULL, after a local allocate() returned a non-0 sp\u003cIMemory\u003e.\nIt\u0027s not clear if this is \"cargo cult\" paranoia, or if there was a\ngenuine reason for the check.\n\nIn any case, we now consistently check pointer() for sp\u003cIMemory\u003e\ninput parameters in createTrack() and queueTimedBuffer().\n\nWe also check after successful allocate(). If allocate() returns a\nnon-0 sp\u003c\u003e but NULL pointer(), then treat it as if the allocate() had\nreturned 0.\n\nChange-Id: I3013ac5766b493d443ecef71711ec861076a623e\n" }, { "commit": "30ff92cba19c5acd747631365db1e1084e45ab34", "tree": "529f382c59fc9f686e1ec49b279bdaf6303af1d1", "parents": [ "7ae751960d8b31e6e301c18122d1146da8fe5983" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 20 11:57:08 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Nov 20 14:02:40 2013 -0800" }, "message": "Code simplification for timed allocate\n\nChange-Id: I5acccd7418c5b4a4dc0112147c750fef9f74bf33\n" }, { "commit": "1fc6cb5be26734938b3999e6bf4ce0e625e7d284", "tree": "ceca20e265134ebd5158b56d9341301ffd4242cc", "parents": [ "d21952fe5bc94f7bb6ee729f806c0e641fdb1a0d", "ce275b7dd20e3d4781a46126c753e6eb998e6c0f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 29 18:20:38 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 29 18:20:38 2013 -0700" }, "message": "am ce275b7d: am 1c594b63: Merge \"audioflinger: enable effects after registration if needed\" into klp-dev\n\n* commit \u0027ce275b7dd20e3d4781a46126c753e6eb998e6c0f\u0027:\n audioflinger: enable effects after registration if needed\n" }, { "commit": "1c594b637df26499ce1dae2db34f2b3290efd838", "tree": "0d231e939a18d3f28f1e19658a7b7ed2e61ed1fb", "parents": [ "fd4779740ec3e9e865d5514464df26d015354388", "d72b7c0180ee83fc3754629ed68fc5887a125c4c" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Oct 30 01:13:52 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Oct 30 01:13:52 2013 +0000" }, "message": "Merge \"audioflinger: enable effects after registration if needed\" into klp-dev" }, { "commit": "9cae217050aa1347d4ac5053c305754879e3f97f", "tree": "dff82f277cba8f34af39eaeeb00adec01bbda26c", "parents": [ "be567be3f92026f5964c1c9ecce00e30bb7df412" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Jan 14 14:12:05 2013 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Oct 25 14:06:03 2013 -0700" }, "message": "Assign blame for playback wakelocks.\n\nSet a work source for the playback wakelock, so that playback is\ncounted against the requesting app instead of the media server.\n\nCherrypicked from master.\n\nb/9464621\n\nChange-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31\n" }, { "commit": "462fd2fa9eef642b0574aa7409de0bde3fec8d43", "tree": "65446a138d197f062bf199480b96cca4df560fcf", "parents": [ "f7d89bd79d170be3b299717ac11aff62909314c5" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Mon Jan 14 14:12:05 2013 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Oct 25 11:13:17 2013 -0700" }, "message": "Assign blame for playback wakelocks.\n\nSet a work source for the playback wakelock, so that playback is\ncounted against the requesting app instead of the media server.\n\nChange-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31\n" }, { "commit": "a153b68f2260a8ed7fbb236fa659b13264ac5ac0", "tree": "fde0bd5a83da59bde7dc9b146a8a8af48d911adc", "parents": [ "6a7327f110b86613e6e8c7de105c49803acacc1d", "77177fa20773d02b4f9c4147ecb98107f019fa7d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Oct 18 15:09:03 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Oct 18 15:09:03 2013 -0700" }, "message": "am 77177fa2: am 95c03858: Merge \"Allow releaseBuffer after flush\" into klp-dev\n\n* commit \u002777177fa20773d02b4f9c4147ecb98107f019fa7d\u0027:\n Allow releaseBuffer after flush\n" }, { "commit": "2e422c472c91aa7912befd0fc038d1e11f354bc1", "tree": "7583e04f353f9cadf5081fafdcb8042450e3c85c", "parents": [ "dedc7b0fa23c21b525dc8abb572bb8161ad66a9b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Oct 18 13:00:29 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Oct 18 13:53:41 2013 -0700" }, "message": "Allow releaseBuffer after flush\n\nAfter AudioTrack start checks for pending flush,\nallow releaseBuffer on any previously obtained buffer.\nFor example, this can happen if the resampler has obtained\na buffer but not released the whole buffer yet.\nNote that the resampler will be reading obsolete data.\n\nBug: 11285590\nChange-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5\n" }, { "commit": "9138d32050411c04cc45c25094352cf8b6e01df9", "tree": "47baaae0e9ea8f737c8ce1af5a52e3872432df70", "parents": [ "653edc77815c76769b6ac1871add6f47a95d1dc5", "e45796dee9c072cdb13a00b407e68be2cd55e2f2" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 17 16:23:39 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Oct 17 16:23:39 2013 -0700" }, "message": "am e45796de: am dedc7b0f: Merge \"Fix flush() followed by start()\" into klp-dev\n\n* commit \u0027e45796dee9c072cdb13a00b407e68be2cd55e2f2\u0027:\n Fix flush() followed by start()\n" }, { "commit": "12022ff8d223ccf4dfae019c81e4a93a3f44985c", "tree": "ba799e32b0699249e7fb8e6f5d6fa4120b978d67", "parents": [ "f8f15b05fe051009945c9042a1a9260280e0feb2" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 17 11:32:39 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Oct 17 11:33:31 2013 -0700" }, "message": "Fix flush() followed by start()\n\nBug: 11259166\nChange-Id: I72526cdfd4e3ff4b06e6a317e577f57cc285205d\n" }, { "commit": "d72b7c0180ee83fc3754629ed68fc5887a125c4c", "tree": "9c6bef31eaca96d7420a65fcdd2438666c5668dd", "parents": [ "15ad2470b2f2ac34473eb568b606ad75e8e63ac6" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat Oct 12 16:17:46 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat Oct 12 16:37:00 2013 -0700" }, "message": "audioflinger: enable effects after registration if needed\n\nThis fixes a bug where effects were not properly reenabled after\nbeing moved from one playback thread to another. The effect\nis enabled but the audio policy manager sees it as disabled.\n\nBug: 11181933.\nChange-Id: I19cac7acbaf61c546e667fd85ed7d4eda1c716d8\n" }, { "commit": "34717c83733def81287e2b4ba2f62b416325c7ae", "tree": "bdc06557b16690a491298f6a73653bae249a6c84", "parents": [ "cff0d41463dfa0bcb33805794f1341d029e86f04", "3424d6e17637e0743ddf3bf4688af8ee36e69264" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Oct 01 20:58:58 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Oct 01 20:58:58 2013 -0700" }, "message": "am 3424d6e1: am 1adf20ce: Merge \"fix volume and effect enable delay on offloaded tracks\" into klp-dev\n\n* commit \u00273424d6e17637e0743ddf3bf4688af8ee36e69264\u0027:\n fix volume and effect enable delay on offloaded tracks\n" }, { "commit": "59fe010bcc072597852454a2ec53d7b0a2002a3b", "tree": "b6b42e04a89ead77c9ecd9635a328686a8bb9863", "parents": [ "5d6d86a4d102704f49b9235eaf282c428d7100b6" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 27 18:48:26 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 30 12:05:38 2013 -0700" }, "message": "fix volume and effect enable delay on offloaded tracks\n\nVolume: add a method to wake up the mediaserver playback\nthread when a volume command is received on an offloaded track.\n\nEffects: call effect chain process on offloaded playback threads\nasynchronously from writes to allow effect state updates while\nwaiting for async write callback.\n\nBug: 10796540.\n\nChange-Id: Id2747ae88783575d1d7ffd6fc86fbd054ab2c739\n" }, { "commit": "0230a2a8a413076a138db4c4e1dea018104fd5e2", "tree": "1d78509ed7b005fe0bc3a998c8eda13a93f65876", "parents": [ "d2b80a1fb90cb4dc3f569e716af0279c1e1ea72d", "c6bed216e3a759a855ac4b9b743fbaed2d5929c1" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 20 11:22:17 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 20 11:22:17 2013 -0700" }, "message": "am c6bed216: am a3b97ad2: Merge \"audioflinger: implement getTimestamp() for offloaded tracks\" into klp-dev\n\n* commit \u0027c6bed216e3a759a855ac4b9b743fbaed2d5929c1\u0027:\n audioflinger: implement getTimestamp() for offloaded tracks\n" }, { "commit": "d2b80a1fb90cb4dc3f569e716af0279c1e1ea72d", "tree": "9094262e799f5ff66acd45a0bae59a7de863349c", "parents": [ "bd1be321f7d3626305c1c6d0b006768b5130fedd", "ce3e7cb0bd09e7861d417b7d45c1e5921f10a93f" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 20 11:20:56 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 20 11:20:56 2013 -0700" }, "message": "am ce3e7cb0: am fbb2609f: Merge \"audioflinger: fix lost offload thread resume event\" into klp-dev\n\n* commit \u0027ce3e7cb0bd09e7861d417b7d45c1e5921f10a93f\u0027:\n audioflinger: fix lost offload thread resume event\n" }, { "commit": "a3b97ad288e6808c54c6275eaac1bd53108d8f11", "tree": "eb4ee28ecd01cf4a4548004e8a2d9154ce0f2c73", "parents": [ "fbb2609f132f23a983d376dec9ae6bfebfcacc4c", "accc147666bfd37fc8b4ef745f18a8c751555ec2" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 20 16:56:33 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Sep 20 16:56:34 2013 +0000" }, "message": "Merge \"audioflinger: implement getTimestamp() for offloaded tracks\" into klp-dev" }, { "commit": "accc147666bfd37fc8b4ef745f18a8c751555ec2", "tree": "a091aa566ed09e8efe881a16e3806ee4169de3f0", "parents": [ "5baf2af52cd186633b7173196c1e4a4cd3435f22" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 20 09:36:34 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 20 09:36:34 2013 -0700" }, "message": "audioflinger: implement getTimestamp() for offloaded tracks\n\nBug: 9587132.\nChange-Id: Ie9d5f4cca96306d08bc9a2dbd6edd8953096702d\n" }, { "commit": "ede6c3b8b1147bc425f7b923882f559a513fe23b", "tree": "ac3986f0521aa4a5af705299ab423ec9d5e98bfa", "parents": [ "5baf2af52cd186633b7173196c1e4a4cd3435f22" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 19 14:37:46 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 19 15:53:20 2013 -0700" }, "message": "audioflinger: fix lost offload thread resume event\n\nIt was possible that a resume request signaled by addTrack_l()\nwhile waiting for an async write callback is lost. This is because\nmSignalPending was not set and waitingAsyncCallback_l() would pause the\nthread loop before executing prepareTracks_l().\n\nThe fix consists in using signal_l() method to wake the thread\nloop o that mSignalPending is set.\n\nAlso make sure that sleepTime is reset to 0 when resuming to make sure\nthat we write any remaining bytes to the HAL.\n\nBug: 10810347.\n\nChange-Id: If9a3b22cc3b9e6eb384a56c48c40e6258d0896ad\n" }, { "commit": "dc8cae8c118e4aef4ef1f7b2c6f79becc1df4a05", "tree": "ea0f76bad13db737ca85146367304b3397a111a3", "parents": [ "b81332964f2f3fb83f056b539a4eeea245bb7999", "bf5e23979a03da96ce1d63126c480103232f174b" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Sep 18 14:26:49 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 18 14:26:49 2013 -0700" }, "message": "am bf5e2397: am 5baf2af5: more support for audio effect offload\n\n* commit \u0027bf5e23979a03da96ce1d63126c480103232f174b\u0027:\n more support for audio effect offload\n" }, { "commit": "5baf2af52cd186633b7173196c1e4a4cd3435f22", "tree": "9c6752456812c4a927574a71e1d2ec2495ff6ce3", "parents": [ "9a98b6de791aeb130192df10744f5b35f8b6ef1a" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 12 17:37:00 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Sep 18 11:52:40 2013 -0700" }, "message": "more support for audio effect offload\n\nOffloading of audio effects is now enabled for offloaded\noutput threads. If an effect not supporting offload is enabled,\nthe AudioTrack is invalidated so that it can be recreated in PCM\nmode.\n\nFix some issues in effect proxy related to handling of effect\ncommands to offloaded and non offloaded effects.\n\nAlso fixed a bug on capture index in software Visualizer effect.\n\nBug: 8174034.\n\nChange-Id: Ib23d3c2d5a652361b0aaec7faee09102f2b18fce\n" }, { "commit": "d455cdfad40ca0558b8f4f800ec192027e272c14", "tree": "611c503995f513534951637d07c82ac9c4053236", "parents": [ "fb61216af1971be53222eaf818ab272798c05359", "c91eb6059a6af8b84c48e0ce727b01829f9cd789" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 13 17:31:47 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Sep 13 17:31:47 2013 -0700" }, "message": "am c91eb605: am 972a173d: audioflinger: longer offload thread standby delay\n\n* commit \u0027c91eb6059a6af8b84c48e0ce727b01829f9cd789\u0027:\n audioflinger: longer offload thread standby delay\n" }, { "commit": "972a173d7d1de1a3b5a617aae3e2abb6e05ae02d", "tree": "f506c9ef80a8a31bfd58a254617fdecb26dbbcf5", "parents": [ "99bf6267f0a4e2c3153be49ced59ae164d55ea6d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Sep 04 09:42:59 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Sep 13 12:14:07 2013 -0700" }, "message": "audioflinger: longer offload thread standby delay\n\n- Increase offloaded output thread standby delay to 1 second\nto allow transition between tracks with going to stanby\nif reusing the same audio track (gapless)\n\n- Make sure pause/flush/resume sequence is sent to the HAL\nin the right order\n\n- Fix format display in track dump\n\nBug: 8174034.\nChange-Id: I43ef6f8fdbf7427e4eff6cc2d0665d7d1463ea8a\n" }, { "commit": "f523897787b64cf2217d0ab4946b564420c675fe", "tree": "bf4361fd297eabb324294ce8e30e95b50176a85e", "parents": [ "d5577f26de1ae3a0dc6fbea9c60a07d585f894bf", "8a220740cd77eb844123d3914190a94513797b40" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Sep 12 09:21:43 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Sep 12 09:21:43 2013 -0700" }, "message": "am 8a220740: am dc33c542: Merge \"Fix AudioTrack shared memory leak\" into klp-dev\n\n* commit \u00278a220740cd77eb844123d3914190a94513797b40\u0027:\n Fix AudioTrack shared memory leak\n" }, { "commit": "dc33c542351449ceee95cc50a9009f495e7c72ba", "tree": "0f44c9770a45605876de1e051801bee5781a56ad", "parents": [ "efc4d4899e03fb8464017dd48539106cec2163de", "0c72b24f91c68442eb374bd1b338c394105b8262" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Sep 12 15:13:44 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 12 15:13:45 2013 +0000" }, "message": "Merge \"Fix AudioTrack shared memory leak\" into klp-dev" }, { "commit": "d5577f26de1ae3a0dc6fbea9c60a07d585f894bf", "tree": "9f39de6f98f3955cbd94ac2f9a66f36165847234", "parents": [ "0fc610ade6ecd2cec75df4b9d91ed3298601400a", "4823964d198228289ff21530bf8b01bb2ef196bb" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Wed Sep 11 17:25:02 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Sep 11 17:25:02 2013 -0700" }, "message": "am 4823964d: am efc4d489: Merge \"audioflinger: add HOTWORD audio source.\" into klp-dev\n\n* commit \u00274823964d198228289ff21530bf8b01bb2ef196bb\u0027:\n audioflinger: add HOTWORD audio source.\n" }, { "commit": "efc4d4899e03fb8464017dd48539106cec2163de", "tree": "40e6503137bc0720b515c05b2d39771d1d25c7c7", "parents": [ "a911f51c21430ac92f1d796b2338878fd98382e9", "9a54bc27876acd5d8be5b1fc3dc46701fe76fbb3" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Sep 12 00:15:15 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Sep 12 00:15:15 2013 +0000" }, "message": "Merge \"audioflinger: add HOTWORD audio source.\" into klp-dev" }, { "commit": "0c72b24f91c68442eb374bd1b338c394105b8262", "tree": "d5b7396b593f2157fead8f0c5c41d45c1c236009", "parents": [ "6220f993541b0317e6ace3c410dd35a8d76e30bc" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 11 09:14:16 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Sep 11 12:47:29 2013 -0700" }, "message": "Fix AudioTrack shared memory leak\n\nBug: 2801375\nChange-Id: I50e15164fe310f69ea019dca5b49171a02bc6992\n" }, { "commit": "9a54bc27876acd5d8be5b1fc3dc46701fe76fbb3", "tree": "15f25097fc7fc2548d41a29c94c22710472f01ca", "parents": [ "84b7fb0c88ddd05ed7c148c82fe1691040a9404d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 09 09:08:44 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Tue Sep 10 14:39:28 2013 -0700" }, "message": "audioflinger: add HOTWORD audio source.\n\nHOTWORD is a special capture audio source that uses\nthe same audio tuning as VOICE_RECOGNITION but allows an\nactive capture to be preempted.\n\nBug: 10640877.\n\nChange-Id: Iea09a11cbcdbacc8d434e5230e7559dcd1b44ac0\n" }, { "commit": "8136cfae9c22ae8ff42eec9ed751833dda605444", "tree": "b6e71058c48bcdd37046ddfa60e3da80b5cc1015", "parents": [ "a041f2fce87fa7a0926365d8e8fbc66019ac0661", "8a910716892d17a2ac62c7e9884af0e9d75b26bc" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 09 14:29:08 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Sep 09 14:29:08 2013 -0700" }, "message": "am 8a910716: am 6ca83fad: Merge \"audioflinger: no effects on offloaded tracks\" into klp-dev\n\n* commit \u00278a910716892d17a2ac62c7e9884af0e9d75b26bc\u0027:\n audioflinger: no effects on offloaded tracks\n" }, { "commit": "813e2a74853bde19e37d878c596a044b3f299efc", "tree": "b95aa8b59f49b4348b2112047ee80e572637d706", "parents": [ "84b7fb0c88ddd05ed7c148c82fe1691040a9404d" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Sat Aug 31 12:59:48 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Sep 09 09:09:21 2013 -0700" }, "message": "audioflinger: no effects on offloaded tracks\n\nInvalidate offloaded tracks when an effect is enabled\nso that the track is recreated in PCM mode and the effect\ncan be applied.\nThis is temporary until effect offloading is implemented.\n\nBug: 8174034.\n\nChange-Id: I77b8b54a10db6cb8334be76d863ea7e720eaad09\n" }, { "commit": "344202e13a91c9d3d109fd8f4a67f5b23efa7800", "tree": "53b9fd4dd46d79e97367486f8368f55f99bf4275", "parents": [ "9a3418485c9581d2b294e3aafdecdac015b08329", "55817ab9c1868f1e6a59155f55c768f01509cda5" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Sep 03 16:11:26 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 03 16:11:26 2013 -0700" }, "message": "am 55817ab9: am fe346c70: Fix miscellanous AudioTrack::getTimestamp() bugs\n\n* commit \u002755817ab9c1868f1e6a59155f55c768f01509cda5\u0027:\n Fix miscellanous AudioTrack::getTimestamp() bugs\n" }, { "commit": "1462a2b84a578b5541683c824e0f77ebf2aa82ae", "tree": "a8d522f1f7fe438432bacb0b3f6eacaae2257e20", "parents": [ "f701ddad1a4f58c368e3b642530849dcb57bb22c", "a4a82c5f8f3eccfa10ce30a52cbb4b1c5c983282" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Sep 03 16:11:24 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Sep 03 16:11:24 2013 -0700" }, "message": "am a4a82c5f: am 6466c9e6: Add ExtendedAudioBufferProvider::framesReleased and onTimestamp\n\n* commit \u0027a4a82c5f8f3eccfa10ce30a52cbb4b1c5c983282\u0027:\n Add ExtendedAudioBufferProvider::framesReleased and onTimestamp\n" }, { "commit": "fe346c707f59d763ded93bc3d27b51f0c0408258", "tree": "3e6f12ac7b37bc8ef10845c4c7ccdcfef4b51cd5", "parents": [ "4d0815d694e5a2edb3ce48427de50f55d0f84c0b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Aug 30 13:28:22 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Sep 03 15:19:03 2013 -0700" }, "message": "Fix miscellanous AudioTrack::getTimestamp() bugs\n\nCheck that get_presentation_position is non-NULL before calling.\n\nAudioTrack::getTimestamp not implemented for fast tracks.\n\nFix typo in Track::getTimestamp().\n\nFix bugs in AudioTrack::getTimestamp after stop:\n - getTimestamp while stopped is not allowed.\n - stop, start, getTimestamp now returns the correct value.\n\nChange-Id: Ie8d9dc1f28d8927634e04175a68b147ffc2ea8eb\n" }, { "commit": "6466c9e6e6278c740aed77f695f679be9f5db478", "tree": "cd987ec819ddecba0665cd692285069c083fb19b", "parents": [ "894d6be4f9b4721c77a01919ecf03b27cec90cc9" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Aug 23 10:54:07 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Sep 03 15:12:11 2013 -0700" }, "message": "Add ExtendedAudioBufferProvider::framesReleased and onTimestamp\n\nand implement them in SourceAudioBufferProvider using the associated NBAIO_Source,\nand in Track using the associated AudioTrackServerProxy.\n\nChange-Id: I60dc4adba63fc1dc452ff16caf347e4a7c8242c2\n" }, { "commit": "f557872b594d15599bdb65efd91eb5adeb1d0840", "tree": "8df16a0c49bac71163035d11562e06bcc12a2490", "parents": [ "30c296c153447f5c2bb5251928bf4d3c4e28e552", "908d3c09ca7f2ccb280aa5dc8d876099ff9a9d0f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 29 17:12:45 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 29 17:12:45 2013 -0700" }, "message": "am 908d3c09: am 51ec03c2: Merge \"Implement Track::getTimestamp()\" into klp-dev\n\n* commit \u0027908d3c09ca7f2ccb280aa5dc8d876099ff9a9d0f\u0027:\n Implement Track::getTimestamp()\n" }, { "commit": "30c296c153447f5c2bb5251928bf4d3c4e28e552", "tree": "add654497b6e4ad0a66066a96ab1afd9e480327a", "parents": [ "ec9ad1b0947f5d6b465281312dbe92f096a8f881", "3ae0a58a83d092d96672295c8a62908478f28a9b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 29 17:12:44 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 29 17:12:44 2013 -0700" }, "message": "am 3ae0a58a: am 9841f636: Merge \"Add AudioFlinger::PlaybackThread::Track::getTimestamp()\" into klp-dev\n\n* commit \u00273ae0a58a83d092d96672295c8a62908478f28a9b\u0027:\n Add AudioFlinger::PlaybackThread::Track::getTimestamp()\n" }, { "commit": "ec9ad1b0947f5d6b465281312dbe92f096a8f881", "tree": "71a3b3f48c0c563311db4fedf75efa5241d2d2c9", "parents": [ "6dc365f0d5a92084517f0c3846e4f07fc7206bab", "f94b2946a511c5cbb6b9001449ca8278cb332bda" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 29 17:12:44 2013 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 29 17:12:44 2013 -0700" }, "message": "am f94b2946: am 56b59224: Merge \"Add IAudioTrack::getTimestamp()\" into klp-dev\n\n* commit \u0027f94b2946a511c5cbb6b9001449ca8278cb332bda\u0027:\n Add IAudioTrack::getTimestamp()\n" }, { "commit": "bd096fd9d8e5fc0e62f98807f4818a06f70d0812", "tree": "8ff27bce9f34e4bdd0f8e233494a24efef475a7d", "parents": [ "573d80a8f463f648a515fc0975bf83951b272993" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Aug 23 13:53:56 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 29 09:59:31 2013 -0700" }, "message": "Implement Track::getTimestamp()\n\nusing a new timestamp latch in PlaybackThread, and\nAudioTrackServerProxy::framesReleased() which returns mServer.\n\nChange-Id: I1ebfba968c773faaab95648c272fd3ebd74718d6\n" }, { "commit": "573d80a8f463f648a515fc0975bf83951b272993", "tree": "c50d730bd7bd113a0f86c091730f9b861354f395", "parents": [ "53cec22821072719ee02c856e9ac2dda2496c570" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 26 09:36:23 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 29 09:24:28 2013 -0700" }, "message": "Add AudioFlinger::PlaybackThread::Track::getTimestamp()\n\nwith a dummy implementation initially,\nand use it in AudioFlinger::TrackHandle::getTimestamp()\n\nChange-Id: I2da88fc52a135a7f0d9fd9538986e919dc8ccd3b\n" }, { "commit": "53cec22821072719ee02c856e9ac2dda2496c570", "tree": "1ac72eaf3ba6059680f8c3d7e39ae58a9e03adc8", "parents": [ "ce70374bf105f8a6160bf5dd70affea012b2a464" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 29 09:01:02 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 29 09:19:07 2013 -0700" }, "message": "Add IAudioTrack::getTimestamp()\n\nwith dummy implementation in AudioFlinger::TrackHandle, and\nimplement AudioTrack::getTimestamp() using IAudioTrack.\n\nAlso document invariant that mAudioTrack and control block are always\nnon-0 after successful initialization.\n\nChange-Id: I9861d1454cff7decf795d5d5898ac7999a9f3b7e\n" }, { "commit": "6e2ebe97f2ad0a21907f20f9ee644c4eacbb7a40", "tree": "ea9d525f25620253ea86f434452bc37fbad73f76", "parents": [ "e198c360d5e75a9b2097844c495c10902e7e8500" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Aug 13 09:14:51 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Aug 13 09:55:59 2013 -0700" }, "message": "Use curly braces in \u0027if\u0027 to make it easier to add logs\n\nChange-Id: I58b33fefdd8bf703647414157a99a3223be3531c\n" }, { "commit": "030033342a6ea17003e6af38a56c7edc6d2ead01", "tree": "342168125e3c97f01af88dfe133f99c7f71d7e3d", "parents": [ "9156ef3e11b68cc4b6d3cea77f1f63673855a6d1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Aug 06 15:40:54 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 12 16:35:25 2013 -0700" }, "message": "Clean up error handling in createTrack and openRecord\n\nOutside callers now use initCheck() to determine whether a TrackBase\nhas been created successfully, instead of relying on internal knowledge.\n\nPreviously, callers needed to know that a TrackBase was only valid if it\u0027s\ngetCbk() !\u003d 0. For a Track (playback), they needed to know to also check\nthe track\u0027s name (track index). Now, outsiders can just call initCheck().\n\nOther changes:\n - Return a 0 reference if track creation fails\n - Remove a dead line of code in AudioFlinger::openRecord\n\nChange-Id: If374924a3f6fd27906f625aa83dd0a1e3f506e00\n" }, { "commit": "6ae6b811666865815ebb1f670aacb1a0f2edaa73", "tree": "4a65f9bf68867d7b174e266d8ee206029e5af644", "parents": [ "5279e3e1187e4da0fed4349d29ea548f52e95f95" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 05 15:16:21 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Aug 06 09:26:14 2013 -0700" }, "message": "Remove obsolete field RecordTrack::mAudioRecordServerProxy\n\nChange-Id: I054ba929e209797542940a0e734fc15f19f321c9\n" }, { "commit": "82aaf94a5b18939e4d790bbc752031f3070704a3", "tree": "4e39e32d0ccde726548afcbd81e253d5e316b295", "parents": [ "b08ab81bab9e8cd2e3a7fff02725a387070fd078" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jul 17 16:05:07 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jul 31 09:15:00 2013 -0700" }, "message": "Report underruns for fast tracks also\n\nThis fixes a regression that was introduced earlier\nby commit 9f80dd223d83d9bb9077fb6baee056cee4eaf7e5\ncalled \"New control block for AudioTrack and AudioRecord\".\nThat commit broke underrun reporting for fast tracks.\n\nAlso remove Track::mUnderrunCount, which counted the number of underrun\nevents, and was only used by dumpsys media.audio_flinger.\n\nNow dumpsys media.audio_flinger reports the number of underrun frames,\n\nIsolated underrun-related control block accesses via the proxy, so that\nthe server is not directly poking around in the control block.\n\nThe new proxy APIs are AudioTrackServerProxy::getUnderrunFrames() and\nAudioTrackServerProxy::tallyUnderrunFrames(). getUnderrunFrames() returns\na rolling counter for streaming tracks, or zero for static buffer tracks\nwhich never underrun, but do a kind of \u0027pause\u0027 at end of buffer.\ntallyUnderrunFrames() increments the counter by a specified number of frames.\n\nChange-Id: Ib31fd73eb17cbb23888ce3af8ff29f471f5bd5a2\n" }, { "commit": "d054c32443a493513ab63529b0c8b1aca290278c", "tree": "fc68ba259ded1dd4960bee2938a9bcc7c599c9a3", "parents": [ "96f60d8f04432a1ed503b3e24d5736d28c63c9a2" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jul 12 12:59:20 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Jul 30 09:50:48 2013 -0700" }, "message": "Move control block mName to createTrack() output\n\nThis is part of a series of CLs to clean up the shared memory\ncontrol block, by removing any fields that don\u0027t have to be there.\n\nChange-Id: I6e51003a1293b6800258c31b22cff2eba42162e7\n" }, { "commit": "96f60d8f04432a1ed503b3e24d5736d28c63c9a2", "tree": "083f6224327e0965a925076b3e1aec5636598203", "parents": [ "97252bb0e40a5a9b41f020163393cf6c5da10b7e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jul 12 10:21:18 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Jul 30 09:40:17 2013 -0700" }, "message": "Rename control block flags to mFlags\n\nChange-Id: I7b6d31e24531954ab1ecdf3ed56c19433700bd89\n" }, { "commit": "f20e1d8df84c5fbeeace0052d100982ae39bb7a4", "tree": "997cd41de1adb829c194f56cf29eb02945666b94", "parents": [ "eced2daaa6c91a3731eef978ce65c6ec319c5e6a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jul 12 09:45:18 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Jul 30 09:24:03 2013 -0700" }, "message": "Rename control block server to mServer and add comments\n\nChange-Id: Ieabd91acee92d0e84e66fbd358df5282b856306e\n" }, { "commit": "a30e75897934da2ce7b1b03bcb4b58e139d3e81e", "tree": "78a398fee8ff72494debd7284ce0b43115412ad0", "parents": [ "fa319e6d918b84f93fb5457af5d1cca6421ac517", "9fdcb0a9497ca290bcf364b10868587b6bde3a34" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Jul 30 14:36:19 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jul 30 14:36:20 2013 +0000" }, "message": "Merge \"Fix theoretical race using TrackBase::sampleRate()\"" }, { "commit": "fa319e6d918b84f93fb5457af5d1cca6421ac517", "tree": "2ccff564a324d72c8bd5d872a220f56b26431203", "parents": [ "548efc94813c1dec6e8cf6c085ae41ccb04827f1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 29 17:17:38 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 29 17:20:47 2013 -0700" }, "message": "Remove CC_LIKELY and CC_UNLIKELY where not needed\n\nOnly keep them in performance-sensitive code\n\nChange-Id: Ib257ddd7bc39ce9896997ffae008c524ac743d01\n" }, { "commit": "b59c1ad726b8bdf441f373d0bdc612539769334a", "tree": "9f870ae2f9f64f4a01f3c91e95d310db4d9895b7", "parents": [ "3af48e6b28983da8c11d3d7d7fdd2088d881b462", "3dcd00dddec86a1c5133083ad7ba2265d49c048c" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 29 17:59:04 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 29 17:59:09 2013 +0000" }, "message": "Merge \"Declare methods in binder opcode order\"" }, { "commit": "3dcd00dddec86a1c5133083ad7ba2265d49c048c", "tree": "0cb9279c20e16d3f059739818b71e9b77c185330", "parents": [ "b283374cbf79dc5a36f1eef0015d7baf8881792e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jul 17 10:10:23 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 29 10:49:59 2013 -0700" }, "message": "Declare methods in binder opcode order\n\nChange-Id: I5f624b7a51ffe1a17a67c056cf984f74e4c56eac\n" }, { "commit": "35cc4f3127322ad3e3dd1e15e8ae29ff4b4a3af6", "tree": "ad534d537cd19cdb33fb5068059f3bd726e1f805", "parents": [ "bd4c4fbb3b073e48963185d11a15da1fa18d2e54" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:21:35 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 29 09:40:24 2013 -0700" }, "message": "Remove obsolete mBufferEnd\n\nChange-Id: I507c6109d66000bb30933ca23b912a1316f55e5e\n" }, { "commit": "bd4c4fbb3b073e48963185d11a15da1fa18d2e54", "tree": "00ebf9a7c78cd47ca27ca22b072142e3b21e7c04", "parents": [ "afbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:21:14 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 29 09:40:19 2013 -0700" }, "message": "Remove obsolete TrackBase::step(), mStepCount, mStepServerFailed\n\nChange-Id: I6347096f066b8b19451c6472db7b0671f0cf7702\n" }, { "commit": "afbbc6c5f6bc470d504dcf24ceb3ac21d57fb78d", "tree": "6fc44421938fc9a08c232580f581b89f95259ed3", "parents": [ "420ea49539d23ab305a7b33c0854a7a475493dd4", "a8356f663014e7d4c27869629af83d8bb3441e19" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 29 14:27:55 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Jul 29 14:27:56 2013 +0000" }, "message": "Merge \"Simplify RecordTrack::stop()\"" }, { "commit": "420ea49539d23ab305a7b33c0854a7a475493dd4", "tree": "d67162f23f49a00a39f701548f6a52a11376d537", "parents": [ "65d30dd9ee498f7b3bfc033735458a6ff399c207", "fc38a2e0268b5e531db2975c3a81462a3593c861" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Sat Jul 27 00:00:33 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Jul 27 00:00:34 2013 +0000" }, "message": "Merge \"CBLK_OVERRUN, not CBLK_UNDERRUN, is for record threads\"" }, { "commit": "65d30dd9ee498f7b3bfc033735458a6ff399c207", "tree": "e5fa59313d1c9ed9e61622217b92383fccac93eb", "parents": [ "422801c5e9b795105f28e639c4bed5ee3f4e56f3", "0fea74cdbc09c1259e08215e2ea90e7988d62df8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jul 26 23:24:50 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Jul 26 23:24:50 2013 +0000" }, "message": "Merge \"Remove obsolete TrackBase::reset()\"" }, { "commit": "a8356f663014e7d4c27869629af83d8bb3441e19", "tree": "af015d8d690aaf239b940d0ca65576bd795719c9", "parents": [ "fc38a2e0268b5e531db2975c3a81462a3593c861" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:37:52 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:44:51 2013 -0700" }, "message": "Simplify RecordTrack::stop()\n\nChange-Id: Ib959c1e9dc9544d12277ce11bea445118b2e0521\n" }, { "commit": "fc38a2e0268b5e531db2975c3a81462a3593c861", "tree": "bc9f29a75795ea00e5ab0785ae2b11647acdc1c1", "parents": [ "0fea74cdbc09c1259e08215e2ea90e7988d62df8" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:41:19 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:42:26 2013 -0700" }, "message": "CBLK_OVERRUN, not CBLK_UNDERRUN, is for record threads\n\nChange-Id: I8948f76ef4717a423c37cd6ea7db4381636af612\n" }, { "commit": "0fea74cdbc09c1259e08215e2ea90e7988d62df8", "tree": "45421baddb2bab78c036dba12063e7d70b5b2082", "parents": [ "fc5ea08326b510c6f82f71845d95a8758a6ab698" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:34:57 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jul 25 14:39:31 2013 -0700" }, "message": "Remove obsolete TrackBase::reset()\n\nChange-Id: I38100b7e28a12d7af8cb40ae3f4d9cb4a0ebe701\n" }, { "commit": "bfb1b832079bbb9426f72f3863199a54aefd02da", "tree": "5007d22456776dc77d124be84bcfe8bc4152bbb2", "parents": [ "fc5ea08326b510c6f82f71845d95a8758a6ab698" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Jan 07 09:53:42 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jul 25 14:08:09 2013 -0700" }, "message": "AudioFlinger: offload playback, non-blocking write\n\n- Added specialized playback thread class for offload playback,\nderived from directoutput thread.\nThis thread type handles specific state transitions for offloaded\ntracks and offloading commands (pause/resume/drain/flush..) to audio HAL.\nAs opposed to other threads, does not go to standby if the track is paused.\n\n- Added support for asynchronous write and drain operations at audio HAL.\nUse a thread to handle async callback events from HAL: this avoids locking\nplayback thread mutex when executing the callback and cause deadlocks when\ncalling audio HAL functions with the playback thread mutex locked.\n\n- Better accouting for track activity: call start/stop and release Output\nmethods in audio policy manager when tracks are actually added and removed\nfrom the active tracks list.\nAdded a command thread in audio policy service to handle stop/release commands\nasynchronously and avoid deadlocks with playback thread.\n\n- Track terminated status is not a state anymore. This condition is othogonal\nto state to permitted state transitions while terminated.\n\nChange-Id: Id157f4b3277620568d8eace7535d9186602564de\n" }, { "commit": "153b9fe667e6e78e0218ff0159353097428c7657", "tree": "360a76911071e362a94af32ccf67ce9619629708", "parents": [ "20f4754b7e687d3718a0a0a585f2c9ac22e2567d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Jul 15 11:23:36 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jul 19 09:30:37 2013 -0700" }, "message": "Make AudioFlinger::instantiate() more resilient when called from separate module\n\nBug: 8834855\nChange-Id: I4cd842cdfb09d2aaaaab9df9ac3bec6179709bd3\n" }, { "commit": "ad3af3305f024bcbbd55c894a4995e449498e1ba", "tree": "2e242d4c49cce9faefc28665c6ee63a2a5da170c", "parents": [ "7919fa2c33b1fa7f5e49b2188d671bfe519c231e" ], "author": { "name": "Richard Fitzgerald", "email": "rf@opensource.wolfsonmicro.com", "time": "Mon Mar 25 16:54:37 2013 +0000" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Jun 27 17:16:24 2013 -0700" }, "message": "Public API changes for audio offload support.\n\nNOTE: this does _not_ include all private member variables added\nto classes as part of offload support. Only public/protected functions\nand stubs functions/variables needed to make the changes buildable.\n\n- isOffloadSupported() added to audio policy service\n A stub implementation is required to build, this always returns false\n- setParameters() added to IAudioTrack\n A stub implementation is required to build, this always returns\n INVALID_OPERATION\n\n- CBlk flag for stream end\n\n- Change AudioSystem::getRenderPosition() to take an audio_output_t\n so caller can specify which output to query\n\n- Add AudioSystem::isOffloadSupported()\n This is fully implemented down to the AudioFlinger function\n AudioPolicyServer::isOffloadSupported() which is just a stub\n that always returns false.\n\n- Add EVENT_STREAM_END to AudioTrack interface.\n STREAM_END is used to signal when the hardware has actually finished\n playing all the data it was sent.\n\n- Add event type enumeration to media player interface AudioSink callbacks\n so that the same callback can be used to handle multiple types of\n event. For offloaded tracks we also have to handle STREAM_END and\n TEAR_DOWN events\n\n- Pass audio_offload_info_t to various functions used for opening outputs,\n tracks and audio players. This passes additional information about the\n compressed stream down to the HAL when using offload.\n For publicly-available APIs this is an optional parameter (for some of\n the internal and low-level APIs around the HAL interface it is mandatory)\n\n- Add getParameters() and setParameters() API to AudioTrack\n Currently dummy implementations.\n\n- Change AudioPlayer contructor so that it takes a set of bitflags defining what\n options are required. This replaces the original bool which only specified\n whether to use deep buffering.\n\n- Changes to StageFright class definition related to handling tearing-down of\n an offloaded track when we need to switch back to software decode\n\n- Define new StageFright utility functions used for offloaded tracks\n Currently dummy implementations.\n\n- AudioFlinger changes to use extended audio_config_t.\n Fills in audio_offload_info_t member if this info is passed in when\n opening an output.\n\n- libvideoeditor changes required to add the new event type parameter\n to AudioSink callback functions\n\n- libmediaplayerservice changes required to add the new event type parameter\n to AudioSink callback functions\n\nChange-Id: I3ab41138aa1083d81fe83b886a9b1021ec7320f1\nSigned-off-by: Richard Fitzgerald \u003crf@opensource.wolfsonmicro.com\u003e\nSigned-off-by: Eric Laurent \u003celaurent@google.com\u003e\n" }, { "commit": "9fdcb0a9497ca290bcf364b10868587b6bde3a34", "tree": "95292e5a21adb17ca3d40b0eec8590aab93bb557", "parents": [ "7919fa2c33b1fa7f5e49b2188d671bfe519c231e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jun 26 16:11:36 2013 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jun 26 16:11:36 2013 -0700" }, "message": "Fix theoretical race using TrackBase::sampleRate()\n\nIn two places we assumed that TrackBase::sampleRate() would return the\nsame value when it is called twice in the same function. This is not\nguaranteed; sampleRate() reads from the control block so the return\nvalue could change. To fix this, only call sampleRate() once and cache\nthe return value to get a consistent value.\n\nThis was only a theoretical race. In MixerThread::prepareTracks_l()\nit would have no bad effect. In TimedTrack::getNextBuffer() it could\ncause a real problem, but we don\u0027t currently support dynamic sample rate\nratios for timed tracks.\n\nChange-Id: I8e5c33f0121fc058d1e70c2ab5e9135397d3e0b7\n" }, { "commit": "9f80dd223d83d9bb9077fb6baee056cee4eaf7e5", "tree": "79f19f80ebb7978e9bab16e1d9b835849c735592", "parents": [ "9fef8d453b15a91a2b748faac2bfaff713bcf1e1" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Dec 18 15:57:32 2012 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Jun 12 14:33:10 2013 -0700" }, "message": "New control block for AudioTrack and AudioRecord\n\nMain differences between old and new control block:\n - removes the mutex, which was a potential source of priority inversion\n - circular indices into shared buffer, which is now always a power-of-2 size\n\nChange-Id: I4e9b7fa99858b488ac98a441fa70e31dbba1b865\n" }, { "commit": "7c027248e1a4ccd5b22bc4deafb03e2d87ac8f38", "tree": "ed6b92a79faa533f7c1156836f00b9dcaec8834d", "parents": [ "8bae43ae86b9942892980c3c01bff5c812b1db7f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Dec 26 14:43:16 2012 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu May 30 13:40:56 2013 -0700" }, "message": "Consistent whitespace\n\nChange-Id: I118cce68d3b777f9ec9b6bfb70367496422a40f2\n" }, { "commit": "8d2d4932b96632e9eb3af4a3d4000192ef603960", "tree": "98de74d897c69756c049926296908a694b2acb19", "parents": [ "7f86d98317843838c4a5248c733bf95f9574fcab" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Apr 25 12:56:18 2013 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Thu Apr 25 12:56:18 2013 -0700" }, "message": "audioflinger: fix duplicating track sampling rate\n\nAdd missing initialization of client proxy sampling rate\nand volumes in OutputTrack constructor.\n\nBug: 8687522\nChange-Id: I813e700315bb97083a63dd32279f1998ac775483\n" }, { "commit": "c9b2e20f7c9a71e07ef398152709c76079decbcd", "tree": "7e3cbee883fbe1462e24a31b8b4af5a5911e8276", "parents": [ "bf04b5860182d8f4130dcb5d6d88ee68a58c99cd" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 26 11:32:32 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Mar 04 12:58:21 2013 -0800" }, "message": "Miscellaneous cleanup\n\nAbbreviation framesReady to fRdy for new systrace.\nPut inline const on one line.\nUse local copy of mState in state.\nImprove logging.\nLine length 100.\n\nChange-Id: I8201c3ce0e53fd464fd33d02544e52c342d40b68\n" }, { "commit": "bf04b5860182d8f4130dcb5d6d88ee68a58c99cd", "tree": "b68876a589e063ce86f7e24f6e5aff918995f6e2", "parents": [ "ea2839f133b989b770cc5f093aca4754e5523599", "ab7d72f0804fbb7e91ad9d2a16f826d97e20e5d0" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Sat Mar 02 00:04:34 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Mar 02 00:04:35 2013 +0000" }, "message": "Merge \"media.log cleanup\" into jb-mr2-dev" }, { "commit": "ab7d72f0804fbb7e91ad9d2a16f826d97e20e5d0", "tree": "9eda6276ab70724dcc98e56f7ca16afeb70ff079", "parents": [ "3605ab3c02516e4123c39062de301bacc8ea8d9f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Feb 27 09:05:28 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Mar 01 15:36:26 2013 -0800" }, "message": "media.log cleanup\n\nRemove almost all of the specific logs, but leave the media.log\nlogging infrastructure in place for the next time we need it.\n\nRe-apply a few good changes that were reverted earlier:\n - check logf format vs. argument list compatibility\n - distinguish potentially modified and actually modified tracks in FastMixer\n - fix benign bug where sq-\u003eend() was called more than once\n - fix a build warning\n\nBug: 6490974\nChange-Id: I02d3e83646c738acaebb415bd0d6b548638b4ef5\n" }, { "commit": "46909e7eb074ce1b95b8a411eb71154f53f84f77", "tree": "a0b31a2590a604b0e2c7a6a133bba067dadfad5e", "parents": [ "ceb388d6c03c38b96dc41c0ea4804b749aa077c4" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 26 09:20:22 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 26 11:36:38 2013 -0800" }, "message": "Remove tee sink debugging at compile time\n\nBug: 8223560\nChange-Id: Iddbfb06c45d43d9f20bb428215dd4094931e19a7\n" }, { "commit": "da6ef1320d0161b1640dc84d7a9c5a25860c3619", "tree": "86b24f64ed0bd55de10deb193290009687886192", "parents": [ "99c2f923f6b04efffe949d1daf9cb7148e3cc201" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jan 10 12:31:01 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 22 16:50:36 2013 -0800" }, "message": "Update tee sink\n\nImplement rotation to reduce long-term storage use.\nImplement optional per-track tee.\nDynamically enable at runtime based on property, instead of at compile-time.\nDynamic frame count not yet implemented.\n\nBug: 8223560\nChange-Id: I3706443c6ec0cb0c6656dc288715a02ad5fea63a\n" }, { "commit": "7f5d335f7b4caecd0dfb8f1085f352f1d2da5d2e", "tree": "dda17a3e4149815397c7bef198e64bc81dee3552", "parents": [ "32584a7d672864b20ab8b83a3cb23c1858e908b7" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 15 23:55:04 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 15 23:55:04 2013 +0000" }, "message": "Revert \"Temporary additional logging to investigate bug\"\n\nThis reverts commit 32584a7d672864b20ab8b83a3cb23c1858e908b7\n\nChange-Id: I9dc680578b955b1af462eeb7a49d61a0d45eb81b\n" }, { "commit": "32584a7d672864b20ab8b83a3cb23c1858e908b7", "tree": "87a3d8c3b801d13ceee09abab5048aef46e65332", "parents": [ "ab89ac209fd1c3b0a2227168a48d7f3ae9bc43f3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Feb 13 14:46:45 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 15 15:44:50 2013 -0800" }, "message": "Temporary additional logging to investigate bug\n\nThe bug appears related to continuing to use an invalid buffer provider\nin fast mixer after track destruction, so focus the added logs in that area.\n\nAlso includes a bug fix: was calling log in an unsafe place\nnear Threads.cpp AudioFlinger::PlaybackThread::createTrack_l line 1250.\n\nDetails:\n - include caller pid or client pid where appropriate\n - increase log buffer size\n - log mFastIndex when AudioMixer sees an invalid bufferProvider.\n - log both potentially modified and actually modified tracks in FastMixer.\n - fix benign bug where sq-\u003eend() was called more than once.\n - log StateQueue push() call and return.\n - increase StateQueue size from 4 to 8 entries\n - log mixer-\u003eenable(), bufferProvider, and currentTrackMask\n - log buffer provider addresses\n - increase fast mixer log buffer again\n - check logf format vs. argument list compatibility\n - add logging to AudioMixer\n - add checking of magic field in AudioMixer to detect overwrites\n - add bool AudioMixer::enabled()\n - increase log buffer sizes yet again\n - enable assertion checking without ALOGV\n - improve a few log messages\n - check for corruption in more places\n - log in all the process hooks\n - add new mixer APIs so we can check for corruption of mixer state\n - fix a build warning\n\nBug: 6490974\nChange-Id: Ib0c4a73dcf606ef9bd898313b3b40ef61ab42f51\n" }, { "commit": "e186b51e0a9834b287d7a509e960eaf1b688db75", "tree": "82b017a4c77a82fca62571eccaa3723ee93738d1", "parents": [ "639482c24c911b125398b31883ba6d55faebe28b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 14 23:57:02 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 14 23:57:02 2013 +0000" }, "message": "Revert \"Temporary additional logging to investigate bug\"\n\nThis reverts commit 639482c24c911b125398b31883ba6d55faebe28b\n\nChange-Id: I11f2829072ab11e18b0663024f27bf31192f1d39\n" } ], "next": "639482c24c911b125398b31883ba6d55faebe28b" }