1. d1e1aac 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 · 11 years ago
  2. 1abb9fa am 0fe40641: am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 11 years ago
  3. 15a3157 am 72c7cf9d: am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 11 years ago
  4. 0a6fba4 am a1b1e2de: (-s ours) am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 11 years ago
  5. ca53acd am 56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 11 years ago
  6. 5fa506c Reconcile with jb-mr1-release - do not merge by Jean-Baptiste Queru · 11 years ago
  7. dbda1c8 Merge "Clean up the native code to match Java update" into jb-mr2-dev by ztenghui · 11 years ago
  8. afde4e5 Clean up the native code to match Java update by ztenghui · 11 years ago
  9. 96aeef2 Merge "Disable our fancy logic to respect both sink and source's native formats" into jb-mr2-dev by Andreas Huber · 11 years ago
  10. 219a9d5 Merge "Camera: Log warning on out-of-range face detect scores" into jb-mr2-dev by Alex Ray · 11 years ago
  11. 13700b0 Disable our fancy logic to respect both sink and source's native formats by Andreas Huber · 11 years ago
  12. 1c345eb The transport stream HDCP descriptor belongs in the program_info section by Andreas Huber · 11 years ago
  13. 36185a4 Camera: Log warning on out-of-range face detect scores by Alex Ray · 11 years ago
  14. 8d4c382 Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev by Andy McFadden · 11 years ago
  15. ba6218e Correct MediaCodec + Surface behavior by Andy McFadden · 11 years ago
  16. 060c684 Merge "Add template class SingleStateQueue" into jb-mr2-dev by Glenn Kasten · 11 years ago
  17. 7b28844 Merge "Squashed commit of the following:" into jb-mr2-dev by Andreas Huber · 11 years ago
  18. 4343311 Squashed commit of the following: by Andreas Huber · 11 years ago
  19. a7a5917 Merge "Implement Surface input to MediaCodec." into jb-mr2-dev by Andy McFadden · 11 years ago
  20. 538f498 Add template class SingleStateQueue by Glenn Kasten · 12 years ago
  21. f779bb5 Implement Surface input to MediaCodec. by Andy McFadden · 11 years ago
  22. 0c57461 Merge "Miscellaneous cleanup" into jb-mr2-dev by Glenn Kasten · 11 years ago
  23. a265845 Miscellaneous cleanup by Glenn Kasten · 11 years ago
  24. 10774e1 Merge "media.log cleanup" into jb-mr2-dev by Glenn Kasten · 11 years ago
  25. d3c4b13 media.log cleanup by Glenn Kasten · 11 years ago
  26. 551bb75 am c0048178: Merge "Avoid invalid memory access when using extractMetadata()" by Marco Nelissen · 11 years ago
  27. 1a76084 Merge "Avoid invalid memory access when using extractMetadata()" by Marco Nelissen · 11 years ago
  28. 5324bb2 Merge "Remove tee sink debugging at compile time" into jb-mr2-dev by Glenn Kasten · 11 years ago
  29. 358538c Merge changes I25423a2b,I24680f1a into jb-mr2-dev by Igor Murashkin · 11 years ago
  30. 48c3f1f Merge "ProCameraTest: Drop frames test move processing delay between lock/unlock" into jb-mr2-dev by Igor Murashkin · 11 years ago
  31. fb41376 ProCamera: Add CpuConsumer asynchronous mode support by Igor Murashkin · 11 years ago
  32. 8fdfbe2 Camera: Drop ProCamera connections when a Camera connection happens by Igor Murashkin · 11 years ago
  33. 721f172 ProCameraTest: Drop frames test move processing delay between lock/unlock by Igor Murashkin · 11 years ago
  34. d72b2aa Avoid invalid memory access when using extractMetadata() by Sangkyu Lee · 11 years ago
  35. 7072e03 am ceb83b8d: Merge "SoftAMR: Signal the right frame format" by Andreas Huber · 11 years ago
  36. f9a2b81 am ccf51ec4: Merge "SoftVorbis: Set the right encoding in the port definition" by Andreas Huber · 11 years ago
  37. 7fa43f3 Camera: Start of support for version 3.0 of camera device HAL by Eino-Ville Talvala · 11 years ago
  38. f5daac4 Merge "camera_client: refactor Camera/ProCamera commonalities into BasicCamera" into jb-mr2-dev by Igor Murashkin · 11 years ago
  39. d166e4c Merge "SoftAMR: Signal the right frame format" by Andreas Huber · 11 years ago
  40. 25e964b Merge "SoftVorbis: Set the right encoding in the port definition" by Andreas Huber · 11 years ago
  41. 5e8e702 Merge "Revert "Logging to investigate a crash"" into jb-mr2-dev by Glenn Kasten · 11 years ago
  42. aebd9bb am 801726ef: Merge "MPEG4Writer: Write a zero-length compressor string" by Andreas Huber · 11 years ago
  43. 3c3c527 Revert "Logging to investigate a crash" by Glenn Kasten · 11 years ago
  44. 6ee1b86 Merge "MPEG4Writer: Write a zero-length compressor string" by Andreas Huber · 11 years ago
  45. b84d935 camera_client: refactor Camera/ProCamera commonalities into BasicCamera by Igor Murashkin · 11 years ago
  46. dd0bda0 Remove tee sink debugging at compile time by Glenn Kasten · 11 years ago
  47. 253e3c0 am ceb388d6: CameraService and Stagefright: Support AppOps by Eino-Ville Talvala · 11 years ago
  48. 48af7e8 CameraService and Stagefright: Support AppOps by Eino-Ville Talvala · 11 years ago
  49. fec2744 Merge "Handles duplicated NAL start code to fix crash on HLS streams." by Andreas Huber · 11 years ago
  50. c9c47e4 Handles duplicated NAL start code to fix crash on HLS streams. by Insun Kang · 12 years ago
  51. 68e6e24 Merge "Update tee sink" by Glenn Kasten · 11 years ago
  52. dd4abb5 Update tee sink by Glenn Kasten · 12 years ago
  53. 94a90a4 ProCamera: Fix waitForFrameBuffer not handling multiple outstanding frames by Igor Murashkin · 11 years ago
  54. 687f26c ProCamera: add waitForFrameBuffer/waitForFrameResult blocking calls by Igor Murashkin · 11 years ago
  55. 1d74853 Camera: ProCameraTests: clean up a bit, still needs more cleanup by Igor Murashkin · 11 years ago
  56. d127c2c ProCamera: Add getInfo for getting static metadata (and a test) by Igor Murashkin · 11 years ago
  57. 418e493 Camera: ProCamera - implement onResultReceived callback for metadata callbacks by Igor Murashkin · 11 years ago
  58. 5076182 Camera: ProCameraTests - add CpuConsumer tests for dual streams by Igor Murashkin · 11 years ago
  59. c0767f1 Camera: ProCamera - add createStreamCpu and unit test by Igor Murashkin · 11 years ago
  60. 5494cdc Camera: Change ProCamera to take IGraphicBufferProducer by Igor Murashkin · 11 years ago
  61. 9fb7fa1 Camera: ProCamera2Client implement createStream,createDefaultRequest by Igor Murashkin · 11 years ago
  62. 69e2243 Camera: ProCamera2Client - add createStream (service is stubbed) and unit test by Igor Murashkin · 11 years ago
  63. 9476926 Camera: ProCamera - add createStream stub and unit test for it by Igor Murashkin · 11 years ago
  64. 90fce97 Camera: ProCameraTests - add asynchronous locking unit test by Igor Murashkin · 11 years ago
  65. 68c8066 Camera: ProClient add asynchronous locks and such by Igor Murashkin · 11 years ago
  66. bfb5d5e Camera: Add ProCamera private binder interface for an API2-light functionality by Igor Murashkin · 11 years ago
  67. e4e5b2f Camera: Add unit test infrastructure for libcameraclient by Igor Murashkin · 11 years ago
  68. 5377991 Camera: Add exists function to CameraMetadata by Igor Murashkin · 11 years ago
  69. bd02dd1 Camera: Move CameraMetadata.h from service to client library by Igor Murashkin · 11 years ago
  70. ee9cc42 Merge "replace getISurfaceTexture by getIGraphicBufferProducer" by Mathias Agopian · 11 years ago
  71. 3706fe7 Merge "Permit conditional registry of mediaserver extensions" by Glenn Kasten · 11 years ago
  72. 8029ea4 Permit conditional registry of mediaserver extensions by Glenn Kasten · 11 years ago
  73. dacd2b0 Merge "CameraService: Log camera module name" by Alex Ray · 11 years ago
  74. 53c8ad3 CameraService: Log camera module name by Alex Ray · 11 years ago
  75. 9b50b2f Merge remote-tracking branch 'goog/jb-mr2-release' by Ed Heyl · 11 years ago
  76. a684366 replace getISurfaceTexture by getIGraphicBufferProducer by Mathias Agopian · 11 years ago
  77. 22b74bc A reference cannot be re-bound by Glenn Kasten · 11 years ago
  78. 2f8025e A reference cannot be re-bound by Glenn Kasten · 11 years ago
  79. c6d26a3 merge in jb-mr2-release history after reset to master by The Android Automerger · 11 years ago
  80. d13e6d0 SoftAMR: Signal the right frame format by Martin Storsjo · 11 years ago
  81. a457c43 Merge "Revert "Temporary additional logging to investigate bug"" by Glenn Kasten · 11 years ago
  82. 5f6f376 Revert "Temporary additional logging to investigate bug" by Glenn Kasten · 11 years ago
  83. c046148 Merge "Temporary additional logging to investigate bug" by Glenn Kasten · 11 years ago
  84. dd97642 Temporary additional logging to investigate bug by Glenn Kasten · 11 years ago
  85. 4490bf0 Merge "Refactoring: Rename SurfaceTextureClient to Surface" by Mathias Agopian · 11 years ago
  86. b1e7cd1 Refactoring: Rename SurfaceTextureClient to Surface by Mathias Agopian · 11 years ago
  87. 6bde467 Remove FragmentedMP4Extractor by Marco Nelissen · 11 years ago
  88. 62ad907 Add support for fragmented mp4 to MPEG4Extractor by Marco Nelissen · 11 years ago
  89. 4dbb17e Temporary additional logging to investigate bug by Glenn Kasten · 11 years ago
  90. 0d02633 Merge "Revert "Temporary additional logging to investigate bug"" by Glenn Kasten · 11 years ago
  91. ce70d40 Revert "Temporary additional logging to investigate bug" by Glenn Kasten · 11 years ago
  92. 159967d Merge "Temporary additional logging to investigate bug" by Glenn Kasten · 11 years ago
  93. 5881f18 Temporary additional logging to investigate bug by Glenn Kasten · 11 years ago
  94. ae09bf6 Merge "Add a test utility for MediaMuxer." by ztenghui · 11 years ago
  95. 15381e3 merge in jb-mr2-release history after reset to master by The Android Automerger · 11 years ago
  96. 5bdcf3e Temporary additional logging to investigate bug by Glenn Kasten · 11 years ago
  97. 7e1e1e6 Merge "Revert "Temporary additional logging to investigate bug"" by Glenn Kasten · 11 years ago
  98. 7f2f804 Revert "Temporary additional logging to investigate bug" by Glenn Kasten · 11 years ago
  99. cef1245 Merge "Temporary additional logging to investigate bug" by Glenn Kasten · 11 years ago
  100. b900234 Temporary additional logging to investigate bug by Glenn Kasten · 11 years ago