1. 87406db resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 by Wei Jia · 10 years ago
  2. f4285f2 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 by Wei Jia · 10 years ago
  3. 67ca3ca resolve merge conflicts of 823bd74 to lmp-mr1-dev by Wei Jia · 10 years ago
  4. e31eeb4 MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. by Wei Jia · 11 years ago
  5. 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
  6. 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
  7. 8278e43 Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 am: 6ee73da by Robert Shih · 11 years ago
  8. 9ef3f17 Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev am: 4fa31b5 by Robert Shih · 11 years ago
  9. 6ee73da Merge "NuPlayerStreamListener: NULL and bounds check before memcpy" into klp-dev by Robert Shih · 11 years ago
  10. 88b3147 NuPlayerStreamListener: NULL and bounds check before memcpy by Robert Shih · 11 years ago
  11. fe2d80d DO NOT MERGE nuplayer: do not use cached source for wvm content am: 91a23ed95c by Chong Zhang · 11 years ago
  12. 91a23ed DO NOT MERGE nuplayer: do not use cached source for wvm content by Chong Zhang · 12 years ago
  13. fd72a5b GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 am: 7b5564e251 by Wei Jia · 11 years ago
  14. 000321c GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 am: 313358c747 am: 92b6cd8da9 by Wei Jia · 11 years ago
  15. 92b6cd8 GenericSource: reset mDecryptHandle when mDataSource is cleared. am: 09c291c838 by Wei Jia · 11 years ago
  16. 09c291c GenericSource: reset mDecryptHandle when mDataSource is cleared. by Wei Jia · 11 years ago
  17. ddb3d77 GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a am: e01ba47052 by Wei Jia · 11 years ago
  18. adadada GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 am: 69c8e36da7 am: 3fcddfd23a by Wei Jia · 11 years ago
  19. 3fcddfd GenericSource: reset mDrmManagerClient when mDataSource is cleared. am: 224858e719 by Wei Jia · 11 years ago
  20. 224858e GenericSource: reset mDrmManagerClient when mDataSource is cleared. by Wei Jia · 11 years ago
  21. 421977a am c53328a5: am 67f36a8e: resolved conflicts for 76b704e3 to lmp-mr1-dev by Wonsik Kim · 11 years ago
  22. 67f36a8 resolved conflicts for 76b704e3 to lmp-mr1-dev by Wonsik Kim · 11 years ago
  23. f3eb826 DO NOT MERGE: Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  24. b946648 Protect data source access with mutex during disconnect by Robert Shih · 11 years ago
  25. 566da80 NuPlayer: do not create audio decoder if the player is still in shutdown process. by Wei Jia · 11 years ago
  26. 97c9f4f NuPlayerRenderer: handle error when resuming an offloaded track by Eric Laurent · 11 years ago
  27. 6b7d2ed NuPlayer: set video surface directly when NuPlayer has not started yet. by Wei Jia · 11 years ago
  28. 27b71aa Merge "NuPlayer:seek handling on kWhatAudioTearDown" into mnc-dev by Robert Shih · 11 years ago
  29. 1a5c859 NuPlayer:seek handling on kWhatAudioTearDown by Robert Shih · 11 years ago
  30. 7c3c275 stagefright: disable automatic experiments by Lajos Molnar · 11 years ago
  31. e1d7019 NuPlayerRenderer: prepareForMediaRenderingStart_l on en/disable offload audio by Robert Shih · 11 years ago
  32. 68845c1 libmediaplayerservice: propagate caller pid to MediaCodec. by Ronghua Wu · 11 years ago
  33. 9febc8a Merge "RTSP: clear data/eos status before returning from seek" into mnc-dev by Robert Shih · 11 years ago
  34. a3725d7 stagefright: MediaSync: use VideoFrameScheduler by Lajos Molnar · 11 years ago
  35. 8d237a5 RTSP: clear data/eos status before returning from seek by Robert Shih · 11 years ago
  36. 6712ae1 Merge "NuPlayer: fix handling of teardown event during flushing or shutting down." into mnc-dev by Wei Jia · 11 years ago
  37. da4252f NuPlayer: fix handling of teardown event during flushing or shutting down. by Wei Jia · 11 years ago
  38. 1bc8881 Merge "NuPlayer: pull more video buffers in advance in GenericSource" into mnc-dev by Chong Zhang · 11 years ago
  39. fcf044a NuPlayer: pull more video buffers in advance in GenericSource by Chong Zhang · 11 years ago
  40. 495151d Merge "NuPlayer: determine audio mode before instantiating audio decoder." into mnc-dev by Wei Jia · 11 years ago
  41. e4d18c7 NuPlayer: determine audio mode before instantiating audio decoder. by Wei Jia · 11 years ago
  42. a7c2db7 Merge "nuplayer: use codec->setSurface when possible to avoid seeking" into mnc-dev by Lajos Molnar · 11 years ago
  43. db35073 Merge "NuPlayerRenderer: clear first audio anchor time only when audio is flushed." into mnc-dev by Wei Jia · 11 years ago
  44. a81c622 nuplayer: use codec->setSurface when possible to avoid seeking by Lajos Molnar · 11 years ago
  45. 3b0cd26 NuPlayerRenderer: clear first audio anchor time only when audio is flushed. by Wei Jia · 11 years ago
  46. c6e5841 NuPlayer: seek to current position when changing video surface and audio decoder exists. by Wei Jia · 11 years ago
  47. 0c61a0d NuPlayer: disable pre-start preview for audio only sources by Robert Shih · 11 years ago
  48. 9d66d7f Merge "stagefright: post audio EOS in NuPlayerRenderer if getPosition fails" into mnc-dev by Chong Zhang · 11 years ago
  49. 9da0ce4 stagefright: post audio EOS in NuPlayerRenderer if getPosition fails by Chong Zhang · 11 years ago
  50. 67c2c94 NuPlayerDriver: add more logging. by Wei Jia · 11 years ago
  51. 3a20d29 NuPlayer: print player stats at the end of playback by Praveen Chavan · 11 years ago
  52. e1e5d7a NuPlayer: Enhance dumpsys statistics by Praveen Chavan · 11 years ago
  53. 3ab2545 NuPlayerRenderer: discard pending kWhatDrainAudioQueue message when AudioSink is opened in callback mode. by Wei Jia · 11 years ago
  54. 416d4a8 Merge "NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports WOULD_BLOCK on writing." into mnc-dev by Wei Jia · 11 years ago
  55. df80947 NuPlayerRenderer: change log from ALOGW to ALOGV when audio sink reports WOULD_BLOCK on writing. by Wei Jia · 11 years ago
  56. 005e9d0 NuPlayer: Allow audio drain to fill buffer when paused by Andy Hung · 11 years ago
  57. 85e4814 NuPlayer: Allow audio callback to fill buffer when paused by Andy Hung · 11 years ago
  58. 288da02 NuPlayer: Add audio deep buffer configuration by Andy Hung · 11 years ago
  59. 179652e NuPlayer: Add audio sink buffer configuration by Andy Hung · 11 years ago
  60. a0b3971 NuPlayer: Add audio callback mode for PCM audio. by Andy Hung · 11 years ago
  61. 0a62c19 Merge "libmediaplayerservice: get isStreaming info from source." into mnc-dev by Ronghua Wu · 11 years ago
  62. 02fc5e3 GenericSource should report -1 instead of 0 for unknown duration by Marco Nelissen · 11 years ago
  63. 02cb98d libmediaplayerservice: get isStreaming info from source. by Ronghua Wu · 11 years ago
  64. 0a7989f Merge "libmediaplayerservice: try to open audio sink in offload mode in error." into mnc-dev by Ronghua Wu · 11 years ago
  65. faeb0f2 libmediaplayerservice: try to open audio sink in offload mode in error. by Ronghua Wu · 11 years ago
  66. 1061c9c mediaplayer: display one frame when seek is called before start. by Wei Jia · 11 years ago
  67. 856f37a Merge "mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec." into mnc-dev by Wei Jia · 11 years ago
  68. 5a8422a Merge "libmediaplayerservice: queue discontinuity when seek to eos." into mnc-dev by Ronghua Wu · 11 years ago
  69. 8f291bc libmediaplayerservice: queue discontinuity when seek to eos. by Ronghua Wu · 11 years ago
  70. 6301a5e mediaplayer: handle decoder error when NuPlayerDecoder gets a NULL buffer from MediaCodec. by Wei Jia · 11 years ago
  71. 4a95e69 Merge "mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek." into mnc-dev by Wei Jia · 11 years ago
  72. 2984080 mediaplayer: remove unused parameter needNotify in NuPlayer::performSeek. by Wei Jia · 11 years ago
  73. 89cf894 Merge "HTTPLiveSource: fix non timed id3 track selection" into mnc-dev by Robert Shih · 11 years ago
  74. 055404e HTTPLiveSource: fix non timed id3 track selection by Robert Shih · 11 years ago
  75. 27ea08e mediaplayer: get/set PlaybackRate only when AudioSink has been opened. by Wei Jia · 11 years ago
  76. e5e9a0d Merge "nuplayer: fixes for subtitle pause/resume" into mnc-dev by Chong Zhang · 11 years ago
  77. 8a04833 nuplayer: fixes for subtitle pause/resume by Chong Zhang · 11 years ago
  78. 2e3a425 NuPlayer: parcel placeholder mime in track info if not provided by source by Robert Shih · 11 years ago
  79. c8a70d3 nuplayer: get playback frame rate from video track meta instead of file meta. by Ronghua Wu · 11 years ago
  80. 0247f0d Merge "mediaplayer: flush audio sink when renderer is flushed." into mnc-dev by Wei Jia · 11 years ago
  81. 9e7ed33 mediaplayer: flush audio sink when renderer is flushed. by Wei Jia · 11 years ago
  82. 1de1e25 stagefright: remove NativeWindowWrapper by Lajos Molnar · 11 years ago
  83. 94ce218 Merge "GenericSource: reply mime information for *all* track types" into mnc-dev by Robert Shih · 11 years ago
  84. 3a474aa stagefright: support setting/getting playback/sync config in MediaSync by Lajos Molnar · 11 years ago
  85. 755106e GenericSource: reply mime information for *all* track types by Robert Shih · 11 years ago
  86. 8db8813 DO NOT MERGE libmediaplayerservice: set priority and operating rate for the codec used by nuplayer. by Ronghua Wu · 11 years ago
  87. bb6635d Merge "HLS: make disconnect faster to prevent ANR" by Chong Zhang · 11 years ago
  88. 5abbd3d HLS: make disconnect faster to prevent ANR by Chong Zhang · 11 years ago
  89. f8bd851 Copy sei offset/size during ABuffer/MediaBuffer conversion by Robert Shih · 11 years ago
  90. 8163676 HLS: remove no more than 10% of bandwidth history at a time by Chong Zhang · 11 years ago
  91. dfe5c42 Merge "NuPlayer: queue a deferred scan sources when flushing during scan" by Chong Zhang · 12 years ago
  92. 6d339f1 libmediaplayerservice: fix warnings, make warnings errors, use clang by Lajos Molnar · 12 years ago
  93. 3b032b3 NuPlayer: queue a deferred scan sources when flushing during scan by Chong Zhang · 12 years ago
  94. ee4e1b1 stagefright: warnings be gone, some are now errors, use clang by Lajos Molnar · 12 years ago
  95. 2170233 Merge "NuPlayerDriver: Maintain the timeStamp after seek" by Wei Jia · 12 years ago
  96. d3c28f6 NuPlayerDriver: Maintain the timeStamp after seek by Haynes Mathew George · 12 years ago
  97. 0852843 stagefright: initial timed id3 support in hls by Robert Shih · 12 years ago
  98. c224ec5 Merge "Unhide the android.media.[Media]DataSource interface." by Chris Watkins · 12 years ago
  99. 99f3160 Unhide the android.media.[Media]DataSource interface. by Chris Watkins · 12 years ago
  100. 43cc944 fix NuPlayerDecoder discontinuity handling with async mode by Chong Zhang · 12 years ago