)]}' { "log": [ { "commit": "e4e5b2f23fa85cae789dc6824ea8af321e211d60", "tree": "00607609c6a079439b1c1ae583c07bbf659ff6f4", "parents": [ "537799199bdd7a585585dee409e0e3a86bad93b7" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Feb 20 16:50:13 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Feb 22 10:50:14 2013 -0800" }, "message": "Camera: Add unit test infrastructure for libcameraclient\n\nChange-Id: I957538663ae8332d26f3640c63a75efc79f4ac5c\n" }, { "commit": "537799199bdd7a585585dee409e0e3a86bad93b7", "tree": "662d09dd904faaea81bff84f4587cdf7a59918d9", "parents": [ "bd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Feb 13 18:23:39 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Feb 22 10:50:14 2013 -0800" }, "message": "Camera: Add exists function to CameraMetadata\n\nChange-Id: I081f61417fca7c8408e9e767129647ddce5364ab\n" }, { "commit": "bd02dd1bf1f34eb4e100d0d058f1fe5a2790d67e", "tree": "09dabb9a40decb5640f9b5d419565e999a5995d2", "parents": [ "ee9cc423e2551ffbacfd226b8627737beabaec99" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Feb 13 15:53:56 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Fri Feb 22 10:50:14 2013 -0800" }, "message": "Camera: Move CameraMetadata.h from service to client library\n\nChange-Id: I940ce86f318f37ae5b73f912a6e589415150125f\n" }, { "commit": "ee9cc423e2551ffbacfd226b8627737beabaec99", "tree": "b210a4f6f36ab0a6798db09baf44eadb62261231", "parents": [ "3706fe79df688b84125c79838a4eeeaa11640022", "a6843669d4da47755ce97fb85389d4d1c52b8197" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Feb 21 23:21:20 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 21 23:21:21 2013 +0000" }, "message": "Merge \"replace getISurfaceTexture by getIGraphicBufferProducer\"" }, { "commit": "3706fe79df688b84125c79838a4eeeaa11640022", "tree": "dd9163639d052472f5e423f5fbdc717965a55efb", "parents": [ "dacd2b01291acc67e83e87e336472b966bf92b2c", "8029ea41c8851c527ed5829e8c26fbf939661f34" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 21 20:57:15 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 21 20:57:16 2013 +0000" }, "message": "Merge \"Permit conditional registry of mediaserver extensions\"" }, { "commit": "8029ea41c8851c527ed5829e8c26fbf939661f34", "tree": "5ef58bfba85abac9234c739ab65ef4d195e285b6", "parents": [ "2f8025eef6c681920579f75d298a262b12a80ac9" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Feb 20 16:47:28 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Feb 20 16:47:28 2013 -0800" }, "message": "Permit conditional registry of mediaserver extensions\n\nChange-Id: I94dc0d038e702dfe1779a50a1de0fae9bad15057\n" }, { "commit": "dacd2b01291acc67e83e87e336472b966bf92b2c", "tree": "50b6e081a48441cf30ffe1afc47741c7340c7748", "parents": [ "9b50b2f2828e57f9bf5df946423fd7d4304fa2a8", "53c8ad31435bfb7c71a5b04dfc0314ac8f899219" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Wed Feb 20 23:52:12 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 20 23:52:13 2013 +0000" }, "message": "Merge \"CameraService: Log camera module name\"" }, { "commit": "53c8ad31435bfb7c71a5b04dfc0314ac8f899219", "tree": "50b6e081a48441cf30ffe1afc47741c7340c7748", "parents": [ "2f8025eef6c681920579f75d298a262b12a80ac9" ], "author": { "name": "Alex Ray", "email": "aray@google.com", "time": "Wed Feb 20 13:39:37 2013 -0800" }, "committer": { "name": "Alex Ray", "email": "aray@google.com", "time": "Wed Feb 20 14:55:34 2013 -0800" }, "message": "CameraService: Log camera module name\n\nExplicitly logs camera module loaded. This is useful on systems with\nmultiple camera modules installed. Also this make the camera service\nmatch audioflinger, which logs hardware module names as well.\n\nChange-Id: I280bf12df2d517f936916b8ba3cb662e671d0216\n" }, { "commit": "9b50b2f2828e57f9bf5df946423fd7d4304fa2a8", "tree": "1e3c3880f6198a9ccdcadc0cf97e6de103161aba", "parents": [ "2f8025eef6c681920579f75d298a262b12a80ac9", "22b74bcdc40fe751010aa7a250c4dbf7514f4540" ], "author": { "name": "Ed Heyl", "email": "edheyl@google.com", "time": "Wed Feb 20 13:47:28 2013 -0800" }, "committer": { "name": "Ed Heyl", "email": "edheyl@google.com", "time": "Wed Feb 20 13:47:28 2013 -0800" }, "message": "Merge remote-tracking branch \u0027goog/jb-mr2-release\u0027\n" }, { "commit": "a6843669d4da47755ce97fb85389d4d1c52b8197", "tree": "ce9b36fa01d3140cc7b2b7af91bcfb0dc6dea957", "parents": [ "2f8025eef6c681920579f75d298a262b12a80ac9" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Feb 19 18:25:33 2013 -0800" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Tue Feb 19 18:25:33 2013 -0800" }, "message": "replace getISurfaceTexture by getIGraphicBufferProducer\n\nChange-Id: I723a3863558126f2635a544a39bb3ec88d499c60\n" }, { "commit": "22b74bcdc40fe751010aa7a250c4dbf7514f4540", "tree": "1e3c3880f6198a9ccdcadc0cf97e6de103161aba", "parents": [ "c6d26a3c7f710f1e60344a84a3549d556551f9fe" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Feb 18 12:47:49 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 19 15:33:58 2013 -0800" }, "message": "A reference cannot be re-bound\n\nBug: 8213067\nBug: 6490974\nChange-Id: If546215641fbc9a0fb1e8af8b85cc01f0a4b26ab\n" }, { "commit": "2f8025eef6c681920579f75d298a262b12a80ac9", "tree": "1e3c3880f6198a9ccdcadc0cf97e6de103161aba", "parents": [ "a457c43cd7f4225ffbedfbdcd68dd9cf6fef1d38" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Feb 18 12:47:49 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 19 10:51:47 2013 -0800" }, "message": "A reference cannot be re-bound\n\nBug: 8213067\nBug: 6490974\nChange-Id: If546215641fbc9a0fb1e8af8b85cc01f0a4b26ab\n" }, { "commit": "c6d26a3c7f710f1e60344a84a3549d556551f9fe", "tree": "62c3cfb9c8fb3c48df46aea39f4d6c3d27dab65a", "parents": [ "a457c43cd7f4225ffbedfbdcd68dd9cf6fef1d38", "4dbb17e333b843a7e446f0fde47eda8564743ef3" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 19 09:51:09 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 19 09:51:09 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "a457c43cd7f4225ffbedfbdcd68dd9cf6fef1d38", "tree": "62c3cfb9c8fb3c48df46aea39f4d6c3d27dab65a", "parents": [ "c046148d93212f8a4da916bb860a1fa5926fe159", "5f6f3764989601d3b3ee65beaf1447d2a6b5f284" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 15 23:55:26 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 15 23:55:26 2013 +0000" }, "message": "Merge \"Revert \"Temporary additional logging to investigate bug\"\"" }, { "commit": "5f6f3764989601d3b3ee65beaf1447d2a6b5f284", "tree": "b32615250ff96cb6e55206f5c78ae2e15c83cc87", "parents": [ "dd9764290b3c1d801fea9505189cae29db919902" ], "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": "c046148d93212f8a4da916bb860a1fa5926fe159", "tree": "1980477800bc27663417d5306d4af89de92533fb", "parents": [ "4490bf05a9addf5a4e12e0da92f22d854e5ce9a0", "dd9764290b3c1d801fea9505189cae29db919902" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 15 23:54:53 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 15 23:54:53 2013 +0000" }, "message": "Merge \"Temporary additional logging to investigate bug\"" }, { "commit": "dd9764290b3c1d801fea9505189cae29db919902", "tree": "2a9ef9c4d5a2d279f18f535441a0eeb8e9476700", "parents": [ "6bde4671ae7cb383e731606d9ee548859047c961" ], "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": "4490bf05a9addf5a4e12e0da92f22d854e5ce9a0", "tree": "62c3cfb9c8fb3c48df46aea39f4d6c3d27dab65a", "parents": [ "6bde4671ae7cb383e731606d9ee548859047c961", "b1e7cd156ca3e1747374e0d20cdd1ce467210453" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Feb 15 22:05:59 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 15 22:05:59 2013 +0000" }, "message": "Merge \"Refactoring: Rename SurfaceTextureClient to Surface\"" }, { "commit": "b1e7cd156ca3e1747374e0d20cdd1ce467210453", "tree": "557f25ff5a0477f0cf0f89d4c21b0291371f09a2", "parents": [ "62ad9071cd61fc56355d3c2d25895382003ea362" ], "author": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Thu Feb 14 17:11:27 2013 -0800" }, "committer": { "name": "Mathias Agopian", "email": "mathias@google.com", "time": "Fri Feb 15 12:47:35 2013 -0800" }, "message": "Refactoring: Rename SurfaceTextureClient to Surface\n\nChange-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830\n" }, { "commit": "6bde4671ae7cb383e731606d9ee548859047c961", "tree": "b32615250ff96cb6e55206f5c78ae2e15c83cc87", "parents": [ "62ad9071cd61fc56355d3c2d25895382003ea362" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Feb 15 08:26:24 2013 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Feb 15 11:46:09 2013 -0800" }, "message": "Remove FragmentedMP4Extractor\n\nMPEG4Extractor now supports fragmented mp4 files.\n\nChange-Id: I5659a51f4e5e4407a12535e69238fe3abffda7dc\n" }, { "commit": "62ad9071cd61fc56355d3c2d25895382003ea362", "tree": "3795e34e35b63dbe73daac08d151501c43a91733", "parents": [ "0d026335f6040df997d35b7e81f8c9f8be8cdec0" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Wed Feb 13 09:27:28 2013 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Feb 15 10:03:04 2013 -0800" }, "message": "Add support for fragmented mp4 to MPEG4Extractor\n\nThis makes FragmentedMP4Extractor obsolete. It will be removed in a\nseparate change.\n\nChange-Id: Ida74c07ccf84983e20a1320ee24ffc7a5c083859\n" }, { "commit": "4dbb17e333b843a7e446f0fde47eda8564743ef3", "tree": "3de394e4626f829fed4237e756489e0fba865236", "parents": [ "15381e33a9c567ca828e2d76d690dcbf471942db" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Feb 13 14:46:45 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Feb 14 16:31:03 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\nBug: 6490974\nChange-Id: I1f3f18aa62d9fbd35bc32285b669f5ba40efe28e\n" }, { "commit": "0d026335f6040df997d35b7e81f8c9f8be8cdec0", "tree": "3e956b9206105380d3c51eecfa421317ea612ed5", "parents": [ "159967da236ae12619ee09ba4de5a15633f62fbb", "ce70d400ff9fb614e334ab2b661df2933533ef57" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 14 23:57:13 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 14 23:57:13 2013 +0000" }, "message": "Merge \"Revert \"Temporary additional logging to investigate bug\"\"" }, { "commit": "ce70d400ff9fb614e334ab2b661df2933533ef57", "tree": "30610a5b21cfa882a9f17a7b4cc39d11e8ccdd7d", "parents": [ "5881f18029deb80eb83ea88046d0593441be79c7" ], "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" }, { "commit": "159967da236ae12619ee09ba4de5a15633f62fbb", "tree": "7fe058f8f7d3715f2cd121238f40c2f9a9ee581e", "parents": [ "ae09bf643d1f4f7dbb0507ec0c9518688238fa06", "5881f18029deb80eb83ea88046d0593441be79c7" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 14 23:56:52 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 14 23:56:52 2013 +0000" }, "message": "Merge \"Temporary additional logging to investigate bug\"" }, { "commit": "5881f18029deb80eb83ea88046d0593441be79c7", "tree": "3de394e4626f829fed4237e756489e0fba865236", "parents": [ "7e1e1e61fca5334e11a0c26ab23e6122e742d517" ], "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": "Thu Feb 14 14:35:29 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\nBug: 6490974\nChange-Id: I1f3f18aa62d9fbd35bc32285b669f5ba40efe28e\n" }, { "commit": "ae09bf643d1f4f7dbb0507ec0c9518688238fa06", "tree": "3e956b9206105380d3c51eecfa421317ea612ed5", "parents": [ "7e1e1e61fca5334e11a0c26ab23e6122e742d517", "fc9afba35492257e5e80a36b0765ff035908bb6d" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Thu Feb 14 20:42:53 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 14 20:42:53 2013 +0000" }, "message": "Merge \"Add a test utility for MediaMuxer.\"" }, { "commit": "15381e33a9c567ca828e2d76d690dcbf471942db", "tree": "30610a5b21cfa882a9f17a7b4cc39d11e8ccdd7d", "parents": [ "7e1e1e61fca5334e11a0c26ab23e6122e742d517", "5bdcf3e40fc5600370015cc4f9f80636ed9dee66" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Feb 14 05:55:39 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Feb 14 05:55:39 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "5bdcf3e40fc5600370015cc4f9f80636ed9dee66", "tree": "b637fbbfb9a0405349200102eba4e4af4f298810", "parents": [ "fbf7d7ee1a1d631cb86f623124ce3d23f6d76233" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Wed Feb 13 14:46:45 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Feb 13 16:31:39 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\nBug: 6490974\nChange-Id: Iee7c8f40e20b6000cd8286c0ec6a14fff4a37af1\n" }, { "commit": "7e1e1e61fca5334e11a0c26ab23e6122e742d517", "tree": "30610a5b21cfa882a9f17a7b4cc39d11e8ccdd7d", "parents": [ "cef1245fe7522759ab5ccfab0d2a6e56aea8c2a6", "7f2f8042cf335ab1323dec3edbe9143a06109f4e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 14 00:02:53 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 14 00:02:53 2013 +0000" }, "message": "Merge \"Revert \"Temporary additional logging to investigate bug\"\"" }, { "commit": "7f2f8042cf335ab1323dec3edbe9143a06109f4e", "tree": "debfbedbe8cf9a16d279f9a408519aa4743cc854", "parents": [ "b900234f9e772bb7591a551f06ba17ee1969368f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 14 00:02:36 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 14 00:02:36 2013 +0000" }, "message": "Revert \"Temporary additional logging to investigate bug\"\n\nThis reverts commit 0ddd56316262ac74a95e9edb595697c163136d6d\n\nChange-Id: I180a928af6f5a38d15a5efe44cd1fe927b5d961c\n" }, { "commit": "cef1245fe7522759ab5ccfab0d2a6e56aea8c2a6", "tree": "868b16f07fd3a0bd389e00c16c96fe3e1b2e1dfd", "parents": [ "c7c78e3d17cd3e599b052b35dfa7ba204803ac53", "b900234f9e772bb7591a551f06ba17ee1969368f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Feb 14 00:02:22 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 14 00:02:22 2013 +0000" }, "message": "Merge \"Temporary additional logging to investigate bug\"" }, { "commit": "b900234f9e772bb7591a551f06ba17ee1969368f", "tree": "b637fbbfb9a0405349200102eba4e4af4f298810", "parents": [ "10e5eada4a265865494b93ca588f75beef14f592" ], "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": "Wed Feb 13 14:51: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\nBug: 6490974\nChange-Id: Iee7c8f40e20b6000cd8286c0ec6a14fff4a37af1\n" }, { "commit": "fc9afba35492257e5e80a36b0765ff035908bb6d", "tree": "0793a9b8123d53898bbe9901a01aa9f41c0a432f", "parents": [ "10e5eada4a265865494b93ca588f75beef14f592" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Thu Feb 07 15:12:10 2013 -0800" }, "committer": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Wed Feb 13 11:39:06 2013 -0800" }, "message": "Add a test utility for MediaMuxer.\n\nThis test/utility copy samples from one video and mux into another video.\nIt support trimming, cutting audio or video track.\nIt can run simply as command line like:\nadb shell muxer -a -v -s 1000 -e 8000 \"/sdcard/DCIM/Camera/VID_*.mp4\"\n\nbug:7991013\n\nChange-Id: I8a2eeff3cabd001b6b2a7062d991dd076edbf22e\n" }, { "commit": "c7c78e3d17cd3e599b052b35dfa7ba204803ac53", "tree": "30610a5b21cfa882a9f17a7b4cc39d11e8ccdd7d", "parents": [ "79e499be700ff3365b778f9f6b2c179ad69ae43a", "b6cd3797b010e0de3366e062f590fcb98c5f81bf" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Feb 13 18:18:22 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Feb 13 18:18:22 2013 +0000" }, "message": "Merge \"Add OMX.google.vpx.encoder\"" }, { "commit": "fbf7d7ee1a1d631cb86f623124ce3d23f6d76233", "tree": "debfbedbe8cf9a16d279f9a408519aa4743cc854", "parents": [ "10e5eada4a265865494b93ca588f75beef14f592", "dbb8196f9e496da9fba56e328877703b9c90d572" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Feb 13 05:55:41 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Feb 13 05:55:41 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "b6cd3797b010e0de3366e062f590fcb98c5f81bf", "tree": "f7a064d94c090f0935fd91455b78ce69b5208d26", "parents": [ "10e5eada4a265865494b93ca588f75beef14f592" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Feb 12 10:36:01 2013 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Feb 12 17:26:42 2013 -0800" }, "message": "Add OMX.google.vpx.encoder\n\nChange-Id: I843e6e542533884a94e105e1cb56f16f0440af61\n" }, { "commit": "79e499be700ff3365b778f9f6b2c179ad69ae43a", "tree": "44d4b26da9ba2ef5b71e5dd41c3e3711f178d891", "parents": [ "10e5eada4a265865494b93ca588f75beef14f592" ], "author": { "name": "Kunter Gultekin", "email": "kuntergultekin@google.com", "time": "Fri Feb 01 17:01:15 2013 +0200" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Tue Feb 12 17:24:04 2013 -0800" }, "message": "Adds VPX encoding support for stagefright.\n\nOnly following encoder settings are available\n - target bitrate\n - rate control (constant / variable)\n - frame rate\n - token partitioning\n - error resilience\n - reconstruction \u0026 loop filters\n\nOnly following color formats are recognized\n - YUV420Planar\n - YUV420SemiPlanar\n - AndroidOpaque\n\nFollowing settings are not configurable by the client\n - encoding deadline is realtime\n - the algorithm interface for encoder is vp8\n - fractional bits of frame rate is discarded\n - timebase is fixed to 1/1000000\n\nRequires libvpx to be built with encoder support enabled.\nRequires openmax 1.1.2 extension headers.\n\nRelevant tests exist in cts repo.\n\nChange-Id: I650f1aca83e7dc93f79d7e6cba7ac24f26e66d40\nSigned-off-by: Kunter Gultekin \u003ckuntergultekin@google.com\u003e\n" }, { "commit": "dbb8196f9e496da9fba56e328877703b9c90d572", "tree": "16d8b1d0e8d0e768ebf7ba769c17c264b978d68d", "parents": [ "ba241171eb3c2727189afbab3e35f089f145ee16" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 12 12:12:42 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 12 15:09:54 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\nBug: 6490974\nChange-Id: I4c030f171343fe4b483eae0ddea4427118d8d4b1\n" }, { "commit": "10e5eada4a265865494b93ca588f75beef14f592", "tree": "debfbedbe8cf9a16d279f9a408519aa4743cc854", "parents": [ "303a8811cb2171b6323e7c03210ff59c1742a750", "c93aff0a698265501f46393f3146b884aa357aee" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 12 20:44:09 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 12 20:44:09 2013 +0000" }, "message": "Merge \"Revert \"Temporary additional logging to investigate bug\"\"" }, { "commit": "c93aff0a698265501f46393f3146b884aa357aee", "tree": "a53d8070243784449dc87ca193e2e121d38863b7", "parents": [ "a1bf28b533907b0b234e52c72bc372b3fa49c5a3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 12 20:43:58 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 12 20:43:58 2013 +0000" }, "message": "Revert \"Temporary additional logging to investigate bug\"\n\nThis reverts commit 3051df27261e9952c0e642dec548515250e85f6a\n\nChange-Id: I8bf5c3e91b65bd20de26f480c367c2854b62373c\n" }, { "commit": "303a8811cb2171b6323e7c03210ff59c1742a750", "tree": "10a0cfaadf23018aee4419e031ab9871e570ac8f", "parents": [ "6269d53cce5c1c9350565d3d72d92116594260cb", "a1bf28b533907b0b234e52c72bc372b3fa49c5a3" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 12 20:43:45 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 12 20:43:45 2013 +0000" }, "message": "Merge \"Temporary additional logging to investigate bug\"" }, { "commit": "a1bf28b533907b0b234e52c72bc372b3fa49c5a3", "tree": "16d8b1d0e8d0e768ebf7ba769c17c264b978d68d", "parents": [ "e336f9113bdd35119866a3c3f8008ca01c576660" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 12 12:12:42 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Tue Feb 12 12:40:18 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\nBug: 6490974\nChange-Id: I4c030f171343fe4b483eae0ddea4427118d8d4b1\n" }, { "commit": "6269d53cce5c1c9350565d3d72d92116594260cb", "tree": "debfbedbe8cf9a16d279f9a408519aa4743cc854", "parents": [ "e336f9113bdd35119866a3c3f8008ca01c576660" ], "author": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Mon Feb 04 15:59:38 2013 -0800" }, "committer": { "name": "ztenghui", "email": "ztenghui@google.com", "time": "Tue Feb 12 11:10:12 2013 -0800" }, "message": "Add the native MediaMuxer support.\n\nMediaAdapter: a helper class to convert the push model to pull model.\nMediaMuxer: the real muxer.\n\nbug:7991013\n\nChange-Id: If3b79551bc6332bc81f5c2740885e579a5c4abf9\n" }, { "commit": "ba241171eb3c2727189afbab3e35f089f145ee16", "tree": "a53d8070243784449dc87ca193e2e121d38863b7", "parents": [ "e336f9113bdd35119866a3c3f8008ca01c576660", "12f220bf84c5d70a6f203b1704542ae1a0865a10" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 12 07:10:36 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 12 07:10:36 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "e336f9113bdd35119866a3c3f8008ca01c576660", "tree": "a53d8070243784449dc87ca193e2e121d38863b7", "parents": [ "51a920302a6f376cdb24691051d96f34f24a55bf" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Feb 04 16:26:02 2013 -0800" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Feb 11 10:13:00 2013 -0800" }, "message": "Add support for querying if a stream is active remotely\n\nBug 7485803\n\nChange-Id: I0744374f130fd2dd0714102354cffed2fa915361\n" }, { "commit": "12f220bf84c5d70a6f203b1704542ae1a0865a10", "tree": "3efa1d517f317e9171eed91370a18d381cca4536", "parents": [ "51a920302a6f376cdb24691051d96f34f24a55bf", "236e3676b5b94661c8e79052e52a4f02efb65902" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Feb 11 07:10:54 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Feb 11 07:10:54 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "51a920302a6f376cdb24691051d96f34f24a55bf", "tree": "3efa1d517f317e9171eed91370a18d381cca4536", "parents": [ "fa171eaa239ee2e83ce57091279e170369de4edb" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Feb 08 18:16:02 2013 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Feb 08 18:17:46 2013 -0800" }, "message": "Revert \"Adds VPX encoding support for stagefright.\"\nThis lib was not part of the build, but it is built anyway for userdebug image (not for eng though).\nlet me revert it for now...\n\nThis reverts commit 6c6bb9873f55853fe74d8f45ad3ae116636d8be7.\n" }, { "commit": "fa171eaa239ee2e83ce57091279e170369de4edb", "tree": "498b0ce4e6bce51ff7dca73160b5c168bb04a3a4", "parents": [ "2b02df2df65dd12162bc7b3a2ef135bbce8ed0a7", "8b7a86119ca2da79d23713ee6b4581c222f2c0fe" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sat Feb 09 00:47:03 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sat Feb 09 00:47:03 2013 +0000" }, "message": "Merge \"Adds VPX encoding support for stagefright.\"" }, { "commit": "2b02df2df65dd12162bc7b3a2ef135bbce8ed0a7", "tree": "3efa1d517f317e9171eed91370a18d381cca4536", "parents": [ "90cede87c5a0176574961a4a57589eb217ac1873", "38fb629c46efb74517332696d5d117f4466fa3f0" ], "author": { "name": "Mike Lockwoood", "email": "lockwood@google.com", "time": "Fri Feb 08 21:51:43 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 08 21:51:43 2013 +0000" }, "message": "Merge \"MTP: Write initial data to correct file offset in SendPartialObject\"" }, { "commit": "38fb629c46efb74517332696d5d117f4466fa3f0", "tree": "27a6883c8003ea76befc4b57c6986f145f983f96", "parents": [ "1cca13c79ff7e3f36a2fc6e564b60f5e57d00919" ], "author": { "name": "Mike Lockwoood", "email": "lockwood@google.com", "time": "Fri Feb 08 13:25:01 2013 -0800" }, "committer": { "name": "Mike Lockwoood", "email": "lockwood@google.com", "time": "Fri Feb 08 13:25:01 2013 -0800" }, "message": "MTP: Write initial data to correct file offset in SendPartialObject\n\nChange-Id: I84288aeda3e65e6e6487f11d32a72910cd16cff2\n" }, { "commit": "90cede87c5a0176574961a4a57589eb217ac1873", "tree": "83bd670377ac615a4803d9cfb8455bb178ba72e5", "parents": [ "1dfc70879323990ba4b4d3e7cadc93ea3900063c", "c71601c3b1dd63afc9be462194809813e4dbacf1" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 07 23:25:59 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Feb 07 23:26:00 2013 +0000" }, "message": "Merge \"Allow for dynamic reconfiguration of the video bitrate used\"" }, { "commit": "1dfc70879323990ba4b4d3e7cadc93ea3900063c", "tree": "3153e38fe4f71bd3ad754d569a594591fb1950b5", "parents": [ "0955986e6c1c27ba752e293246086ea79c49d39c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 07 11:38:08 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 07 13:33:28 2013 -0800" }, "message": "A few more patches to fix wfd tcp unicast transport.\n\nChange-Id: Ie2f1b1e56c487ac4c3ef19d9e79022a35084e042\n" }, { "commit": "c71601c3b1dd63afc9be462194809813e4dbacf1", "tree": "f91f7e9da453d188934ef99d136f2606a52fe3d9", "parents": [ "0955986e6c1c27ba752e293246086ea79c49d39c" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 07 10:56:14 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Feb 07 10:56:14 2013 -0800" }, "message": "Allow for dynamic reconfiguration of the video bitrate used\n\nto encode video while running as a wfd source.\n\nChange-Id: I44f7b2350c88fc5807047c61bfe594ef8fa79275\n" }, { "commit": "8b7a86119ca2da79d23713ee6b4581c222f2c0fe", "tree": "00b34067f704d0de106635cda01175b11234abaf", "parents": [ "0955986e6c1c27ba752e293246086ea79c49d39c" ], "author": { "name": "Kunter Gultekin", "email": "kuntergultekin@google.com", "time": "Fri Feb 01 17:01:15 2013 +0200" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Thu Feb 07 10:18:13 2013 -0800" }, "message": "Adds VPX encoding support for stagefright.\n\nOnly following encoder settings are available\n - target bitrate\n - rate control (constant / variable)\n - frame rate\n - token partitioning\n - error resilience\n - reconstruction \u0026 loop filters\n\nOnly following color formats are recognized\n - YUV420Planar\n - YUV420SemiPlanar\n - AndroidOpaque\n\nFollowing settings are not configurable by the client\n - encoding deadline is realtime\n - the algorithm interface for encoder is vp8\n - fractional bits of frame rate is discarded\n - timebase is fixed to 1/1000000\n\nRequires libvpx to be built with encoder support enabled.\nRequires openmax 1.1.2 extension headers.\n\nRelevant tests exist in cts repo.\n\nChange-Id: If759edb8db36acbd24dcb53d159a54e942766020\nSigned-off-by: Kunter Gultekin \u003ckuntergultekin@google.com\u003e\n" }, { "commit": "236e3676b5b94661c8e79052e52a4f02efb65902", "tree": "916e9f3ecf9f371e8b11d7d04eabaec46f6ad0d9", "parents": [ "0955986e6c1c27ba752e293246086ea79c49d39c", "02b21e25975f630bd92bf31dc8cb6ef3d5caab58" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Feb 07 07:10:37 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Feb 07 07:10:37 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "0955986e6c1c27ba752e293246086ea79c49d39c", "tree": "916e9f3ecf9f371e8b11d7d04eabaec46f6ad0d9", "parents": [ "1a37ee3c877165c812734b405f922f6e0d747052" ], "author": { "name": "Roger Jönsson", "email": "roger1.jonsson@sonymobile.com", "time": "Wed Jan 23 18:18:08 2013 +0100" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 06 13:48:16 2013 -0800" }, "message": "Avoid rebuffering after RTSP pause\n\nIf pausing an RTSP stream, an RTSP Pause request is sent and then\nif the stream is immediately resumed again, an RTSP Play request\nwill be sent to the server.\nBut the new data after the pause will not be buffered until\nSender Reports have arrived again on both channels.\nMeanwhile the player will resume playback and continue consuming\nthe already existing buffer.\nThis means that there is a risk that the buffer is emptied while\nwaiting for sender reports.\n\nThis commit simply adds a delay before the RTSP pause request is\nsent, allowing some additional RTSP buffering that might be needed\nwhen the stream is resumed again.\nAlso, if the stream is resumed again before the RTSP pause request\nis sent, there is no need for any RTSP pause request, hence it is\nomitted.\n\nChange-Id: I928c8bfb5e99a6a146dcda4e51e528973ecbe065\n" }, { "commit": "1a37ee3c877165c812734b405f922f6e0d747052", "tree": "8fbcdb52e343942586e0dbd2f104b1f0c6cac7ba", "parents": [ "b6ec588faa7728ff3b518bf809ff75e8dd14f08c" ], "author": { "name": "joakim johansson", "email": "joakim.c.johansson@sonyericsson.com", "time": "Wed Jan 23 17:18:56 2013 +0100" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 06 13:45:28 2013 -0800" }, "message": "EOS fixes for RTSP streams\n\nThe fix takes care of several near end of stream use cases:\nseek, pause and fake timestamps.\n\nChange-Id: I5f5fa881b1f619dfd5e1afd2af957082345c59eb\n" }, { "commit": "b6ec588faa7728ff3b518bf809ff75e8dd14f08c", "tree": "4fe2958cdf06a4f37df49d6b85b72255c8b98180", "parents": [ "46d13e3606b87d71379287672b54b50d0d9aa5cc" ], "author": { "name": "Måns Zigher", "email": "mans.zigher@sonyericsson.com", "time": "Wed Jan 23 14:48:57 2013 +0100" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 06 13:41:17 2013 -0800" }, "message": "RTSP: Parse session level control attribute from SDP\n\nIf a\u003dcontrol: is present at session-level in the SDP response,\nRFC2326:C.1.1 defines the URL to be used for aggregate commands.\nThis includes PLAY and PAUSE but not TEARDOWN.\n\nChange-Id: Iaa1dc2271d00df39dc83477a99fda6fbeb73c5b4\n" }, { "commit": "46d13e3606b87d71379287672b54b50d0d9aa5cc", "tree": "e8109ccba1377865e831847f4ad81542671dd815", "parents": [ "cfc3083927df14bf82403b20a45ae303a01c39f5" ], "author": { "name": "Roger Jönsson", "email": "roger1.jonsson@sonymobile.com", "time": "Mon Jan 21 17:15:45 2013 +0100" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 06 13:37:09 2013 -0800" }, "message": "Enable pause/resume for RTSP streaming\n\nWhen a stream is paused, RTSP Pause is also sent to the server.\nOtherwise the buffering might continue until the memory runs out.\nWhen the stream is resumed, RTSP Play will be sent in order to\nresume the buffering.\n\nChange-Id: I5dc1761140827c532451638c3fd3f34271e5b9ab\n" }, { "commit": "cfc3083927df14bf82403b20a45ae303a01c39f5", "tree": "a6803785a07ff3fdbe8c9d84a0596d0040ecdbc6", "parents": [ "0c3f0fa983107a8b5a4d6274179d15333fde8d3c" ], "author": { "name": "Roger Jönsson", "email": "roger1.jonsson@sonymobile.com", "time": "Mon Jan 21 16:26:41 2013 +0100" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 06 13:32:55 2013 -0800" }, "message": "RTSP buffering improvements\n\nAdded buffering start and end notifications for RTSP.\nMEDIA_INFO_BUFFERING_START is sent when buffering is started\nand MEDIA_INFO_BUFFERING_END is sent when the buffer has\nfilled up.\n\nThis patch also adds RTSP end of stream handling.\nEOS is signalled when BYE is received OR when\ndetecting end of stream even if no actual EOS is received.\n\nChange-Id: I5cccb6845060ae6afd66d9f735b89da81476cd13\n" }, { "commit": "0c3f0fa983107a8b5a4d6274179d15333fde8d3c", "tree": "6ede9b14751812fcd5b9101e3f53a1910a3ac7a5", "parents": [ "7f475c34ffc8e35345f2cceee2ef56a50bb5fea6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 06 10:44:39 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Feb 06 10:44:39 2013 -0800" }, "message": "HLS now properly publishes its \"seekable\" flags after connection\n\nhas successfully completed and a sufficient amount of data fetched,\nand only then signals that preparation is completed.\n\nChange-Id: I7684a14238b826909f518f2af506966e522dfcfc\n" }, { "commit": "02b21e25975f630bd92bf31dc8cb6ef3d5caab58", "tree": "d27f2ad0bb24ae1d97d4cf21fb692c3f2748f8c2", "parents": [ "7f475c34ffc8e35345f2cceee2ef56a50bb5fea6", "5927ffb9ad7005c4a06eb2d096825b3aadb6d3c5" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Feb 06 07:10:35 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Feb 06 07:10:35 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "7f475c34ffc8e35345f2cceee2ef56a50bb5fea6", "tree": "d27f2ad0bb24ae1d97d4cf21fb692c3f2748f8c2", "parents": [ "b81b557d6e89cc2960b74ab343a08b5b44bff1f2" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 14:47:13 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 15:27:16 2013 -0800" }, "message": "RTSP now properly publishes its \"seekable\" flags after connection\n\nhas successfully completed and only then signals that preparation is\ncomplete.\n\nChange-Id: I1a60f718e673fe1462c69369c40eafbed6a14326\n" }, { "commit": "b81b557d6e89cc2960b74ab343a08b5b44bff1f2", "tree": "46b630f44dd82e2082d8a5682d63e02d18af6012", "parents": [ "27243b75722c077699a593cb64947f1d763a177f", "57cea553cb19235553463412db5ad04c99835411" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 22:46:45 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 05 22:46:45 2013 +0000" }, "message": "Merge \"Support for a \"preparation\" state that can take care of lengthy\"" }, { "commit": "57cea553cb19235553463412db5ad04c99835411", "tree": "484c824ca8ae2961e3f461f43d7330c1174618cc", "parents": [ "ec29a2bfb5364a5968b77559fd13821b827d173a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 13:59:56 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 14:09:08 2013 -0800" }, "message": "Support for a \"preparation\" state that can take care of lengthy\n\noperations in NuPlayer and its sources. Sources also can publish their\nflags now and the mediaplayer UI will be able to pick up on these.\n\nChange-Id: I4f2b7e5d105dcb4b6c9132cd0e8799efa0c6a14b\n" }, { "commit": "27243b75722c077699a593cb64947f1d763a177f", "tree": "45f2fba07da11e72ed27d1ef9d34bcc1ea6438f5", "parents": [ "ec29a2bfb5364a5968b77559fd13821b827d173a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 13:16:39 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 13:17:17 2013 -0800" }, "message": "Fix a typo in MediaPlayerFactory that would prevent us from\n\nopting in to nuplayer for general media playback.\n\nChange-Id: I050f5178aadbb0b8bf422861ef885745c0b9006a\n" }, { "commit": "ec29a2bfb5364a5968b77559fd13821b827d173a", "tree": "dd4c1ae2ccc29d1895921178e6621d4a2c9ee40d", "parents": [ "80c1ae8f63cbbd243756caf1533ddbb97244b8b5" ], "author": { "name": "Roger Jönsson", "email": "roger1.jonsson@sonymobile.com", "time": "Thu Jan 17 13:22:31 2013 +0100" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 10:50:06 2013 -0800" }, "message": "Detect live streams\n\nThe information is used to decide on visibility of pause button and\nto handle the duration clock correctly.\n\nChange-Id: I286ac992fd171c7fc313e429326d38b6fc80e3fb\n" }, { "commit": "80c1ae8f63cbbd243756caf1533ddbb97244b8b5", "tree": "5d5b070e6d10ee836bb7b656cdd97fce842aec86", "parents": [ "1c5ea2d56c74601191c1bc3a6bfc303891f596fc", "81dd60e0340ddcf7f1d5fb80b6c30906fabf201a" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 18:29:37 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 05 18:29:37 2013 +0000" }, "message": "Merge \"Added HTTP support for SDP files.\"" }, { "commit": "81dd60e0340ddcf7f1d5fb80b6c30906fabf201a", "tree": "d29f39c38d2452c094468b88a2406f1970b6fc6a", "parents": [ "5ab368af38fefacc4009e3ab1c1bbd00e62b3bcf" ], "author": { "name": "Oscar Rydhé", "email": "oscar.rydhe@sonyericsson.com", "time": "Mon Feb 20 10:15:48 2012 +0100" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 10:27:34 2013 -0800" }, "message": "Added HTTP support for SDP files.\n\nAdded support for playing SDP files from http links. Previously,\nSDP files only worked when started from rtsp links\n(rtsp://a.b.c/abc.sdp), but they are just as common in http links.\n\npatch provided by \"Oscar Rydhé \u003coscar.rydhe@sonyericsson.com\u003e\"\n\nChange-Id: Ic73af3a9a002009dbe8b04c267a4621bf7fe2f46\n" }, { "commit": "1c5ea2d56c74601191c1bc3a6bfc303891f596fc", "tree": "ede69631f19dd56df037daa5be74e731a0b073c7", "parents": [ "7846311d9a7d1f52432f5b66d084d587666ab27a", "5ab368af38fefacc4009e3ab1c1bbd00e62b3bcf" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 18:26:03 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 05 18:26:03 2013 +0000" }, "message": "Merge \"Groundwork to support bidirectional, asynchronous communication\"" }, { "commit": "5ab368af38fefacc4009e3ab1c1bbd00e62b3bcf", "tree": "ca3c894a78eee86acb934a70ace03bad7efae1b8", "parents": [ "c41c932328f35f5eed7e517e9b64db9144f2fcb0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 10:14:26 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 10:14:26 2013 -0800" }, "message": "Groundwork to support bidirectional, asynchronous communication\n\nbetween NuPlayer and its sources.\n\nChange-Id: I1989022d806206b926555add3aa5c1fcf37aa78d\n" }, { "commit": "7846311d9a7d1f52432f5b66d084d587666ab27a", "tree": "5129a41b2dc4118d13439409440529e562e0047f", "parents": [ "b15a3e8292d3c98d06d136a07b6e8e66f33dd5c7", "7bc2ffca12828d72aaeeace0891183dc547877c0" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Feb 05 17:55:48 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 05 17:55:48 2013 +0000" }, "message": "Merge \"Revive the code to support TCP interleaved transport\"" }, { "commit": "b15a3e8292d3c98d06d136a07b6e8e66f33dd5c7", "tree": "6a4c3db31e7c3b9c3e4fa6156cf362c50bd73e43", "parents": [ "c41c932328f35f5eed7e517e9b64db9144f2fcb0", "200d71c850e308d4153ea2ea2ebc0004bcae7808" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 05 17:39:04 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Feb 05 17:39:04 2013 +0000" }, "message": "Merge \"Return error code if setting scaling mode fails\"" }, { "commit": "200d71c850e308d4153ea2ea2ebc0004bcae7808", "tree": "df348c603a7ce5cc4eccc3106b8ead6f0529ea8a", "parents": [ "4f5454ecf49b1021cdd492f7764f013b39676bc6" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 05 09:03:22 2013 -0800" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Tue Feb 05 09:03:22 2013 -0800" }, "message": "Return error code if setting scaling mode fails\n\nThe return code from native_window_set_scaling_mode() was ignored.\nLooking at the code review comments that introduced this code, it\nseems like the intention was to return the error code in that case.\n\nChange-Id: I9592cc378f0a0b960d37178aa0525fc17e8734ba\n" }, { "commit": "5927ffb9ad7005c4a06eb2d096825b3aadb6d3c5", "tree": "30a1748c2f491e2c420048eae243ced8696f43f1", "parents": [ "c41c932328f35f5eed7e517e9b64db9144f2fcb0", "a7b90d803f72e8be128853e9f63b845da96b01de" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 05 07:10:41 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Feb 05 07:10:41 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "c41c932328f35f5eed7e517e9b64db9144f2fcb0", "tree": "30a1748c2f491e2c420048eae243ced8696f43f1", "parents": [ "83fa606bd629ac32a2dab5af255188acfa30db4a", "ea85a11a0833a887340d7e977db0c59fb508b92f" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Feb 04 18:18:48 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Feb 04 18:18:48 2013 +0000" }, "message": "Merge \"Remove a few unused header includes from PlaybackSession.cpp\"" }, { "commit": "83fa606bd629ac32a2dab5af255188acfa30db4a", "tree": "41d2c6dc2fbb8ef4a30eac3593ffa22279513874", "parents": [ "5fa419b962f668e6fa9adf7e14fddea97cdb736e", "201fc9c9feb4765a12bc39e95d25f3aa1deb8ffe" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Mon Feb 04 17:05:30 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Feb 04 17:05:30 2013 +0000" }, "message": "Merge \"AudioFlinger: fix RecordThread initial device\"" }, { "commit": "5fa419b962f668e6fa9adf7e14fddea97cdb736e", "tree": "363ec9b9202f4d341ec4351fcaddc3c89b002d94", "parents": [ "1d3a2a224f6a617f62fed36e9b6664f4b682727f" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Feb 04 08:15:34 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Feb 04 08:15:34 2013 -0800" }, "message": "Fix crash when destroying a DuplicatingThread\n\nBug: 8121343\nChange-Id: I9b1fc56c753e465e8a08916022e52db6c3a36906\n" }, { "commit": "a7b90d803f72e8be128853e9f63b845da96b01de", "tree": "656509d1153fdb6084402988c0700407963d17c6", "parents": [ "1d3a2a224f6a617f62fed36e9b6664f4b682727f", "5090822b17ae2ec2fc11ce8b337d4faac8a41bf7" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Feb 04 07:10:31 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Feb 04 07:10:31 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "201fc9c9feb4765a12bc39e95d25f3aa1deb8ffe", "tree": "fc83fba00c9101d552f794021b3f551cd947673a", "parents": [ "7acd13defdb3f33b2e266f1ef8f3ac85285c5e27" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Feb 01 17:57:04 2013 -0800" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Feb 01 17:57:04 2013 -0800" }, "message": "AudioFlinger: fix RecordThread initial device\n\nA regression was introduced when the audio device enums where\nmodified for a 32 bit representation: the device passed when\nconstructing a RecordThread was still the concatenation of input\ndevice and output device bit fields on one 32 bit value which\nis not possible anymore.\n\nThe fix consists in modifying the RecordThread constructor to accept\nseparate values for input and output devices.\n\nChange-Id: I81fb5f4718428b54251e65d74b86e198ce15193e\n" }, { "commit": "ea85a11a0833a887340d7e977db0c59fb508b92f", "tree": "8238e5004c280756678324bdcaf03d1c59f2dfa9", "parents": [ "4f5454ecf49b1021cdd492f7764f013b39676bc6" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Wed Jan 30 13:31:59 2013 -0800" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Feb 01 17:29:07 2013 -0800" }, "message": "Remove a few unused header includes from PlaybackSession.cpp\n\nChange-Id: Id3147e2f2d5d75ccc172e67802639cd43ed68870\n" }, { "commit": "7bc2ffca12828d72aaeeace0891183dc547877c0", "tree": "2191ce6aaaf12988f213f0825e6d1f8beab29140", "parents": [ "1d3a2a224f6a617f62fed36e9b6664f4b682727f" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Feb 01 11:43:44 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Feb 01 11:43:44 2013 -0800" }, "message": "Revive the code to support TCP interleaved transport\n\nAlso support non-interleaved transport now, but the sink gets to decide\nwhat mode it wants to run in, _not_ the source.\n\nChange-Id: I3b6057f86871084e4decf930bb4a7a2d7517b0f2\n" }, { "commit": "1d3a2a224f6a617f62fed36e9b6664f4b682727f", "tree": "656509d1153fdb6084402988c0700407963d17c6", "parents": [ "011aa652a9349750dd6bca1dcb1b82f19e07504e", "2520d32ca16632e1810bc195707146a9d030d39e" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Fri Feb 01 16:35:11 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 01 16:35:11 2013 +0000" }, "message": "Merge \"Fix typo and reduce allocation overhead of RTP retransmission requests.\"" }, { "commit": "5090822b17ae2ec2fc11ce8b337d4faac8a41bf7", "tree": "11598e68d5451cdf4965ff42cecc39fdaa28d074", "parents": [ "011aa652a9349750dd6bca1dcb1b82f19e07504e", "f3929d618978614b52609865f99abafd6dcc4069" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Feb 01 07:10:24 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Fri Feb 01 07:10:24 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "011aa652a9349750dd6bca1dcb1b82f19e07504e", "tree": "11598e68d5451cdf4965ff42cecc39fdaa28d074", "parents": [ "0be9fe5864c39c11eefe335038cf6ce5473e4ec5" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Jan 18 15:09:48 2013 -0800" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Jan 31 16:40:24 2013 -0800" }, "message": "AudioFlinger uses media.log service for logging\n\nChange-Id: Ia0f8204334f6b233f644d897762a18c95d936b4b\n" }, { "commit": "0be9fe5864c39c11eefe335038cf6ce5473e4ec5", "tree": "a5a21ccd28ea763c36d3c4a0aae1d455baf9636d", "parents": [ "1cca13c79ff7e3f36a2fc6e564b60f5e57d00919", "fdf4e4f1859771b95585cbc87f8cd038ea2815c6" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Fri Feb 01 00:39:48 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Feb 01 00:39:48 2013 +0000" }, "message": "Merge \"Add media.log service based on NBLog\"" }, { "commit": "2520d32ca16632e1810bc195707146a9d030d39e", "tree": "ecae86b7e37105cbf7daa90d8dc9ffb4349210a7", "parents": [ "4f5454ecf49b1021cdd492f7764f013b39676bc6" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Jan 31 15:25:07 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Thu Jan 31 15:25:07 2013 -0800" }, "message": "Fix typo and reduce allocation overhead of RTP retransmission requests.\n\nChange-Id: I402a195da5dfeceadb4d073888ee7702c5532dc8\n" }, { "commit": "f3929d618978614b52609865f99abafd6dcc4069", "tree": "23378824ee91854bcd68ac893a4a4949c2c83c40", "parents": [ "1cca13c79ff7e3f36a2fc6e564b60f5e57d00919", "a510d7e5e85e77c32e632920bae9073f0f4ae1e4" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Jan 31 07:10:27 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Jan 31 07:10:27 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "1cca13c79ff7e3f36a2fc6e564b60f5e57d00919", "tree": "23378824ee91854bcd68ac893a4a4949c2c83c40", "parents": [ "9fc7589ad61931a35799be8ece02001583a1afbc", "9a6c614a68b07209919aaea3d4a8b5403379fb35" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jan 30 18:59:49 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 30 18:59:49 2013 -0800" }, "message": "am c3afe559: (-s ours) am 9b7e8fc7: Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE\n\n# Via Android Git Automerger (1) and Igor Murashkin (1)\n* commit \u0027c3afe5591a5c3a1aaf1cdcdeded75f6cff931569\u0027:\n Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE\n" }, { "commit": "9fc7589ad61931a35799be8ece02001583a1afbc", "tree": "23378824ee91854bcd68ac893a4a4949c2c83c40", "parents": [ "4f5454ecf49b1021cdd492f7764f013b39676bc6", "da76dc4df30dff9139832d2964289e810fe4c24c" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Jan 30 18:59:48 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 30 18:59:48 2013 -0800" }, "message": "am 253f6830: (-s ours) am abeee0ec: Camera2: fix metadata symbols: DO NOT MERGE\n\n# Via Android Git Automerger (1) and Igor Murashkin (1)\n* commit \u0027253f683018caa803499f4e612d53846f76072e89\u0027:\n Camera2: fix metadata symbols: DO NOT MERGE\n" }, { "commit": "9a6c614a68b07209919aaea3d4a8b5403379fb35", "tree": "9ff6436bf6a8a286be6869128ce62490e6f1946a", "parents": [ "da76dc4df30dff9139832d2964289e810fe4c24c", "64143ff27c2ffd8bd91ee9451305704e6b54ac6e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Wed Jan 30 18:57:21 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 30 18:57:21 2013 -0800" }, "message": "am 9b7e8fc7: Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE\n\n# Via Igor Murashkin\n* commit \u00279b7e8fc7c564b24a1c099dddae4e9c1126bd7c4e\u0027:\n Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE\n" }, { "commit": "da76dc4df30dff9139832d2964289e810fe4c24c", "tree": "3cb01eea2f9ed88793343ca7df750370e4960c9c", "parents": [ "7f73aa0a0a043764b3ed387765ae794aecae9ab8", "950fcbe17288bfb3d9bb89f8311cc6bead276499" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Jan 30 18:57:20 2013 -0800" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Jan 30 18:57:20 2013 -0800" }, "message": "am abeee0ec: Camera2: fix metadata symbols: DO NOT MERGE\n\n# Via Igor Murashkin\n* commit \u0027abeee0ec92b5c77147036bf346de9309092a5ca1\u0027:\n Camera2: fix metadata symbols: DO NOT MERGE\n" }, { "commit": "64143ff27c2ffd8bd91ee9451305704e6b54ac6e", "tree": "e9bdb0a8eef7eff82045b95e8cfcb26d3807ef6b", "parents": [ "950fcbe17288bfb3d9bb89f8311cc6bead276499" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Jan 04 12:05:56 2013 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Jan 30 17:06:51 2013 -0800" }, "message": "Camera2: Fix JPEG quality metadata type, new warnings.: DO NOT MERGE\n\n- JPEG quality tag is now a uint8_t, not an int. Update parameter code\naccordingly.\n\n- Fix new warnings about narrowing conversions.\n\nBug: 7944244\n\nChange-Id: Ie081c57c9e9323148614b170b132ffb98c0a0b9f\n" }, { "commit": "950fcbe17288bfb3d9bb89f8311cc6bead276499", "tree": "ddee5c687b34c2fbc244e2ae2204207908bc5492", "parents": [ "ef5abc369823f634c460c8f24d3cbf310542fe3b" ], "author": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Tue Nov 27 16:25:46 2012 -0800" }, "committer": { "name": "Igor Murashkin", "email": "iam@google.com", "time": "Wed Jan 30 16:22:45 2013 -0800" }, "message": "Camera2: fix metadata symbols: DO NOT MERGE\n\nChange-Id: I59e457824782de26b7b489cd92eb33d48e6ee2d9\n" }, { "commit": "4f5454ecf49b1021cdd492f7764f013b39676bc6", "tree": "23378824ee91854bcd68ac893a4a4949c2c83c40", "parents": [ "279dcd89ab1d2de91dfe95e461412a0f577a6891", "4563d95b810682195529100e0bc4ae70fa4abe29" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 30 21:33:23 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Wed Jan 30 21:33:23 2013 +0000" }, "message": "Merge \"Actually display something on screen when instantiating a wfd sink via\"" }, { "commit": "4563d95b810682195529100e0bc4ae70fa4abe29", "tree": "54bbcac6d930ba2c6a0691ef067e41dec0d3adba", "parents": [ "150a516ce434bd1df81e3c3070915e3f549bca59" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 30 11:35:39 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 30 11:35:39 2013 -0800" }, "message": "Actually display something on screen when instantiating a wfd sink via\n\nthe wfd commandline tool.\n\nChange-Id: I26466efb95a5837a14d77d6581e0777038d31d95\n" }, { "commit": "279dcd89ab1d2de91dfe95e461412a0f577a6891", "tree": "fa0ae875d3404f6fae47823e4c3b2d09207dae9b", "parents": [ "150a516ce434bd1df81e3c3070915e3f549bca59" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 30 10:41:25 2013 -0800" }, "committer": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Wed Jan 30 10:41:25 2013 -0800" }, "message": "Plumbing to reflect minor changes in the HDCP module API that allow for\n\nsupport of _decryption_ modules in addition to what we already supported.\n\nChange-Id: Ic37b87dc170ba8def3817991d25df798f21e950b\n" }, { "commit": "a510d7e5e85e77c32e632920bae9073f0f4ae1e4", "tree": "017c7d4380362242f94738029ef31bc0cc811066", "parents": [ "150a516ce434bd1df81e3c3070915e3f549bca59", "0d57efb1750729a49a3f16a82dc96598791952ae" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Jan 30 07:10:31 2013 -0800" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Jan 30 07:10:31 2013 -0800" }, "message": "merge in jb-mr2-release history after reset to master\n" }, { "commit": "150a516ce434bd1df81e3c3070915e3f549bca59", "tree": "017c7d4380362242f94738029ef31bc0cc811066", "parents": [ "cabdae9950f53735a51c07f7cbb691ab483fe180", "bf049b94f53f0213d53ba00e1cbe6996164d8eca" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Tue Jan 29 18:32:23 2013 +0000" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Jan 29 18:32:23 2013 +0000" }, "message": "Merge \"Squashed commit of the following:\"" } ], "next": "cabdae9950f53735a51c07f7cbb691ab483fe180" }