1. ff8818d resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c by Wei Jia · 10 years ago
  2. 5f44938 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf by Wei Jia · 10 years ago
  3. 87406db resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 by Wei Jia · 10 years ago
  4. f4285f2 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 by Wei Jia · 10 years ago
  5. 67ca3ca resolve merge conflicts of 823bd74 to lmp-mr1-dev by Wei Jia · 10 years ago
  6. e31eeb4 MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. by Wei Jia · 11 years ago
  7. 26ef0c4 Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7 by Marco Nelissen · 10 years ago
  8. c83479d Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 by Marco Nelissen · 10 years ago
  9. 5f527d4 Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b by Marco Nelissen · 10 years ago
  10. 7c3e69c Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 by Marco Nelissen · 10 years ago
  11. 38f2482 Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa by Marco Nelissen · 10 years ago
  12. ef1fcff Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 by Marco Nelissen · 10 years ago
  13. 2d4cf31 Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e by Marco Nelissen · 10 years ago
  14. e663be8 Clear unused pointer field when sending across binder by Marco Nelissen · 10 years ago
  15. 297a8d2 Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 am: 093cd05 am: 05cb2d8 am: 5042d77 by Robert Shih · 11 years ago
  16. 6d1599d Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 am: 093cd05 am: 05cb2d8 by Robert Shih · 11 years ago
  17. 5042d77 Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 am: 093cd05 by Robert Shih · 11 years ago
  18. 05cb2d8 Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da am: 9ef3f17 am: 8278e43 by Robert Shih · 11 years ago
  19. 8278e43 Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da by Robert Shih · 11 years ago
  20. 9ef3f17 Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 by Robert Shih · 11 years ago
  21. 6ee73da Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev by Robert Shih · 11 years ago
  22. 88b3147 NuPlayerStreamListener: NULL and bounds check before memcpy by Robert Shih · 11 years ago
  23. fe2d80d DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c by Chong Zhang · 11 years ago
  24. 91a23ed DO NOT MERGE nuplayer: do not use cached source for wvm content by Chong Zhang · 12 years ago
  25. 7845a1f fix deadlock in MediaPlayerService BUG: 25263909 by Erik Wolsheimer · 11 years ago
  26. fd72a5b GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 am: 7b5564e251 by Wei Jia · 11 years ago
  27. 000321c GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 by Wei Jia · 11 years ago
  28. 92b6cd8 GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 by Wei Jia · 11 years ago
  29. 313358c GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 by Wei Jia · 11 years ago
  30. 09c291c GenericSource: reset mDecryptHandle when mDataSource is cleared. by Wei Jia · 11 years ago
  31. cdc9cf6 GenericSource: reset mDecryptHandle when mDataSource is cleared. by Wei Jia · 11 years ago
  32. ddb3d77 GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a am: e01ba47052 by Wei Jia · 11 years ago
  33. adadada GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a by Wei Jia · 11 years ago
  34. 3fcddfd GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 by Wei Jia · 11 years ago
  35. 69c8e36 GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  36. 224858e GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  37. b41fd0d GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  38. 216f017 NuPlayerDecoder: report error in case of audio sink open error. by Eric Laurent · 11 years ago
  39. a5b4642 NuPlayerRenderer: do not send rendering started message when paused by Andy Hung · 11 years ago
  40. 95c3a43 Merge "Don't send OnCompletion events when looping" into mnc-dr-dev by Marco Nelissen · 11 years ago
  41. 106ceac NuPlayer: reset mAudioEOS and mVideoEOS when renderer is flushed. by Wei Jia · 11 years ago
  42. 780b766 Merge "NuPlayerDriver: acquire mLock when needed." into mnc-dr-dev by Wei Jia · 11 years ago
  43. 8423965 NuPlayerDriver: acquire mLock when needed. by Wei Jia · 11 years ago
  44. 492ccd6 NuPlayerRenderer: always update MediaClock with max media duration. by Wei Jia · 11 years ago
  45. b345ddc Don't send OnCompletion events when looping by Marco Nelissen · 11 years ago
  46. 82b3450 Merge "NuPlayerRenderer: Do not drain audio during teardown" into mnc-dr-dev by Andy Hung · 11 years ago
  47. 421977a am c53328a5: am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-dev by Wonsik Kim · 11 years ago
  48. 67f36a8 resolved conflicts for 76b704e3 to lmp-mr1-dev by Wonsik Kim · 11 years ago
  49. f5eb7c6 Merge "NuPlayerRenderer: Do not deliver audio too soon after stop" into mnc-dr-dev by Andy Hung · 11 years ago
  50. 76b704e am f3eb8268: DO NOT MERGE: Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  51. 3f5ff68 NuPlayerRenderer: Do not drain audio during teardown by Andy Hung · 11 years ago
  52. 27e0350 am b946648c: Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  53. f3eb826 DO NOT MERGE: Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  54. b946648 Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  55. 4d7ac85 NuPlayerRenderer: avoid divison by zero when sample rate is 0. by Wei Jia · 11 years ago
  56. 7665f58 nuplayer: let non-offload AudioSink to handle the reconnect when there's video. by Ronghua Wu · 11 years ago
  57. 7d05308 NuPlayerRenderer: Do not deliver audio too soon after stop by Andy Hung · 11 years ago
  58. 08723d8 am 5d76e54d: Merge "NuPlayer: do not create audio decoder if the player is still in shutdown process." into mnc-dev by Wei Jia · 11 years ago
  59. 566da80 NuPlayer: do not create audio decoder if the player is still in shutdown process. by Wei Jia · 11 years ago
  60. 2e17eef AudioSink: Fix for gapless offload playback by Preetam Singh Ranawat · 11 years ago
  61. dd6a176 am c08872f9: Merge "NuPlayerRenderer: handle error when resuming an offloaded track" into mnc-dev by Eric Laurent · 11 years ago
  62. f33a302 Merge "RTSPSource::pause mHandler NULL check" into mnc-dr-dev by Robert Shih · 11 years ago
  63. 6d3cd2e RTSPSource::pause mHandler NULL check by Robert Shih · 11 years ago
  64. 97c9f4f NuPlayerRenderer: handle error when resuming an offloaded track by Eric Laurent · 11 years ago
  65. 6b7d2ed NuPlayer: set video surface directly when NuPlayer has not started yet. by Wei Jia · 11 years ago
  66. 27b71aa Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-dev by Robert Shih · 11 years ago
  67. 1a5c859 NuPlayer:seek handling on kWhatAudioTearDown by Robert Shih · 11 years ago
  68. 7c3c275 stagefright: disable automatic experiments by Lajos Molnar · 11 years ago
  69. 6134ad6 Merge "NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio" into mnc-dev by Robert Shih · 11 years ago
  70. f18cce4 am ef4cd0a4: am d3831760: DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance by Jeff Tinker · 11 years ago
  71. e1d7019 NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio by Robert Shih · 11 years ago
  72. 2650e96 MediaPlayerService: prevent audio_attributes_t race conditions by Jean-Michel Trivi · 11 years ago
  73. d383176 DO NOT MERGE: Lock drm plugin API calls globally, not per MediaDrm instance by Jeff Tinker · 11 years ago
  74. 68845c1 libmediaplayerservice: propagate caller pid to MediaCodec. by Ronghua Wu · 11 years ago
  75. dd761ec Merge "MediaRecorder: enable audio for slow motion recording" into mnc-dev by Chong Zhang · 11 years ago
  76. 46d26dd MediaRecorder: enable audio for slow motion recording by Chong Zhang · 11 years ago
  77. 9febc8a Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev by Robert Shih · 11 years ago
  78. a3725d7 stagefright: MediaSync: use VideoFrameScheduler by Lajos Molnar · 11 years ago
  79. 8d237a5 RTSP: clear data/eos status before returning from seek by Robert Shih · 11 years ago
  80. a8dc93e Merge "mediaplayer: fix audio attributes override by stream type" into mnc-dev by Eric Laurent · 11 years ago
  81. 4356269 mediaplayer: fix audio attributes override by stream type by Eric Laurent · 11 years ago
  82. 6712ae1 Merge "NuPlayer: fix handling of teardown event during flushing or shutting down." into mnc-dev by Wei Jia · 11 years ago
  83. da4252f NuPlayer: fix handling of teardown event during flushing or shutting down. by Wei Jia · 11 years ago
  84. 1bc8881 Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev by Chong Zhang · 11 years ago
  85. fcf044a NuPlayer: pull more video buffers in advance in GenericSource by Chong Zhang · 11 years ago
  86. 495151d Merge "NuPlayer: determine audio mode before instantiating audio decoder." into mnc-dev by Wei Jia · 11 years ago
  87. e4d18c7 NuPlayer: determine audio mode before instantiating audio decoder. by Wei Jia · 11 years ago
  88. a7c2db7 Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev by Lajos Molnar · 11 years ago
  89. db35073 Merge "NuPlayerRenderer: clear first audio anchor time only when audio is flushed." into mnc-dev by Wei Jia · 11 years ago
  90. a81c622 nuplayer: use codec->setSurface when possible to avoid seeking by Lajos Molnar · 11 years ago
  91. 3b0cd26 NuPlayerRenderer: clear first audio anchor time only when audio is flushed. by Wei Jia · 11 years ago
  92. 9ad9e74 Merge "NuPlayer: seek to current position when changing video surface and audio decoder exists." into mnc-dev by Wei Jia · 11 years ago
  93. c6e5841 NuPlayer: seek to current position when changing video surface and audio decoder exists. by Wei Jia · 11 years ago
  94. d1c7434 libmediaplayerservice: Serialize access to AudioOutput by Andy Hung · 11 years ago
  95. 0c61a0d NuPlayer: disable pre-start preview for audio only sources by Robert Shih · 11 years ago
  96. 2b63384 Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-dev by Marco Nelissen · 11 years ago
  97. 6155085 Serialize calls to getFrameAtTime in the mediaserver by Marco Nelissen · 11 years ago
  98. 9d66d7f Merge "stagefright: post audio EOS in NuPlayerRenderer if getPosition fails" into mnc-dev by Chong Zhang · 11 years ago
  99. 9da0ce4 stagefright: post audio EOS in NuPlayerRenderer if getPosition fails by Chong Zhang · 11 years ago
  100. 67c2c94 NuPlayerDriver: add more logging. by Wei Jia · 11 years ago