1. 9de8c1d resolved conflicts for merge of 4f342e87 to master by Jeff Tinker · 11 years ago
  2. 53c90cf am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev by Jeff Tinker · 11 years ago
  3. 6dc8063 am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev by Jeff Tinker · 11 years ago
  4. e4095a8 Support CAST V2 Authentication in MediaDrm by Jeff Tinker · 11 years ago
  5. 9c3b258 Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()" by Lajos Molnar · 11 years ago
  6. 3710981 am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" by Narayan Kamath · 11 years ago
  7. 303d666 am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint" by Narayan Kamath · 11 years ago
  8. 91bbb75 Merge "Cast CallMethod's size_t parameters to jint" by Narayan Kamath · 11 years ago
  9. 0046b16 am 959bce3e: am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue" by Mark Salyzyn · 11 years ago
  10. 959bce3 am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue" by Mark Salyzyn · 11 years ago
  11. aeb75fc jni: 64-bit compile issue by Mark Salyzyn · 11 years ago
  12. 7ac4f56 MediaCodec: avoid silent array overflow in queueSecureInputBuffer() by Lajos Molnar · 11 years ago
  13. 136c08a Cast CallMethod's size_t parameters to jint by Ashok Bhat · 11 years ago
  14. 7acd69b MediaHTTPConnection: fix JNI signature by Colin Cross · 11 years ago
  15. 5e8ff02 MediaHTTPConnection: use jlong to store native pointer by Colin Cross · 11 years ago
  16. 07cf4da Merge "Add stream-level suppression to vibrate/audio services." by John Spurlock · 11 years ago
  17. 29427a2 am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." by Glenn Kasten · 11 years ago
  18. 458edc8 am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger." by Glenn Kasten · 11 years ago
  19. 1af30c7 Add stream-level suppression to vibrate/audio services. by John Spurlock · 11 years ago
  20. 587a25b mediaeditor shouldn't depend on audioflinger. by Narayan Kamath · 11 years ago
  21. 8a358e4 Merge "Remove deprecated BufferQueue constructor" by Dan Stoza · 11 years ago
  22. 92b53bc MTP: Add support for some audio specific object properties by Mike Lockwood · 11 years ago
  23. 5b3c7c1 Remove deprecated BufferQueue constructor by Dan Stoza · 11 years ago
  24. 5b568aa Merge "MTP: Add support for battery level device property" by Mike Lockwood · 11 years ago
  25. 56c8524 MTP: Add support for battery level device property by Mike Lockwood · 11 years ago
  26. 8e70165 am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev by Marco Nelissen · 11 years ago
  27. 3442519 am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev by Marco Nelissen · 11 years ago
  28. e78a747 am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" by Narayan Kamath · 11 years ago
  29. 6ae7cd0 am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" by Narayan Kamath · 11 years ago
  30. aefa427 Make MtpDatabase use libexif instead of libjhead by Marco Nelissen · 11 years ago
  31. 0425a51 am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit" by Narayan Kamath · 11 years ago
  32. 214c3d9 am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value" by Narayan Kamath · 11 years ago
  33. 5de03b1 Merge "Don't assume that size_t is 32-bit" by Narayan Kamath · 11 years ago
  34. faab8b2 Fix build by Marco Nelissen · 11 years ago
  35. da7ad46 am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev by Marco Nelissen · 11 years ago
  36. daefb17 am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev by Marco Nelissen · 11 years ago
  37. e1af0bd am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev by Marco Nelissen · 11 years ago
  38. c0786cc libexif is now libjhead by Marco Nelissen · 11 years ago
  39. e92416d Don't assume that size_t is 32-bit by Ashok Bhat · 11 years ago
  40. 58fad0b Don't use size_t for variables that store uint32_t value by Ashok Bhat · 11 years ago
  41. 128b012 fix MediaCodec release deadlock and resource leak by Chong Zhang · 11 years ago
  42. eece0dd Fix includes so that they no longer rely on the global Skia includes directories. by Derek Sollenberger · 11 years ago
  43. 9ae000c Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest." by Andreas Huber · 11 years ago
  44. 7825334 Split AndroidRuntime into AndroidRuntimeBase base-class and the rest. by Andreas Huber · 11 years ago
  45. b1ed19a am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code" by Narayan Kamath · 11 years ago
  46. d2507a2 Fix in MediaMuxer's JNI code by Ashok Bhat · 11 years ago
  47. b341a24 Merge "Remove no longer needed http proxy handling code, it's obsolete now" by Andreas Huber · 11 years ago
  48. 7da2747 Merge "android_media_MediaMuxer_setLocation: amended signature." by Robert Shih · 11 years ago
  49. f8a0c47 Remove no longer needed http proxy handling code, it's obsolete now by Andreas Huber · 11 years ago
  50. 3cb7849 android_media_MediaMuxer_setLocation: amended signature. by Robert Shih · 11 years ago
  51. d2506a5 FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code by Andreas Huber · 11 years ago
  52. 10586ad am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer" by Zhijun He · 11 years ago
  53. 0a1b64f Merge "Release locked buffer when it fails to acquire graphics buffer" by Zhijun He · 11 years ago
  54. a039843 AArch64: Make graphics classes 64-bit compatible by Ashok Bhat · 11 years ago
  55. 36bef0b AArch64: Make graphics classes 64-bit compatible by Ashok Bhat · 11 years ago
  56. 3347789 Release locked buffer when it fails to acquire graphics buffer by lina.x.pi · 11 years ago
  57. aba6713 API that allows usage of MediaCodec APIs without polling. by Andreas Huber · 11 years ago
  58. 7023df0 Revert "AArch64: Make graphics classes 64-bit compatible" by Narayan Kamath · 11 years ago
  59. 18b4cbe AArch64: Make graphics classes 64-bit compatible by Ashok Bhat · 11 years ago
  60. 0937eed Check that the exif bits are actually there by Marco Nelissen · 11 years ago
  61. 6bb5cb2 Resolved conflicts for merge of 28c6ec02 to master by Narayan Kamath · 11 years ago
  62. 075e9a1 AArch64: Use long for pointers in media classes by Ashok Bhat · 11 years ago
  63. 633f8c2 am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  64. 337aa37 Merge "Add NULL check in updateProxyConfig" by Marco Nelissen · 11 years ago
  65. 92351c5 libjhead_jni is still needed by Marco Nelissen · 11 years ago
  66. 08af2ca am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm" by Jason Sams · 11 years ago
  67. 868173a Merge "Fix a JNI local reference leak in MediaDrm" by Jason Sams · 11 years ago
  68. 3cd393c Make MtpDatabase use libexif instead of libjhead by Marco Nelissen · 11 years ago
  69. c975437 am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes" by Narayan Kamath · 11 years ago
  70. 819f2e1 am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes" by Narayan Kamath · 11 years ago
  71. e434ddd am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes" by Narayan Kamath · 11 years ago
  72. ac8bd53 am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream" by Narayan Kamath · 11 years ago
  73. e2e5932 AArch64: Use long for pointers in MTP classes by Ashok Bhat · 11 years ago
  74. 44ba5c1 AArch64: Use long for pointers in VideoEditor classes by Ashok Bhat · 11 years ago
  75. ea7861c AArch64: Use long for pointers in audio effect classes by Ashok Bhat · 11 years ago
  76. b348c3f AArch64: Use long for pointers in AmrInputStream by Ashok Bhat · 11 years ago
  77. 83cc994 MediaRecorder: add getSurface() api and SURFACE video source by Chong Zhang · 11 years ago
  78. e754e78 Merge "libexif is now libjhead" by Marco Nelissen · 11 years ago
  79. 7f6abf8 libexif is now libjhead by Marco Nelissen · 11 years ago
  80. f3172c6 Merge "MediaDrm#mNativeContext is a long, not int." by Narayan Kamath · 11 years ago
  81. 265551a Fix a JNI local reference leak in MediaDrm by Patrik2 Carlsson · 11 years ago
  82. e795ec7 Add NULL check in updateProxyConfig by Oscar Rydhé · 11 years ago
  83. 535daa1 Remove unused field from MediaMuxer by Narayan Kamath · 11 years ago
  84. f11dd63 MediaDrm#mNativeContext is a long, not int. by Narayan Kamath · 11 years ago
  85. 656fd04 AArch64: Use long for pointers in MediaDrm and MediaMuxer by Ashok Bhat · 11 years ago
  86. dbccd44a Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD by The Android Open Source Project · 11 years ago
  87. 99f7521 Fix a JNI local reference leak in JNIMediaPlayerListener::notify. by Elliott Hughes · 11 years ago
  88. fd2e500 Fix hang by Marco Nelissen · 11 years ago
  89. badca26 Add audio level monitoring capabilities in Visualizer effect by Jean-Michel Trivi · 11 years ago
  90. 4eda9f5 ImageReader: disable NV21 support by Zhijun He · 11 years ago
  91. 9e6d073 ImageReader: fix the 0 crop rect size issue by Zhijun He · 11 years ago
  92. 5cf86aa Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev by Igor Murashkin · 11 years ago
  93. 26cb5fd Merge "media: Update ImageReader APIs" into klp-dev by Igor Murashkin · 11 years ago
  94. cfa5533 ImageReader: get correct crop size by Zhijun He · 11 years ago
  95. e3351f1 media: Update ImageReader to remove MaxImagesAcquiredException by Igor Murashkin · 11 years ago
  96. 5e71206 media: Update ImageReader APIs by Igor Murashkin · 11 years ago
  97. 91019c9 Merge "Remove dependency on JNIHelp header side effects." into klp-dev by Ruben Brunk · 11 years ago
  98. 3768213 ImageReader: Skip size check for BLOB format by Zhijun He · 11 years ago
  99. 87eac99 Remove dependency on JNIHelp header side effects. by Ruben Brunk · 11 years ago
  100. cfd4748 MediaMuxer: Add setLocation API by Zhijun He · 11 years ago