1. 65d30dd Merge "Remove obsolete TrackBase::reset()" by Glenn Kasten · 11 years ago
  2. 422801c Merge "HAL stream format for mixer output threads must be stereo 16-bit PCM" by Glenn Kasten · 11 years ago
  3. 94ea60f stagefright: offload playback support by Richard Fitzgerald · 11 years ago
  4. d89532e libmediaplayerservice: offload playback support by Richard Fitzgerald · 11 years ago
  5. a8356f6 Simplify RecordTrack::stop() by Glenn Kasten · 11 years ago
  6. fc38a2e CBLK_OVERRUN, not CBLK_UNDERRUN, is for record threads by Glenn Kasten · 11 years ago
  7. 0fea74c Remove obsolete TrackBase::reset() by Glenn Kasten · 11 years ago
  8. b1a270d libmedia: offloaded playback support by Richard Fitzgerald · 11 years ago
  9. bfb1b83 AudioFlinger: offload playback, non-blocking write by Eric Laurent · 12 years ago
  10. 9e8fcbc Move delete AudioMixer closer to point of re-allocation by Glenn Kasten · 11 years ago
  11. 7fc97ba HAL stream format for mixer output threads must be stereo 16-bit PCM by Glenn Kasten · 11 years ago
  12. d8ea699 Simplify getParameters() by Glenn Kasten · 11 years ago
  13. 34542ac Move local variable declarations to point of first use by Glenn Kasten · 11 years ago
  14. fc5ea08 Merge "Update error message" by Andy McFadden · 11 years ago
  15. fad226a Use standard name and type for channel mask by Glenn Kasten · 11 years ago
  16. 92cb8f9 Update error message by Andy McFadden · 11 years ago
  17. 291bb6d AudioRecord and HAL input stream must be 16-bit PCM only by Glenn Kasten · 11 years ago
  18. 39a6031 Merge "camera2: Implement ICameraDeviceUser::waitUntilIdle" by Zhijun He · 11 years ago
  19. 2a65cc8 Merge "Remove obsolete drm manager code" by Jeff Tinker · 11 years ago
  20. de7c96a Merge "Don't abort on unusual state transition" by Andy McFadden · 11 years ago
  21. d1fbc46 Merge "Prototype screen recording command" by Andy McFadden · 11 years ago
  22. 1f5a90b Prototype screen recording command by Andy McFadden · 11 years ago
  23. ba812e3 Don't abort on unusual state transition by Andy McFadden · 11 years ago
  24. f355f18 Remove obsolete drm manager code by Jeff Tinker · 11 years ago
  25. 4e0a584 Merge "Fix typo in socket name" by Geremy Condra · 11 years ago
  26. 59d3f80 Fix typo in socket name by Chad Brubaker · 11 years ago
  27. 2ab500c camera2: Implement ICameraDeviceUser::waitUntilIdle by Zhijun He · 11 years ago
  28. 0429aa9 Merge "Add routing sockets for the requesting user" by Geremy Condra · 11 years ago
  29. 4711005 Camera: ProCamera connect need support HAL3 device by Zhijun He · 11 years ago
  30. 01061c1 Merge "Use AudioSystem::setLowRamDevice() to configure memory" by Glenn Kasten · 11 years ago
  31. cb155c8 Merge "Revert "Fix Audioflinger crash when TeeSink is enabled"" by Glenn Kasten · 11 years ago
  32. 18cf609 Merge "Fix compile warning" by Glenn Kasten · 11 years ago
  33. 288abb6 Merge "camera2: Fix request ID bug" by Zhijun He · 11 years ago
  34. cd63212 Merge "update to new Consumer APIs" by Mathias Agopian · 11 years ago
  35. 83e5c37 am f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  36. e4bc8db am b0177ff2: am 46910bdc: Camera2/3: Fix deadlock when starting recording before preview. by Eino-Ville Talvala · 11 years ago
  37. d118343 Merge "Make AudioFlinger::instantiate() more resilient when called from separate module" by Glenn Kasten · 11 years ago
  38. 5908f88 Add routing sockets for the requesting user by Chad Brubaker · 11 years ago
  39. f2d744d Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  40. 336da16 Enable support for explicitly requesting an encoded keyframe from the vp8 by Andreas Huber · 11 years ago
  41. b0177ff am 46910bdc: Camera2/3: Fix deadlock when starting recording before preview. by Eino-Ville Talvala · 11 years ago
  42. fe0799e camera2: Fix request ID bug by Zhijun He · 11 years ago
  43. a05822a Minor tweaks to DirectRenderer and Converter by Andreas Huber · 11 years ago
  44. 1b8ae3d Fix compile warning by Glenn Kasten · 11 years ago
  45. 4182c4e Use AudioSystem::setLowRamDevice() to configure memory by Glenn Kasten · 11 years ago
  46. 0d61251 Revert "Fix Audioflinger crash when TeeSink is enabled" by Glenn Kasten · 11 years ago
  47. 153b9fe Make AudioFlinger::instantiate() more resilient when called from separate module by Glenn Kasten · 11 years ago
  48. a0e0ade Camera2/3: Fix deadlock when starting recording before preview. by Eino-Ville Talvala · 11 years ago
  49. 46910bd Camera2/3: Fix deadlock when starting recording before preview. by Eino-Ville Talvala · 11 years ago
  50. 20f4754 Merge "ANetworkSession and ParsedMessage are now part of stagefright foundation." by Andreas Huber · 11 years ago
  51. 8060060 ANetworkSession and ParsedMessage are now part of stagefright foundation. by Andreas Huber · 11 years ago
  52. 760874c Merge "stagefright: set scaling mode for blank frames in ACodec" by Dima Zavin · 11 years ago
  53. 87eb285 stagefright: set scaling mode for blank frames in ACodec by Dima Zavin · 11 years ago
  54. 9d7376a Merge "Fix theoretical memory leak in mConfigEvents" by Glenn Kasten · 11 years ago
  55. c6ae3c8 Fix theoretical memory leak in mConfigEvents by Glenn Kasten · 11 years ago
  56. bea3d3e Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT" by Glenn Kasten · 11 years ago
  57. 0b83a15 Merge "Support "suspension" of a video encoder in "surface-input" mode." by Andreas Huber · 11 years ago
  58. e40cda7 Support "suspension" of a video encoder in "surface-input" mode. by Andreas Huber · 11 years ago
  59. 41f9f1a Merge "Experimental support for enabling the use of "surface input" mode" by Andreas Huber · 11 years ago
  60. a0a63e1 Experimental support for enabling the use of "surface input" mode by Andreas Huber · 11 years ago
  61. 3a24dfc Merge "Output more detailed error message if loading library fails" by leozwang@google.com · 11 years ago
  62. d1eff57 Output more detailed error message if loading library fails by leozwang@google.com · 11 years ago
  63. ee5e8d3 Merge "Fix indentation" by Glenn Kasten · 11 years ago
  64. cff1b23 Merge "Add comments" by Glenn Kasten · 11 years ago
  65. bb849b5 Merge "Fix typo in logs" by Glenn Kasten · 11 years ago
  66. 5e1f08b update to new Consumer APIs by Mathias Agopian · 11 years ago
  67. 5478f3c Merge "always pass the BufferQueue explicitely to consumers" by Mathias Agopian · 11 years ago
  68. 099b457 camera2: Implement ICameraDeviceUser::getCameraInfo by Igor Murashkin · 11 years ago
  69. 8d764bf always pass the BufferQueue explicitely to consumers by Mathias Agopian · 11 years ago
  70. ce177bb Merge "AudioTrackShared cleanup" by Glenn Kasten · 11 years ago
  71. 303d783 Merge "Fix AudioTrack::flush()" by Glenn Kasten · 11 years ago
  72. 050501d Fix AudioTrack::flush() by Glenn Kasten · 11 years ago
  73. 1c0e7a9 am 1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  74. cf5dd91 am 0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  75. ceb1f0a Merge "Pass additional arg to acquireBuffer calls." by Andy McFadden · 11 years ago
  76. 132a4fb am adaa78c9: am a2520db0: camera2/3: set preview callback oneshot flag during still capture by Zhijun He · 11 years ago
  77. 3d19825 Fix indentation by Glenn Kasten · 11 years ago
  78. fb1fdc9 Add comments by Glenn Kasten · 11 years ago
  79. b0dfd46 Fix type error in AudioTrack::processAudioBuffer by Glenn Kasten · 11 years ago
  80. b7f08d3 Clean up references to AUDIO_FORMAT_PCM_8_24_BIT by Glenn Kasten · 11 years ago
  81. 1bb5925 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  82. ba83e61 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  83. f90b123 Fix typo in AwesomePlayer by Sungsoo Lim · 11 years ago
  84. 0a95b17 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  85. adaa78c am a2520db0: camera2/3: set preview callback oneshot flag during still capture by Zhijun He · 11 years ago
  86. af06050 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  87. 656e862 Pass additional arg to acquireBuffer calls. by Andy McFadden · 11 years ago
  88. a2520db camera2/3: set preview callback oneshot flag during still capture by Zhijun He · 11 years ago
  89. 551abab am 06a4604e: am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers by Eino-Ville Talvala · 11 years ago
  90. 06a4604 am 4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers by Eino-Ville Talvala · 11 years ago
  91. 6760cfd am 29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  92. 2919677 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  93. 9046684 am 1468dd9c: am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master by Jean-Baptiste Queru · 11 years ago
  94. 1468dd9 am c582fde9: resolved conflicts for merge of c158971f to stage-aosp-master by Jean-Baptiste Queru · 11 years ago
  95. c582fde resolved conflicts for merge of c158971f to stage-aosp-master by Jean-Baptiste Queru · 11 years ago
  96. 4a5c009 Camera2/3: As a fallback, unilaterally free old recording buffers by Eino-Ville Talvala · 11 years ago
  97. c158971 Merge "Store rtsp accessunit until PLAY response parsed" by Jean-Baptiste Queru · 11 years ago
  98. 91a582c am 8ebdfa8b: am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 11 years ago
  99. 8ebdfa8 am 5de9ef20: am 365ed394: Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 11 years ago
  100. 5de9ef2 am 365ed394: Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 11 years ago