1. b4d92c5 am c5604b08: am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 12 years ago
  2. c5604b0 am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 12 years ago
  3. 0fe4064 am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 12 years ago
  4. 72c7cf9 am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 12 years ago
  5. a1b1e2d am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 12 years ago
  6. 56f387a Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 12 years ago
  7. 7036984 Merge "Clean up the native code to match Java update" into jb-mr2-dev by ztenghui · 12 years ago
  8. 3db62df Clean up the native code to match Java update by ztenghui · 12 years ago
  9. 2797b47 Merge "Disable our fancy logic to respect both sink and source's native formats" into jb-mr2-dev by Andreas Huber · 12 years ago
  10. 6472c2a Merge "Camera: Log warning on out-of-range face detect scores" into jb-mr2-dev by Alex Ray · 12 years ago
  11. 5abf87f Disable our fancy logic to respect both sink and source's native formats by Andreas Huber · 12 years ago
  12. bfd79f2 The transport stream HDCP descriptor belongs in the program_info section by Andreas Huber · 12 years ago
  13. 910403e Camera: Log warning on out-of-range face detect scores by Alex Ray · 12 years ago
  14. 0ab4d86 Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev by Andy McFadden · 12 years ago
  15. 6507d14 Correct MediaCodec + Surface behavior by Andy McFadden · 12 years ago
  16. 2217a40 Merge "Add template class SingleStateQueue" into jb-mr2-dev by Glenn Kasten · 12 years ago
  17. 0695ea9 Merge "Squashed commit of the following:" into jb-mr2-dev by Andreas Huber · 12 years ago
  18. a556c48 Squashed commit of the following: by Andreas Huber · 12 years ago
  19. e51d8b3 Merge "Implement Surface input to MediaCodec." into jb-mr2-dev by Andy McFadden · 12 years ago
  20. 5c4cc0d Add template class SingleStateQueue by Glenn Kasten · 13 years ago
  21. 7cd5853 Implement Surface input to MediaCodec. by Andy McFadden · 12 years ago
  22. d573622d Merge "Miscellaneous cleanup" into jb-mr2-dev by Glenn Kasten · 12 years ago
  23. 8602e55 Modified udptest to sync time across devices. by Andreas Huber · 12 years ago
  24. c9b2e20 Miscellaneous cleanup by Glenn Kasten · 12 years ago
  25. bf04b58 Merge "media.log cleanup" into jb-mr2-dev by Glenn Kasten · 12 years ago
  26. ab7d72f media.log cleanup by Glenn Kasten · 12 years ago
  27. ea2839f am c0048178: Merge "Avoid invalid memory access when using extractMetadata()" by Marco Nelissen · 12 years ago
  28. c004817 Merge "Avoid invalid memory access when using extractMetadata()" by Marco Nelissen · 12 years ago
  29. 4874220 Merge "Remove tee sink debugging at compile time" into jb-mr2-dev by Glenn Kasten · 12 years ago
  30. 3605ab3 Merge changes I25423a2b,I24680f1a into jb-mr2-dev by Igor Murashkin · 12 years ago
  31. 3eeaca1 Merge "ProCameraTest: Drop frames test move processing delay between lock/unlock" into jb-mr2-dev by Igor Murashkin · 12 years ago
  32. ba5ca4e ProCamera: Add CpuConsumer asynchronous mode support by Igor Murashkin · 12 years ago
  33. bfc9915 Camera: Drop ProCamera connections when a Camera connection happens by Igor Murashkin · 12 years ago
  34. 3fa4891 ProCameraTest: Drop frames test move processing delay between lock/unlock by Igor Murashkin · 12 years ago
  35. d01c148 Avoid invalid memory access when using extractMetadata() by Sangkyu Lee · 12 years ago
  36. fa74de2 am ceb83b8d: Merge "SoftAMR: Signal the right frame format" by Andreas Huber · 12 years ago
  37. eed157d am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition" by Andreas Huber · 12 years ago
  38. b99c5b8 Camera: Start of support for version 3.0 of camera device HAL by Eino-Ville Talvala · 12 years ago
  39. 8b5c4ec Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev by Igor Murashkin · 12 years ago
  40. ceb83b8 Merge "SoftAMR: Signal the right frame format" by Andreas Huber · 12 years ago
  41. ccf51ec Merge "SoftVorbis: Set the right encoding in the port definition" by Andreas Huber · 12 years ago
  42. 2c86f53 Merge "Revert "Logging to investigate a crash"" into jb-mr2-dev by Glenn Kasten · 12 years ago
  43. 6818947 am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string" by Andreas Huber · 12 years ago
  44. 409e374 Revert "Logging to investigate a crash" by Glenn Kasten · 12 years ago
  45. 801726e Merge "MPEG4Writer: Write a zero-length compressor string" by Andreas Huber · 12 years ago
  46. c073ba5 camera_client: refactor Camera/ProCamera commonalities into BasicCamera by Igor Murashkin · 12 years ago
  47. 46909e7 Remove tee sink debugging at compile time by Glenn Kasten · 12 years ago
  48. b39f30b am ceb388d6: CameraService and Stagefright: Support AppOps by Eino-Ville Talvala · 12 years ago
  49. ceb388d CameraService and Stagefright: Support AppOps by Eino-Ville Talvala · 12 years ago
  50. b4ac0ea Merge "Handles duplicated NAL start code to fix crash on HLS streams." by Andreas Huber · 12 years ago
  51. 2b56065 Handles duplicated NAL start code to fix crash on HLS streams. by Insun Kang · 13 years ago
  52. 0894bfb Merge "Update tee sink" by Glenn Kasten · 12 years ago
  53. da6ef13 Update tee sink by Glenn Kasten · 13 years ago
  54. 4bc4a38 ProCamera: Fix waitForFrameBuffer not handling multiple outstanding frames by Igor Murashkin · 12 years ago
  55. a140a6e ProCamera: add waitForFrameBuffer/waitForFrameResult blocking calls by Igor Murashkin · 12 years ago
  56. dcb07d5 Camera: ProCameraTests: clean up a bit, still needs more cleanup by Igor Murashkin · 12 years ago
  57. 7b33a74 ProCamera: Add getInfo for getting static metadata (and a test) by Igor Murashkin · 12 years ago
  58. a91537e Camera: ProCamera - implement onResultReceived callback for metadata callbacks by Igor Murashkin · 12 years ago
  59. eb72e17 Camera: ProCameraTests - add CpuConsumer tests for dual streams by Igor Murashkin · 12 years ago
  60. 5835cc4 Camera: ProCamera - add createStreamCpu and unit test by Igor Murashkin · 12 years ago
  61. 76f8b43 Camera: Change ProCamera to take IGraphicBufferProducer by Igor Murashkin · 12 years ago
  62. 3261fd3 Camera: ProCamera2Client implement createStream,createDefaultRequest by Igor Murashkin · 12 years ago
  63. 985fd30 Camera: ProCamera2Client - add createStream (service is stubbed) and unit test by Igor Murashkin · 12 years ago
  64. 68506fd Camera: ProCamera - add createStream stub and unit test for it by Igor Murashkin · 12 years ago
  65. 39f79f7 Camera: ProCameraTests - add asynchronous locking unit test by Igor Murashkin · 13 years ago
  66. 5376573 Camera: ProClient add asynchronous locks and such by Igor Murashkin · 12 years ago
  67. 634a515 Camera: Add ProCamera private binder interface for an API2-light functionality by Igor Murashkin · 12 years ago
  68. 1d88023 Camera: Add unit test infrastructure for libcameraclient by Igor Murashkin · 12 years ago
  69. fc42642a Camera: Add exists function to CameraMetadata by Igor Murashkin · 12 years ago
  70. 7efa520 Camera: Move CameraMetadata.h from service to client library by Igor Murashkin · 12 years ago
  71. 99c2f92 Merge "replace getISurfaceTexture by getIGraphicBufferProducer" by Mathias Agopian · 12 years ago
  72. e2fb147 Merge "Permit conditional registry of mediaserver extensions" by Glenn Kasten · 12 years ago
  73. feb2179 Permit conditional registry of mediaserver extensions by Glenn Kasten · 12 years ago
  74. 23e0b66 Merge "CameraService: Log camera module name" by Alex Ray · 12 years ago
  75. c0dd54f CameraService: Log camera module name by Alex Ray · 12 years ago
  76. 68afa03 Merge remote-tracking branch 'goog/jb-mr2-release' by Ed Heyl · 12 years ago
  77. 9e1cdea replace getISurfaceTexture by getIGraphicBufferProducer by Mathias Agopian · 12 years ago
  78. fc7e676 A reference cannot be re-bound by Glenn Kasten · 12 years ago
  79. fc900c9 A reference cannot be re-bound by Glenn Kasten · 12 years ago
  80. 2b99a71 merge in jb-mr2-release history after reset to master by The Android Automerger · 12 years ago
  81. 8298cd4 SoftAMR: Signal the right frame format by Martin Storsjo · 12 years ago
  82. 4353cef Merge "Revert "Temporary additional logging to investigate bug"" by Glenn Kasten · 12 years ago
  83. 7f5d335 Revert "Temporary additional logging to investigate bug" by Glenn Kasten · 12 years ago
  84. e96cdab Merge "Temporary additional logging to investigate bug" by Glenn Kasten · 12 years ago
  85. 32584a7 Temporary additional logging to investigate bug by Glenn Kasten · 12 years ago
  86. 7aa1237 Merge "Refactoring: Rename SurfaceTextureClient to Surface" by Mathias Agopian · 12 years ago
  87. 1a2952a Refactoring: Rename SurfaceTextureClient to Surface by Mathias Agopian · 12 years ago
  88. ab89ac2 Remove FragmentedMP4Extractor by Marco Nelissen · 12 years ago
  89. 05f625c Add support for fragmented mp4 to MPEG4Extractor by Marco Nelissen · 12 years ago
  90. 08725b7 Temporary additional logging to investigate bug by Glenn Kasten · 12 years ago
  91. 7deec82 Merge "Revert "Temporary additional logging to investigate bug"" by Glenn Kasten · 12 years ago
  92. e186b51 Revert "Temporary additional logging to investigate bug" by Glenn Kasten · 12 years ago
  93. 901e5e7 Merge "Temporary additional logging to investigate bug" by Glenn Kasten · 12 years ago
  94. 639482c Temporary additional logging to investigate bug by Glenn Kasten · 12 years ago
  95. 031b1b1 Merge "Add a test utility for MediaMuxer." by ztenghui · 12 years ago
  96. c6eb287 merge in jb-mr2-release history after reset to master by The Android Automerger · 12 years ago
  97. 9036ba8 Temporary additional logging to investigate bug by Glenn Kasten · 12 years ago
  98. 085205b Merge "Revert "Temporary additional logging to investigate bug"" by Glenn Kasten · 12 years ago
  99. 51eb396 Revert "Temporary additional logging to investigate bug" by Glenn Kasten · 12 years ago
  100. 736c738 Merge "Temporary additional logging to investigate bug" by Glenn Kasten · 12 years ago