)]}' { "log": [ { "commit": "fa5f8f5a98d389c7581ac7236a9b5aa60a4f9694", "tree": "af0bd42d291b48a64ba5f2603fa20e2e53440fd4", "parents": [ "c604a9297ae6bb68950f21583053211287a4df10", "6d000617230e82b9497a88ca0f485e0c16ba4543" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Aug 27 10:18:50 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 27 10:18:50 2012 -0700" }, "message": "am 6d000617: am db7e3856: Merge \"Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method\" into jb-mr1-dev\n\n* commit \u00276d000617230e82b9497a88ca0f485e0c16ba4543\u0027:\n Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method\n" }, { "commit": "c604a9297ae6bb68950f21583053211287a4df10", "tree": "eb674aaf41391822b1b9f86e358867190a96bd98", "parents": [ "1b75d45e583031f4301bd9687a24b007cacc0967", "cdb84c5debd72a0787fb07f502d474b8989eb5ed" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Aug 27 10:18:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 27 10:18:49 2012 -0700" }, "message": "am cdb84c5d: am 1c356d38: Merge \"Fixed a native crash due to unexpected state at destroy time when encoder component\\\u0027s source fails to start\" into jb-mr1-dev\n\n* commit \u0027cdb84c5debd72a0787fb07f502d474b8989eb5ed\u0027:\n Fixed a native crash due to unexpected state at destroy time when encoder component\u0027s source fails to start\n" }, { "commit": "db7e3856c1cb7c2a25d1b01a86339596cc2c00a0", "tree": "987786ac415467223629a3da3ac8f9e1b311bbba", "parents": [ "1c356d38527efbbee0894188c0a8f82074b0f441", "b8a9825bf0f5c74333b0e4ff5ba7677ac6fd2a25" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Aug 27 10:14:29 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 27 10:14:30 2012 -0700" }, "message": "Merge \"Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method\" into jb-mr1-dev" }, { "commit": "1c356d38527efbbee0894188c0a8f82074b0f441", "tree": "15a9f511a77a8817f02c558883052dd754298a2d", "parents": [ "690921927f289da73556ea71c28981194af8ffcd", "aa8879d381918335c9d829fc279b76d53a15a550" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Mon Aug 27 10:14:23 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 27 10:14:23 2012 -0700" }, "message": "Merge \"Fixed a native crash due to unexpected state at destroy time when encoder component\u0027s source fails to start\" into jb-mr1-dev" }, { "commit": "1b75d45e583031f4301bd9687a24b007cacc0967", "tree": "7b90cb0fcb8a208997612a21ca243eeaa5fbc03e", "parents": [ "e3c1094b0164bc5b01f42b80ebb80660f5651515", "e577b1b4da53a70e994628ab6a561ac36271b50a" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Sun Aug 26 16:31:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Sun Aug 26 16:31:47 2012 -0700" }, "message": "am e577b1b4: am 69092192: Merge \"SurfaceMediaSource: a few fixes / cleanups\" into jb-mr1-dev\n\n* commit \u0027e577b1b4da53a70e994628ab6a561ac36271b50a\u0027:\n SurfaceMediaSource: a few fixes / cleanups\n" }, { "commit": "690921927f289da73556ea71c28981194af8ffcd", "tree": "e4bef9233f3f73be80d44ee99dd140e933a4c723", "parents": [ "96272d57caa39566842795ba1f0605a5a5f72272", "a0ead0a2d2ce1d114ad3a17d755dddce831abb40" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Sun Aug 26 16:28:14 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Sun Aug 26 16:28:14 2012 -0700" }, "message": "Merge \"SurfaceMediaSource: a few fixes / cleanups\" into jb-mr1-dev" }, { "commit": "a0ead0a2d2ce1d114ad3a17d755dddce831abb40", "tree": "0908865a805a13176c98f2a9a5ffb2c28380d75d", "parents": [ "ff3f75c3e827c1c1f3e3a11b1de46b19444af197" ], "author": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Thu Aug 23 20:24:09 2012 -0700" }, "committer": { "name": "Jamie Gennis", "email": "jgennis@google.com", "time": "Sun Aug 26 16:25:12 2012 -0700" }, "message": "SurfaceMediaSource: a few fixes / cleanups\n\n- Remove the setting of mStopped to true in onBuffersReleased\n- Cleaned up a few function call logs\n- Removed the \u0027reset\u0027 method.\n\nChange-Id: I56bab1d5cb2f3e6d59d54698c2e045d796d1849f\n" }, { "commit": "b8a9825bf0f5c74333b0e4ff5ba7677ac6fd2a25", "tree": "4dd56785fc2185f44abff6f257197ca982e4c49b", "parents": [ "96272d57caa39566842795ba1f0605a5a5f72272" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Aug 26 16:13:03 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Sun Aug 26 16:18:11 2012 -0700" }, "message": "Fixed a potential/rare race condtion in MediaPlayerService::Client::notify() method\n\no The mClient could be disconnected before the notify message is sent out. Use\n a local reference could help resolve this issue.\n\no related-to-bug: 6782035\n\nChange-Id: Ia2047bd7f2666100fed83c6e5417a3bf2e20cd2c\n" }, { "commit": "cdd5447c1ed159afde002dc85c3542e685bdc6ba", "tree": "bf6866705d005ce3cde8128b9ca6f68aa8c906ef", "parents": [ "87944cc816c1f3c53891107eb310e5f42601347f", "734e831157b755c399122cca1e2236638201540c" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 17:22:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 17:22:16 2012 -0700" }, "message": "am 734e8311: am 96272d57: Merge \"Fix deadlock\" into jb-mr1-dev\n\n* commit \u0027734e831157b755c399122cca1e2236638201540c\u0027:\n Fix deadlock\n" }, { "commit": "96272d57caa39566842795ba1f0605a5a5f72272", "tree": "1ca35139ef23f8758896eda687ac12882ec9f8d3", "parents": [ "b0c1e303913f606dca15bfb75c029f3d4a1ab04c", "fd7ec80f3d0e30c8df61b86951d926ab9c8c6d25" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 17:18:25 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 24 17:18:25 2012 -0700" }, "message": "Merge \"Fix deadlock\" into jb-mr1-dev" }, { "commit": "fd7ec80f3d0e30c8df61b86951d926ab9c8c6d25", "tree": "a43a6dee60d9c94ad41b1801803c1ce09ac2dea0", "parents": [ "ff3f75c3e827c1c1f3e3a11b1de46b19444af197" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 17:10:17 2012 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 17:12:20 2012 -0700" }, "message": "Fix deadlock\n\nI wanted to save some space, and ended up with a deadlock.\nThis change basically restores setDataSource(fd, offset, size) to the\nway it was before I added the new setDataSource(DataSource) method,\ninstead of calling through to it.\n\nChange-Id: Iacf4627c8745369fa84b467530189a9f64f8726b\n" }, { "commit": "87944cc816c1f3c53891107eb310e5f42601347f", "tree": "340453b48d21ce5e8069d9e090ec97d02d34c922", "parents": [ "bff66fe9da474021dd6fe55a9326d97d499f32f2", "89e6b55619b6e9c0f2a8dc83ee0ad88b62ff3533" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 24 14:34:32 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 14:34:32 2012 -0700" }, "message": "am 89e6b556: am b0c1e303: Merge \"Reduce THD when equalizer is ON.\" into jb-mr1-dev\n\n* commit \u002789e6b55619b6e9c0f2a8dc83ee0ad88b62ff3533\u0027:\n Reduce THD when equalizer is ON.\n" }, { "commit": "b0c1e303913f606dca15bfb75c029f3d4a1ab04c", "tree": "ab5fd76968ff644d0dc3d73c694dda4f025249ca", "parents": [ "ff3f75c3e827c1c1f3e3a11b1de46b19444af197", "e44615ff6022239850a3ea459ad6e07b44c37544" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 24 14:29:56 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 24 14:29:57 2012 -0700" }, "message": "Merge \"Reduce THD when equalizer is ON.\" into jb-mr1-dev" }, { "commit": "e44615ff6022239850a3ea459ad6e07b44c37544", "tree": "67b26af98c6bff960193a642bf0a48181c1cee43", "parents": [ "9a150640a28d3fa5507a590125a6c004681bb221" ], "author": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 24 14:17:34 2012 -0700" }, "committer": { "name": "Eric Laurent", "email": "elaurent@google.com", "time": "Fri Aug 24 14:17:34 2012 -0700" }, "message": "Reduce THD when equalizer is ON.\n\nIncrease headroom in LVM bundle to reduce THD when equalizer is ON\nwith high band gains.\n\nAlso add a workaround for a bug in headroom parameter control.\n\nChange-Id: I1d67c9ae475f6cf852c2e0e49bacfc82a5e484fd\n" }, { "commit": "aa8879d381918335c9d829fc279b76d53a15a550", "tree": "0ec909da8db12815112ba15ba266d1093ff91de8", "parents": [ "9a150640a28d3fa5507a590125a6c004681bb221" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Aug 24 10:53:31 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Aug 24 13:10:16 2012 -0700" }, "message": "Fixed a native crash due to unexpected state at destroy time when encoder component\u0027s source fails to start\n\no Encoder component initializes to be in the state of EXECUTING before its source gets started, because we wanted to be able\n to configure the source to use the advertised number of input buffers. However, if the source fails to start, then the encoder\n ends up in the state of EXECUTING when OMXCodec object gets destroyed. As a result, the assertion on the expected state in\n OMXCodec\u0027s constructor fails. The fix is to stop the video encoder component right way when its source fails to start so to\n bring the state of the encoder component back to the expected state.\n\no related-to-bug: 7045494\n\nChange-Id: I6d4a221eb809d7137f53e58098a04816998f7a25\n" }, { "commit": "bff66fe9da474021dd6fe55a9326d97d499f32f2", "tree": "4adac250b4327ade19af69790443efac2bb3b7f2", "parents": [ "f6520a29781ebf1fa16efc282899fbd0c858a57e", "3944e33ac33e6c53b04e6a6cd63996c53812e5d8" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 10:41:08 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 10:41:08 2012 -0700" }, "message": "am 3944e33a: am ff3f75c3: Merge \"Allow directly setting a DataSource for NuMediaExtractor\" into jb-mr1-dev\n\n* commit \u00273944e33ac33e6c53b04e6a6cd63996c53812e5d8\u0027:\n Allow directly setting a DataSource for NuMediaExtractor\n" }, { "commit": "ff3f75c3e827c1c1f3e3a11b1de46b19444af197", "tree": "5b660851627c1926b96278f9dac189b36b17e3cf", "parents": [ "6de95261c619d53f3e7b431fd17995e73928571e", "dbcb4c17f16230dfc6af908f176681c49f61b13e" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 10:37:39 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 24 10:37:39 2012 -0700" }, "message": "Merge \"Allow directly setting a DataSource for NuMediaExtractor\" into jb-mr1-dev" }, { "commit": "dbcb4c17f16230dfc6af908f176681c49f61b13e", "tree": "bef549ee2c80ee54309207846ab36192b0124879", "parents": [ "9a150640a28d3fa5507a590125a6c004681bb221" ], "author": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 09:53:35 2012 -0700" }, "committer": { "name": "Marco Nelissen", "email": "marcone@google.com", "time": "Fri Aug 24 10:14:37 2012 -0700" }, "message": "Allow directly setting a DataSource for NuMediaExtractor\n\nThis adds NuMediaExtractor::setDataSource(const sp\u003cDataSource\u003e \u0026source),\nwhich some new code under frameworks/av will use to let applications\nprovide a custom data source for extractors.\n\nChange-Id: I8fb743441d04b4eadbda3c2d76858c3d60e2a3b2\n" }, { "commit": "f6520a29781ebf1fa16efc282899fbd0c858a57e", "tree": "b20753caf29f6ed4b7cd353b0c32772e2a638bdd", "parents": [ "c0c152f81d9e7374a30f90d7ce576719d318fe98", "e171593f9afb2b345257cc8e6599f8da9b3437c3" ], "author": { "name": "John Grossman", "email": "johngro@google.com", "time": "Fri Aug 24 09:24:41 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 09:24:41 2012 -0700" }, "message": "am e171593f: am 6de95261: Merge \"Add a missing NULL check.\" into jb-mr1-dev\n\n* commit \u0027e171593f9afb2b345257cc8e6599f8da9b3437c3\u0027:\n Add a missing NULL check.\n" }, { "commit": "6de95261c619d53f3e7b431fd17995e73928571e", "tree": "77f07b8a0d4aeb0ff8ad0badf69cab797ce415ef", "parents": [ "960e46f97e3ca22e99548841816ab77ac3a30d86", "cb0b755efc2cd24703f400729994900bf2117f66" ], "author": { "name": "John Grossman", "email": "johngro@google.com", "time": "Fri Aug 24 09:20:07 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Fri Aug 24 09:20:08 2012 -0700" }, "message": "Merge \"Add a missing NULL check.\" into jb-mr1-dev" }, { "commit": "c0c152f81d9e7374a30f90d7ce576719d318fe98", "tree": "b623bc3c8da8fe42652413b8dbdf63a8aaa34277", "parents": [ "8f0157aa878e4f4720527952708927efff3cc488", "e4b03a9c2a467b1bc088962e055092c76a5f7ad5" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 24 07:36:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 07:36:43 2012 -0700" }, "message": "am e4b03a9c: am 960e46f9: am 07315f82: am 4b60ac04: Merge \"Fixed redefinition of \\\u0027i\\\u0027 with a different type error\"\n\n* commit \u0027e4b03a9c2a467b1bc088962e055092c76a5f7ad5\u0027:\n Fixed redefinition of \u0027i\u0027 with a different type error\n" }, { "commit": "8f0157aa878e4f4720527952708927efff3cc488", "tree": "83e701de69950d63610b369d91af61cc43c8d078", "parents": [ "1ab99ac7b3af2645ce26987586eca90d83437f29", "aebe78670ca9ff11cfbb27ed93f1667ed9973838" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 24 07:36:42 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 07:36:42 2012 -0700" }, "message": "am aebe7867: am a8d21ea6: am 78015984: am 6e55a0f7: Merge \"Fixed member access into incomplete type build error\"\n\n* commit \u0027aebe78670ca9ff11cfbb27ed93f1667ed9973838\u0027:\n Fixed member access into incomplete type build error\n" }, { "commit": "960e46f97e3ca22e99548841816ab77ac3a30d86", "tree": "3245f2587b5c90c1574bdda55b7e4d5563b7eba7", "parents": [ "a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7", "07315f8262f843f3624c70974642e4fb733a661c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 24 07:29:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 07:29:47 2012 -0700" }, "message": "am 07315f82: am 4b60ac04: Merge \"Fixed redefinition of \\\u0027i\\\u0027 with a different type error\"\n\n* commit \u002707315f8262f843f3624c70974642e4fb733a661c\u0027:\n Fixed redefinition of \u0027i\u0027 with a different type error\n" }, { "commit": "a8d21ea6dd37683a11a7ba2a63ab0af786ef52d7", "tree": "0c46f5322f4553357481c91d7171ba1c05c117d6", "parents": [ "d8d4d666cc323d6a30d2030f7a41f5778b9bbbd5", "780159840d754eae8e4e3f693ea10932634053f8" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 24 07:29:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 24 07:29:45 2012 -0700" }, "message": "am 78015984: am 6e55a0f7: Merge \"Fixed member access into incomplete type build error\"\n\n* commit \u0027780159840d754eae8e4e3f693ea10932634053f8\u0027:\n Fixed member access into incomplete type build error\n" }, { "commit": "cb0b755efc2cd24703f400729994900bf2117f66", "tree": "21d73848006bb14b4de9fcfe56fa0a1befd09868", "parents": [ "9a150640a28d3fa5507a590125a6c004681bb221" ], "author": { "name": "John Grossman", "email": "johngro@google.com", "time": "Thu Aug 23 17:47:31 2012 -0700" }, "committer": { "name": "John Grossman", "email": "johngro@google.com", "time": "Thu Aug 23 17:47:31 2012 -0700" }, "message": "Add a missing NULL check.\n\nDon\u0027t crash if its time to start the next media player in a media\nplayer chain, but the current player\u0027s client has a NULL mAudioOutput,\nas is the case when the low level player implements\nMediaPlayerHWInterface.\n\nChange-Id: If555da3a46960cbee91ff26e5b1fd05e52c8ef28\n" }, { "commit": "1ab99ac7b3af2645ce26987586eca90d83437f29", "tree": "92b9e4cb11038ff897ed565b831c15a1c2261222", "parents": [ "12cd8f22622168def0a6aa3c90f91efbe8dcde4e", "4b9a895d8bda928351e7169319dd73891873f929" ], "author": { "name": "Jeffrey Tinker", "email": "jtinker@google.com", "time": "Thu Aug 23 17:29:28 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 23 17:29:28 2012 -0700" }, "message": "am 4b9a895d: am d8d4d666: Merge \"Send current bandwidth info event when buffering occurs\" into jb-mr1-dev\n\n* commit \u00274b9a895d8bda928351e7169319dd73891873f929\u0027:\n Send current bandwidth info event when buffering occurs\n" }, { "commit": "07315f8262f843f3624c70974642e4fb733a661c", "tree": "98dcde6faf3c948c4d7c69f9dfb95e3c47247960", "parents": [ "780159840d754eae8e4e3f693ea10932634053f8", "4b60ac04a878eaf8344b56189509ccd6925855c2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 23 13:01:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 23 13:01:44 2012 -0700" }, "message": "am 4b60ac04: Merge \"Fixed redefinition of \\\u0027i\\\u0027 with a different type error\"\n\n* commit \u00274b60ac04a878eaf8344b56189509ccd6925855c2\u0027:\n Fixed redefinition of \u0027i\u0027 with a different type error\n" }, { "commit": "780159840d754eae8e4e3f693ea10932634053f8", "tree": "8d9bce07167ade8dcd7979360f827230ee4b07d7", "parents": [ "8d4d590dcbbd2b178976d0bd024625e9d6216365", "6e55a0f71eef07c6041077e6e9e7fad8c973a752" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 23 13:01:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 23 13:01:43 2012 -0700" }, "message": "am 6e55a0f7: Merge \"Fixed member access into incomplete type build error\"\n\n* commit \u00276e55a0f71eef07c6041077e6e9e7fad8c973a752\u0027:\n Fixed member access into incomplete type build error\n" }, { "commit": "4b60ac04a878eaf8344b56189509ccd6925855c2", "tree": "8a969706f792f58bd6449d3085d83ff9abcbd50f", "parents": [ "6e55a0f71eef07c6041077e6e9e7fad8c973a752", "cba4ed0039c8b8fac01b3193d19fc2364f934506" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 23 12:42:48 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 23 12:42:48 2012 -0700" }, "message": "Merge \"Fixed redefinition of \u0027i\u0027 with a different type error\"" }, { "commit": "f10f36d34812bae602ff018fb503ad07eaf550b1", "tree": "b6b7ce250b453bd8713c9e6acfb4cef9f7f7a9fe", "parents": [ "cd3ed11664d16939f1f5763a896d7fc75dd3642e" ], "author": { "name": "Jeffrey Tinker", "email": "jtinker@google.com", "time": "Thu Aug 23 01:56:53 2012 -0700" }, "committer": { "name": "Jeffrey Tinker", "email": "jtinker@google.com", "time": "Thu Aug 23 01:56:53 2012 -0700" }, "message": "Send current bandwidth info event when buffering occurs\n\nThere is a dependent change in vendor/widevine repo.\n\nChange-Id: If063f4b1c8857e5bfc7be54ab0f97a4ed169b303\nrelated-to-bug: 5883234\n" }, { "commit": "cba4ed0039c8b8fac01b3193d19fc2364f934506", "tree": "54289d793301bd0b48e33439ea331d8143df5172", "parents": [ "1e75e9721254ae5df05c3d88b30ed7f778406261" ], "author": { "name": "Tareq A. Siraj", "email": "tareq.a.siraj@intel.com", "time": "Thu Jul 26 16:53:14 2012 -0400" }, "committer": { "name": "Edwin Vane", "email": "edwin.vane@intel.com", "time": "Wed Aug 22 15:01:29 2012 -0400" }, "message": "Fixed redefinition of \u0027i\u0027 with a different type error\n\nRenamed the redefinition of \u0027i\u0027 to \u0027k\u0027.\n\nChange-Id: I8ae8ed1dee42c896fa15e55be8d58b33b29254f4\nAuthor: Tareq A. Siraj \u003ctareq.a.siraj@intel.com\u003e\nReviewed-by: Kevin P Schoedel \u003ckevin.p.schoedel@intel.com\u003e\n" }, { "commit": "3677437296fd1547d762b1b227a3de83dbc960d6", "tree": "aba2b34a68b8f1c340ddd568c9b4df96ec02066c", "parents": [ "1e75e9721254ae5df05c3d88b30ed7f778406261" ], "author": { "name": "Tareq A. Siraj", "email": "tareq.a.siraj@intel.com", "time": "Fri Jul 27 11:49:32 2012 -0400" }, "committer": { "name": "Edwin Vane", "email": "edwin.vane@intel.com", "time": "Wed Aug 22 14:55:22 2012 -0400" }, "message": "Fixed member access into incomplete type build error\n\nIncluded the ARTPAssembler.h file to fix the \u0027member access into\nincomplete type \"android::ARTPAssembler\"\u0027 error reported by clang.\n\nChange-Id: I10cb1e38bf360858bb7ebdeae82ba1e64431f87d\nAuthor: Tareq A. Siraj \u003ctareq.a.siraj@intel.com\u003e\nReviewed-by: Edwin Vane\u003cedwin.vane@intel.com\u003e\n" }, { "commit": "1de4f8ed7174c7f47ea8f277cc3169a06d83c0e2", "tree": "71b4b84cd2f899bbb7c2b9809cfcaf28abbd94d6", "parents": [ "a8ee31ab2c2a5c87a4aedac28c4809b9e1ae16c7", "7436fa8e21e245d3b9724d1f7a27edcaaafbf235" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 10:20:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 10:20:11 2012 -0700" }, "message": "am 7436fa8e: am cd3ed116: am 8d4d590d: am 1e75e972: Merge \"avcenc: Update a comment about the inline assembly\"\n\n* commit \u00277436fa8e21e245d3b9724d1f7a27edcaaafbf235\u0027:\n avcenc: Update a comment about the inline assembly\n" }, { "commit": "a8ee31ab2c2a5c87a4aedac28c4809b9e1ae16c7", "tree": "062274a63cba37ed1b0671befa9be040051102d6", "parents": [ "94c768ee8c8f27a712d54d1eaae30be7b65c74ac", "bceb306ab61aed1bbff14c6521ab512836bcaa4b" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 10:20:10 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 10:20:10 2012 -0700" }, "message": "am bceb306a: am 562d6548: am 8a825ec0: am aa411adf: Merge \"h264 streaming: make profile-level-id optional\"\n\n* commit \u0027bceb306ab61aed1bbff14c6521ab512836bcaa4b\u0027:\n h264 streaming: make profile-level-id optional\n" }, { "commit": "cd3ed11664d16939f1f5763a896d7fc75dd3642e", "tree": "05a2628b93f509323c722bf244c99ccdaa0ca874", "parents": [ "562d654876c6134b1e879f56f72635dabc5535f2", "8d4d590dcbbd2b178976d0bd024625e9d6216365" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 10:16:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 10:16:09 2012 -0700" }, "message": "am 8d4d590d: am 1e75e972: Merge \"avcenc: Update a comment about the inline assembly\"\n\n* commit \u00278d4d590dcbbd2b178976d0bd024625e9d6216365\u0027:\n avcenc: Update a comment about the inline assembly\n" }, { "commit": "562d654876c6134b1e879f56f72635dabc5535f2", "tree": "a2554ee8517bc372c6715374524a2918391170d6", "parents": [ "391348890849f99663dd46c475a1fc0737d6908d", "8a825ec079da6f2b89149c53568cb9721c10d923" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 10:16:08 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 10:16:08 2012 -0700" }, "message": "am 8a825ec0: am aa411adf: Merge \"h264 streaming: make profile-level-id optional\"\n\n* commit \u00278a825ec079da6f2b89149c53568cb9721c10d923\u0027:\n h264 streaming: make profile-level-id optional\n" }, { "commit": "8d4d590dcbbd2b178976d0bd024625e9d6216365", "tree": "63b0c5ec268f2971724cd846aaa9cc8fee4bcee8", "parents": [ "8a825ec079da6f2b89149c53568cb9721c10d923", "1e75e9721254ae5df05c3d88b30ed7f778406261" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 10:15:00 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 10:15:00 2012 -0700" }, "message": "am 1e75e972: Merge \"avcenc: Update a comment about the inline assembly\"\n\n* commit \u00271e75e9721254ae5df05c3d88b30ed7f778406261\u0027:\n avcenc: Update a comment about the inline assembly\n" }, { "commit": "8a825ec079da6f2b89149c53568cb9721c10d923", "tree": "d1d83f2efea1c1b7ba86450bf4adada59a795b52", "parents": [ "41ee747fc019eb5856454c698adf23f55073c69e", "aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 10:14:59 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 10:14:59 2012 -0700" }, "message": "am aa411adf: Merge \"h264 streaming: make profile-level-id optional\"\n\n* commit \u0027aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3\u0027:\n h264 streaming: make profile-level-id optional\n" }, { "commit": "1e75e9721254ae5df05c3d88b30ed7f778406261", "tree": "50e025da4eac6549340197695ca78b477b0810bc", "parents": [ "aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3", "42d515121f11389df082dd02319904c99dd50cd6" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:49:26 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 21 09:49:26 2012 -0700" }, "message": "Merge \"avcenc: Update a comment about the inline assembly\"" }, { "commit": "aa411adfc39a4ee6c4ff57952296ba40c2fbfdb3", "tree": "6dc319b62e71585335eb3a9b7c5b8ae6ef175bc8", "parents": [ "5ebce52c46360b349daa8c944ca81e3c74accec0", "8033393a74a6872ad8d702b10da34d98dde0bf41" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:18:31 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Aug 21 09:18:31 2012 -0700" }, "message": "Merge \"h264 streaming: make profile-level-id optional\"" }, { "commit": "94c768ee8c8f27a712d54d1eaae30be7b65c74ac", "tree": "bed3c63b0f11371c1e79095375b499a94560ed46", "parents": [ "d91f4d26319d910fd70152a8cb5ec615b409a820", "38ca35b929fa81f2ac8f242a1805a5b258f59442" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:13:42 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 09:13:42 2012 -0700" }, "message": "am 38ca35b9: am 39134889: am 41ee747f: am 5ebce52c: Merge \"avcenc: Fix the gcc inline assembly constraints\"\n\n* commit \u002738ca35b929fa81f2ac8f242a1805a5b258f59442\u0027:\n avcenc: Fix the gcc inline assembly constraints\n" }, { "commit": "d91f4d26319d910fd70152a8cb5ec615b409a820", "tree": "8e88816d2cccfa8b2acc684e219dea393a67b9c1", "parents": [ "e1fbc3c974e9802371d6c9cc47766543b7d31487", "d20a2d6409dacb99272b6fd7ebc6eeeea3d15fb3" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:13:41 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 09:13:41 2012 -0700" }, "message": "am d20a2d64: am 136e83a2: am 894a7e45: am 9e13e927: Merge \"avcenc: Properly indent assembly blocks\"\n\n* commit \u0027d20a2d6409dacb99272b6fd7ebc6eeeea3d15fb3\u0027:\n avcenc: Properly indent assembly blocks\n" }, { "commit": "391348890849f99663dd46c475a1fc0737d6908d", "tree": "b522584229c99110eee9a6fc7114780c905216ac", "parents": [ "136e83a2987acdb7a6956934098bfc0d347c4e7d", "41ee747fc019eb5856454c698adf23f55073c69e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:09:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 09:09:45 2012 -0700" }, "message": "am 41ee747f: am 5ebce52c: Merge \"avcenc: Fix the gcc inline assembly constraints\"\n\n* commit \u002741ee747fc019eb5856454c698adf23f55073c69e\u0027:\n avcenc: Fix the gcc inline assembly constraints\n" }, { "commit": "136e83a2987acdb7a6956934098bfc0d347c4e7d", "tree": "35d485bd485e9301b71bdaf010e5fc6e5546fe38", "parents": [ "164c75d47081e714b1a0b537b2b509d5ba9a4dd2", "894a7e450704b0c7858a2187a5432b479ac69c1d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:09:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 09:09:44 2012 -0700" }, "message": "am 894a7e45: am 9e13e927: Merge \"avcenc: Properly indent assembly blocks\"\n\n* commit \u0027894a7e450704b0c7858a2187a5432b479ac69c1d\u0027:\n avcenc: Properly indent assembly blocks\n" }, { "commit": "41ee747fc019eb5856454c698adf23f55073c69e", "tree": "7e03c52511403b2b3d4e1e47434afbe1e3bf49eb", "parents": [ "894a7e450704b0c7858a2187a5432b479ac69c1d", "5ebce52c46360b349daa8c944ca81e3c74accec0" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:08:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 09:08:38 2012 -0700" }, "message": "am 5ebce52c: Merge \"avcenc: Fix the gcc inline assembly constraints\"\n\n* commit \u00275ebce52c46360b349daa8c944ca81e3c74accec0\u0027:\n avcenc: Fix the gcc inline assembly constraints\n" }, { "commit": "894a7e450704b0c7858a2187a5432b479ac69c1d", "tree": "6ce2753d6e78048c7b503458e7361412da53513e", "parents": [ "add7c4d329586119fb8b5501b049905004400233", "9e13e927206b7c7c15359af2b0ccc8f525e78a7d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Tue Aug 21 09:08:37 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 21 09:08:37 2012 -0700" }, "message": "am 9e13e927: Merge \"avcenc: Properly indent assembly blocks\"\n\n* commit \u00279e13e927206b7c7c15359af2b0ccc8f525e78a7d\u0027:\n avcenc: Properly indent assembly blocks\n" }, { "commit": "42d515121f11389df082dd02319904c99dd50cd6", "tree": "f5b7a1ca28cc2e425eea857445a567544c87020f", "parents": [ "3fdb405597f0e062a9bb8af20199c5e67f0f764c" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Tue Aug 21 12:28:45 2012 +0100" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Tue Aug 21 12:28:45 2012 +0100" }, "message": "avcenc: Update a comment about the inline assembly\n\nSince the inline assembly was fixed in commit 3fdb405597f the\ncomment was no longer accurate.\n\nChange-Id: Id4f8a111d1fa6e0c2e97f7db64262e8d1604c519\n" }, { "commit": "3fdb405597f0e062a9bb8af20199c5e67f0f764c", "tree": "927a7c240a6322926289762279192c4776e7b740", "parents": [ "ccde1257952d2c073e51ecba6180060570ffa41f" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Apr 13 14:17:30 2012 +0300" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Mon Aug 20 23:50:59 2012 +0100" }, "message": "avcenc: Fix the gcc inline assembly constraints\n\nUse +r for registers whose value is used as input to the block.\n\nAlso switch input registers to output registers with +r, for\nregisters that are modified by the assembly block (SUB_SAD in\nsad_inline.h).\n\nWithout this, the inline assembly fails on modern gcc versions\n(tested on gcc 4.6), where the intended input value never is\nloaded into the registers, causing segfaults at runtime.\n\nCurrently this assembly isn\u0027t used, but this change makes it\nwork properly if enabled.\n\nChange-Id: I37c247cd5c8aff213445e31ab3bd33d8f0f37e05\n" }, { "commit": "4324ecc672696040c3784effef330542d20a4d6d", "tree": "08b68fb3bb57e4966e8c2278fad6a3f84dcb0beb", "parents": [ "2dd96c62c566560ea82687a612fd868efffa41c1", "d50b650e35f78e3286e5735f344bebea9e7dd072" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 20 15:48:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 15:48:35 2012 -0700" }, "message": "am d50b650e: am 6a8ea471: Merge \"Revert \"Swap the order of creating IAudioTrack and thread\"\" into jb-mr1-dev\n\n* commit \u0027d50b650e35f78e3286e5735f344bebea9e7dd072\u0027:\n Revert \"Swap the order of creating IAudioTrack and thread\"\n" }, { "commit": "ccde1257952d2c073e51ecba6180060570ffa41f", "tree": "6c4a4527855885d8f4d337836612df5372db8942", "parents": [ "46b7eeb8be7449515082ecb1a61700affb44115f" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Apr 13 14:16:54 2012 +0300" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Mon Aug 20 23:47:00 2012 +0100" }, "message": "avcenc: Properly indent assembly blocks\n\nAlso line break multiline assembly blocks - previously they were\nvirtually unreadable.\n\nChange-Id: Icb269909b78746e26b28ab7dcb6979c4655a0b0c\n" }, { "commit": "6a8ea471a9f3b001bd0ffa3381eba12975dfc59f", "tree": "3590178bb20b7042efdaca9f7f87822f7ea1968a", "parents": [ "3411fc2f3a44b22d69a359a3eb26f756d6116e4f", "a997e7a7c5aa2fc7e95316218316f8b7b98786ba" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 20 15:46:06 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 20 15:46:07 2012 -0700" }, "message": "Merge \"Revert \"Swap the order of creating IAudioTrack and thread\"\" into jb-mr1-dev" }, { "commit": "2dd96c62c566560ea82687a612fd868efffa41c1", "tree": "3d920ea59216402ead68cbc62fad0cb657490387", "parents": [ "5667a754ead7d0df140facd39d53436dcf7ef2d0", "233ac8ffc93e1b4281add5e61cd5cba364c47c79" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Aug 20 12:59:09 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 12:59:09 2012 -0700" }, "message": "am 233ac8ff: am 3411fc2f: am add7c4d3: am 46b7eeb8: Merge \"hardening: eliminate text relocations from h264\"\n\n* commit \u0027233ac8ffc93e1b4281add5e61cd5cba364c47c79\u0027:\n hardening: eliminate text relocations from h264\n" }, { "commit": "3411fc2f3a44b22d69a359a3eb26f756d6116e4f", "tree": "131cb9a8dd9b3b91f0a809754274295b7052558f", "parents": [ "11623fa3eb2c25ace502fdbdf290e154ac66960e", "add7c4d329586119fb8b5501b049905004400233" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Aug 20 12:55:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 12:55:05 2012 -0700" }, "message": "am add7c4d3: am 46b7eeb8: Merge \"hardening: eliminate text relocations from h264\"\n\n* commit \u0027add7c4d329586119fb8b5501b049905004400233\u0027:\n hardening: eliminate text relocations from h264\n" }, { "commit": "add7c4d329586119fb8b5501b049905004400233", "tree": "61952e496a2640c1744ea2da02a4d0306fecfb9c", "parents": [ "af5f9f05937521acb4855848d77bed1d4ed7db0a", "46b7eeb8be7449515082ecb1a61700affb44115f" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Aug 20 12:53:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 12:53:43 2012 -0700" }, "message": "am 46b7eeb8: Merge \"hardening: eliminate text relocations from h264\"\n\n* commit \u002746b7eeb8be7449515082ecb1a61700affb44115f\u0027:\n hardening: eliminate text relocations from h264\n" }, { "commit": "46b7eeb8be7449515082ecb1a61700affb44115f", "tree": "ad2839a6000d915476085e356a3ab2e81ead9e50", "parents": [ "cd622346235829f60246a061560adf5921ba129c", "22e06318d04074d1a7c90caa173857abdcfd153e" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Aug 20 11:55:17 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 20 11:55:17 2012 -0700" }, "message": "Merge \"hardening: eliminate text relocations from h264\"" }, { "commit": "5667a754ead7d0df140facd39d53436dcf7ef2d0", "tree": "8667f2a3d6f89b97526c924d11c63c24a514cb79", "parents": [ "0be827919dc552ba9a0e737e80cdbbdd74193fff", "9df404fafd9059205b04af80714575ed7fd38833" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 10:33:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 10:33:58 2012 -0700" }, "message": "am 9df404fa: am 11623fa3: am af5f9f05: am cd622346: Merge \"MPEG2TSWriter: Fix an off-by-one in the condition for padding\"\n\n* commit \u00279df404fafd9059205b04af80714575ed7fd38833\u0027:\n MPEG2TSWriter: Fix an off-by-one in the condition for padding\n" }, { "commit": "0be827919dc552ba9a0e737e80cdbbdd74193fff", "tree": "7c3d881bd28564fc590fb1708970c22c2b5c5215", "parents": [ "28786a40e5361babaf2fac9129b6ba2c6195737a", "a002beab1bdf7d4a551add6c17b50b253ebfad06" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 10:33:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 10:33:58 2012 -0700" }, "message": "am a002beab: am 07c6ddb4: am 3b939a5e: am 02a4ec21: Merge \"avcenc: Remove a leftover define\"\n\n* commit \u0027a002beab1bdf7d4a551add6c17b50b253ebfad06\u0027:\n avcenc: Remove a leftover define\n" }, { "commit": "11623fa3eb2c25ace502fdbdf290e154ac66960e", "tree": "90d1d05ba5c0c714de2a9263acc74b766b3e24c9", "parents": [ "07c6ddb431c784a24a70a5a91d8a454e9c1dde5d", "af5f9f05937521acb4855848d77bed1d4ed7db0a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 10:29:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 10:29:35 2012 -0700" }, "message": "am af5f9f05: am cd622346: Merge \"MPEG2TSWriter: Fix an off-by-one in the condition for padding\"\n\n* commit \u0027af5f9f05937521acb4855848d77bed1d4ed7db0a\u0027:\n MPEG2TSWriter: Fix an off-by-one in the condition for padding\n" }, { "commit": "07c6ddb431c784a24a70a5a91d8a454e9c1dde5d", "tree": "166f453fbf3717c6b25a7168e8bf6742a4d16f97", "parents": [ "53ae1640ffbfc690962f7f94694b02680c6f66cb", "3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 10:29:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 10:29:34 2012 -0700" }, "message": "am 3b939a5e: am 02a4ec21: Merge \"avcenc: Remove a leftover define\"\n\n* commit \u00273b939a5e893ccfe87f5b7b3fe229439a9b2fc87a\u0027:\n avcenc: Remove a leftover define\n" }, { "commit": "af5f9f05937521acb4855848d77bed1d4ed7db0a", "tree": "6756478f35cfd51b1722cacd2f517f13e27ba586", "parents": [ "3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a", "cd622346235829f60246a061560adf5921ba129c" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 09:40:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 09:40:13 2012 -0700" }, "message": "am cd622346: Merge \"MPEG2TSWriter: Fix an off-by-one in the condition for padding\"\n\n* commit \u0027cd622346235829f60246a061560adf5921ba129c\u0027:\n MPEG2TSWriter: Fix an off-by-one in the condition for padding\n" }, { "commit": "3b939a5e893ccfe87f5b7b3fe229439a9b2fc87a", "tree": "19e908b8090ddc52139e422fae37264198c0109c", "parents": [ "523c09d56c78933eea7fb4f028e0bfa595ca82b1", "02a4ec216cf5ca903e1765ca3e7ff2985436b236" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 09:40:12 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 09:40:12 2012 -0700" }, "message": "am 02a4ec21: Merge \"avcenc: Remove a leftover define\"\n\n* commit \u002702a4ec216cf5ca903e1765ca3e7ff2985436b236\u0027:\n avcenc: Remove a leftover define\n" }, { "commit": "cd622346235829f60246a061560adf5921ba129c", "tree": "f3e6809ef93057af3315e731518ea7d87cd291cc", "parents": [ "02a4ec216cf5ca903e1765ca3e7ff2985436b236", "c867a50ec5317e74602798e2e8435cde313b91e9" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 08:54:11 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 20 08:54:11 2012 -0700" }, "message": "Merge \"MPEG2TSWriter: Fix an off-by-one in the condition for padding\"" }, { "commit": "c867a50ec5317e74602798e2e8435cde313b91e9", "tree": "c30488f382a34b1adea9c8ffb1f92167f52c4cc5", "parents": [ "64b3fe55f7edd16be32e07c28c2c90f84f3b9b80" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Mon Aug 20 14:34:14 2012 +0100" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Mon Aug 20 14:34:14 2012 +0100" }, "message": "MPEG2TSWriter: Fix an off-by-one in the condition for padding\n\nThis makes a remuxed file play without any decoding warnings,\nwhile there still were some occasional warnings with the previous\nversion.\n\nChange-Id: I31d73446ded1eeb3da10783c5ef841270563ca12\n" }, { "commit": "8033393a74a6872ad8d702b10da34d98dde0bf41", "tree": "3e41afb0ac096efa134f8a59911d2960a916d916", "parents": [ "ffb829430ff20ccd6c13e6ed894f2373b2d93939" ], "author": { "name": "Patrik2 Carlsson", "email": "patrik2.carlsson@sonymobile.com", "time": "Mon Aug 20 09:53:09 2012 +0200" }, "committer": { "name": "Zoran Jovanovic", "email": "zoran.jovanovic@sonymobile.com", "time": "Mon Aug 20 09:54:18 2012 +0200" }, "message": "h264 streaming: make profile-level-id optional\n\nprofile-level-id is made optional according to rfc3984:\n\"If no profile-level-id is present, the Baseline Profile without\nadditional constraints at Level 1 MUST be implied.\"\n\nChange-Id: If868468a48917ceccb963b8ac15767583da29723\n" }, { "commit": "28786a40e5361babaf2fac9129b6ba2c6195737a", "tree": "a5ff4cbfef7b5fc651d3d4167673761e2e406ddb", "parents": [ "e469b590341bceb86d558e6b1ffa669089177de6", "c8988ee99e3ffc99c9865412574f5ad6b9be4f1b" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Aug 17 15:07:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 17 15:07:46 2012 -0700" }, "message": "am c8988ee9: am 53ae1640: Don\\\u0027t log streaming url.\n\n* commit \u0027c8988ee99e3ffc99c9865412574f5ad6b9be4f1b\u0027:\n Don\u0027t log streaming url.\n" }, { "commit": "53ae1640ffbfc690962f7f94694b02680c6f66cb", "tree": "93f6e4232098ace9e3f8c3596fbd391628af9930", "parents": [ "02d3c328d2c127c26ab787aa95e5240e6b7ff223" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Aug 17 13:41:59 2012 -0700" }, "committer": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Aug 17 13:51:09 2012 -0700" }, "message": "Don\u0027t log streaming url.\n\no related-to-bug: 6994761\n\nChange-Id: I79d5549a70b3bde67ddf496cfc6283ac92b1f569\n" }, { "commit": "0a1b2aecb75b949df6b465a4e4ccc739af034443", "tree": "af702ddbd7f738e6c714df88e092559a7a72f1ee", "parents": [ "64b3fe55f7edd16be32e07c28c2c90f84f3b9b80" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Aug 17 11:28:09 2012 +0300" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Fri Aug 17 11:28:09 2012 +0300" }, "message": "avcenc: Remove a leftover define\n\nThis should have been removed as part of f5af6314db, but\nthe second __arm__ define was introduced after the original commit\nwas written, and not removing the second one was an oversight in\nrebasing the patch on top of the new code.\n\nChange-Id: Iccf08ffdef130446dd6e97dc1e15e6a1d4f9386f\n" }, { "commit": "7f8be6a55389c5333d6801583d1966fe50b375e3", "tree": "652c95d1801479b9fabd4edb30ea678737352860", "parents": [ "0dffa2363716f817771cbc7e2a48f9ed9dbab01f", "1bfad87cacb38a2e1418de8019ccb775f8926f66" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:43:11 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:43:11 2012 -0700" }, "message": "am 1bfad87c: am 02d3c328: am 523c09d5: am 64b3fe55: Merge \"stagefright amrnb: Remove unused leftover source files\"\n\n* commit \u00271bfad87cacb38a2e1418de8019ccb775f8926f66\u0027:\n stagefright amrnb: Remove unused leftover source files\n" }, { "commit": "0dffa2363716f817771cbc7e2a48f9ed9dbab01f", "tree": "60ddd5ce14b1ea1f1aecce153017a3ea4b13781f", "parents": [ "fcae2155ead72db76686b427565aaed71431ddd7", "bf407d4de523177755fac5e699e1aaf5372c8d6d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:43:10 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:43:10 2012 -0700" }, "message": "am bf407d4d: am f81ed003: am f20e4ad9: am c1d2777c: Merge \"stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\"\n\n* commit \u0027bf407d4de523177755fac5e699e1aaf5372c8d6d\u0027:\n stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\n" }, { "commit": "02d3c328d2c127c26ab787aa95e5240e6b7ff223", "tree": "e9d6420a8f22f5127690fe79f0022ef055944a60", "parents": [ "f81ed0032f86ab0943baa1ad8a25de8e06498409", "523c09d56c78933eea7fb4f028e0bfa595ca82b1" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:40:07 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:40:07 2012 -0700" }, "message": "am 523c09d5: am 64b3fe55: Merge \"stagefright amrnb: Remove unused leftover source files\"\n\n* commit \u0027523c09d56c78933eea7fb4f028e0bfa595ca82b1\u0027:\n stagefright amrnb: Remove unused leftover source files\n" }, { "commit": "f81ed0032f86ab0943baa1ad8a25de8e06498409", "tree": "17ec439e0c8c65063b892446e6f15d7851fd784a", "parents": [ "08ebb6b114c9a2700e88e669a6064c7c91cfea2e", "f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:40:06 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:40:06 2012 -0700" }, "message": "am f20e4ad9: am c1d2777c: Merge \"stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\"\n\n* commit \u0027f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a\u0027:\n stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\n" }, { "commit": "523c09d56c78933eea7fb4f028e0bfa595ca82b1", "tree": "519d3aa44383d783917a72259ebc19c1da7f5c3a", "parents": [ "f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a", "64b3fe55f7edd16be32e07c28c2c90f84f3b9b80" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:37:44 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:37:44 2012 -0700" }, "message": "am 64b3fe55: Merge \"stagefright amrnb: Remove unused leftover source files\"\n\n* commit \u002764b3fe55f7edd16be32e07c28c2c90f84f3b9b80\u0027:\n stagefright amrnb: Remove unused leftover source files\n" }, { "commit": "f20e4ad9f23fe0267f8f3434a6eb961eb69bde3a", "tree": "6cf3483ce068f19f190104917737da2bc6228653", "parents": [ "0df213babc4fb41b7daa05cb3c08071f2b60f6a5", "c1d2777c8004a9491e1381cca33a6768faed50c3" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:37:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:37:43 2012 -0700" }, "message": "am c1d2777c: Merge \"stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\"\n\n* commit \u0027c1d2777c8004a9491e1381cca33a6768faed50c3\u0027:\n stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\n" }, { "commit": "64b3fe55f7edd16be32e07c28c2c90f84f3b9b80", "tree": "804b82086af3f61a13b1a679bbcc9be34c3dd36f", "parents": [ "c1d2777c8004a9491e1381cca33a6768faed50c3", "223933e8e7419d0d4431d01e8980592fcafd2404" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 16:42:06 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 16:42:07 2012 -0700" }, "message": "Merge \"stagefright amrnb: Remove unused leftover source files\"" }, { "commit": "c1d2777c8004a9491e1381cca33a6768faed50c3", "tree": "81de2d89d5baabb11cf9f90a3fa5d8ec8ad1151f", "parents": [ "dde79acfb97083d690e3cceabff78931b10d1539", "448239b929de32621e26504b86482ab4d436a5e3" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 16:40:19 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 16:40:20 2012 -0700" }, "message": "Merge \"stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\"" }, { "commit": "3f4e81f45d30986f62439ad8fadb6a468969555e", "tree": "8b319a26cd5afaa63ae455a52d1322ca2f523bed", "parents": [ "12c750d748060d1b2329b8b9f13980729780cb89", "1fd1150784176646f9bcad4fd99af23dc6c9bc31" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:34:41 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:34:41 2012 -0700" }, "message": "am 1fd11507: am 7df98f17: am 0df213ba: am dde79acf: Merge \"hardening: eliminate text relocations from mp3\"\n\n* commit \u00271fd1150784176646f9bcad4fd99af23dc6c9bc31\u0027:\n hardening: eliminate text relocations from mp3\n" }, { "commit": "12c750d748060d1b2329b8b9f13980729780cb89", "tree": "20d860beec3dd959f87f0000a2b1394e6222832e", "parents": [ "d37ade3929bbedc8c8b2ebde07e2837c6a745d15", "120462a9cbb3c40210f1b86185f28efb91361987" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:34:41 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:34:41 2012 -0700" }, "message": "am 120462a9: am 1a42aee5: am a109e9d5: am b7ca7dc9: Merge \"avcenc: Clarify the ifdefs surrounding inline assembly\"\n\n* commit \u0027120462a9cbb3c40210f1b86185f28efb91361987\u0027:\n avcenc: Clarify the ifdefs surrounding inline assembly\n" }, { "commit": "d37ade3929bbedc8c8b2ebde07e2837c6a745d15", "tree": "a37480b22b20dea3b6174b36d75f70c589df9acc", "parents": [ "4ea4d13ed698fe6b1c708b46fc6cdb4accd3e228", "706f36c73d8c2b7f463abf1afe9d9ea8fa5a5985" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:34:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:34:40 2012 -0700" }, "message": "am 706f36c7: am 9bd763d1: am fba9d50d: am 4f981882: Merge \"hardening: eliminate text relocations from amrwb\"\n\n* commit \u0027706f36c73d8c2b7f463abf1afe9d9ea8fa5a5985\u0027:\n hardening: eliminate text relocations from amrwb\n" }, { "commit": "4ea4d13ed698fe6b1c708b46fc6cdb4accd3e228", "tree": "6bc384387b8064bda1ee063700dded670a97117e", "parents": [ "7db44680291203578fdc721a2fa25585a92595bb", "a83ec8c5c7502466d500540698a71886c3286eb5" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:34:39 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:34:39 2012 -0700" }, "message": "am a83ec8c5: am f365fecf: am 1191287b: am c3bfa026: Merge \"aacenc/amrwbenc: Remove the now unused LINUX define\"\n\n* commit \u0027a83ec8c5c7502466d500540698a71886c3286eb5\u0027:\n aacenc/amrwbenc: Remove the now unused LINUX define\n" }, { "commit": "7db44680291203578fdc721a2fa25585a92595bb", "tree": "2f3abb38485191a0d39372f0620431d98b799805", "parents": [ "9b5d15ccd07690493300eb35f43f432664a2b14d", "2f72739bcb5b65e286e663fae5bbb6304d04954f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:34:38 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:34:38 2012 -0700" }, "message": "am 2f72739b: am fa172b0d: am eeb9fde0: am 3f5d2e17: Merge \"aacenc/amrwbenc: Remove unused and dubious typedefs\"\n\n* commit \u00272f72739bcb5b65e286e663fae5bbb6304d04954f\u0027:\n aacenc/amrwbenc: Remove unused and dubious typedefs\n" }, { "commit": "7df98f17a42e47d8bc49891c370786ee3d3a1379", "tree": "98a1c6adb462fb0b6d3d2f4353f37a06c5e1c68b", "parents": [ "1a42aee5e1e975158da4754f9bae46c945e27281", "0df213babc4fb41b7daa05cb3c08071f2b60f6a5" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:31:19 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:31:19 2012 -0700" }, "message": "am 0df213ba: am dde79acf: Merge \"hardening: eliminate text relocations from mp3\"\n\n* commit \u00270df213babc4fb41b7daa05cb3c08071f2b60f6a5\u0027:\n hardening: eliminate text relocations from mp3\n" }, { "commit": "1a42aee5e1e975158da4754f9bae46c945e27281", "tree": "a53726fd44407323ef9cb2adcb8913d78c4143c8", "parents": [ "9bd763d1d3b7dcb30320aa70597680a53ffb5bbf", "a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:31:18 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:31:18 2012 -0700" }, "message": "am a109e9d5: am b7ca7dc9: Merge \"avcenc: Clarify the ifdefs surrounding inline assembly\"\n\n* commit \u0027a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99\u0027:\n avcenc: Clarify the ifdefs surrounding inline assembly\n" }, { "commit": "9bd763d1d3b7dcb30320aa70597680a53ffb5bbf", "tree": "c11cdabdd016e454ec2ddf37a477e6c44049c799", "parents": [ "f365fecf8519a0a1c7e511657f79638844be02e3", "fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:31:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:31:16 2012 -0700" }, "message": "am fba9d50d: am 4f981882: Merge \"hardening: eliminate text relocations from amrwb\"\n\n* commit \u0027fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe\u0027:\n hardening: eliminate text relocations from amrwb\n" }, { "commit": "f365fecf8519a0a1c7e511657f79638844be02e3", "tree": "7f4eb9c37e9a497c110cb1bed4a8eaabb20d56b9", "parents": [ "fa172b0d2dcd761622b61701b7c7dd4d0f19610b", "1191287bc438c164a89cf86704936aeddbefb136" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:31:16 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:31:16 2012 -0700" }, "message": "am 1191287b: am c3bfa026: Merge \"aacenc/amrwbenc: Remove the now unused LINUX define\"\n\n* commit \u00271191287bc438c164a89cf86704936aeddbefb136\u0027:\n aacenc/amrwbenc: Remove the now unused LINUX define\n" }, { "commit": "fa172b0d2dcd761622b61701b7c7dd4d0f19610b", "tree": "a62306737201b8724ac8a05507a6e47492c92987", "parents": [ "ce088d274b4530fb813a030216d675b0e7262711", "eeb9fde0cb8e0ace44eb720bcac272ee70282d4d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:31:15 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:31:15 2012 -0700" }, "message": "am eeb9fde0: am 3f5d2e17: Merge \"aacenc/amrwbenc: Remove unused and dubious typedefs\"\n\n* commit \u0027eeb9fde0cb8e0ace44eb720bcac272ee70282d4d\u0027:\n aacenc/amrwbenc: Remove unused and dubious typedefs\n" }, { "commit": "0df213babc4fb41b7daa05cb3c08071f2b60f6a5", "tree": "b2fc4095cff4876c777d756884dfd2d18c79de66", "parents": [ "a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99", "dde79acfb97083d690e3cceabff78931b10d1539" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:29:28 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:29:28 2012 -0700" }, "message": "am dde79acf: Merge \"hardening: eliminate text relocations from mp3\"\n\n* commit \u0027dde79acfb97083d690e3cceabff78931b10d1539\u0027:\n hardening: eliminate text relocations from mp3\n" }, { "commit": "a109e9d5d5dbdbbd63a3f32fce131c718f0f8c99", "tree": "a17063a2a0b0248b295508d3bf6e944d280dbe0f", "parents": [ "fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe", "b7ca7dc9652456181080bf28ec376bc5a36cf6a2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:29:26 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:29:26 2012 -0700" }, "message": "am b7ca7dc9: Merge \"avcenc: Clarify the ifdefs surrounding inline assembly\"\n\n* commit \u0027b7ca7dc9652456181080bf28ec376bc5a36cf6a2\u0027:\n avcenc: Clarify the ifdefs surrounding inline assembly\n" }, { "commit": "fba9d50d1b2e487bc08b59ec93d7ed3183c76dbe", "tree": "4756e9ef2e6ce5775ce08fa0f3312feab8f8fb5e", "parents": [ "1191287bc438c164a89cf86704936aeddbefb136", "4f981882da8080e1d41d000bfbad92df61adcfba" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:29:25 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:29:25 2012 -0700" }, "message": "am 4f981882: Merge \"hardening: eliminate text relocations from amrwb\"\n\n* commit \u00274f981882da8080e1d41d000bfbad92df61adcfba\u0027:\n hardening: eliminate text relocations from amrwb\n" }, { "commit": "1191287bc438c164a89cf86704936aeddbefb136", "tree": "49971b973d0cd490724e026c3df07ab25cba1c03", "parents": [ "eeb9fde0cb8e0ace44eb720bcac272ee70282d4d", "c3bfa0260a530af3e9c091c1c9d90d1283021dd6" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:29:24 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:29:24 2012 -0700" }, "message": "am c3bfa026: Merge \"aacenc/amrwbenc: Remove the now unused LINUX define\"\n\n* commit \u0027c3bfa0260a530af3e9c091c1c9d90d1283021dd6\u0027:\n aacenc/amrwbenc: Remove the now unused LINUX define\n" }, { "commit": "eeb9fde0cb8e0ace44eb720bcac272ee70282d4d", "tree": "f69dc154b38bcc667a87d8609408f6ae86dd7fd8", "parents": [ "add9f820eaeb180b5e72a4420995a54062cfabd7", "3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:29:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:29:23 2012 -0700" }, "message": "am 3f5d2e17: Merge \"aacenc/amrwbenc: Remove unused and dubious typedefs\"\n\n* commit \u00273f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49\u0027:\n aacenc/amrwbenc: Remove unused and dubious typedefs\n" }, { "commit": "dde79acfb97083d690e3cceabff78931b10d1539", "tree": "62bdaf89b7a5c2237c79b58eaa5916d393cdc14d", "parents": [ "b7ca7dc9652456181080bf28ec376bc5a36cf6a2", "9a2c14b2c96625d5be73e1a7627f5d2a3091c4a2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 14:45:30 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 14:45:31 2012 -0700" }, "message": "Merge \"hardening: eliminate text relocations from mp3\"" }, { "commit": "b7ca7dc9652456181080bf28ec376bc5a36cf6a2", "tree": "d0ffc520e062cb00a3f847ef06756c1947a71d99", "parents": [ "4f981882da8080e1d41d000bfbad92df61adcfba", "f5af6314db25ff3bef9bd2eeba201bc6cc60805d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 14:44:54 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 14:44:55 2012 -0700" }, "message": "Merge \"avcenc: Clarify the ifdefs surrounding inline assembly\"" }, { "commit": "4f981882da8080e1d41d000bfbad92df61adcfba", "tree": "cee6a8eda092515d19b3d66679323a06f3ce6b59", "parents": [ "c3bfa0260a530af3e9c091c1c9d90d1283021dd6", "74bc3e133bd59a65dbed70b5fc89549f04a545e2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 14:44:39 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 14:44:39 2012 -0700" }, "message": "Merge \"hardening: eliminate text relocations from amrwb\"" }, { "commit": "fef71ef418d8ecff6d20fbd50b7fbabf6ad58f74", "tree": "b48db3143802871fa70835ea96af338d5a8d9b23", "parents": [ "adee070820d9b038ac811b3785de618349f35293" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Wed Mar 07 13:17:52 2012 +0200" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Thu Aug 16 15:58:43 2012 +0300" }, "message": "aacenc/amrwbenc: Remove the now unused LINUX define\n\nThis is no longer used by the codec code (except for the\namrwbenc sample).\n\nChange-Id: I78c7f62f257c490bf44477217975a93abcc7779e\n" }, { "commit": "adee070820d9b038ac811b3785de618349f35293", "tree": "192aa46e12cbdba09f5ac7ba0228af1297fc6f89", "parents": [ "2c3d9b7b9e34c9122c0a568d6b1fb24404021f55" ], "author": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Thu Jun 23 10:53:55 2011 +0300" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Thu Aug 16 15:58:43 2012 +0300" }, "message": "aacenc/amrwbenc: Remove unused and dubious typedefs\n\nThese typedefs aren\u0027t used anywhere, and their description\ndoesn\u0027t really match their actual definition. The VO_TCHAR\ntype is even defined as pointer for one configuration and\nas non-pointer for another configuration.\n\nThis gets rid of the last use of the LINUX define in the\nVO codecs (except for the amrwbenc sample application).\nWithin the codecs, the use of this define is unclear - does it\nindicate code specific to android but not normal linux, linux\nbut not other unixes, unix but not windows, or gcc but not\nother compilers, etc.\n\nOriginally, prior to cleanup, the define has meant many\ndifferent of these - these uses has now been cleaned up to\nuse the proper feature detection macros (e.g. looking for\ndefines automatically set by the compiler, instead of\nrelying on manually setting this define).\n\nChange-Id: I1a675d653d6d305f558aa7f74c7255858dc62758\n" }, { "commit": "9b5d15ccd07690493300eb35f43f432664a2b14d", "tree": "1eb4bb0d5b4afb8738ae047b73b67a7ebf49a539", "parents": [ "068515d953ddd3241741e89bf42349c6298a403c", "ff42ad8716cf956918976821ba9625b7814c8b09" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Aug 15 11:29:23 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 15 11:29:23 2012 -0700" }, "message": "am ff42ad87: am ce088d27: am add9f820: am 2c3d9b7b: Merge \"MPEG2TSWriter: Correctly add padding using the adaptation field\"\n\n* commit \u0027ff42ad8716cf956918976821ba9625b7814c8b09\u0027:\n MPEG2TSWriter: Correctly add padding using the adaptation field\n" }, { "commit": "ce088d274b4530fb813a030216d675b0e7262711", "tree": "c65e7e76b4d945e46e8093aa2cc56b8a74c3b1a8", "parents": [ "f363ec5564abf4788d07e00d89c93a66a0c91b88", "add9f820eaeb180b5e72a4420995a54062cfabd7" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Aug 15 11:25:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 15 11:25:49 2012 -0700" }, "message": "am add9f820: am 2c3d9b7b: Merge \"MPEG2TSWriter: Correctly add padding using the adaptation field\"\n\n* commit \u0027add9f820eaeb180b5e72a4420995a54062cfabd7\u0027:\n MPEG2TSWriter: Correctly add padding using the adaptation field\n" }, { "commit": "add9f820eaeb180b5e72a4420995a54062cfabd7", "tree": "64599be239b50cd3e77a345d64b2f0fcc5af743d", "parents": [ "979df012eb0588ac7f87d5f6e8bff77e2049ee46", "2c3d9b7b9e34c9122c0a568d6b1fb24404021f55" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Aug 15 11:24:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 15 11:24:36 2012 -0700" }, "message": "am 2c3d9b7b: Merge \"MPEG2TSWriter: Correctly add padding using the adaptation field\"\n\n* commit \u00272c3d9b7b9e34c9122c0a568d6b1fb24404021f55\u0027:\n MPEG2TSWriter: Correctly add padding using the adaptation field\n" }, { "commit": "99b99df476b1bfb49da74fda9d6960d82b5ffd10", "tree": "7d3f16ce63b55b65c35765c1574b58d8487ccc61", "parents": [ "98159acd68307bf0fcec40ae0fffc1a715517d1d" ], "author": { "name": "Paul Fariello", "email": "fariello@archos.com", "time": "Mon Jan 23 17:32:06 2012 +0100" }, "committer": { "name": "Martin Storsjo", "email": "martin@martin.st", "time": "Wed Aug 15 19:06:16 2012 +0300" }, "message": "MPEG2TSWriter: Correctly add padding using the adaptation field\n\nChange-Id: I268cce36ada910ba168c4c9dcedab0b20f6e6ebb\n" }, { "commit": "ea28831238e4c629b704f77c7e9d369bf2d3da5c", "tree": "006980316a3046d69c61b5c247ad153fe52b1115", "parents": [ "446757410404c3509dc1eff5bc0ef6ec7dfa58ac", "b3c5f569c6262338bc13f1c7952b5f4e4f9e6357" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Aug 13 17:49:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 17:49:43 2012 -0700" }, "message": "am b3c5f569: am 0088e930: Merge \"Fix AAC DRC metadata being ignored\" into jb-mr1-dev\n\n* commit \u0027b3c5f569c6262338bc13f1c7952b5f4e4f9e6357\u0027:\n Fix AAC DRC metadata being ignored\n" } ], "next": "0088e930b17228f23ddfff4840ed6172da354730" }