)]}' { "log": [ { "commit": "233ac8ffc93e1b4281add5e61cd5cba364c47c79", "tree": "131cb9a8dd9b3b91f0a809754274295b7052558f", "parents": [ "9df404fafd9059205b04af80714575ed7fd38833", "3411fc2f3a44b22d69a359a3eb26f756d6116e4f" ], "author": { "name": "Nick Kralevich", "email": "nnk@google.com", "time": "Mon Aug 20 12:56:46 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 12:56:46 2012 -0700" }, "message": "am 3411fc2f: am add7c4d3: am 46b7eeb8: Merge \"hardening: eliminate text relocations from h264\"\n\n* commit \u00273411fc2f3a44b22d69a359a3eb26f756d6116e4f\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": "9df404fafd9059205b04af80714575ed7fd38833", "tree": "90d1d05ba5c0c714de2a9263acc74b766b3e24c9", "parents": [ "a002beab1bdf7d4a551add6c17b50b253ebfad06", "11623fa3eb2c25ace502fdbdf290e154ac66960e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 10:31:49 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 10:31:49 2012 -0700" }, "message": "am 11623fa3: am af5f9f05: am cd622346: Merge \"MPEG2TSWriter: Fix an off-by-one in the condition for padding\"\n\n* commit \u002711623fa3eb2c25ace502fdbdf290e154ac66960e\u0027:\n MPEG2TSWriter: Fix an off-by-one in the condition for padding\n" }, { "commit": "a002beab1bdf7d4a551add6c17b50b253ebfad06", "tree": "166f453fbf3717c6b25a7168e8bf6742a4d16f97", "parents": [ "c8988ee99e3ffc99c9865412574f5ad6b9be4f1b", "07c6ddb431c784a24a70a5a91d8a454e9c1dde5d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 10:31:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 20 10:31:48 2012 -0700" }, "message": "am 07c6ddb4: am 3b939a5e: am 02a4ec21: Merge \"avcenc: Remove a leftover define\"\n\n* commit \u002707c6ddb431c784a24a70a5a91d8a454e9c1dde5d\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": "02a4ec216cf5ca903e1765ca3e7ff2985436b236", "tree": "af702ddbd7f738e6c714df88e092559a7a72f1ee", "parents": [ "64b3fe55f7edd16be32e07c28c2c90f84f3b9b80", "0a1b2aecb75b949df6b465a4e4ccc739af034443" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 20 08:53:54 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 20 08:53:54 2012 -0700" }, "message": "Merge \"avcenc: Remove a leftover define\"" }, { "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": "c8988ee99e3ffc99c9865412574f5ad6b9be4f1b", "tree": "93f6e4232098ace9e3f8c3596fbd391628af9930", "parents": [ "4d1ca6fb1cc5b7139de283212079636e9fd83b37", "53ae1640ffbfc690962f7f94694b02680c6f66cb" ], "author": { "name": "James Dong", "email": "jdong@google.com", "time": "Fri Aug 17 15:05:53 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 17 15:05:53 2012 -0700" }, "message": "am 53ae1640: Don\\\u0027t log streaming url.\n\n* commit \u002753ae1640ffbfc690962f7f94694b02680c6f66cb\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": "4d1ca6fb1cc5b7139de283212079636e9fd83b37", "tree": "e9d6420a8f22f5127690fe79f0022ef055944a60", "parents": [ "1bfad87cacb38a2e1418de8019ccb775f8926f66", "2ce25523c47a5f6cc81e67906924bfbbb3ef0f02" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Aug 16 19:10:23 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Thu Aug 16 19:10:23 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I907688f075794f3eb2854421f6cae592e6982398\n" }, { "commit": "1bfad87cacb38a2e1418de8019ccb775f8926f66", "tree": "e9d6420a8f22f5127690fe79f0022ef055944a60", "parents": [ "bf407d4de523177755fac5e699e1aaf5372c8d6d", "02d3c328d2c127c26ab787aa95e5240e6b7ff223" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:41:06 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:41:06 2012 -0700" }, "message": "am 02d3c328: am 523c09d5: am 64b3fe55: Merge \"stagefright amrnb: Remove unused leftover source files\"\n\n* commit \u002702d3c328d2c127c26ab787aa95e5240e6b7ff223\u0027:\n stagefright amrnb: Remove unused leftover source files\n" }, { "commit": "bf407d4de523177755fac5e699e1aaf5372c8d6d", "tree": "17ec439e0c8c65063b892446e6f15d7851fd784a", "parents": [ "9b9b8a9ece1c4e05f04f04b1fff63236fb3067f7", "f81ed0032f86ab0943baa1ad8a25de8e06498409" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 17:41:05 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:41:05 2012 -0700" }, "message": "am f81ed003: am f20e4ad9: am c1d2777c: Merge \"stagefright amrnb: Move the bitstream_format enum into frame_type_3gpp.h\"\n\n* commit \u0027f81ed0032f86ab0943baa1ad8a25de8e06498409\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": "9b9b8a9ece1c4e05f04f04b1fff63236fb3067f7", "tree": "37b6fff3afe911c06b8327406641dcdf2ce23187", "parents": [ "1fd1150784176646f9bcad4fd99af23dc6c9bc31", "08ebb6b114c9a2700e88e669a6064c7c91cfea2e" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 16 17:22:07 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 17:22:07 2012 -0700" }, "message": "am 08ebb6b1: Merge \"Camera2: Fix SCENE_MODE\" into jb-mr1-dev\n\n* commit \u002708ebb6b114c9a2700e88e669a6064c7c91cfea2e\u0027:\n Camera2: Fix SCENE_MODE\n" }, { "commit": "08ebb6b114c9a2700e88e669a6064c7c91cfea2e", "tree": "37b6fff3afe911c06b8327406641dcdf2ce23187", "parents": [ "7df98f17a42e47d8bc49891c370786ee3d3a1379", "3cc89794d92b833feff15ca76dfa196cc886e43f" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 16 17:20:36 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Thu Aug 16 17:20:37 2012 -0700" }, "message": "Merge \"Camera2: Fix SCENE_MODE\" into jb-mr1-dev" }, { "commit": "3cc89794d92b833feff15ca76dfa196cc886e43f", "tree": "d9b54775638b0b4c6aec370485c9bc7f62e14244", "parents": [ "ce088d274b4530fb813a030216d675b0e7262711" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 16 16:03:59 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Thu Aug 16 17:11:01 2012 -0700" }, "message": "Camera2: Fix SCENE_MODE\n\nNow can set scene mode back to auto.\n\nBug: 7001465\n\nChange-Id: Ia25ba54d13de662bef5bf79957987513a7313c18\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": "1fd1150784176646f9bcad4fd99af23dc6c9bc31", "tree": "98a1c6adb462fb0b6d3d2f4353f37a06c5e1c68b", "parents": [ "120462a9cbb3c40210f1b86185f28efb91361987", "7df98f17a42e47d8bc49891c370786ee3d3a1379" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:33:36 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:33:36 2012 -0700" }, "message": "am 7df98f17: am 0df213ba: am dde79acf: Merge \"hardening: eliminate text relocations from mp3\"\n\n* commit \u00277df98f17a42e47d8bc49891c370786ee3d3a1379\u0027:\n hardening: eliminate text relocations from mp3\n" }, { "commit": "120462a9cbb3c40210f1b86185f28efb91361987", "tree": "a53726fd44407323ef9cb2adcb8913d78c4143c8", "parents": [ "706f36c73d8c2b7f463abf1afe9d9ea8fa5a5985", "1a42aee5e1e975158da4754f9bae46c945e27281" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:33:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:33:35 2012 -0700" }, "message": "am 1a42aee5: am a109e9d5: am b7ca7dc9: Merge \"avcenc: Clarify the ifdefs surrounding inline assembly\"\n\n* commit \u00271a42aee5e1e975158da4754f9bae46c945e27281\u0027:\n avcenc: Clarify the ifdefs surrounding inline assembly\n" }, { "commit": "706f36c73d8c2b7f463abf1afe9d9ea8fa5a5985", "tree": "c11cdabdd016e454ec2ddf37a477e6c44049c799", "parents": [ "a83ec8c5c7502466d500540698a71886c3286eb5", "9bd763d1d3b7dcb30320aa70597680a53ffb5bbf" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:33:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:33:34 2012 -0700" }, "message": "am 9bd763d1: am fba9d50d: am 4f981882: Merge \"hardening: eliminate text relocations from amrwb\"\n\n* commit \u00279bd763d1d3b7dcb30320aa70597680a53ffb5bbf\u0027:\n hardening: eliminate text relocations from amrwb\n" }, { "commit": "a83ec8c5c7502466d500540698a71886c3286eb5", "tree": "7f4eb9c37e9a497c110cb1bed4a8eaabb20d56b9", "parents": [ "2f72739bcb5b65e286e663fae5bbb6304d04954f", "f365fecf8519a0a1c7e511657f79638844be02e3" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:33:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:33:33 2012 -0700" }, "message": "am f365fecf: am 1191287b: am c3bfa026: Merge \"aacenc/amrwbenc: Remove the now unused LINUX define\"\n\n* commit \u0027f365fecf8519a0a1c7e511657f79638844be02e3\u0027:\n aacenc/amrwbenc: Remove the now unused LINUX define\n" }, { "commit": "2f72739bcb5b65e286e663fae5bbb6304d04954f", "tree": "a62306737201b8724ac8a05507a6e47492c92987", "parents": [ "ff42ad8716cf956918976821ba9625b7814c8b09", "fa172b0d2dcd761622b61701b7c7dd4d0f19610b" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 15:33:33 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Thu Aug 16 15:33:33 2012 -0700" }, "message": "am fa172b0d: am eeb9fde0: am 3f5d2e17: Merge \"aacenc/amrwbenc: Remove unused and dubious typedefs\"\n\n* commit \u0027fa172b0d2dcd761622b61701b7c7dd4d0f19610b\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": "c3bfa0260a530af3e9c091c1c9d90d1283021dd6", "tree": "b48db3143802871fa70835ea96af338d5a8d9b23", "parents": [ "3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49", "fef71ef418d8ecff6d20fbd50b7fbabf6ad58f74" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 14:42:35 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 14:42:36 2012 -0700" }, "message": "Merge \"aacenc/amrwbenc: Remove the now unused LINUX define\"" }, { "commit": "3f5d2e1777bcf8856e966b93b2bce0b2c9cd1a49", "tree": "192aa46e12cbdba09f5ac7ba0228af1297fc6f89", "parents": [ "2c3d9b7b9e34c9122c0a568d6b1fb24404021f55", "adee070820d9b038ac811b3785de618349f35293" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Thu Aug 16 14:42:16 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Aug 16 14:42:17 2012 -0700" }, "message": "Merge \"aacenc/amrwbenc: Remove unused and dubious typedefs\"" }, { "commit": "2ce25523c47a5f6cc81e67906924bfbbb3ef0f02", "tree": "c65e7e76b4d945e46e8093aa2cc56b8a74c3b1a8", "parents": [ "ce088d274b4530fb813a030216d675b0e7262711", "5dea1cecbe6e454e22571cdd31b9db3ffc0f3261" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Aug 16 06:33:47 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Thu Aug 16 06:33:47 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "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": "ff42ad8716cf956918976821ba9625b7814c8b09", "tree": "c65e7e76b4d945e46e8093aa2cc56b8a74c3b1a8", "parents": [ "39ae04bcc844ed53af95f67b3490ce4307d0782d", "ce088d274b4530fb813a030216d675b0e7262711" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Aug 15 11:28:07 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Wed Aug 15 11:28:07 2012 -0700" }, "message": "am ce088d27: am add9f820: am 2c3d9b7b: Merge \"MPEG2TSWriter: Correctly add padding using the adaptation field\"\n\n* commit \u0027ce088d274b4530fb813a030216d675b0e7262711\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": "2c3d9b7b9e34c9122c0a568d6b1fb24404021f55", "tree": "7d3f16ce63b55b65c35765c1574b58d8487ccc61", "parents": [ "98159acd68307bf0fcec40ae0fffc1a715517d1d", "99b99df476b1bfb49da74fda9d6960d82b5ffd10" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Wed Aug 15 10:14:29 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 15 10:14:29 2012 -0700" }, "message": "Merge \"MPEG2TSWriter: Correctly add padding using the adaptation field\"" }, { "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": "39ae04bcc844ed53af95f67b3490ce4307d0782d", "tree": "d2e4f73fd06a02832e10b381ef09ce31177f7826", "parents": [ "86e2067c41b4ec0fdeae1c09a22610ffed9e2fe5", "5dea1cecbe6e454e22571cdd31b9db3ffc0f3261" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Aug 15 08:27:10 2012 -0700" }, "committer": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Wed Aug 15 08:27:10 2012 -0700" }, "message": "Reconcile with jb-mr1-release - do not merge\n\nChange-Id: I5984e2de0d851c7c71d6424b7f783346e18980da\n" }, { "commit": "5dea1cecbe6e454e22571cdd31b9db3ffc0f3261", "tree": "d2e4f73fd06a02832e10b381ef09ce31177f7826", "parents": [ "f363ec5564abf4788d07e00d89c93a66a0c91b88", "1d5c225d32524a54494b65c6b619b4e4d3eed3cc" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Aug 15 06:34:09 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Wed Aug 15 06:34:09 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "86e2067c41b4ec0fdeae1c09a22610ffed9e2fe5", "tree": "d2e4f73fd06a02832e10b381ef09ce31177f7826", "parents": [ "b3c5f569c6262338bc13f1c7952b5f4e4f9e6357", "f363ec5564abf4788d07e00d89c93a66a0c91b88" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Aug 14 11:57:21 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Tue Aug 14 11:57:21 2012 -0700" }, "message": "am f363ec55: Merge \"Camera2: Skeleton for output frame processing, plus face detect\" into jb-mr1-dev\n\n* commit \u0027f363ec5564abf4788d07e00d89c93a66a0c91b88\u0027:\n Camera2: Skeleton for output frame processing, plus face detect\n" }, { "commit": "f363ec5564abf4788d07e00d89c93a66a0c91b88", "tree": "d2e4f73fd06a02832e10b381ef09ce31177f7826", "parents": [ "0088e930b17228f23ddfff4840ed6172da354730", "8ce89d9e2b132bf58a030acec88acf0a998926a1" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Aug 14 11:55:50 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Tue Aug 14 11:55:50 2012 -0700" }, "message": "Merge \"Camera2: Skeleton for output frame processing, plus face detect\" into jb-mr1-dev" }, { "commit": "8ce89d9e2b132bf58a030acec88acf0a998926a1", "tree": "00a9c5d1799d3ef29365c5c5596797dadf09a079", "parents": [ "93b68548124ec9b01b9bf4ddf010afa06a503547" ], "author": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Fri Aug 10 08:40:26 2012 -0700" }, "committer": { "name": "Eino-Ville Talvala", "email": "etalvala@google.com", "time": "Tue Aug 14 11:31:27 2012 -0700" }, "message": "Camera2: Skeleton for output frame processing, plus face detect\n\n- Plumbing for processing output metadata frames from the HAL\n- Support for passing face detection metadata from said frames\n to the application.\n- Switch calls on ICameraClient interface to use separate mutex to\n avoid deadlock scenarios with messages being communicated from the\n HAL to the camera user while calls from the user to the service are\n active.\n\nBug: 6243944\n\nChange-Id: Id4cf821d9c5c3c0069be4c0f669874b6ff0d1ecd\n" }, { "commit": "1d5c225d32524a54494b65c6b619b4e4d3eed3cc", "tree": "44b3ec3b449b948bf6092b44ed2f876735a7cf26", "parents": [ "0088e930b17228f23ddfff4840ed6172da354730", "dce5500f2978ab705911eaecba6b3981b60acefa" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Aug 14 07:06:56 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Tue Aug 14 07:06:56 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "b3c5f569c6262338bc13f1c7952b5f4e4f9e6357", "tree": "44b3ec3b449b948bf6092b44ed2f876735a7cf26", "parents": [ "99d777a285edd30941530cacd429070c08090593", "0088e930b17228f23ddfff4840ed6172da354730" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Aug 13 17:48:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 17:48:31 2012 -0700" }, "message": "am 0088e930: Merge \"Fix AAC DRC metadata being ignored\" into jb-mr1-dev\n\n* commit \u00270088e930b17228f23ddfff4840ed6172da354730\u0027:\n Fix AAC DRC metadata being ignored\n" }, { "commit": "0088e930b17228f23ddfff4840ed6172da354730", "tree": "44b3ec3b449b948bf6092b44ed2f876735a7cf26", "parents": [ "93b68548124ec9b01b9bf4ddf010afa06a503547", "5696a4efef79ee474ac6bcf2639c741e159bed1b" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Aug 13 17:46:40 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 13 17:46:40 2012 -0700" }, "message": "Merge \"Fix AAC DRC metadata being ignored\" into jb-mr1-dev" }, { "commit": "5696a4efef79ee474ac6bcf2639c741e159bed1b", "tree": "b435c5616319b2ea591e81e171d1303070332b65", "parents": [ "7edbacf24e60c01e2d3b10715ec8f9cc2f55c11a" ], "author": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Fri Aug 10 12:24:59 2012 -0700" }, "committer": { "name": "Jean-Michel Trivi", "email": "jmtrivi@google.com", "time": "Mon Aug 13 17:27:28 2012 -0700" }, "message": "Fix AAC DRC metadata being ignored\n\nThe decoder will bypass all DRC processing during decode unless\n any of the DRC parameters is set.\nThe fix consists in setting the DRC reference level to its\n default value when after the decoder is initialized.\n\nChange-Id: Ibb8355ab8c3c65020c5eef0752957040f7316c2a\n" }, { "commit": "99d777a285edd30941530cacd429070c08090593", "tree": "fb890460f999c97d6375954a07f3890b5c5ac60e", "parents": [ "a6a266d0e148f085ac1f83c4a36d3cf940c59e24", "93b68548124ec9b01b9bf4ddf010afa06a503547" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 16:07:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 16:07:43 2012 -0700" }, "message": "am 93b68548: am 979df012: am 98159acd: Merge \"amrnb: Restart the p_xn pointer when retraversing the array on overflow\"\n\n* commit \u002793b68548124ec9b01b9bf4ddf010afa06a503547\u0027:\n amrnb: Restart the p_xn pointer when retraversing the array on overflow\n" }, { "commit": "93b68548124ec9b01b9bf4ddf010afa06a503547", "tree": "fb890460f999c97d6375954a07f3890b5c5ac60e", "parents": [ "106e8a42038f9e90d5ff97f8ab6f1a42258bde9e", "979df012eb0588ac7f87d5f6e8bff77e2049ee46" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 16:03:31 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 16:03:31 2012 -0700" }, "message": "am 979df012: am 98159acd: Merge \"amrnb: Restart the p_xn pointer when retraversing the array on overflow\"\n\n* commit \u0027979df012eb0588ac7f87d5f6e8bff77e2049ee46\u0027:\n amrnb: Restart the p_xn pointer when retraversing the array on overflow\n" }, { "commit": "979df012eb0588ac7f87d5f6e8bff77e2049ee46", "tree": "bcc146ce1765013b95360d46e2498f547f68fa0a", "parents": [ "10004fe612bc38bedc258fd1c380ebccacfa0c1e", "98159acd68307bf0fcec40ae0fffc1a715517d1d" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 15:19:13 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 15:19:13 2012 -0700" }, "message": "am 98159acd: Merge \"amrnb: Restart the p_xn pointer when retraversing the array on overflow\"\n\n* commit \u002798159acd68307bf0fcec40ae0fffc1a715517d1d\u0027:\n amrnb: Restart the p_xn pointer when retraversing the array on overflow\n" }, { "commit": "98159acd68307bf0fcec40ae0fffc1a715517d1d", "tree": "32db1fc8029c7b40c8790b28566f66540e3faefe", "parents": [ "5efa7bf945f53c419501b0a4f9718962f24f0df5", "6d72a807dc3910ddd0b7c4f85130951dd189e8f5" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 14:37:57 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 13 14:37:57 2012 -0700" }, "message": "Merge \"amrnb: Restart the p_xn pointer when retraversing the array on overflow\"" }, { "commit": "22e06318d04074d1a7c90caa173857abdcfd153e", "tree": "ad3ba6642d9ff8dd6861b5b15b0a43ef2df95756", "parents": [ "9a2c14b2c96625d5be73e1a7627f5d2a3091c4a2" ], "author": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@gmail.com", "time": "Mon Aug 13 22:55:51 2012 +0200" }, "committer": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@gmail.com", "time": "Mon Aug 13 22:55:51 2012 +0200" }, "message": "hardening: eliminate text relocations from h264\n\nChange-Id: I8bdf9746f28f2f7bed6c1109c0f4badbab765a7c\n" }, { "commit": "9a2c14b2c96625d5be73e1a7627f5d2a3091c4a2", "tree": "dbf2a346379e8b728b7d4a27e34cdf976d03632f", "parents": [ "74bc3e133bd59a65dbed70b5fc89549f04a545e2" ], "author": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@gmail.com", "time": "Mon Aug 13 22:47:33 2012 +0200" }, "committer": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@gmail.com", "time": "Mon Aug 13 22:55:03 2012 +0200" }, "message": "hardening: eliminate text relocations from mp3\n\nChange-Id: I671ed4c8c7bb15172a8b64d513e2844319495102\n" }, { "commit": "74bc3e133bd59a65dbed70b5fc89549f04a545e2", "tree": "931b7ebb4ccdf834d740784be617257eb7c41deb", "parents": [ "24893fef8e0f816a8a21749fa3eb9eed9173a0fd" ], "author": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@gmail.com", "time": "Mon Aug 13 22:44:43 2012 +0200" }, "committer": { "name": "Ard Biesheuvel", "email": "ard.biesheuvel@gmail.com", "time": "Mon Aug 13 22:44:43 2012 +0200" }, "message": "hardening: eliminate text relocations from amrwb\n\nChange-Id: I47235fc4afe6b916da1e999401fb3c8b12c94e62\n" }, { "commit": "a6a266d0e148f085ac1f83c4a36d3cf940c59e24", "tree": "af631b5e756cf711d5d9d34db2dffe02cf64e7e3", "parents": [ "0319e9e31cb7b0033a3026b0305b78e2d48c6ec8", "106e8a42038f9e90d5ff97f8ab6f1a42258bde9e" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:42:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 11:42:35 2012 -0700" }, "message": "am 106e8a42: const methods\n\n* commit \u0027106e8a42038f9e90d5ff97f8ab6f1a42258bde9e\u0027:\n const methods\n" }, { "commit": "0319e9e31cb7b0033a3026b0305b78e2d48c6ec8", "tree": "4fe3b2ab60f96691faaaf50f163c92946954e6de", "parents": [ "b2f2d1644b9d1a823fc3b78a59893652b080b35d", "0dbb356050d0db9e0043dd43045c1864a933332b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:39:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 11:39:04 2012 -0700" }, "message": "am 0dbb3560: Simplify AudioFlinger::PlaybackThread::isValidSyncEvent()\n\n* commit \u00270dbb356050d0db9e0043dd43045c1864a933332b\u0027:\n Simplify AudioFlinger::PlaybackThread::isValidSyncEvent()\n" }, { "commit": "106e8a42038f9e90d5ff97f8ab6f1a42258bde9e", "tree": "af631b5e756cf711d5d9d34db2dffe02cf64e7e3", "parents": [ "0dbb356050d0db9e0043dd43045c1864a933332b" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 02 13:37:12 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:38:18 2012 -0700" }, "message": "const methods\n\nChange-Id: I92e32ee16274c032c9d0ce910676be2a7fa52471\n" }, { "commit": "b2f2d1644b9d1a823fc3b78a59893652b080b35d", "tree": "9f0c4309ded6a390c49bbe70590ea568a7167307", "parents": [ "f02356254262ec4a56e5ec1b1abefe1849ba9f9d", "d23eedca9b5a1812891c05d89850ab7ee707040d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:36:12 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 11:36:12 2012 -0700" }, "message": "am d23eedca: Discard setSyncEvent() return value\n\n* commit \u0027d23eedca9b5a1812891c05d89850ab7ee707040d\u0027:\n Discard setSyncEvent() return value\n" }, { "commit": "0dbb356050d0db9e0043dd43045c1864a933332b", "tree": "4fe3b2ab60f96691faaaf50f163c92946954e6de", "parents": [ "d23eedca9b5a1812891c05d89850ab7ee707040d" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 02 16:36:50 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:35:47 2012 -0700" }, "message": "Simplify AudioFlinger::PlaybackThread::isValidSyncEvent()\n\nChange-Id: I3e4af69b929d4ca04afaac26c7e41c89fce25b9c\n" }, { "commit": "d23eedca9b5a1812891c05d89850ab7ee707040d", "tree": "9f0c4309ded6a390c49bbe70590ea568a7167307", "parents": [ "a959904968f1d300fe86334bf5099ae2dc39ee28" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Thu Aug 02 13:35:47 2012 -0700" }, "committer": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:31:55 2012 -0700" }, "message": "Discard setSyncEvent() return value\n\nsetSyncEvent() returns a status_t which is sometimes ignored.\nEmphasize this is intentional by casting to void.\n\nChange-Id: Ic614988347cba36bd2504d7ad321594a355b0d9d\n" }, { "commit": "f02356254262ec4a56e5ec1b1abefe1849ba9f9d", "tree": "bf95afcaab7a56642d1bf6b88ad2699eeaf5af04", "parents": [ "1f3d61f99c5cbe65a2cd32985445fc9ffa12adca", "a959904968f1d300fe86334bf5099ae2dc39ee28" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:31:39 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 11:31:39 2012 -0700" }, "message": "am a9599049: Merge \"Replace hard-coded \"2\" by a constant and comment\" into jb-mr1-dev\n\n* commit \u0027a959904968f1d300fe86334bf5099ae2dc39ee28\u0027:\n Replace hard-coded \"2\" by a constant and comment\n" }, { "commit": "a959904968f1d300fe86334bf5099ae2dc39ee28", "tree": "bf95afcaab7a56642d1bf6b88ad2699eeaf5af04", "parents": [ "bd828233d3eda966bf7145108dde74616abd97fb", "3ed292031dc50c56110cdadb1e3778117e3be76a" ], "author": { "name": "Glenn Kasten", "email": "gkasten@google.com", "time": "Mon Aug 13 11:30:17 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 13 11:30:17 2012 -0700" }, "message": "Merge \"Replace hard-coded \"2\" by a constant and comment\" into jb-mr1-dev" }, { "commit": "1f3d61f99c5cbe65a2cd32985445fc9ffa12adca", "tree": "942a6d829a42a3b3f3a1ac2286015a94acde5332", "parents": [ "f64f9b2dd0e0582442fb2bd04296f7d64c55140d", "bd828233d3eda966bf7145108dde74616abd97fb" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Aug 13 11:16:47 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 11:16:47 2012 -0700" }, "message": "am bd828233: Use the correct data offset by remembering the offset of the enclosing \\\u0027moof\\\u0027\n\n* commit \u0027bd828233d3eda966bf7145108dde74616abd97fb\u0027:\n Use the correct data offset by remembering the offset of the enclosing \u0027moof\u0027\n" }, { "commit": "bd828233d3eda966bf7145108dde74616abd97fb", "tree": "942a6d829a42a3b3f3a1ac2286015a94acde5332", "parents": [ "8cf9c1a8640553a146f3a7aad01b393c664a46af" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Aug 13 10:59:48 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 13 11:13:22 2012 -0700" }, "message": "Use the correct data offset by remembering the offset of the enclosing \u0027moof\u0027\n\ncontainer.\n\nChange-Id: I2f0f92dabe31341a6a91d435943e4a65e34884ba\n" }, { "commit": "f64f9b2dd0e0582442fb2bd04296f7d64c55140d", "tree": "d862c8a9dc8a7e71754d5e01abec6d7a8439c7a5", "parents": [ "73247cac58b0c295e02b2350722699689ac45189", "8cf9c1a8640553a146f3a7aad01b393c664a46af" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 10:58:48 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 10:58:48 2012 -0700" }, "message": "am 8cf9c1a8: am 10004fe6: am 5efa7bf9: Merge \"amrnb: Fix audio distortion in an AMR-NB clip\"\n\n* commit \u00278cf9c1a8640553a146f3a7aad01b393c664a46af\u0027:\n amrnb: Fix audio distortion in an AMR-NB clip\n" }, { "commit": "8cf9c1a8640553a146f3a7aad01b393c664a46af", "tree": "d862c8a9dc8a7e71754d5e01abec6d7a8439c7a5", "parents": [ "d58a68a4d6915d43d8b9d02ebfe04be62efe2eb1", "10004fe612bc38bedc258fd1c380ebccacfa0c1e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 10:56:58 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 10:56:58 2012 -0700" }, "message": "am 10004fe6: am 5efa7bf9: Merge \"amrnb: Fix audio distortion in an AMR-NB clip\"\n\n* commit \u002710004fe612bc38bedc258fd1c380ebccacfa0c1e\u0027:\n amrnb: Fix audio distortion in an AMR-NB clip\n" }, { "commit": "10004fe612bc38bedc258fd1c380ebccacfa0c1e", "tree": "17b3ce288cb1221b7ace4540766ba4168aa0c3df", "parents": [ "3ca352c4cd01f6df3b691f835efc68a5771e724e", "5efa7bf945f53c419501b0a4f9718962f24f0df5" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 10:53:51 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 10:53:51 2012 -0700" }, "message": "am 5efa7bf9: Merge \"amrnb: Fix audio distortion in an AMR-NB clip\"\n\n* commit \u00275efa7bf945f53c419501b0a4f9718962f24f0df5\u0027:\n amrnb: Fix audio distortion in an AMR-NB clip\n" }, { "commit": "5efa7bf945f53c419501b0a4f9718962f24f0df5", "tree": "7e57ab9664e7bb00e3c73170e5703a9e864ac4c0", "parents": [ "24893fef8e0f816a8a21749fa3eb9eed9173a0fd", "8d5a687f4f4c50f4fc8c1a29ab7a0cd618bcf9d1" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Mon Aug 13 10:37:03 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Aug 13 10:37:03 2012 -0700" }, "message": "Merge \"amrnb: Fix audio distortion in an AMR-NB clip\"" }, { "commit": "73247cac58b0c295e02b2350722699689ac45189", "tree": "b2bae0d6b37fff0a0aff3b3456c2831425d7a0f0", "parents": [ "6f1ecc9815b8b02c407254de0fb9dbbb575c6fc1", "d58a68a4d6915d43d8b9d02ebfe04be62efe2eb1" ], "author": { "name": "John Grossman", "email": "johngro@google.com", "time": "Mon Aug 13 09:53:45 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 09:53:45 2012 -0700" }, "message": "am d58a68a4: Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev\n\n* commit \u0027d58a68a4d6915d43d8b9d02ebfe04be62efe2eb1\u0027:\n Move the AAH RTP code out of framework and into vendor.\n Add the ability to dynamicaly register MediaPlayer types.\n" }, { "commit": "6f1ecc9815b8b02c407254de0fb9dbbb575c6fc1", "tree": "cce64e4d784733732f01483ccd7c36d2363e6768", "parents": [ "b18a26cd65d751547ceb396c2876d0256049a77c", "75767ab7cc1aee315d655538322a8349faa61a64" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Aug 13 09:53:43 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Mon Aug 13 09:53:43 2012 -0700" }, "message": "am 75767ab7: Merge \"Signal end of stream if no more fragments are going to be available.\" into jb-mr1-dev\n\n* commit \u002775767ab7cc1aee315d655538322a8349faa61a64\u0027:\n Signal end of stream if no more fragments are going to be available.\n" }, { "commit": "d58a68a4d6915d43d8b9d02ebfe04be62efe2eb1", "tree": "b2bae0d6b37fff0a0aff3b3456c2831425d7a0f0", "parents": [ "75767ab7cc1aee315d655538322a8349faa61a64", "8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b" ], "author": { "name": "John Grossman", "email": "johngro@google.com", "time": "Mon Aug 13 09:52:14 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 13 09:52:14 2012 -0700" }, "message": "Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-dev\n\n* changes:\n Move the AAH RTP code out of framework and into vendor.\n Add the ability to dynamicaly register MediaPlayer types.\n" }, { "commit": "75767ab7cc1aee315d655538322a8349faa61a64", "tree": "cce64e4d784733732f01483ccd7c36d2363e6768", "parents": [ "b3e12a4d15a329821979bf287c49a9630486e23f", "c7708555ea7511aea684e00a55fb5309281540ce" ], "author": { "name": "Andreas Huber", "email": "andih@google.com", "time": "Mon Aug 13 09:03:06 2012 -0700" }, "committer": { "name": "Android (Google) Code Review", "email": "android-gerrit@google.com", "time": "Mon Aug 13 09:51:50 2012 -0700" }, "message": "Merge \"Signal end of stream if no more fragments are going to be available.\" into jb-mr1-dev" }, { "commit": "8ec1f2a4f3c72fe7472f8b8fa227f6b7bbc9279b", "tree": "5a85d007f81c1d09f68f3894f8cbb0a950372250", "parents": [ "44a7e42f0310831e6a846d1b6bb40bf3a399bf6d" ], "author": { "name": "John Grossman", "email": "johngro@google.com", "time": "Mon Aug 06 13:50:00 2012 -0700" }, "committer": { "name": "John Grossman", "email": "johngro@google.com", "time": "Mon Aug 13 09:48:56 2012 -0700" }, "message": "Move the AAH RTP code out of framework and into vendor.\n\nRelocate the AAH RTP code from framework/av into\nvendor/google_devices/phantasm. This change is the deletion, there\nwill be a separate CL which re-introduces on the vendor side of\nthings.\n\nChange-Id: Ibe7e6d4b633a3886b87a615691a2692f2382af6c\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\n" }, { "commit": "44a7e42f0310831e6a846d1b6bb40bf3a399bf6d", "tree": "aba58d779eb8a1d8fe4616d33b8eb6e1672d6f00", "parents": [ "b3e12a4d15a329821979bf287c49a9630486e23f" ], "author": { "name": "John Grossman", "email": "johngro@google.com", "time": "Thu Jun 21 17:29:24 2012 -0700" }, "committer": { "name": "John Grossman", "email": "johngro@google.com", "time": "Mon Aug 13 09:48:56 2012 -0700" }, "message": "Add the ability to dynamicaly register MediaPlayer types.\n\nAdd the ability to dynamically register low level MediaPlayer\nfactories which will be probed at setDataSource time to determine the\nproper MediaPlayerBase to instantiate.\n\nThis change is in preparation for moving libaah_rtp out of\nframeworks/base and into phantasm platform directory.\n\nChange-Id: Icf8904db3ab9e3c85df6e780d5546d9988cb9076\nSigned-off-by: John Grossman \u003cjohngro@google.com\u003e\n" }, { "commit": "dce5500f2978ab705911eaecba6b3981b60acefa", "tree": "b79b0ca57e79e2ee19f09b150f9a60e397af24d7", "parents": [ "b3e12a4d15a329821979bf287c49a9630486e23f", "a0f3d222a6dafd9a7011717d385291285614667e" ], "author": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Aug 13 08:09:20 2012 -0700" }, "committer": { "name": "The Android Automerger", "email": "android-build@android.com", "time": "Mon Aug 13 08:09:20 2012 -0700" }, "message": "merge in jb-mr1-release history after reset to jb-mr1-dev\n" }, { "commit": "b18a26cd65d751547ceb396c2876d0256049a77c", "tree": "b79b0ca57e79e2ee19f09b150f9a60e397af24d7", "parents": [ "b07043ff3b743bbfd991f3d0fc4625d5fe2f1122", "b3e12a4d15a329821979bf287c49a9630486e23f" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 15:35:20 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 15:35:20 2012 -0700" }, "message": "am b3e12a4d: am 3ca352c4: am 24893fef: Merge \"MPEG2TSWriter: Write a proper CRC in PAT and PMT\"\n\n* commit \u0027b3e12a4d15a329821979bf287c49a9630486e23f\u0027:\n MPEG2TSWriter: Write a proper CRC in PAT and PMT\n" }, { "commit": "b3e12a4d15a329821979bf287c49a9630486e23f", "tree": "b79b0ca57e79e2ee19f09b150f9a60e397af24d7", "parents": [ "751fa786aa9599c694219085601f9f5ebe96a516", "3ca352c4cd01f6df3b691f835efc68a5771e724e" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 15:34:06 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 15:34:06 2012 -0700" }, "message": "am 3ca352c4: am 24893fef: Merge \"MPEG2TSWriter: Write a proper CRC in PAT and PMT\"\n\n* commit \u00273ca352c4cd01f6df3b691f835efc68a5771e724e\u0027:\n MPEG2TSWriter: Write a proper CRC in PAT and PMT\n" }, { "commit": "3ca352c4cd01f6df3b691f835efc68a5771e724e", "tree": "8cc59347af40bd76345e794b934e4b9ee0483751", "parents": [ "31a593b901eeb924ae5214962c628397dd0197f2", "24893fef8e0f816a8a21749fa3eb9eed9173a0fd" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 15:32:40 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 15:32:40 2012 -0700" }, "message": "am 24893fef: Merge \"MPEG2TSWriter: Write a proper CRC in PAT and PMT\"\n\n* commit \u002724893fef8e0f816a8a21749fa3eb9eed9173a0fd\u0027:\n MPEG2TSWriter: Write a proper CRC in PAT and PMT\n" }, { "commit": "24893fef8e0f816a8a21749fa3eb9eed9173a0fd", "tree": "3a5b5cc9b025e90a8a077059937b6ea2e228a9ad", "parents": [ "2001d2ac01e36c13c1abda5f73b6404cba2648e1", "983995747ed3adaf25035c433df1ccbaa056a898" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 15:26:43 2012 -0700" }, "committer": { "name": "android code review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Aug 10 15:26:44 2012 -0700" }, "message": "Merge \"MPEG2TSWriter: Write a proper CRC in PAT and PMT\"" }, { "commit": "b07043ff3b743bbfd991f3d0fc4625d5fe2f1122", "tree": "6b8ea38fa25a0cce13ae5d00ded028be74307cc6", "parents": [ "0efd035854ad2c8d20100a740e054c4bf7b3e9a4", "751fa786aa9599c694219085601f9f5ebe96a516" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 12:46:35 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 12:46:35 2012 -0700" }, "message": "am 751fa786: am 31a593b9: am 2001d2ac: Merge \"MPEG2TSWriter: Write proper continuity counters for PAT and PMT\"\n\n* commit \u0027751fa786aa9599c694219085601f9f5ebe96a516\u0027:\n MPEG2TSWriter: Write proper continuity counters for PAT and PMT\n" }, { "commit": "0efd035854ad2c8d20100a740e054c4bf7b3e9a4", "tree": "7dd8aadcffc35c98504f35d69fe467c0a8e8f397", "parents": [ "6014fb449be39f57b27fafe522ecae7b15dc87c4", "fcfc61da927e98d18cdcb53da8fa0a8a32ee1422" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 12:46:34 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 12:46:34 2012 -0700" }, "message": "am fcfc61da: am ff4c64d6: am c64a1787: Merge \"Fix initialization of audio mixer track resources for MIPS.\"\n\n* commit \u0027fcfc61da927e98d18cdcb53da8fa0a8a32ee1422\u0027:\n Fix initialization of audio mixer track resources for MIPS.\n" }, { "commit": "751fa786aa9599c694219085601f9f5ebe96a516", "tree": "6b8ea38fa25a0cce13ae5d00ded028be74307cc6", "parents": [ "fcfc61da927e98d18cdcb53da8fa0a8a32ee1422", "31a593b901eeb924ae5214962c628397dd0197f2" ], "author": { "name": "Jean-Baptiste Queru", "email": "jbq@google.com", "time": "Fri Aug 10 12:44:04 2012 -0700" }, "committer": { "name": "Android Git Automerger", "email": "android-git-automerger@android.com", "time": "Fri Aug 10 12:44:04 2012 -0700" }, "message": "am 31a593b9: am 2001d2ac: Merge \"MPEG2TSWriter: Write proper continuity counters for PAT and PMT\"\n\n* commit \u002731a593b901eeb924ae5214962c628397dd0197f2\u0027:\n MPEG2TSWriter: Write proper continuity counters for PAT and PMT\n" } ], "next": "fcfc61da927e98d18cdcb53da8fa0a8a32ee1422" }