1. 1825ce2 resolved conflicts for merge of c761a80d to master by Gloria Wang · 13 years ago
  2. 6cfa41f am 7ea3c7f5: Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waitin by Gloria Wang · 13 years ago
  3. 56d0834 Merge "- Some change on the DrmManager in order to support feature request 4082089. In DrmManager, we currently lock both processDrmInfo() and onInfo() which is ok for now since processDrmInfo() is async call, and it will return without waiting for onInfo() call. However, if we send an event in processDrmInfo(), we will got deadlock here because we need to invoke onInf() which will wait for processDrmInfo() to release the lock. Use different lock for onInfo(). - Remove some redundent mutex lock." into honeycomb-mr1 by Gloria Wang · 13 years ago
  4. 8b9a906 am 0bea34fc: am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 13 years ago
  5. 23771ca am dec0b755: Merge "MTP host: Fix problems reading large data packets" into honeycomb-mr1 by Mike Lockwood · 13 years ago
  6. 33bde8d MTP host: Fix problems reading large data packets by Mike Lockwood · 13 years ago
  7. 6d8ed95 If MP3 decoder output frame size were 0, media server would crash. by James Dong · 13 years ago
  8. 0e0a5f9 - Some change on the DrmManager in order to support feature request 4082089. by Gloria Wang · 13 years ago
  9. 34fba66 Only use ChromiumHTTPDataSource if webkit was built with chromium support. by Andreas Huber · 13 years ago
  10. 884d064 am 055066e1: am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1 by Glenn Kasten · 13 years ago
  11. 203616f am 92f2f3ff: Merge "Bug 3012968 DRM output control" into honeycomb-mr1 by Glenn Kasten · 13 years ago
  12. 2eb6295 Bug 3012968 DRM output control by Glenn Kasten · 13 years ago
  13. b5ce361 Fix for bug 3477330 by Gloria Wang · 13 years ago
  14. 609ce04 am 256290b1: am 54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1 by Gloria Wang · 13 years ago
  15. 0592e3c am 54fe5856: Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content\'s point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1 by Gloria Wang · 13 years ago
  16. 8862028 Merge "- Change level of some LOGs from LOGE to LOGV because those logs are not error logs from non-DRMed content's point of view. - Add more mutex lock to avoid crash by multi-thread calls. - Fix for bug 4050039" into honeycomb-mr1 by Gloria Wang · 13 years ago
  17. 6b610a3 - Change level of some LOGs from LOGE to LOGV because those logs by Gloria Wang · 13 years ago
  18. c4122f5 Merge "Support http authentication ala http://foo:bar@host.org in stagefright." by Andreas Huber · 13 years ago
  19. 3b93951 am d1e09e08: am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming. by Lorenzo Colitti · 13 years ago
  20. e146aa5 am d6aaec0c: am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming. by Lorenzo Colitti · 13 years ago
  21. 4ec5179 am 8df2477c: am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming. by Lorenzo Colitti · 13 years ago
  22. 83bfaf0 am e4a02b61: am b9da16a1: Support IPv6 in HTTP streaming. by Lorenzo Colitti · 13 years ago
  23. d563b83 am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming. by Lorenzo Colitti · 13 years ago
  24. f64b241 am b9da16a1: Support IPv6 in HTTP streaming. by Lorenzo Colitti · 13 years ago
  25. 70fcf53 Support http authentication ala http://foo:bar@host.org in stagefright. by Andreas Huber · 13 years ago
  26. 72fee69 Use the same http proxy mechanism that webkit uses instead of bypassing proxies. by Andreas Huber · 13 years ago
  27. 2aac40f am 2dc78477: am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 by Eric Laurent · 13 years ago
  28. bd75c0d am cc34967f: Merge "Fix issue 3439872: video chat and bluetooth SCO" into honeycomb-mr1 by Eric Laurent · 13 years ago
  29. 1156dc9 An HTTP datasource for stagefright using the chromium code. by Andreas Huber · 13 years ago
  30. 1703cdf Fix issue 3439872: video chat and bluetooth SCO by Eric Laurent · 13 years ago
  31. 0ef6315 Support IPv6->IPv4 fallback in HTTP streaming. by Lorenzo Colitti · 13 years ago
  32. 7528e58 Support IPv6 in HTTP streaming. by Lorenzo Colitti · 14 years ago
  33. 271151e am 73179134: (-s ours) am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch... by James Dong · 13 years ago
  34. 335874e am b1be086e: (-s ours) am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch... by James Dong · 13 years ago
  35. a5967fa Merge "Add the default back-facing camera to the MediaProfile camera vector As a result, missing media_profiles.xml will be still allowed." by James Dong · 13 years ago
  36. d3ee677 Add the default back-facing camera to the MediaProfile camera vector by James Dong · 13 years ago
  37. af50f11 am d581c047: Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch... by James Dong · 13 years ago
  38. 64bfdc7 Add missing copyright headers for a couple of files. DO NOT MERGE by James Dong · 13 years ago
  39. 38978f5 am a7c9dffd: am 4ed072f9: Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1 by James Dong · 13 years ago
  40. fbb1909 Add missing copyright headers to a couple of files by James Dong · 13 years ago
  41. e648291 Merge "Added more metadata published by the MediaMetaDataRetriever" by Andreas Huber · 13 years ago
  42. 6ab1d17 am 0b7912d3: am 99b86247: Fix a leak from AACEncoder.cpp by James Dong · 13 years ago
  43. 73870c9 Fix a leak from AACEncoder.cpp by James Dong · 13 years ago
  44. 918581c am 70d7522e: am 865448a0: Merge "Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode" into honeycomb-mr1 by James Dong · 13 years ago
  45. 2eb6a47 Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode by James Dong · 13 years ago
  46. 2256d51 Added more metadata published by the MediaMetaDataRetriever by Andreas Huber · 13 years ago
  47. bdba1f2 Reject streaming .mp4 files over http that are not muxed reasonably. by Andreas Huber · 13 years ago
  48. 4f46fed Merge "- To track the usage of all audio output devices - To track the currently used audio device - The devices are separated as speaker and other audio devices - Provide the collected data to battery application through pullBatteryData()" by Gloria Wang · 13 years ago
  49. 9ee159b - To track the usage of all audio output devices by Gloria Wang · 13 years ago
  50. 9a5f9b7 Merge "Stagefright: Use the ANW min undequeued bufs query." by Jamie Gennis · 13 years ago
  51. 8b17ba3 Merge "To support DRM files without file extension" by Gloria Wang · 13 years ago
  52. c3369fd Merge "Resize internal PES buffers dynamically instead of relying on a fixed maximum size." by Andreas Huber · 13 years ago
  53. 3e57322 Resize internal PES buffers dynamically instead of relying on a fixed maximum size. by Andreas Huber · 13 years ago
  54. 43a7e77 Merge "Allow optional specification of a PTS timestamp when signalling a discontinuity." by Andreas Huber · 13 years ago
  55. 32f3cef Allow optional specification of a PTS timestamp when signalling a discontinuity. by Andreas Huber · 13 years ago
  56. 1c49671 Merge "Fix issue 3388775." by Eric Laurent · 13 years ago
  57. f96ebc6 Merge "PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits" by James Dong · 13 years ago
  58. 7f89d09 To support DRM files without file extension by Gloria Wang · 13 years ago
  59. ebdc652 PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits by James Dong · 13 years ago
  60. 3fd91ba Provide better duration and seek accuracy if playing vorbis audio from a non-streaming source. by Andreas Huber · 13 years ago
  61. 5f5354e Merge "Add support for up to 32 buffers per Surface" by Mathias Agopian · 13 years ago
  62. 2a21ff5 Merge "Get rid of redundant media profiles" by James Dong · 13 years ago
  63. 2a7e0a1 Get rid of redundant media profiles by James Dong · 13 years ago
  64. 196855e Add support for up to 32 buffers per Surface by Mathias Agopian · 13 years ago
  65. d71a0e1 Fix issue 3499926. by Eric Laurent · 13 years ago
  66. c0bff9b Merge "Fix issue 3479042." by Eric Laurent · 13 years ago
  67. 532492c Fix issue 3388775. by Eric Laurent · 13 years ago
  68. 59e7879 Merge "Stagefright: Query buffer usage from the component." by Jamie Gennis · 13 years ago
  69. e13e24b Merge "Add an OMX IL API for querying buffer usage flags." by Jamie Gennis · 13 years ago
  70. d2d38d5 Merge "Fix error recovery in Stagefright init." by Jamie Gennis · 13 years ago
  71. 243f5f9 Fix issue 3479042. by Eric Laurent · 13 years ago
  72. 258d4e3 Stagefright: Use the ANW min undequeued bufs query. by Jamie Gennis · 13 years ago
  73. 7400680 Fix error recovery in Stagefright init. by Jamie Gennis · 13 years ago
  74. 3c14b97 Stagefright: Query buffer usage from the component. by Jamie Gennis · 13 years ago
  75. e2ce645 Add an OMX IL API for querying buffer usage flags. by Jamie Gennis · 13 years ago
  76. 6fa83fb Merge "The color conversion from YUV420Planar to RGB only requires the image width to be a multiple of 2, not 4." by James Dong · 13 years ago
  77. 3911a72 Merge "Add the option '-S' to use surface allocated buffers in the stagefright cmdline tool." by Andreas Huber · 13 years ago
  78. 4855ea6 Merge "Fix bug 3376700 Volume too loud at lowest setting" by Jean-Michel Trivi · 13 years ago
  79. c83d4f5 Add the option '-S' to use surface allocated buffers in the stagefright cmdline tool. by Andreas Huber · 13 years ago
  80. 8ddeebb Bug 3447027 Limit previews for DRM video by Glenn Kasten · 13 years ago
  81. 043b22d Fix bug 3376700 Volume too loud at lowest setting by Jean-Michel Trivi · 13 years ago
  82. 6018185 am fbd67fec: (-s ours) am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units by Mike Lockwood · 13 years ago
  83. 5f19885 am 0600fff9: DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units by Mike Lockwood · 13 years ago
  84. 5124931 DO NOT MERGE: MTP: Add support for dynamically adding and removing storage units by Mike Lockwood · 13 years ago
  85. c3def8f am cd6828e8: (-s ours) am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb by Andreas Huber · 13 years ago
  86. 02b9599 am 2332cd8c: Merge "DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues." into honeycomb by Andreas Huber · 13 years ago
  87. 633b4c8 mp4a box contains mp3 audio when the object type indication is 0x6b by James Dong · 13 years ago
  88. 34d1115 DO NOT MERGE: Cherry picked hacks to better hide A/V sync issues. by Andreas Huber · 13 years ago
  89. 18eb42e Merge "Alternate patch for late video issue: seek only the video ahead to the next" by Andreas Huber · 13 years ago
  90. 827b55c Merge "Suppress the logging of URLs when in incognito mode." by Andreas Huber · 13 years ago
  91. 7314fa1 Suppress the logging of URLs when in incognito mode. by Andreas Huber · 13 years ago
  92. 64bb698 Alternate patch for late video issue: seek only the video ahead to the next by Andreas Huber · 13 years ago
  93. 72feaa5 Merge "Bug 3438258 Add SurfaceTexture as MediaPlayer sink" by Glenn Kasten · 13 years ago
  94. e23da61 Fix MP3Extractor by James Dong · 13 years ago
  95. 9287abf Merge "Don't crash when parsing DRM MIME types" by Glenn Kasten · 13 years ago
  96. 6f7a293 Merge "Add YV12 preview format to camera parameter constants." by Wu-cheng Li · 13 years ago
  97. d42c6e8 Add YV12 preview format to camera parameter constants. by Wu-cheng Li · 13 years ago
  98. 17e89b5 d263 may contain optional bitr box, and thus its size can be up to 23 bytes by James Dong · 13 years ago
  99. 676ae75 Merge "Remove RefBase.h dependency on TextOutput.h" by Mathias Agopian · 13 years ago
  100. 1173118 Bug 3438258 Add SurfaceTexture as MediaPlayer sink by Glenn Kasten · 13 years ago