1. ce177bb Merge "AudioTrackShared cleanup" by Glenn Kasten · 12 years ago
  2. 303d783 Merge "Fix AudioTrack::flush()" by Glenn Kasten · 12 years ago
  3. 050501d Fix AudioTrack::flush() by Glenn Kasten · 12 years ago
  4. 1c0e7a9 am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  5. cf5dd91 am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  6. ceb1f0a Merge "Pass additional arg to acquireBuffer calls." by Andy McFadden · 12 years ago
  7. 132a4fb am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag during still capture by Zhijun He · 12 years ago
  8. b0dfd46 Fix type error in AudioTrack::processAudioBuffer by Glenn Kasten · 12 years ago
  9. 1bb5925 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  10. ba83e61 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  11. 0a95b17 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  12. adaa78c am a2520db0: camera2/3: set preview callback oneshot flag during still capture by Zhijun He · 12 years ago
  13. af06050 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  14. 656e862 Pass additional arg to acquireBuffer calls. by Andy McFadden · 12 years ago
  15. a2520db camera2/3: set preview callback oneshot flag during still capture by Zhijun He · 12 years ago
  16. 551abab am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers by Eino-Ville Talvala · 12 years ago
  17. 06a4604 am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers by Eino-Ville Talvala · 12 years ago
  18. 6760cfd am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  19. 2919677 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  20. 9046684 am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master by Jean-Baptiste Queru · 12 years ago
  21. 1468dd9 am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master by Jean-Baptiste Queru · 12 years ago
  22. c582fde resolved conflicts for merge of c158971f to stage-aosp-master by Jean-Baptiste Queru · 12 years ago
  23. 4a5c009 Camera2/3: As a fallback, unilaterally free old recording buffers by Eino-Ville Talvala · 12 years ago
  24. c158971 Merge "Store rtsp accessunit until PLAY response parsed" by Jean-Baptiste Queru · 12 years ago
  25. 91a582c am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 12 years ago
  26. 8ebdfa8 am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 12 years ago
  27. 5de9ef2 am 365ed394: Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 12 years ago
  28. 365ed39 Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 12 years ago
  29. 680e9b5 am c26ab375: am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack" by Jean-Baptiste Queru · 12 years ago
  30. c26ab37 am 5d2ab2a6: am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack" by Jean-Baptiste Queru · 12 years ago
  31. 90eb959 am 046d9c8d: am 06197925: am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero." by Jean-Baptiste Queru · 12 years ago
  32. 1545d35 am 9f0e0597: am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource" by Jean-Baptiste Queru · 12 years ago
  33. 046d9c8 am 06197925: am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero." by Jean-Baptiste Queru · 12 years ago
  34. 5d2ab2a am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack" by Jean-Baptiste Queru · 12 years ago
  35. 9f0e059 am 7266bc80: am ca7f1609: Merge "Prevent double disconnects in RTSPSource" by Jean-Baptiste Queru · 12 years ago
  36. 8eef093 Merge "libstagefright: Use LOG_BASIC when use chromium http stack" by Jean-Baptiste Queru · 12 years ago
  37. 0619792 am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero." by Jean-Baptiste Queru · 12 years ago
  38. 7266bc8 am ca7f1609: Merge "Prevent double disconnects in RTSPSource" by Jean-Baptiste Queru · 12 years ago
  39. 267363e Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero." by Jean-Baptiste Queru · 12 years ago
  40. ca7f160 Merge "Prevent double disconnects in RTSPSource" by Jean-Baptiste Queru · 12 years ago
  41. 0bc32ae Merge "Explicitly compare raw pointers to NULL" by Glenn Kasten · 12 years ago
  42. 9939943 Merge "mv libcpustats from frameworks/native to frameworks/av" by Glenn Kasten · 12 years ago
  43. 15e5c9f merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  44. 69adec5 am 9a25c012: am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev by Jeff Tinker · 12 years ago
  45. 9a25c01 am eced745a: Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev by Jeff Tinker · 12 years ago
  46. eced745 Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev by Jeff Tinker · 12 years ago
  47. 3d3f67f Part of fix for TEE resource leaks when app crashes by Jeff Tinker · 12 years ago
  48. 20ed5f4 am ace2378c: am f59a4b39: fix scheduling policy service death detection by Eric Laurent · 12 years ago
  49. ace2378 am f59a4b39: fix scheduling policy service death detection by Eric Laurent · 12 years ago
  50. b9b8d14 Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero. by hovanchen · 12 years ago
  51. 7c5977f Explicitly compare raw pointers to NULL by Glenn Kasten · 12 years ago
  52. 7db7df0 AudioTrackShared cleanup by Glenn Kasten · 12 years ago
  53. 1ab85ec Include what is needed by Glenn Kasten · 12 years ago
  54. f59a4b3 fix scheduling policy service death detection by Eric Laurent · 12 years ago
  55. 8f13428 Merge "Camera2Api: Creating a JPEG stream needs to use the right size" by Eino-Ville Talvala · 12 years ago
  56. c7ba4a5 Camera2Api: Creating a JPEG stream needs to use the right size by Eino-Ville Talvala · 12 years ago
  57. 2c1648d am f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  58. f64bd47 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  59. 0ad03bc Prevent double disconnects in RTSPSource by Fredrik Rosin · 12 years ago
  60. fc99165 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  61. 3b94266 am 0eefffd8: am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed" by Andreas Huber · 12 years ago
  62. 0eefffd am 47a1fe04: am a9aa6baa: Merge "Set u.ext_data to null after it has been freed" by Andreas Huber · 12 years ago
  63. 47a1fe0 am a9aa6baa: Merge "Set u.ext_data to null after it has been freed" by Andreas Huber · 12 years ago
  64. a9aa6ba Merge "Set u.ext_data to null after it has been freed" by Andreas Huber · 12 years ago
  65. 1b88b41 Update HTTP proxy configuration for all media playback inside stagefright. by Andreas Huber · 12 years ago
  66. f761cec am 903871da: am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'." by Glenn Kasten · 12 years ago
  67. 226939c Merge "Public API changes for audio offload support." by Eric Laurent · 12 years ago
  68. 25d729c resolved conflicts for merge of 364a2677 to master by Eino-Ville Talvala · 12 years ago
  69. 903871d am 83790fcc: am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'." by Glenn Kasten · 12 years ago
  70. 83790fc am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'." by Glenn Kasten · 12 years ago
  71. bdf33c9 Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'." by Glenn Kasten · 12 years ago
  72. 364a267 am a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist. by Eino-Ville Talvala · 12 years ago
  73. fca8125 Set u.ext_data to null after it has been freed by Christer Fletcher · 12 years ago
  74. ad3af33 Public API changes for audio offload support. by Richard Fitzgerald · 12 years ago
  75. a691ff3 Camera2/3: Don't allow recording and callbacks to coexist. by Eino-Ville Talvala · 12 years ago
  76. 7d40969 Fix compilation warning: incorrect format specifier for type 'ssize_t'. by Scott Fan · 12 years ago
  77. 7919fa2 am bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  78. 414abc5 am 1aee0be6: am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link" by Jean-Baptiste Queru · 12 years ago
  79. bdebd48 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  80. 3b6d6b1 Merge "Adds VP9 decoding support for stagefright." by Lajos Molnar · 12 years ago
  81. 1aee0be am 3a4ff0b8: am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link" by Jean-Baptiste Queru · 12 years ago
  82. 3a4ff0b am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link" by Jean-Baptiste Queru · 12 years ago
  83. d74a9ee Merge "libstagefright: fix the duration "00:00" for some httplive link" by Jean-Baptiste Queru · 12 years ago
  84. 01128a0 Merge "Workaround AudioRecord bug for large buffer sizes" by Glenn Kasten · 12 years ago
  85. 269e91b Merge "Use mFutex as an event flag rather than semaphore" by Glenn Kasten · 12 years ago
  86. d44ffc8 Merge changes I5b2eeab2,I71568560 by Igor Murashkin · 12 years ago
  87. 31484d8 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  88. e3b3777 Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD by The Android Automerger · 12 years ago
  89. 93bb77d Workaround AudioRecord bug for large buffer sizes by Glenn Kasten · 12 years ago
  90. 0d09a9b Use mFutex as an event flag rather than semaphore by Glenn Kasten · 12 years ago
  91. 94705af Adds VP9 decoding support for stagefright. by hkuang · 12 years ago
  92. b68fc26 Merge "stagefright: support for video decoder metadata mode" by Lajos Molnar · 12 years ago
  93. 054e734 stagefright: support for video decoder metadata mode by Lajos Molnar · 12 years ago
  94. a2cf13c am e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  95. e6105c2 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  96. 285aa3a merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  97. d77312b am 455479bc: am 209bbbcf: Apply EQ and bass boost first in effect chain by Jean-Michel Trivi · 12 years ago
  98. 455479b am 209bbbcf: Apply EQ and bass boost first in effect chain by Jean-Michel Trivi · 12 years ago
  99. 98e2472 Make android.hardware.photography.Camera work on HAL3+ devices by Igor Murashkin · 12 years ago
  100. e7ee763 Initial implementation of android.hardware.photography.CameraDevice (service) by Igor Murashkin · 12 years ago