Gitiles
Code Review Sign In
review.blissroms.org / platform_frameworks_av / c582fde93ded7219107157333a9e46d780adcf9c
  1. c582fde resolved conflicts for merge of c158971f to stage-aosp-master by Jean-Baptiste Queru · 12 years ago
  2. c158971 Merge "Store rtsp accessunit until PLAY response parsed" by Jean-Baptiste Queru · 12 years ago
  3. 5de9ef2 am 365ed394: Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 12 years ago
  4. 365ed39 Merge "Typo in CameraParameters::set" by Jean-Baptiste Queru · 12 years ago
  5. 5d2ab2a am 8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack" by Jean-Baptiste Queru · 12 years ago
  6. 8eef093 Merge "libstagefright: Use LOG_BASIC when use chromium http stack" by Jean-Baptiste Queru · 12 years ago
  7. 0619792 am 267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero." by Jean-Baptiste Queru · 12 years ago
  8. 7266bc8 am ca7f1609: Merge "Prevent double disconnects in RTSPSource" by Jean-Baptiste Queru · 12 years ago
  9. 267363e Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero." by Jean-Baptiste Queru · 12 years ago
  10. ca7f160 Merge "Prevent double disconnects in RTSPSource" by Jean-Baptiste Queru · 12 years ago
  11. b9b8d14 Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero. by hovanchen · 12 years ago
  12. 0ad03bc Prevent double disconnects in RTSPSource by Fredrik Rosin · 12 years ago
  13. 47a1fe0 am a9aa6baa: Merge "Set u.ext_data to null after it has been freed" by Andreas Huber · 12 years ago
  14. a9aa6ba Merge "Set u.ext_data to null after it has been freed" by Andreas Huber · 12 years ago
  15. 83790fc am bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'." by Glenn Kasten · 12 years ago
  16. bdf33c9 Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'." by Glenn Kasten · 12 years ago
  17. fca8125 Set u.ext_data to null after it has been freed by Christer Fletcher · 12 years ago
  18. 7d40969 Fix compilation warning: incorrect format specifier for type 'ssize_t'. by Scott Fan · 12 years ago
  19. 3a4ff0b am d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link" by Jean-Baptiste Queru · 12 years ago
  20. d74a9ee Merge "libstagefright: fix the duration "00:00" for some httplive link" by Jean-Baptiste Queru · 12 years ago
  21. f3e21c3 am 60f3f102: Merge "Prevent AudioCommands being freed before read" by Glenn Kasten · 12 years ago
  22. 60f3f10 Merge "Prevent AudioCommands being freed before read" by Glenn Kasten · 12 years ago
  23. 5fa8c4b Prevent AudioCommands being freed before read by Christer Fletcher · 13 years ago
  24. 82fc2ca am d5018116: Merge "Fix typo." by Glenn Kasten · 12 years ago
  25. d501811 Merge "Fix typo." by Glenn Kasten · 12 years ago
  26. 911a184 am 132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track" by Glenn Kasten · 12 years ago
  27. 132bc5b Merge "Noise will be heard if audio sample rate not matched with audio track" by Glenn Kasten · 12 years ago
  28. da5b509 Noise will be heard if audio sample rate not matched with audio track by Ming Zhou · 12 years ago
  29. f65fa17 Fix typo. by Masaki Muranaka · 12 years ago
  30. e64d413 am 25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev by Lajos Molnar · 12 years ago
  31. 25b5617 Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev by Lajos Molnar · 12 years ago
  32. f9bb835 am b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright. by Andreas Huber · 12 years ago
  33. b7319a7 Update HTTP proxy configuration for all media playback inside stagefright. by Andreas Huber · 12 years ago
  34. e532d37 stagefright: Fix port-reconfiguration & output-buffer-filled race condition by Lajos Molnar · 12 years ago
  35. 268f5cc Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  36. fb5cee1 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  37. 1cd6852 am 41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev by Lajos Molnar · 12 years ago
  38. 41688da Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev by Lajos Molnar · 12 years ago
  39. 197d3e0 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  40. 8617908 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  41. 9f013a4 am 3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev by Igor Murashkin · 12 years ago
  42. 3c89a2e Merge "camera3: Don't try to disconnect stream native windows more than once" into jb-mr2-dev by Igor Murashkin · 12 years ago
  43. 6f505a4 MediaMuxer: Remove SAMPLE_FLAG_SYNC flag by Lajos Molnar · 12 years ago
  44. e2172be camera3: Don't try to disconnect stream native windows more than once by Igor Murashkin · 12 years ago
  45. 30ca800 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  46. 1352352 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  47. dd6b47e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  48. b4a0680 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  49. 22a5ddb am 6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  50. 6f6b31d Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev by Zhijun He · 12 years ago
  51. 14e585c am 6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  52. f8f370b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  53. 6947f12 Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev by Ed Heyl · 12 years ago
  54. b662e33 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  55. 059161b camera3: Disable ZSL for limited mode camera HALs by Igor Murashkin · 12 years ago
  56. 9b89c15 am ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  57. ca3fb12 Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev by Igor Murashkin · 12 years ago
  58. 124ccf4 Camera3: Fix the deadlock during recording pinch zooming by Zhijun He · 12 years ago
  59. 98730cd am 1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  60. 1f7f83b Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev by Igor Murashkin · 12 years ago
  61. a842a2a Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  62. fead4f1 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  63. efb0fd2 camera3: Fix zsl buffers released-while-in-use race condition by Igor Murashkin · 12 years ago
  64. b7337d5 am ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  65. ed49d7b Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev by Igor Murashkin · 12 years ago
  66. 1d60db8 am c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  67. c2c874d Camera3: Fix Bug minTimestamp is never greater than frame timestamp by Mansoor Aftab · 12 years ago
  68. 82db9e6 camera3: Fix recording failure when switching resolutions while preview on by Igor Murashkin · 12 years ago
  69. 4345d5b Camera3: Make sure new metadata results signal other threads waiting by Igor Murashkin · 12 years ago
  70. cf2148e Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  71. f3bddaf merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  72. 5bbca46 Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  73. 9545b67 am f21daf47: Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  74. f21daf4 Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev by Jamie Gennis · 12 years ago
  75. 722e489 am 01831d23: Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  76. 1b4ca5c Avoid a deadlock during EmptyBufferDone by Andreas Huber · 12 years ago
  77. 01831d2 Camera2/3: Increase digital zoom steps by Zhijun He · 12 years ago
  78. d763063 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  79. a01f72d merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  80. 81972da Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  81. 074eb38 am e2dfa5a4: Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  82. e2dfa5a Merge "update to Fence::waitForever() API change" into jb-mr2-dev by Mathias Agopian · 12 years ago
  83. b07d3c4 am 4224dedf: Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  84. 4224ded Merge "Adjust timestamp scale" into jb-mr2-dev by Andy McFadden · 12 years ago
  85. d764424 update to Fence::waitForever() API change by Mathias Agopian · 12 years ago
  86. b5b2d03 am 99f27cdf: wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 12 years ago
  87. a7f316e Reconcile with AOSP by Jean-Baptiste Queru · 12 years ago
  88. 324143b Adjust timestamp scale by Andy McFadden · 12 years ago
  89. 99f27cd wifi-display: retry UDP read/write to improve connection robustness by Chong Zhang · 12 years ago
  90. eaf4216 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  91. affd710 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  92. c3e155a Merge branch 'jb-mr2-dev' into jb-mr2-dev-plus-aosp by Conley Owens · 12 years ago
  93. dd90e8b Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev by Conley Owens · 12 years ago
  94. eef0aa7 am 7dd801bd: Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  95. 0d0d868 Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev by Eino-Ville Talvala · 12 years ago
  96. 9f51d98 merge in jb-mr2-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  97. 03b7bdd am 6ed6a2e6: Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev by Chong Zhang · 12 years ago
  98. ceac5fb Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev by Chong Zhang · 12 years ago
  99. a1f70e6 am 083a08ac: Camera: don\'t spam RingBufferConsumer logs in eng builds by Igor Murashkin · 12 years ago
  100. d5694a2 Camera3: Fix fast flexible YUV->NV21 path. by Eino-Ville Talvala · 12 years ago