1. cec40f9 Removed unnecessary include JNI from two drm Android.mk files by James Dong · 12 years ago
  2. 559bf28 AV Android make files changes by James Dong · 12 years ago
  3. b0b2b4d Merge media files with history from frameworks/base.git by Anatol Pomozov · 12 years ago
  4. 5a5491c Merge "Use a status_t return type for GL functors" by Romain Guy · 12 years ago
  5. 00a10e8 Use a status_t return type for GL functors by Romain Guy · 12 years ago
  6. 4116807 stagefright: compile without chromium for pdk builds by Colin Cross · 12 years ago
  7. 1514727 Merge "Provisional support for secure decryption of media streams." by Andreas Huber · 12 years ago
  8. b14f182 Merge "Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h" by James Dong · 12 years ago
  9. 48a98a5 Merge "fix visualizer inactivity detection" by Eric Laurent · 12 years ago
  10. ed3e3e0 Provisional support for secure decryption of media streams. by Andreas Huber · 12 years ago
  11. 131c36e Merge "reorganize SoundPool and JetPlayer code." by Eric Laurent · 12 years ago
  12. 1f08900 Merge changes Ib4d0e0c0,Iea8f4a23 by Colin Cross · 12 years ago
  13. 6eb463b Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h by James Dong · 12 years ago
  14. 183dc77 fix visualizer inactivity detection by Eric Laurent · 12 years ago
  15. 2e66a78 reorganize SoundPool and JetPlayer code. by Eric Laurent · 12 years ago
  16. cc1110d Add TRACK_FAST for IAudioFlinger::createTrack by Glenn Kasten · 12 years ago
  17. b83d38f Merge "IAudioFlinger::createTrack and openRecord flags" by Glenn Kasten · 12 years ago
  18. 60d3a41 libmedia: remove skia include by Colin Cross · 12 years ago
  19. 26a417f stagefright: remove dependency on skia by Colin Cross · 12 years ago
  20. 8f7f7ad remove jni.h include from IOMX.h by Colin Cross · 12 years ago
  21. f500aba Merge "Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files." by James Dong · 12 years ago
  22. 3ee2694 Remove JNI in LOCAL_C_INCLUDE from non-JNI related Android.mk files. by James Dong · 12 years ago
  23. be9b24b Fixed missing return value from a method should have returned status_t by James Dong · 12 years ago
  24. 51f8eec Resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni by James Dong · 12 years ago
  25. ef36d49 Merge "Revert "Split libmedia into libmedia and libmedia_native"" by Glenn Kasten · 12 years ago
  26. 78b5e82 Revert "Split libmedia into libmedia and libmedia_native" by Glenn Kasten · 12 years ago
  27. fdac94a Merge "Revert "AudioFlinger does not need libmedia any more"" by Glenn Kasten · 12 years ago
  28. d12c68a Revert "AudioFlinger does not need libmedia any more" by Glenn Kasten · 12 years ago
  29. bc8b5fa Fix the file mimetype reported by the mpeg4 extractor. by Andreas Huber · 12 years ago
  30. ecb3110 Make file change because libvideoeditor source files moved by James Dong · 12 years ago
  31. 5291274 Merge "Merge remote-tracking branch 'goog/ics-aah-exp' into merge" by Mike Lockwood · 12 years ago
  32. d71fb1b Merge remote-tracking branch 'goog/ics-aah-exp' into merge by Mike Lockwood · 12 years ago
  33. 4f5da11 AudioFlinger does not need libmedia any more by Glenn Kasten · 12 years ago
  34. ab55517 Merge "Use NuPlayer for media playback everywhere" by Andreas Huber · 12 years ago
  35. afed0e1 Use NuPlayer for media playback everywhere by Andreas Huber · 13 years ago
  36. f4a9fb6 LibAAH_RTP: Fix an issue which crept in during code review. by John Grossman · 12 years ago
  37. a411f77 Merge "Remove enforceFrameCount" by Glenn Kasten · 12 years ago
  38. a98478b Support gapless playback for mp3 and m4a by Marco Nelissen · 12 years ago
  39. 898b11f Merge "Split libmedia into libmedia and libmedia_native" by Glenn Kasten · 12 years ago
  40. 19ba8b4 Merge remote-tracking branch 'goog/ics-aah-exp' by Mike Lockwood · 12 years ago
  41. c524ffd Split libmedia into libmedia and libmedia_native by Glenn Kasten · 12 years ago
  42. 291f4d5 Remove enforceFrameCount by Glenn Kasten · 12 years ago
  43. 2f694b3 Merge "Add MetaData::dumpToLog" by Marco Nelissen · 12 years ago
  44. feba11f Add MetaData::dumpToLog by Marco Nelissen · 12 years ago
  45. 29f0c37 LibAAH_RTP: Properly handle EOS conditions. by John Grossman · 12 years ago
  46. 6373153 LibAAH_RTP: Get rid of PipeEvent by John Grossman · 12 years ago
  47. f4d5e64 LibAAH_RTP: Add unicast mode support to the RXPlayer by John Grossman · 12 years ago
  48. 011a306 LibAAH_RTP: Fix a stuttering audio bug. by John Grossman · 12 years ago
  49. f4c7156 LibAAH_RTP: Refactor TXGroup code, add unicast mode. by John Grossman · 12 years ago
  50. 4949c36 Merge "Parse gapless info from mp4 files" by Marco Nelissen · 12 years ago
  51. f209ed7 LibAAH_RTP: Change names to prepare for refactor. by John Grossman · 12 years ago
  52. 5d2f8ba Parse gapless info from mp4 files by Marco Nelissen · 12 years ago
  53. d2d24d8 am fcf2f4b1: am 98e1b541: Reconcile with ics-mr1-release by The Android Open Source Project · 12 years ago
  54. ad9c852 am 98e1b541: Reconcile with ics-mr1-release by The Android Open Source Project · 12 years ago
  55. 0447732 Reconcile with ics-mr1-release by The Android Open Source Project · 12 years ago
  56. bcd5944 am a4a09465: am 35a8f94d: Reconcile with ics-mr1-release by The Android Open Source Project · 12 years ago
  57. c5c4939 Merge "Clean up Track constructor" by Glenn Kasten · 12 years ago
  58. 0ff7b8e am 35a8f94d: Reconcile with ics-mr1-release by The Android Open Source Project · 12 years ago
  59. b6bf4cc Reconcile with ics-mr1-release by The Android Open Source Project · 12 years ago
  60. ccf89b5 Merge "AudioMixer can be configured for fewer max tracks" by Glenn Kasten · 12 years ago
  61. 63c1faa Merge "Update comments" by Glenn Kasten · 12 years ago
  62. 7153494 Merge "Whitespace" by Glenn Kasten · 12 years ago
  63. a26ff6f Merge "new doesn't fail on Android" by Glenn Kasten · 12 years ago
  64. 903626b am d58b6cd1: am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  65. 9a5f413 am a48285c4: am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  66. 65b5a46 am 044e7503: am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 12 years ago
  67. 286df86 resolved conflicts for merge of ec94ecad to master by Eric Laurent · 12 years ago
  68. e9ddbf9 Merge "Handling end times of subtitles." by James Dong · 12 years ago
  69. bae00e7 Handling end times of subtitles. by Insun Kang · 12 years ago
  70. efbdae2 am eb99cacc: am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp by Eric Laurent · 12 years ago
  71. 59a1423 am 04353390: resolved conflicts for merge of 393dd03e to ics-scoop-plus-aosp by Eric Laurent · 12 years ago
  72. 5c94b6c AudioMixer can be configured for fewer max tracks by Glenn Kasten · 12 years ago
  73. f995901 Clean up Track constructor by Glenn Kasten · 12 years ago
  74. 16252eb Add libmedia_native by Glenn Kasten · 12 years ago
  75. 4dceed6 Merge "Add libmedia_native" by Glenn Kasten · 12 years ago
  76. f6e7ad1 Merge "Move COM tag parsing to constructor" by Marco Nelissen · 12 years ago
  77. 092406a Move COM tag parsing to constructor by Marco Nelissen · 12 years ago
  78. 6da08fc Merge "Parse mp3 encoder padding/delay" by Marco Nelissen · 12 years ago
  79. b636abd Parse mp3 encoder padding/delay by Marco Nelissen · 12 years ago
  80. fa6494d Merge "Do not set camera preview display if the surface is null." by Wu-cheng Li · 12 years ago
  81. ea7939a Whitespace by Glenn Kasten · 12 years ago
  82. 2ee367e Add libmedia_native by Glenn Kasten · 12 years ago
  83. 1bb8e81 Merge "Add libmedia_native" by Glenn Kasten · 12 years ago
  84. 17a736c Update comments by Glenn Kasten · 12 years ago
  85. a035676 new doesn't fail on Android by Glenn Kasten · 12 years ago
  86. a075db4 IAudioFlinger::createTrack and openRecord flags by Glenn Kasten · 12 years ago
  87. da394bb am cbc90453: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  88. f607e2e am 165ee4c5: am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  89. 9d7b4c0 am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  90. 0f5591d am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  91. 5616e66 am 14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  92. 4ade008 Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1 by Eric Laurent · 12 years ago
  93. 1746929 Merge "audio_channel_in/out_mask_from_count" by Glenn Kasten · 12 years ago
  94. 8e0792b Do not set camera preview display if the surface is null. by Wu-cheng Li · 12 years ago
  95. 89d94e7 audioflinger: fix issue with camcorder and A2DP by Eric Laurent · 12 years ago
  96. bd98366 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 12 years ago
  97. eb47ddf am eaa08d35: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 12 years ago
  98. bfc4cdf am b1853f70: am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 12 years ago
  99. 7d372bd am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 by Eric Laurent · 12 years ago
  100. c7c8375 am b388138f: resolved conflicts for merge of 3fe7ee65 to ics-mr1-plus-aosp by Eric Laurent · 12 years ago