1. fca092d am f4431278: am 19afb386: Merge "Remove streaming URI from default logs" by Marco Nelissen · 11 years ago
  2. 7f7ccb9 am 708601d0: (-s ours) am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed by Zhijun He · 11 years ago
  3. a441481 Merge "MTP: Add support for device property changed events" by Mike Lockwood · 11 years ago
  4. f443127 am 19afb386: Merge "Remove streaming URI from default logs" by Marco Nelissen · 11 years ago
  5. 19afb38 Merge "Remove streaming URI from default logs" by Marco Nelissen · 11 years ago
  6. 708601d am f0fb921c: am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed by Zhijun He · 11 years ago
  7. 0fa848d MTP: Add support for device property changed events by Mike Lockwood · 11 years ago
  8. f0fb921 am bc69c8ba: DO NOT MERGE: Camera: delete preview callback when preview size is changed by Zhijun He · 11 years ago
  9. 3a0fb34 Merge "Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners" by Jesse Hall · 11 years ago
  10. 4e053b1 Merge "LiveSession: fix incorrect stream key (subtitle"s")" by Robert Shih · 11 years ago
  11. cea17f2 Merge "Convert AudioFlinger mSinkBuffer to flexible format" by Andy Hung · 11 years ago
  12. c644345 Merge "AudioTrack non-blocking write" by Jean-Michel Trivi · 11 years ago
  13. e4f25c2 LiveSession: fix incorrect stream key (subtitle"s") by Robert Shih · 11 years ago
  14. 1ac1638 M3UParser: trim spaces when parsing comma separated codecs. by Robert Shih · 11 years ago
  15. 00133ae Merge "Add mEffectBuffer to AudioFlinger" by Andy Hung · 11 years ago
  16. 1574f41 Merge "Fix build warnings in fir" by Glenn Kasten · 11 years ago
  17. a4ebf13 Fix build warnings in fir by Glenn Kasten · 11 years ago
  18. e7e676f Convert AudioFlinger mSinkBuffer to flexible format by Andy Hung · 11 years ago
  19. 4860cb0 Merge "MPEG4Writer: replace timestamp asserts in threadEntry w err return." by Robert Shih · 11 years ago
  20. bc69c8b DO NOT MERGE: Camera: delete preview callback when preview size is changed by Zhijun He · 12 years ago
  21. a5ae9aa Merge "Stagefright: added WebM muxer." by Robert Shih · 11 years ago
  22. 98ef978 Add mEffectBuffer to AudioFlinger by Andy Hung · 11 years ago
  23. 3a90f28 Fix freeze on pause by Marco Nelissen · 11 years ago
  24. a8b8488 Remove streaming URI from default logs by David Williams · 13 years ago
  25. 664334f am 3a20f9af: am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 11 years ago
  26. 3a20f9a am 38efe8eb: am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 11 years ago
  27. 38efe8e am 6db20dcb: Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 11 years ago
  28. 07c34a5 Merge "httplive: clear access units before returning from seekTo." by Robert Shih · 11 years ago
  29. 6db20dc Merge "AudioTrack: When paused, return cached playback position" into klp-dev by Eric Laurent · 11 years ago
  30. 1f84e97 am 77a85ebe: am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev by Glenn Kasten · 11 years ago
  31. 9374513 am ed043625: am 4293011d: am 5874615f: Allow for larger codec private data by Marco Nelissen · 11 years ago
  32. 5ce50c1 httplive: clear access units before returning from seekTo. by Robert Shih · 11 years ago
  33. 8dcc81a Add empty onSidebandChanged callbacks to BufferQueue::ConsumerListeners by Jesse Hall · 11 years ago
  34. 77a85eb am 4ee774f3: am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev by Glenn Kasten · 11 years ago
  35. ed04362 am 4293011d: am 5874615f: Allow for larger codec private data by Marco Nelissen · 11 years ago
  36. 4ee774f am 2f55c2c0: Merge "Simplify AudioTrack stream end and fix race" into klp-dev by Glenn Kasten · 11 years ago
  37. 4293011 am 5874615f: Allow for larger codec private data by Marco Nelissen · 11 years ago
  38. 64aa53e am 4106cdf1: am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev by Marco Nelissen · 11 years ago
  39. 6278fdb Merge "Miscellaneous cleanup for NBAIO" by Glenn Kasten · 11 years ago
  40. 2f55c2c Merge "Simplify AudioTrack stream end and fix race" into klp-dev by Glenn Kasten · 11 years ago
  41. f1f5475 am 9219bfc4: am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch" by Narayan Kamath · 11 years ago
  42. 08d6608 am 3a46b975: am a9b82160: Merge "LP64 fixes for media/libeffects" by Narayan Kamath · 11 years ago
  43. ad77a5e Merge "NBAIO::Format_from_SR_C requires audio_format_t parameter" by Glenn Kasten · 11 years ago
  44. 9f916de am 31a98ad0: (-s ours) resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aosp by Narayan Kamath · 11 years ago
  45. dcec903 Simplify AudioTrack stream end and fix race by Glenn Kasten · 12 years ago
  46. 15c0240 am 621d382b: am 04352de2: am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev by Lajos Molnar · 11 years ago
  47. c333936 am 7e65e101: am 72d09f62: am 2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev by Lajos Molnar · 11 years ago
  48. 6d2ffab am d1d45fe7: am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev by Lajos Molnar · 11 years ago
  49. 1fa8504 am 414c2371: am 4dbd814d: am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev by Lajos Molnar · 11 years ago
  50. 47be393 am 6fefae26: (-s ours) am e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev by Lajos Molnar · 11 years ago
  51. 5874615 Allow for larger codec private data by Marco Nelissen · 12 years ago
  52. 4106cdf am 03729fbe: am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev by Marco Nelissen · 11 years ago
  53. 03729fb am 5bc83fc3: Merge "Fix SIGABRT when playing mp4 file" into klp-dev by Marco Nelissen · 11 years ago
  54. 5bc83fc Merge "Fix SIGABRT when playing mp4 file" into klp-dev by Marco Nelissen · 11 years ago
  55. 3a06522 am 675b80da: (-s ours) am 3bd0270c: am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev by Lajos Molnar · 11 years ago
  56. 55e599d Miscellaneous cleanup for NBAIO by Glenn Kasten · 11 years ago
  57. f69f986 NBAIO::Format_from_SR_C requires audio_format_t parameter by Glenn Kasten · 11 years ago
  58. 9219bfc am 2ad7af29: Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch" by Narayan Kamath · 11 years ago
  59. 3a46b97 am a9b82160: Merge "LP64 fixes for media/libeffects" by Narayan Kamath · 11 years ago
  60. 2ad7af2 Merge "Check for ARCH_ARM_HAVE_NEON flag only for ARM arch" by Narayan Kamath · 11 years ago
  61. a9b8216 Merge "LP64 fixes for media/libeffects" by Narayan Kamath · 11 years ago
  62. 8eec770 Merge "Remove checks for specific sample rates and channel counts" by Glenn Kasten · 11 years ago
  63. e1b004e Merge "Remove restriction for HAL streams of AUDIO_FORMAT_PCM_16_BIT" by Glenn Kasten · 11 years ago
  64. 24fa6a5 am 40659dea: am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev by Eino-Ville Talvala · 11 years ago
  65. b5e2d48 am 51b7125b: am bfc26066: am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev by Eric Laurent · 11 years ago
  66. 31a98ad resolved conflicts for merge of 8d1caa02 to klp-modular-dev-plus-aosp by Narayan Kamath · 11 years ago
  67. 4cd9a7a am 8f379f63: am 4ed0b0b6: am 880413f7: Merge "stagefright: fix offloading HE-AAC sampling rate." into klp-dev by Eric Laurent · 11 years ago
  68. bad012e am afa5263f: am 395c2fc0: Merge "audioflinger: Fix for a deadlock in track creation" by Glenn Kasten · 11 years ago
  69. 8c64c5b am eff98dde: am 2b6191fd: am 3b7ddf83: set AAC MPEG version to MPEG-2 by Chong Zhang · 11 years ago
  70. 621d382 am 04352de2: am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev by Lajos Molnar · 11 years ago
  71. 8d1caa0 am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev by Lajos Molnar · 11 years ago
  72. 04352de am e0c3058a: Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev by Lajos Molnar · 11 years ago
  73. 7e65e10 am 72d09f62: am 2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev by Lajos Molnar · 11 years ago
  74. d1d45fe am d7c4da3c: am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev by Lajos Molnar · 11 years ago
  75. 414c237 am 4dbd814d: am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev by Lajos Molnar · 11 years ago
  76. 6fefae2 am e389b1bd: am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev by Lajos Molnar · 11 years ago
  77. 675b80d am 3bd0270c: am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev by Lajos Molnar · 11 years ago
  78. 72d09f6 am 2613347d: Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev by Lajos Molnar · 11 years ago
  79. d7c4da3 am 909498b7: Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev by Lajos Molnar · 11 years ago
  80. 4dbd814 am 2338782d: Merge "Fixed misplaced bracket for switch-case block." into klp-dev by Lajos Molnar · 11 years ago
  81. e389b1b am ad21a81a: Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev by Lajos Molnar · 11 years ago
  82. 3bd0270 am b74b2098: Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev by Lajos Molnar · 11 years ago
  83. 49ea133 Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, ... into klp-dev by Lajos Molnar · 11 years ago
  84. e0c3058 Merge "AnotherPacketSource support to get latest buffered MetaData." into klp-dev by Lajos Molnar · 11 years ago
  85. 2613347 Merge "Added support to query ACodec whether adaptive playback is enabled." into klp-dev by Lajos Molnar · 11 years ago
  86. 909498b Merge "stagefright: use CODECS field in EXT-X_STREAM-INF as fallback" into klp-dev by Lajos Molnar · 11 years ago
  87. 2338782 Merge "Fixed misplaced bracket for switch-case block." into klp-dev by Lajos Molnar · 11 years ago
  88. ad21a81 Merge "stagefright: Fix issue with tracking media format in packet source" into klp-dev by Lajos Molnar · 11 years ago
  89. b74b209 Merge "stagefright: Fix bugs in playlist fetcher logic" into klp-dev by Lajos Molnar · 11 years ago
  90. 40659de am 47ef192f: am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev by Eino-Ville Talvala · 11 years ago
  91. a1076eb LiveSession: Use the actual, possibly redirected url as base in the M3U by Martin Storsjo · 12 years ago
  92. 75d0318 M3UParser: Skip query strings when looking for the last slash in a URL by Martin Storsjo · 12 years ago
  93. 47ef192 am a11111f9: Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev by Eino-Ville Talvala · 11 years ago
  94. 2048c22 AudioTrack: When paused, return cached playback position by Haynes Mathew George · 12 years ago
  95. 51b7125 am bfc26066: am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev by Eric Laurent · 11 years ago
  96. be1195a Fix SIGABRT when playing mp4 file by Marco Nelissen · 12 years ago
  97. a11111f Merge changes Id28b35fd,Ie4e64977,I2950f31e into klp-dev by Eino-Ville Talvala · 11 years ago
  98. bfc2606 am ed4d8b28: Merge "stagefright: do not offload LD-AAC decoding" into klp-dev by Eric Laurent · 11 years ago
  99. 1c32a00 Merge "Simplify AudioTrack stream end and fix race" by Glenn Kasten · 11 years ago
  100. ed4d8b2 Merge "stagefright: do not offload LD-AAC decoding" into klp-dev by Eric Laurent · 11 years ago