Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_av / 456caf3f5f0af673dc120c17c23635f40d8f5ac2
  1. 456caf3 resolved conflicts for merge of 07bacabe to master by Andreas Huber · 14 years ago
  2. 1a733a3 am f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1 by Andreas Huber · 14 years ago
  3. a0f2bf5 Properly identify how much metadata we need to cache in order to instantiate by Andreas Huber · 14 years ago
  4. 2158db0 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  5. 0cb4b9a am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 by Mike Lockwood · 14 years ago
  6. 326805a am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 by Mike Lockwood · 14 years ago
  7. 36126b2 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  8. fa845c6 am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 by Mike Lockwood · 14 years ago
  9. 7570af1 am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 by Mike Lockwood · 14 years ago
  10. fed8bb6 MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE by Mike Lockwood · 14 years ago
  11. 8af4c7d MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE by Mike Lockwood · 14 years ago
  12. 651d4c6 Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage" by Mike Lockwood · 14 years ago
  13. f963220 Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver" by Mike Lockwood · 14 years ago
  14. a9a46c1 MTP: Add support for restricting PTP to only certain subdirectories of the storage by Mike Lockwood · 14 years ago
  15. 48bd916 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  16. 42fb390 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  17. 44c1908 MTP: Don't attempt to read more than 16K at a time from the MTP driver by Mike Lockwood · 14 years ago
  18. 17078d8 am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 by Andreas Huber · 14 years ago
  19. 1d26d11 am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 by Andreas Huber · 14 years ago
  20. 4fe1c6c Fixes a typo in AVIExtractor that would advertise the wrong video dimensions by Andreas Huber · 14 years ago
  21. 2c0dd96 Reconcile with ics-mr1-release by The Android Open Source Project · 14 years ago
  22. cd9e929 am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 14 years ago
  23. ea9d51b resolved conflicts for merge of 3d630e86 to master by Andreas Huber · 14 years ago
  24. 2907dac merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  25. 37a153f Merge "Add camera focus move callback." by Wu-cheng Li · 14 years ago
  26. 7a3a2b2 Fix the broken build by James Dong · 14 years ago
  27. 1503185 am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 14 years ago
  28. 21befea Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 by Jamie Gennis · 14 years ago
  29. 8afbf8e am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 14 years ago
  30. c089d02 am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  31. eca36b5 resolved conflicts for merge of 998a929a to master by Andreas Huber · 14 years ago
  32. 8a1fac3 am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1 by Andreas Huber · 14 years ago
  33. b96d3c5 am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 14 years ago
  34. 6bf045c am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  35. b19386f am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1 by Andreas Huber · 14 years ago
  36. 7609b23 Merge "Make sure we can properly shutdown even if" into ics-mr1 by Andreas Huber · 14 years ago
  37. 5274010 Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 by Andreas Huber · 14 years ago
  38. 544ee28 Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 by Andreas Huber · 14 years ago
  39. bfcc8d8 Updated (internal) API for IStreamSource to signal discontinuities by Andreas Huber · 14 years ago
  40. d620506 Add camera focus move callback. by Wu-cheng Li · 14 years ago
  41. 6e3d311 Finer granularity discontinuity support. by Andreas Huber · 14 years ago
  42. b58ce9f Make sure we can properly shutdown even if by Andreas Huber · 14 years ago
  43. 404a123 split ComposerService out of SurfaceComposerClient.h by Mathias Agopian · 14 years ago
  44. c9260c1 Merge "Make AudioTrack a RefBase so wrappers not needed" by Glenn Kasten · 14 years ago
  45. d748311 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  46. d3d8222 If an error occurs that prevents us from reallocating buffers during a format change by Andreas Huber · 14 years ago
  47. 926798f am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 by Eric Laurent · 14 years ago
  48. 3aadf3a am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1 by Eric Laurent · 14 years ago
  49. 7cafbb3 audioflinger: reduce sleep time to avoid underrun by Eric Laurent · 14 years ago
  50. 1d2ad70 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." by James Dong · 14 years ago
  51. 8c3ddf9 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
  52. a1f988d merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  53. a7e4865 am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
  54. a0c986c am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
  55. e933cb5 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 by Andreas Huber · 14 years ago
  56. 0e0c322 Fix a subtitle bug: multiple blank lines in SubRip(srt) file. by Insun Kang · 14 years ago
  57. 7c56bb3 am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
  58. 88b00e9 am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 by James Dong · 14 years ago
  59. 4c57986 SurfaceMediaSource: use the vid enc usage bit by Jamie Gennis · 14 years ago
  60. e8e5f86 Fix log spamming during time lapse video recording by James Dong · 14 years ago
  61. c637289 Reconcile with ics-mr0-release ics-mr1-release by The Android Open Source Project · 14 years ago
  62. 7383d41 am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  63. 26900df am 7ff7821a: am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  64. 6f5cc45 am d4b22ab4: status_t != bool by Marco Nelissen · 14 years ago
  65. 91e2c7d status_t != bool by Marco Nelissen · 14 years ago
  66. 153cefd status_t != bool by Marco Nelissen · 14 years ago
  67. 71b61a9 Report a runtime error instead of asserting on malformed avc configuration data. by Andreas Huber · 14 years ago
  68. 0c5ce9b Merge "Bug 5522189 re-enable ARM opts but disable inline" by Glenn Kasten · 14 years ago
  69. c23e2f2 Bug 5522189 re-enable ARM opts but disable inline by Glenn Kasten · 14 years ago
  70. 60047ae am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
  71. 7f2bec1 am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
  72. 6479b95 Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 by Andreas Huber · 14 years ago
  73. 1de4e2e Merge "MidiFile uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
  74. 528312c Merge "JetPlayer uses C++ Thread not createThreadEtc" by Glenn Kasten · 14 years ago
  75. aaa12ed merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  76. c57c82e am 4dce941e: am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  77. 90100b5 MidiFile uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
  78. a23856c JetPlayer uses C++ Thread not createThreadEtc by Glenn Kasten · 14 years ago
  79. 8791351 Bug 4903178 Restore priority and cgroup on stop by Glenn Kasten · 14 years ago
  80. c34233e Make sure not to cancel pending seek/EOS notifications on a cache underrun... by Andreas Huber · 14 years ago
  81. 185b1e3 am 816e68e2: No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  82. 7b81bc3 No-op merge from ics-mr0 by The Android Open Source Project · 14 years ago
  83. fd8f534 Reconcile with ics-factoryrom-2-release by The Android Open Source Project · 14 years ago
  84. 6c3bc93 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  85. b68a91a Make AudioTrack a RefBase so wrappers not needed by Glenn Kasten · 14 years ago
  86. 5c05221 am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 by Hong Teng · 14 years ago
  87. e7cf4ee am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 by Hong Teng · 14 years ago
  88. 9621add Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 by Hong Teng · 14 years ago
  89. 5ee2648 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  90. 3a9cefe Fix for issue 5309336 by Hong Teng · 14 years ago
  91. c4795ec am 25924f8f: am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  92. 41ff785 am 030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  93. 72ae9fd Merge "audioflinger: fix noise when skipping to next song" into ics-mr1 by Eric Laurent · 14 years ago
  94. b0ea0f7 merge in ics-mr1-release history after reset to ics-mr1 by The Android Automerger · 14 years ago
  95. 544fe9b audioflinger: fix noise when skipping to next song by Eric Laurent · 14 years ago
  96. 78ff828 am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 by Andreas Huber · 14 years ago
  97. 73bb0b9 am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 by Eric Laurent · 14 years ago
  98. 516fb1d am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 by Andreas Huber · 14 years ago
  99. 54500e5 am 9a87a838: (-s ours) am 5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1 by Andreas Huber · 14 years ago
  100. a36d8ca am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1 by Andreas Huber · 14 years ago