)]}' { "log": [ { "commit": "31a98ad0da98227f3c76469e7a8a267c9539b6e8", "tree": "c78392dbff169a61ae80e20759e109f4a70c2159", "parents": [ "621d382baa8e300036f58e7acd43bda9ce87f854", "8d1caa026caef3673799481c5fba454306f831e9" ], "author": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Mar 07 10:29:08 2014 +0000" }, "committer": { "name": "Narayan Kamath", "email": "narayan@google.com", "time": "Fri Mar 07 10:29:08 2014 +0000" }, "message": "resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aosp\n\nChange-Id: Ibcb60d0d3bbc8beb54440951ffe8a14b946ccc85\n" }, { "commit": "621d382baa8e300036f58e7acd43bda9ce87f854", "tree": "83e5f40261aa1b3ce14733ada684df732dd8150a", "parents": [ "7e65e101bd48461e274fd2e927b80fbbd8b71744", "04352de2e32d6dc0901436951f69357f5cd8655c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:45:12 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:45:12 2014 +0000" }, "message": "am 04352de2: am e0c3058a: Merge \"AnotherPacketSource support to get latest buffered MetaData.\" into klp-dev\n\n* commit \u002704352de2e32d6dc0901436951f69357f5cd8655c\u0027:\n AnotherPacketSource support to get latest buffered MetaData.\n" }, { "commit": "8d1caa026caef3673799481c5fba454306f831e9", "tree": "654e8de748a437c7d25550381ff7c0c8015fe40e", "parents": [ "04352de2e32d6dc0901436951f69357f5cd8655c", "49ea13379fb15ddb73183ebafa3a377342ef932f" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:42:14 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:42:14 2014 +0000" }, "message": "am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev\n\n* commit \u002749ea13379fb15ddb73183ebafa3a377342ef932f\u0027:\n LiveSession: Use the actual, possibly redirected url as base in the M3U\n M3UParser: Skip query strings when looking for the last slash in a URL\n ChromiumHTTPDataSource: Keep track of the redirected URL\n Initial HLS seamless switch implementation.\n NuPlayer side support for seamless format switch.\n LiveSession refactor\n PlaylistFetcher: Add support for block-by-block decryption.\n LiveSession: Add support for block-by-block fetchFile.\n" }, { "commit": "04352de2e32d6dc0901436951f69357f5cd8655c", "tree": "2ca35879a3d3ce054489f6324aac7dc50c699381", "parents": [ "72d09f6280cd701e48922a86df0d2e5f4e61cd8e", "e0c3058a1d0953f4c85bfc964926cf5babb7dbac" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:42:13 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:42:13 2014 +0000" }, "message": "am e0c3058a: Merge \"AnotherPacketSource support to get latest buffered MetaData.\" into klp-dev\n\n* commit \u0027e0c3058a1d0953f4c85bfc964926cf5babb7dbac\u0027:\n AnotherPacketSource support to get latest buffered MetaData.\n" }, { "commit": "7e65e101bd48461e274fd2e927b80fbbd8b71744", "tree": "9695a4b9ff2f68c02e920904f8fde3a72a49c7e4", "parents": [ "d1d45fe7779e10e381420c63de79001c8593423b", "72d09f6280cd701e48922a86df0d2e5f4e61cd8e" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:41:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:41:38 2014 +0000" }, "message": "am 72d09f62: am 2613347d: Merge \"Added support to query ACodec whether adaptive playback is enabled.\" into klp-dev\n\n* commit \u002772d09f6280cd701e48922a86df0d2e5f4e61cd8e\u0027:\n Added support to query ACodec whether adaptive playback is enabled.\n" }, { "commit": "d1d45fe7779e10e381420c63de79001c8593423b", "tree": "018c61e337c0bf7a1d21b2ee834fa601227fc6bc", "parents": [ "414c2371ab38a9826dca2506c9cefd703af05c2b", "d7c4da3c1c33b5219d7d87ba698cd7d9c8750c41" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:41:38 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:41:38 2014 +0000" }, "message": "am d7c4da3c: am 909498b7: Merge \"stagefright: use CODECS field in EXT-X_STREAM-INF as fallback\" into klp-dev\n\n* commit \u0027d7c4da3c1c33b5219d7d87ba698cd7d9c8750c41\u0027:\n stagefright: use CODECS field in EXT-X_STREAM-INF as fallback\n" }, { "commit": "414c2371ab38a9826dca2506c9cefd703af05c2b", "tree": "706d56faf49d906492078245bd4a7e247a1cfd5c", "parents": [ "6fefae269ca96af5ebeef0aa6e67932ff5f7a1a0", "4dbd814de3a3bc95ca3fe39be2400418e7a05602" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:41:37 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:41:37 2014 +0000" }, "message": "am 4dbd814d: am 2338782d: Merge \"Fixed misplaced bracket for switch-case block.\" into klp-dev\n\n* commit \u00274dbd814de3a3bc95ca3fe39be2400418e7a05602\u0027:\n Fixed misplaced bracket for switch-case block.\n" }, { "commit": "6fefae269ca96af5ebeef0aa6e67932ff5f7a1a0", "tree": "182ed496b5b63cd0d4943c6738079bb2f51b7c3b", "parents": [ "675b80dac069ada91ceb650f202b5f51d2cae34a", "e389b1bdd13e768baa2532f537236b2c5e6243fa" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:41:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:41:36 2014 +0000" }, "message": "am e389b1bd: am ad21a81a: Merge \"stagefright: Fix issue with tracking media format in packet source\" into klp-dev\n\n* commit \u0027e389b1bdd13e768baa2532f537236b2c5e6243fa\u0027:\n stagefright: Fix issue with tracking media format in packet source\n" }, { "commit": "675b80dac069ada91ceb650f202b5f51d2cae34a", "tree": "2d5d3cd13b42594b3953b21500ebc077a602662d", "parents": [ "40659dea8eefaa9d7f5b742e3333d68b6f0dd89c", "3bd0270c2106241674b1d8cb4951e5c5a7bc98d2" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:41:36 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:41:36 2014 +0000" }, "message": "am 3bd0270c: am b74b2098: Merge \"stagefright: Fix bugs in playlist fetcher logic\" into klp-dev\n\n* commit \u00273bd0270c2106241674b1d8cb4951e5c5a7bc98d2\u0027:\n stagefright: Fix bugs in playlist fetcher logic\n" }, { "commit": "72d09f6280cd701e48922a86df0d2e5f4e61cd8e", "tree": "7b38385ed652c44f759557fd057e04b8ed579de1", "parents": [ "d7c4da3c1c33b5219d7d87ba698cd7d9c8750c41", "2613347d74c3f35bc6fda5df1c29c1119c22d432" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:38:23 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:38:23 2014 +0000" }, "message": "am 2613347d: Merge \"Added support to query ACodec whether adaptive playback is enabled.\" into klp-dev\n\n* commit \u00272613347d74c3f35bc6fda5df1c29c1119c22d432\u0027:\n Added support to query ACodec whether adaptive playback is enabled.\n" }, { "commit": "d7c4da3c1c33b5219d7d87ba698cd7d9c8750c41", "tree": "7e9d5420e764d85b5ac10685985a19ef3c460e60", "parents": [ "4dbd814de3a3bc95ca3fe39be2400418e7a05602", "909498b72d740e3151561fd4435ad0a329ec9c6e" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:38:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:38:22 2014 +0000" }, "message": "am 909498b7: Merge \"stagefright: use CODECS field in EXT-X_STREAM-INF as fallback\" into klp-dev\n\n* commit \u0027909498b72d740e3151561fd4435ad0a329ec9c6e\u0027:\n stagefright: use CODECS field in EXT-X_STREAM-INF as fallback\n" }, { "commit": "4dbd814de3a3bc95ca3fe39be2400418e7a05602", "tree": "d377e9dbea012d8acda6cae168f03700835ac70e", "parents": [ "e389b1bdd13e768baa2532f537236b2c5e6243fa", "2338782d18d9bcc8197c63dbf205332a2a737440" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:38:22 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:38:22 2014 +0000" }, "message": "am 2338782d: Merge \"Fixed misplaced bracket for switch-case block.\" into klp-dev\n\n* commit \u00272338782d18d9bcc8197c63dbf205332a2a737440\u0027:\n Fixed misplaced bracket for switch-case block.\n" }, { "commit": "e389b1bdd13e768baa2532f537236b2c5e6243fa", "tree": "f42a7afdfd302ac31fc8dfaa472c07d64c33d635", "parents": [ "3bd0270c2106241674b1d8cb4951e5c5a7bc98d2", "ad21a81af3e7d6b58002c9dce9c3278b6323e4a9" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:38:21 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:38:21 2014 +0000" }, "message": "am ad21a81a: Merge \"stagefright: Fix issue with tracking media format in packet source\" into klp-dev\n\n* commit \u0027ad21a81af3e7d6b58002c9dce9c3278b6323e4a9\u0027:\n stagefright: Fix issue with tracking media format in packet source\n" }, { "commit": "3bd0270c2106241674b1d8cb4951e5c5a7bc98d2", "tree": "dd6b53bbc892d7f5ebcfc518f7670d082535fb02", "parents": [ "47ef192f0296642b901e82d0c72c5a1a0d08f4df", "b74b209862cbcbab6053cf4a43bbc16940aaafd2" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:38:20 2014 +0000" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Mar 07 02:38:20 2014 +0000" }, "message": "am b74b2098: Merge \"stagefright: Fix bugs in playlist fetcher logic\" into klp-dev\n\n* commit \u0027b74b209862cbcbab6053cf4a43bbc16940aaafd2\u0027:\n stagefright: Fix bugs in playlist fetcher logic\n" }, { "commit": "49ea13379fb15ddb73183ebafa3a377342ef932f", "tree": "67f916593db5990acd0ab5bee3d2e5941c98caf8", "parents": [ "e0c3058a1d0953f4c85bfc964926cf5babb7dbac", "a1076eb135b74a32e9bdc1aed17aee4374eb41af" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:35:50 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 02:35:50 2014 +0000" }, "message": "Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev\n\n* changes:\n LiveSession: Use the actual, possibly redirected url as base in the M3U\n M3UParser: Skip query strings when looking for the last slash in a URL\n ChromiumHTTPDataSource: Keep track of the redirected URL\n Initial HLS seamless switch implementation.\n NuPlayer side support for seamless format switch.\n LiveSession refactor\n PlaylistFetcher: Add support for block-by-block decryption.\n LiveSession: Add support for block-by-block fetchFile.\n" }, { "commit": "e0c3058a1d0953f4c85bfc964926cf5babb7dbac", "tree": "3ddf04eaa4d8bd8c3cd9f87664bcadc71ef3c1a1", "parents": [ "2613347d74c3f35bc6fda5df1c29c1119c22d432", "7e50e1c0c10cba1e27cafe581273adcadf93877d" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:33:32 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 02:33:33 2014 +0000" }, "message": "Merge \"AnotherPacketSource support to get latest buffered MetaData.\" into klp-dev" }, { "commit": "2613347d74c3f35bc6fda5df1c29c1119c22d432", "tree": "7f97cbfd6f1f9d3183a8b8e0ffbdadae662a6372", "parents": [ "909498b72d740e3151561fd4435ad0a329ec9c6e", "933a4d3339ebbcd34a7f97b9e7350ec74b5ec29c" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:33:08 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 02:33:08 2014 +0000" }, "message": "Merge \"Added support to query ACodec whether adaptive playback is enabled.\" into klp-dev" }, { "commit": "909498b72d740e3151561fd4435ad0a329ec9c6e", "tree": "d9fcf6e8275b790e2ede30a30d4d4dab1afea97b", "parents": [ "2338782d18d9bcc8197c63dbf205332a2a737440", "f7e34cfcb9d649989c8e391f23dde782d4931849" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:32:34 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 02:32:34 2014 +0000" }, "message": "Merge \"stagefright: use CODECS field in EXT-X_STREAM-INF as fallback\" into klp-dev" }, { "commit": "2338782d18d9bcc8197c63dbf205332a2a737440", "tree": "9c3e2776df597444edfe3f5cfd52818b3f1c50ec", "parents": [ "ad21a81af3e7d6b58002c9dce9c3278b6323e4a9", "b2be2f2e41d5502d79636b21cbad23f4f983bbd7" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:32:25 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 02:32:25 2014 +0000" }, "message": "Merge \"Fixed misplaced bracket for switch-case block.\" into klp-dev" }, { "commit": "ad21a81af3e7d6b58002c9dce9c3278b6323e4a9", "tree": "aa95e33909367262856ec40abd57d040f2b2db1a", "parents": [ "b74b209862cbcbab6053cf4a43bbc16940aaafd2", "e62d20268de87f63083896b5eef083d541078322" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:32:09 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 02:32:09 2014 +0000" }, "message": "Merge \"stagefright: Fix issue with tracking media format in packet source\" into klp-dev" }, { "commit": "b74b209862cbcbab6053cf4a43bbc16940aaafd2", "tree": "8c60c5ec50a62f36d0d8a79c4d4ac816cc4618a7", "parents": [ "a11111f9135c98cf4247bbd1a61d7df3053e549e", "6708a45ba1b5eacf583d5e80b2075b68940fe0ab" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Fri Mar 07 02:31:50 2014 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Mar 07 02:31:51 2014 +0000" }, "message": "Merge \"stagefright: Fix bugs in playlist fetcher logic\" into klp-dev" }, { "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": "a1076eb135b74a32e9bdc1aed17aee4374eb41af", "tree": "f071cede95394ffcdde758cb5dbf8b16be97cb8c", "parents": [ "75d03185ac7be95c700f3f375080989e5de03ef6" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Nov 22 17:57:31 2013 +0200" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 18:11:27 2014 -0800" }, "message": "LiveSession: Use the actual, possibly redirected url as base in the M3U\n\nThis fixes playback of HLS streams where the M3U playlists use\nrelative paths and the main playlist is opened via a redirect.\n\nBug: 13174301\nChange-Id: I787e1c050daddc566be4c8e3f84803d3f91eec46\n" }, { "commit": "75d03185ac7be95c700f3f375080989e5de03ef6", "tree": "5bb078ad258d93dbb3e024e575fafb142b229ffa", "parents": [ "e2492dc46f5476e3abc617ee21d74f44198591dd" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Nov 22 17:05:05 2013 +0200" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 18:11:27 2014 -0800" }, "message": "M3UParser: Skip query strings when looking for the last slash in a URL\n\nBug: 13174301\nChange-Id: I72d3a5e11fef9bbd75b291bc490c9cab1dce58da\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": "e2492dc46f5476e3abc617ee21d74f44198591dd", "tree": "f7da98c8c6600cd3db8c2f96219626ce8a2ec63e", "parents": [ "777ee5ed736c8f6c3f7d196ea022f7432bfd23e1" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Nov 22 18:11:58 2013 +0200" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:27:19 2014 -0800" }, "message": "ChromiumHTTPDataSource: Keep track of the redirected URL\n\nThis makes the code actually match an existing comment in\nDrmInitialization, which claimed that mURI was the redirected\nURL and not the original one.\n\nBug: 13174301\nChange-Id: I0a5cc65f520f1482ff91320ae78af84a8a681ee3\n" }, { "commit": "777ee5ed736c8f6c3f7d196ea022f7432bfd23e1", "tree": "90c59cbca76978fb5fc9961cc19f7a21dd5aa499", "parents": [ "0523da8f16557a85395da86ab76be6d8cb771da0" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Feb 20 13:07:26 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:27:15 2014 -0800" }, "message": "Initial HLS seamless switch implementation.\n\nBug: 11854054\nChange-Id: I75fc2a258111295039ac13cc37e407df25891dd2\n" }, { "commit": "0523da8f16557a85395da86ab76be6d8cb771da0", "tree": "41e633ee427fcec6193782b8cd1766089d5e20ed", "parents": [ "6c8495c8f1ccc35db972ee7ac0dbb8baf5843548" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jan 23 16:18:22 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:26:58 2014 -0800" }, "message": "NuPlayer side support for seamless format switch.\n\nAvoid reinstantiating decoder if seamless format switch is supported.\n\nBug: 11854054\nChange-Id: I2c2be08d6da90cc835ec747d04a76db2313dfc7c\n" }, { "commit": "6c8495c8f1ccc35db972ee7ac0dbb8baf5843548", "tree": "0c2a6ee4cf3288f7797a8c3fa8e22740123ff124", "parents": [ "2cd94583868b775a548233a4f7cd1d988fc6344f" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Fri Feb 14 12:21:50 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:26:55 2014 -0800" }, "message": "LiveSession refactor\n\nBug: 11854054\nChange-Id: Ia91dce109835e042f72934376d4838b4cc72cb10\n" }, { "commit": "2cd94583868b775a548233a4f7cd1d988fc6344f", "tree": "3c61506c66f0f6f5140f4cda1dd4822922b052c8", "parents": [ "822a489e595336be447f47f5c2a051e8fdd1cdff" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Feb 06 14:25:25 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:26:49 2014 -0800" }, "message": "PlaylistFetcher: Add support for block-by-block decryption.\n\nBug: 11854054\nChange-Id: Ifd3f3369275889e716b360087b5b60d01635b578\n" }, { "commit": "822a489e595336be447f47f5c2a051e8fdd1cdff", "tree": "6cfaa5019c19b8a4cec2fd77857a06c5529b228f", "parents": [ "7e50e1c0c10cba1e27cafe581273adcadf93877d" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Feb 06 14:01:30 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:26:45 2014 -0800" }, "message": "LiveSession: Add support for block-by-block fetchFile.\n\nBug: 11854054\nChange-Id: I4025ba7fab8fab2e0c720f73894e908fd98a43d8\n" }, { "commit": "7e50e1c0c10cba1e27cafe581273adcadf93877d", "tree": "fa821ccd7fc24142651b79d757ee0f6fe2243167", "parents": [ "933a4d3339ebbcd34a7f97b9e7350ec74b5ec29c" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jan 23 14:25:32 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:26:37 2014 -0800" }, "message": "AnotherPacketSource support to get latest buffered MetaData.\n\nBug: 11854054\nChange-Id: Ib3b6e0984036082bf3c4eb7901a2b29be52fdd29\n" }, { "commit": "933a4d3339ebbcd34a7f97b9e7350ec74b5ec29c", "tree": "bd6e305a5ba2d5cb84e6d90779a36b9f0dc457f9", "parents": [ "f7e34cfcb9d649989c8e391f23dde782d4931849" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jan 23 15:26:43 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:26:30 2014 -0800" }, "message": "Added support to query ACodec whether adaptive playback is enabled.\n\nBug: 11854054\nChange-Id: I6b0308aa8550c643706959277e46dad586c37297\n" }, { "commit": "f7e34cfcb9d649989c8e391f23dde782d4931849", "tree": "3a836aaa2a4940547dd9f116e6fe85907d62940e", "parents": [ "b2be2f2e41d5502d79636b21cbad23f4f983bbd7" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jan 23 15:00:53 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:26:01 2014 -0800" }, "message": "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback\n\nUse the CODECS field in EXT-X-STREAM-INF as a viable fallback for identifying\navailable streams in a variant playlist.\n\nBug: 11854054\nChange-Id: I5011809dc7c56220b023eb1a16f2d6a392ddd6f1\n" }, { "commit": "b2be2f2e41d5502d79636b21cbad23f4f983bbd7", "tree": "2212d77b4622295440e988f0c06cc57439a9bd26", "parents": [ "e62d20268de87f63083896b5eef083d541078322" ], "author": { "name": "Robert Shih", "email": "robertshih@google.com", "time": "Thu Jan 23 14:16:32 2014 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:25:13 2014 -0800" }, "message": "Fixed misplaced bracket for switch-case block.\n\nBug: 11854054\nChange-Id: I66b410e1e19601ad65d8357bda4c0c58e2dc15dc\n" }, { "commit": "e62d20268de87f63083896b5eef083d541078322", "tree": "fce776fcf4d2eb288e7eae863932ae980c95b128", "parents": [ "6708a45ba1b5eacf583d5e80b2075b68940fe0ab" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Tue Dec 17 14:10:46 2013 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:25:11 2014 -0800" }, "message": "stagefright: Fix issue with tracking media format in packet source\n\nMedia format in AnotherPacketSource is now tracked across discontinuities.\nThis fixes a bug where format was set on queueAccessUnit and cleared on\ndequeueAccessUnit, thereby allowing it to remain cleared.\n\nChange-Id: I20975a630443f4a223a2b4344e8244f34b9560b9\nSigned-off-by: Lajos Molnar \u003clajos@google.com\u003e\nBug: 12060952\n" }, { "commit": "6708a45ba1b5eacf583d5e80b2075b68940fe0ab", "tree": "3d5956682c42074b73f380f12191a70e2d4527f3", "parents": [ "880413f7923ec77467243e15dc34d4af4f8064f9" ], "author": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Mon Dec 16 10:16:32 2013 -0800" }, "committer": { "name": "Lajos Molnar", "email": "lajos@google.com", "time": "Thu Mar 06 16:19:38 2014 -0800" }, "message": "stagefright: Fix bugs in playlist fetcher logic\n\n1. Improve start time: start playback as soon as the target duration\nor 10s was buffered.\n2. Select playlist monitor time based on target duration to avoid\ncontinuously missing the boat.\n3. If \"we miss the boat\" we still must request a safe sequence\nnumber (last - 3)\n\nChange-Id: Ie99c360ac67b152ad9af19e9c6e520016f67e4e3\nSigned-off-by: Lajos Molnar \u003clajos@google.com\u003e\nBug: 12060952\n" }, { "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" } ], "next": "d26e652226b5e589d6784bd01f2c5fc381dc6e2c" }