Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_av / b06c38687a0ecf8f5662c916e6e98d21d141eb13
  1. b06c386 resolve merge conflicts of 58fc59b91c to oc-mr1-dev-plus-aosp am: 02cc0ecc73 by Elliott Hughes · 8 years ago
  2. 02cc0ec resolve merge conflicts of 58fc59b91c to oc-mr1-dev-plus-aosp by Elliott Hughes · 8 years ago
  3. e942480 Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" am: 2a27078d9a am: 3ccef7847f am: 96a1f1648a by Lajos Molnar · 8 years ago
  4. 250cbc7 Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" am: 2a27078d9a am: 3ccef7847f by Lajos Molnar · 8 years ago
  5. 58fc59b Merge "Add missing includes." am: fe4ab105da am: 5fa7dcf26a by Dan Albert · 8 years ago
  6. 96a1f16 Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" am: 2a27078d9a by Lajos Molnar · 8 years ago
  7. 5fa7dcf Merge "Add missing includes." am: fe4ab105da by Dan Albert · 8 years ago
  8. 3ccef78 Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" by Lajos Molnar · 8 years ago
  9. fe4ab10 Merge "Add missing includes." by Treehugger Robot · 8 years ago
  10. cb2e7fb Add missing includes. by Dan Albert · 8 years ago
  11. fe0597c Merge "NdkMediaCodec: add AMediaCodec_getBufferFormat" by TreeHugger Robot · 8 years ago
  12. 2a27078 Merge "omx: collapse unpopulated slot messages in GraphicBufferSource" by Treehugger Robot · 8 years ago
  13. a2a8eaf Merge "Remove OMX dependency from MediaPlayerService" by TreeHugger Robot · 8 years ago
  14. 2c32f4d NdkMediaCodec: add AMediaCodec_getBufferFormat by Manikanta Kanamarlapudi · 8 years ago
  15. b7798a0 Remove OMX dependency from MediaPlayerService by Pawin Vongmasa · 8 years ago
  16. bf44f4e Merge "Track libgui changes" by Rob Carr · 8 years ago
  17. 49e4421 Merge "stagefright: renaming some variable in ItemTable" by TreeHugger Robot · 8 years ago
  18. ee6dd5c Merge "Camera: fix use after freed error" am: b7939bbfbf am: d0cc49f98d am: 12a4218bd6 by Yin-Chia Yeh · 8 years ago
  19. 8a23ae4 Merge "Camera: fix use after freed error" am: b7939bbfbf am: d0cc49f98d by Yin-Chia Yeh · 8 years ago
  20. a0cf449 Merge "avoid 32-bit integer overflow" by TreeHugger Robot · 8 years ago
  21. c12b9b8 Merge "Don't hide NDK types behind API level guards." am: 37dc3d2136 am: 23ac59ad8d am: d32aab8c29 by Dan Albert · 8 years ago
  22. 8922446 Merge "Don't hide NDK types behind API level guards." am: 37dc3d2136 am: 23ac59ad8d by Dan Albert · 8 years ago
  23. 12a4218 Merge "Camera: fix use after freed error" am: b7939bbfbf am: d0cc49f98d by Yin-Chia Yeh · 8 years ago
  24. d32aab8 Merge "Don't hide NDK types behind API level guards." am: 37dc3d2136 by Dan Albert · 8 years ago
  25. d0cc49f Merge "Camera: fix use after freed error" am: b7939bbfbf by Yin-Chia Yeh · 8 years ago
  26. 23ac59a Merge "Don't hide NDK types behind API level guards." am: 37dc3d2136 by Dan Albert · 8 years ago
  27. b7939bb Merge "Camera: fix use after freed error" by Treehugger Robot · 8 years ago
  28. d1e3188 omx: collapse unpopulated slot messages in GraphicBufferSource by Lajos Molnar · 8 years ago
  29. 37dc3d2 Merge "Don't hide NDK types behind API level guards." by Treehugger Robot · 8 years ago
  30. 73e95a9 avoid 32-bit integer overflow by Ray Essick · 8 years ago
  31. ecd0813 stagefright: renaming some variable in ItemTable by Chong Zhang · 8 years ago
  32. ffbb56d Merge "Add missing includes." by TreeHugger Robot · 8 years ago
  33. 36967fb Add missing includes. by Dan Albert · 8 years ago
  34. 116c792 Track libgui changes by Robert Carr · 8 years ago
  35. 284aa30 Fix dependency on IOMX in OMXClient.h by Pawin Vongmasa · 8 years ago
  36. 3d76251 Merge "Codec2: add argument for C2Buffer::unregisterNotify" by TreeHugger Robot · 8 years ago
  37. f1cb8fa Merge "Move MediaDefs from libmedia to libstagefright_foundation" by TreeHugger Robot · 8 years ago
  38. 084f8e1 Codec2: add argument for C2Buffer::unregisterNotify by Lajos Molnar · 8 years ago
  39. b45a3c2 Merge "Codec2: fix miscellaneous typos" by TreeHugger Robot · 8 years ago
  40. fefee89 Merge "Fix HEIF support" by TreeHugger Robot · 8 years ago
  41. 0222d33 Merge "Move UXX_AT families to libstagefright_foundation" by Dongwon Kang · 8 years ago
  42. ac835db Merge "Move AWakeLock from foundation to libmediaplayerservice" by Dongwon Kang · 8 years ago
  43. e7a8a63 Move MediaDefs from libmedia to libstagefright_foundation by Dongwon Kang · 8 years ago
  44. 6076128 Move UXX_AT families to libstagefright_foundation by Dongwon Kang · 8 years ago
  45. 3dced07 Move AWakeLock from foundation to libmediaplayerservice by Dongwon Kang · 8 years ago
  46. d76a4a1 Fix HEIF support by Marco Nelissen · 8 years ago
  47. 960a62f Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5 am: e14c028ff7 am: e3c46b0a49 by Wei Jia · 8 years ago
  48. 4f9bf54 Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156 am: 648703351f am: d5fd320184 by Lajos Molnar · 8 years ago
  49. 4070157 Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5 am: e14c028ff7 am: 75840e808e by Wei Jia · 8 years ago
  50. 36eb8ab Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156 am: 648703351f am: 204b7f82a4 by Lajos Molnar · 8 years ago
  51. 6061749 Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5 am: e14c028ff7 by Wei Jia · 8 years ago
  52. a2e80ab Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156 am: 648703351f by Lajos Molnar · 8 years ago
  53. 3393982 Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5 am: e14c028ff7 by Wei Jia · 8 years ago
  54. b147f7e Codec2: fix miscellaneous typos by Lajos Molnar · 8 years ago
  55. 75840e8 Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5 by Wei Jia · 8 years ago
  56. e3c46b0 Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev am: 402b8a0ef5 by Wei Jia · 8 years ago
  57. ce9b9e1 Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156 am: 648703351f by Lajos Molnar · 8 years ago
  58. e805950 Merge "Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours am: a5d924154e -s ours am: 0df59eb1e6 -s ours" into oc-mr1-dev-plus-aosp by Eric Laurent · 8 years ago
  59. 6bc63e2 Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours am: a5d924154e -s ours am: b313fcada1 -s ours by Eric Laurent · 8 years ago
  60. e14c028 Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev by Wei Jia · 8 years ago
  61. d5fd320 Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156 by Lajos Molnar · 8 years ago
  62. 204b7f8 Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156 by Lajos Molnar · 8 years ago
  63. 6487033 Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev by Lajos Molnar · 8 years ago
  64. 402b8a0 Merge changes from topic "am-18b00723a9f84b9a9f6c42239c0583b1" into oc-dev by Android Build Merger (Role) · 8 years ago
  65. 4fbd243 MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9 -s ours am: 41392611b5 am: 0b6424a441 am: b9e0bdb6e8 am: 1d242fdfff by Wei Jia · 8 years ago
  66. abdca76 Merge "Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 am: cf3b663306 am: 66196b4056" into oc-mr1-dev-plus-aosp by Marco Nelissen · 8 years ago
  67. 1e79b0c Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev by TreeHugger Robot · 8 years ago
  68. a9c56b5 Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657 -s ours am: 769a422071 am: 4797f02aee am: d951771d27 am: bd9ffb2a77 by Marco Nelissen · 8 years ago
  69. c8ab764 MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9 -s ours am: 41392611b5 am: 0b6424a441 am: b9e0bdb6e8 by Wei Jia · 8 years ago
  70. da86840 Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657 -s ours am: 769a422071 am: 4797f02aee am: d951771d27 by Marco Nelissen · 8 years ago
  71. 3458637 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 am: cf3b663306 am: a7fd5a0775 by Marco Nelissen · 8 years ago
  72. 1d242fd MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9 -s ours am: 41392611b5 am: 0b6424a441 by Wei Jia · 8 years ago
  73. b013b15 Merge "Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours am: a5d924154e -s ours am: 0df59eb1e6 -s ours" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  74. e01fd56 Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours am: a5d924154e -s ours by Eric Laurent · 8 years ago
  75. bd9ffb2 Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657 -s ours am: 769a422071 am: 4797f02aee by Marco Nelissen · 8 years ago
  76. 8ac83c3 Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours am: a5d924154e -s ours by Eric Laurent · 8 years ago
  77. a017cf2 Merge "Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 am: cf3b663306 am: 66196b4056" into oc-mr1-dev-plus-aosp by Android Build Merger (Role) · 8 years ago
  78. e29be76 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 am: cf3b663306 by Marco Nelissen · 8 years ago
  79. 788ddb5 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 am: cf3b663306 by Marco Nelissen · 8 years ago
  80. b313fca Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours by Eric Laurent · 8 years ago
  81. b9e0bdb MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9 -s ours am: 41392611b5 by Wei Jia · 8 years ago
  82. d951771 Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657 -s ours am: 769a422071 by Marco Nelissen · 8 years ago
  83. 0df59eb Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours am: 1fd129f457 -s ours by Eric Laurent · 8 years ago
  84. a7fd5a0 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 by Marco Nelissen · 8 years ago
  85. 66196b4 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 am: fc64ad47f6 by Marco Nelissen · 8 years ago
  86. 0b6424a MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 am: 6c15ae2aa9 -s ours by Wei Jia · 8 years ago
  87. 4797f02 Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b am: efcbb62657 -s ours by Marco Nelissen · 8 years ago
  88. a5d9241 Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e am: 960f0f335e -s ours by Eric Laurent · 8 years ago
  89. cf3b663 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c am: 32d62af8e0 by Marco Nelissen · 8 years ago
  90. 4139261 MediaExtractor: ensure users to check returned value by getTrack. am: 46e359cbc0 am: 1fad937a9c am: 7b66ddb747 by Wei Jia · 8 years ago
  91. 1fd129f Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 am: 830bbb259e by Eric Laurent · 8 years ago
  92. 769a422 Don't CHECK if the source can't be started am: 711f83fa6c am: c3f16a62a2 am: 0ada8e950b by Marco Nelissen · 8 years ago
  93. fc64ad4 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 am: db1e02306c by Marco Nelissen · 8 years ago
  94. 960f0f3 Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d am: 31ac3bd137 by Eric Laurent · 8 years ago
  95. 32d62af Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours am: 4758facf28 by Marco Nelissen · 8 years ago
  96. 830bbb2 Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb am: 7f0263ba2d by Eric Laurent · 8 years ago
  97. db1e023 Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 am: e79b2f044c -s ours by Marco Nelissen · 8 years ago
  98. 31ac3bd Merge "Soundtrigger service: fix cross deadlock with audio policy service" into nyc-dev am: dbda8a95eb by Eric Laurent · 8 years ago
  99. 4758fac Merge changes from topic "b23270724" into nyc-dev am: 45a05eb567 by Marco Nelissen · 8 years ago
  100. 0d182e1 Merge "Soundtrigger service: fix cross deadlock with audio policy service am: 0957621867 am: 87da65273f -s ours am: df5f9746f2 -s ours" into oc-mr1-dev-plus-aosp by Eric Laurent · 8 years ago