1. 6f444c9 Merge "Make sure the ThrottledSource reports the proper mime type" by Andreas Huber · 14 years ago
  2. bd9c9a80 Make sure the ThrottledSource reports the proper mime type by Andreas Huber · 14 years ago
  3. aeeb7e2 resolved conflicts for merge of 05683c85 to master by Eric Laurent · 14 years ago
  4. 27a0d83 Merge "Fix incorrect includes of AudioTrack.h" by Glenn Kasten · 14 years ago
  5. 241fc78 Merge "Simplify range check for audio_mode_t (continued)" by Glenn Kasten · 14 years ago
  6. 86905f4 Merge "Add units to time periods" by Glenn Kasten · 14 years ago
  7. ca42b28 Merge "Use const const strings for arrays and pointers to strings" by Glenn Kasten · 14 years ago
  8. 5cb73e7 Merge "For booleans, use ! instead of == false" by Glenn Kasten · 14 years ago
  9. 9e5af59 am db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1 by Eric Laurent · 14 years ago
  10. a3f1fa3 Fix incorrect includes of AudioTrack.h by Glenn Kasten · 14 years ago
  11. 347966c Simplify range check for audio_mode_t (continued) by Glenn Kasten · 14 years ago
  12. 22ecc91 Add units to time periods by Glenn Kasten · 14 years ago
  13. 8dad0e3 Use const const strings for arrays and pointers to strings by Glenn Kasten · 14 years ago
  14. f1d4592 For booleans, use ! instead of == false by Glenn Kasten · 14 years ago
  15. 2774144 AudioFlinger: mix track only when really ready (2) by Eric Laurent · 14 years ago
  16. b93db88 Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures" by Andreas Huber · 14 years ago
  17. c813985 Temporarily restore AudioSystem/AudioTrack APIs with their former signatures by Andreas Huber · 14 years ago
  18. 77418fc Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)" by Andreas Huber · 14 years ago
  19. 6c90884 Merge "Make sure seek triggers a reconnect if needed." by Bryan Mawhinney · 14 years ago
  20. 04eaf3e Merge "Track volume cleanup" by Glenn Kasten · 14 years ago
  21. 40a4e14 Make sure seek triggers a reconnect if needed. by Bryan Mawhinney · 14 years ago
  22. 63ad6aa Merge "audio framework: manage stream volume per device" by Eric Laurent · 14 years ago
  23. b1cf75c Track volume cleanup by Glenn Kasten · 14 years ago
  24. 83844cc audio framework: manage stream volume per device by Eric Laurent · 14 years ago
  25. f237a30 Merge "Remove dead setVolume() and mVolume[2]" by Glenn Kasten · 14 years ago
  26. ad0f6cc Remove dead setVolume() and mVolume[2] by Glenn Kasten · 14 years ago
  27. 3f6448e Move fixed_fft to system/media/audio_utils by Glenn Kasten · 14 years ago
  28. 0696400 Merge "Use audio_mode_t consistently" by Glenn Kasten · 14 years ago
  29. a9b21c5 Rename Visualizer::mLock by Glenn Kasten · 14 years ago
  30. 263709e Check stream type in AudioFlinger::createTrack by Glenn Kasten · 14 years ago
  31. 3944e03 Merge "Fix locking for mMasterVolume and mMute" by Glenn Kasten · 14 years ago
  32. 6138822 Merge "Use size_t for frame size" by Glenn Kasten · 14 years ago
  33. 0107954 Merge "Use audio_stream_type_t consistently" by Glenn Kasten · 14 years ago
  34. b9ac200 Merge "AudioTrack and AudioFlinger send level cleanup" by Glenn Kasten · 14 years ago
  35. ec2e74b AVIExtractor: adding a H264 fourCC which is also specified in the reference. by Dongwon Kang · 14 years ago
  36. 9806710 Fix locking for mMasterVolume and mMute by Glenn Kasten · 14 years ago
  37. 05632a5 AudioTrack and AudioFlinger send level cleanup by Glenn Kasten · 14 years ago
  38. b998065 Use size_t for frame size by Glenn Kasten · 14 years ago
  39. 51067c1 Merge "media/mtp: Add missing LOCAL_C_INCLUDES" by David 'Digit' Turner · 14 years ago
  40. f4e76c5 am c0ef548c: am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Jean-Baptiste Queru · 14 years ago
  41. b45e50a am d75961ee: am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Jean-Baptiste Queru · 14 years ago
  42. bcc2252 am b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace" by Jean-Baptiste Queru · 14 years ago
  43. fff6d71 Use audio_stream_type_t consistently by Glenn Kasten · 14 years ago
  44. c7a8e24 media/mtp: Add missing LOCAL_C_INCLUDES by David 'Digit' Turner · 14 years ago
  45. 0919265 Merge "Separate sniffing from session initialization" by James Dong · 14 years ago
  46. 9d2f386 Separate sniffing from session initialization by James Dong · 14 years ago
  47. 4cc55d5 Merge "Use audio_format_t consistently" by Glenn Kasten · 14 years ago
  48. f78aee7 Use audio_mode_t consistently by Glenn Kasten · 14 years ago
  49. d5a8bf0 am ce77af47: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  50. bc08dd5 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  51. b676a05 stagefright aacenc/amrwbenc: Remove trailing whitespace by Mans Rullgard · 14 years ago
  52. 7382d6a merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  53. 83bc7f3 libmedia new can't fail on Android by Glenn Kasten · 14 years ago
  54. 3bba0e0 Merge "Fix race in AudioSystem::getInputBufferSize" by Glenn Kasten · 14 years ago
  55. 5440962 Merge "Fix bug in JetPlayer::loadFromFile" by Glenn Kasten · 14 years ago
  56. e3a067f Merge "Simplify range check for audio_mode_t" by Glenn Kasten · 14 years ago
  57. e51dd6d am 05985a2e: am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1 by Eric Laurent · 14 years ago
  58. a7cbd8e am c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1 by Eric Laurent · 14 years ago
  59. c402561 Merge "Use correct type for hardware call state" by Glenn Kasten · 14 years ago
  60. 0132e12 Merge "Declare IAudioTrack methods in binder opcode order" by Glenn Kasten · 14 years ago
  61. 2ea3410 Merge "Use consistent style of & reference for AutoMutex" by Glenn Kasten · 14 years ago
  62. 22f3efd Merge "Fix missing tag in mediaserver ServiceManager: log" by Glenn Kasten · 14 years ago
  63. 9770988 Merge "AudioFlinger new can't fail" by Glenn Kasten · 14 years ago
  64. 02b2d2d Merge "Fix build warning" by Glenn Kasten · 14 years ago
  65. f8c1a6f Fix race in AudioSystem::getInputBufferSize by Glenn Kasten · 14 years ago
  66. 0049acf Fix bug in JetPlayer::loadFromFile by Glenn Kasten · 14 years ago
  67. 930f4ca Simplify range check for audio_mode_t by Glenn Kasten · 14 years ago
  68. 86d24aa stagefright: limit audio gap for looped playback by Eric Laurent · 14 years ago
  69. c1dc1cb Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE by Steve Block · 14 years ago
  70. 5f29ca3 Merge "By convention const goes before the type specifier" by Glenn Kasten · 14 years ago
  71. 25b248e Use cached reference to media.player service by Glenn Kasten · 14 years ago
  72. 879bc64 Merge "Replace loop by __builtin_ctz" by Glenn Kasten · 14 years ago
  73. 5c7b3bc Merge "Clean up AudioTrack::mActive and stopped()" by Glenn Kasten · 14 years ago
  74. febdbfe Merge "suspended() and isSuspended() are const" by Glenn Kasten · 14 years ago
  75. 29357bc Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE by Steve Block · 14 years ago
  76. d709ca9 am 20090b30: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  77. b470ec5 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  78. d9a4d0b merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  79. 0e5ace7 am 4bc873e6: am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 by Eino-Ville Talvala · 14 years ago
  80. afb3f7f am 7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1 by Eino-Ville Talvala · 14 years ago
  81. 4a6f028 AudioFlinger new can't fail by Glenn Kasten · 14 years ago
  82. 33df529 Fix missing tag in mediaserver ServiceManager: log by Glenn Kasten · 14 years ago
  83. 1099586 Declare IAudioTrack methods in binder opcode order by Glenn Kasten · 14 years ago
  84. a7d8d6f Use consistent style of & reference for AutoMutex by Glenn Kasten · 14 years ago
  85. a4454b4 Use correct type for hardware call state by Glenn Kasten · 14 years ago
  86. 60a78ac Switch camera sounds to always use the system enforced audio stream. by Eino-Ville Talvala · 14 years ago
  87. 54c3b66 By convention const goes before the type specifier by Glenn Kasten · 14 years ago
  88. f9a2777 Fix build warning by Glenn Kasten · 14 years ago
  89. 5ff1dd5 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE by Steve Block · 14 years ago
  90. 98dd542 Replace loop by __builtin_ctz by Glenn Kasten · 14 years ago
  91. 8a08dcc Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE" by Steve Block · 14 years ago
  92. e1c3962 Use audio_format_t consistently by Glenn Kasten · 14 years ago
  93. 1dcd475 am d32ee5ba: Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  94. 9a2aaf9 Clean up AudioTrack::mActive and stopped() by Glenn Kasten · 14 years ago
  95. a3a8548 suspended() and isSuspended() are const by Glenn Kasten · 14 years ago
  96. 88592ec Merge "Remove the notion of "active track" from mixer" by Glenn Kasten · 14 years ago
  97. 22bf648 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  98. a2a0a5d Merge "Use the standard CC_LIKELY and CC_UNLIKELY macros" by Glenn Kasten · 14 years ago
  99. f6b1678 Use the standard CC_LIKELY and CC_UNLIKELY macros by Glenn Kasten · 14 years ago
  100. 7ab41c9 resolved conflicts for merge of 1a4b9939 to master by Eric Laurent · 14 years ago