Gitiles
Code Review Sign In
gerrit-public.fairphone.software / fp2-dev / platform / frameworks / av / 3e08ca6709b5a75dc3b779cf3eba8196b08a0245
  1. 3e08ca6 resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aosp by Lajos Molnar · 10 years ago
  2. 2592184 am 6baa8fe7: am 94a92c69: Merge "[audio][audioflinger] Consume all frames when a DirectThread is done." into lmp-mr1-dev by Phil Burk · 10 years ago
  3. b6ac4d4 am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before setDataSource by Lajos Molnar · 10 years ago
  4. 6571ed3 am a0940a56: stagefright: misc fixes to software video encoders (and decoders) by Lajos Molnar · 10 years ago
  5. 6baa8fe am 94a92c69: Merge "[audio][audioflinger] Consume all frames when a DirectThread is done." into lmp-mr1-dev by Phil Burk · 10 years ago
  6. a0940a5 stagefright: misc fixes to software video encoders (and decoders) by Lajos Molnar · 10 years ago
  7. 94a92c6 Merge "[audio][audioflinger] Consume all frames when a DirectThread is done." into lmp-mr1-dev by Phil Burk · 10 years ago
  8. 2253b3c am f484952e: mediaplayer: allow setVideoSurface before setDataSource by Lajos Molnar · 10 years ago
  9. 99adee3 [audio][audioflinger] Consume all frames when a DirectThread is done. by Phil Burk · 10 years ago
  10. f484952 mediaplayer: allow setVideoSurface before setDataSource by Lajos Molnar · 10 years ago
  11. 78e179e am 4e3c2bbc: am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions by Bernhard Rosenkränzer · 10 years ago
  12. 5dfa7c1 Merge branch 'lmp-mr1-dev-plus-aosp' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/av into lmp-mr1-dev-plus-aosp by rmcloughlin · 10 years ago
  13. 46b21c6 am ab01c22a: am cf1e3bb2: Merge "Fix AAC recording issue" by Marco Nelissen · 10 years ago
  14. bd9df74 am 1546028a: am 1767df77: AudioPolicyManager: distinguish between mirroring and rerouting by Jean-Michel Trivi · 10 years ago
  15. 66b17e9 Merge commit 'f5a968a0' into mm by Glenn Kasten · 10 years ago
  16. ab01c22 am cf1e3bb2: Merge "Fix AAC recording issue" by Marco Nelissen · 10 years ago
  17. cf1e3bb Merge "Fix AAC recording issue" by Marco Nelissen · 10 years ago
  18. 41dd3a5 Fix AAC recording issue by Marco Nelissen · 10 years ago
  19. b279f5a am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" into lmp-mr1-dev by Eric Laurent · 10 years ago
  20. a2bc118 am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it." by Marco Nelissen · 10 years ago
  21. 2a0f484 am a04c05ab: Merge "Truncate file before recording into it." by Marco Nelissen · 10 years ago
  22. a04c05a Merge "Truncate file before recording into it." by Marco Nelissen · 10 years ago
  23. 69113e8 Truncate file before recording into it. by Marco Nelissen · 10 years ago
  24. c948a97 am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches." by Chih-Hung Hsieh · 10 years ago
  25. c15a72f am 1914e7ed: Merge "Fix print format mismatches." by Chih-Hung Hsieh · 10 years ago
  26. 1914e7e Merge "Fix print format mismatches." by Chih-Hung Hsieh · 10 years ago
  27. 4e3c2bb am 7e45789f: Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions by Bernhard Rosenkränzer · 10 years ago
  28. 7e45789 Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitions by Bernhard Rosenkränzer · 10 years ago
  29. 1546028 am 1767df77: AudioPolicyManager: distinguish between mirroring and rerouting by Jean-Michel Trivi · 10 years ago
  30. f44bdeb am 61697a5c: am 9cea7aa4: Merge "Camera3Device: support shutter after result" into lmp-mr1-dev by Chien-Yu Chen · 10 years ago
  31. 1767df7 AudioPolicyManager: distinguish between mirroring and rerouting by Jean-Michel Trivi · 10 years ago
  32. 3b46819 Merge commit '2340e5a8' into manualmerge by Ruben Brunk · 10 years ago
  33. f5a968a am 1487d270: Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr1-dev by Eric Laurent · 10 years ago
  34. c49d9cd am 2dda40d6: Merge "audio policy: add support for custom mixes" into lmp-mr1-dev by Eric Laurent · 10 years ago
  35. 1487d27 Merge "audio policy: binder calls for dynamic audio policy mixes" into lmp-mr1-dev by Eric Laurent · 10 years ago
  36. 2dda40d Merge "audio policy: add support for custom mixes" into lmp-mr1-dev by Eric Laurent · 10 years ago
  37. baac183 audio policy: binder calls for dynamic audio policy mixes by Eric Laurent · 10 years ago
  38. 275e8e9 audio policy: add support for custom mixes by Eric Laurent · 10 years ago
  39. 61697a5 am 9cea7aa4: Merge "Camera3Device: support shutter after result" into lmp-mr1-dev by Chien-Yu Chen · 10 years ago
  40. 2340e5a am 6533dc1c: Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-dev by Ruben Brunk · 10 years ago
  41. 9cea7aa Merge "Camera3Device: support shutter after result" into lmp-mr1-dev by Chien-Yu Chen · 10 years ago
  42. 6533dc1 Merge "Camera2: Round unsupported surface sizes in configure." into lmp-mr1-dev by Ruben Brunk · 10 years ago
  43. cd8d9c6 Fix print format mismatches. by Chih-Hung Hsieh · 10 years ago
  44. 43e69a6 Camera3Device: support shutter after result by Chien-Yu Chen · 10 years ago
  45. be6a91d am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev by Marco Nelissen · 10 years ago
  46. 6eb3b52 am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-dev by Marco Nelissen · 10 years ago
  47. f6a364e Merge "Fix AAC recording issue" into lmp-mr1-dev by Marco Nelissen · 10 years ago
  48. 9fa3db9 Fix AAC recording issue by Marco Nelissen · 10 years ago
  49. 33cc5c9 am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode" by Lajos Molnar · 10 years ago
  50. 853bc5a am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print." by Lajos Molnar · 10 years ago
  51. 08fa30d am 5abc1201: am 3cc93734: Merge "Fix build with clang" by Lajos Molnar · 10 years ago
  52. 9f4a2d3 am 54a6b2e1: am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed" by Glenn Kasten · 10 years ago
  53. 80ddb73 am ce48b3a8: am f3df58c7: Merge "Stagefright: Fix unused variables" by Andreas Gampe · 10 years ago
  54. f143b60 am d1aeff55: Merge "Fix build with clang in C++11 mode" by Lajos Molnar · 10 years ago
  55. f3c2534 am 66172f5c: Merge "Cast int64_t values to long long before print." by Lajos Molnar · 10 years ago
  56. 5abc120 am 3cc93734: Merge "Fix build with clang" by Lajos Molnar · 10 years ago
  57. d1aeff5 Merge "Fix build with clang in C++11 mode" by Lajos Molnar · 10 years ago
  58. 66172f5 Merge "Cast int64_t values to long long before print." by Lajos Molnar · 10 years ago
  59. 3cc9373 Merge "Fix build with clang" by Lajos Molnar · 10 years ago
  60. 9574b64 am c1b0d49c: am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed by zunkyu.lee · 10 years ago
  61. c1b0d49 am 82a69ea8: Prevent ANR when AudioTrack is paused or re-routed by zunkyu.lee · 10 years ago
  62. 54a6b2e am 56335ae2: Merge "Prevent ANR when AudioTrack is paused or re-routed" by Glenn Kasten · 10 years ago
  63. 82a69ea Prevent ANR when AudioTrack is paused or re-routed by zunkyu.lee · 10 years ago
  64. 56335ae Merge "Prevent ANR when AudioTrack is paused or re-routed" by Glenn Kasten · 10 years ago
  65. a78e104 Prevent ANR when AudioTrack is paused or re-routed by zunkyu.lee · 10 years ago
  66. 3ca2794 am 0b672c8b: am ca7b4bc4: mediaplayerservice: add support for legacy DRM by Lajos Molnar · 10 years ago
  67. e09bf82 am 6874ed79: am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  68. 1ed99f0 am 2b02f140: am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev by Wei Jia · 10 years ago
  69. b156888 am 427aca5b: am 18265202: Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-dev by Eric Laurent · 10 years ago
  70. e4fe1b6 am 876c21b1: am a147c17a: Merge "fixes for non-secure widevine playback" into lmp-mr1-dev by Chong Zhang · 10 years ago
  71. c12caed am a9450bbc: am cbbe1ccc: Merge "audio policy: fix AudioPort parameter checks" into lmp-mr1-dev by Eric Laurent · 10 years ago
  72. 4ac5f97 am 41d8d8e7: am 57216ca4: Merge "Track volume should be maintained even if track is restored" into lmp-mr1-dev by Glenn Kasten · 10 years ago
  73. f3376bd am 668b0550: am 597ce69a: Merge "Camera: Add support for SCENE_MODE_HDR for newer HALs" into lmp-mr1-dev by Eino-Ville Talvala · 10 years ago
  74. e9011c2 am 07e19019: am 9257000c: camera: fix logging in ZslProcessor to avoid spam by Ruchit Sharma · 10 years ago
  75. 59ca703 am 4df79c2c: am d6e7f1e1: Merge "Fix for AOSP force virtualization mode" into lmp-mr1-dev by Ricardo Garcia · 10 years ago
  76. 5f48089 am 4c56f8e0: am b65842dd: Merge "Fix NuPlayer assertion on failure to create AudioTrack" into lmp-mr1-dev by Andy Hung · 10 years ago
  77. 3202a2d am 7cc9a1c5: am 76c156f7: Merge "fix threading in RTSPSource and StreamingSource" into lmp-mr1-dev by Chong Zhang · 10 years ago
  78. 5185c95 am 25bad49c: am 852dc963: Merge "avc_util: try to find the first start code prefix 0x000001 even though there is non-zero byte at the beginning of the buffer." into lmp-mr1-dev by Wei Jia · 10 years ago
  79. 900f653 am 561f50de: am db995fe3: Merge "Fix getTimestamp if offload thread is not initialized." into lmp-mr1-dev by Andy Hung · 10 years ago
  80. 4eb26aa am 7f099ffd: am 8790740d: media_codecs.xml: extend vorbis sample rate to 8-96kHz by Lajos Molnar · 10 years ago
  81. ce48b3a am f3df58c7: Merge "Stagefright: Fix unused variables" by Andreas Gampe · 10 years ago
  82. f3df58c Merge "Stagefright: Fix unused variables" by Andreas Gampe · 10 years ago
  83. 6c955eb Fix build with clang by Bernhard Rosenkränzer · 10 years ago
  84. 0b672c8 am ca7b4bc4: mediaplayerservice: add support for legacy DRM by Lajos Molnar · 10 years ago
  85. ca7b4bc mediaplayerservice: add support for legacy DRM by Lajos Molnar · 10 years ago
  86. 6874ed7 am a9d2f9fb: Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  87. a9d2f9f Merge "stagefright: preserve output format flags on format change" into lmp-mr1-dev by Lajos Molnar · 10 years ago
  88. 2b02f14 am 80c57d57: Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev by Wei Jia · 10 years ago
  89. 80c57d5 Merge "NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition." into lmp-mr1-dev by Wei Jia · 10 years ago
  90. 427aca5 am 18265202: Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-dev by Eric Laurent · 10 years ago
  91. 1826520 Merge "audio policy: fix inifinite loop in clearAudioPatches()" into lmp-mr1-dev by Eric Laurent · 10 years ago
  92. 474d7c7 NuPlayerRenderer: Update mAnchorMaxMediaUs when anchor time is changed to fix pause-seek-getCurrentPosition. by Wei Jia · 10 years ago
  93. 0add0fd audio policy: fix inifinite loop in clearAudioPatches() by Eric Laurent · 10 years ago
  94. 4e865a3 stagefright: preserve output format flags on format change by Lajos Molnar · 10 years ago
  95. bba7557 Camera2: Round unsupported surface sizes in configure. by Ruben Brunk · 10 years ago
  96. 876c21b am a147c17a: Merge "fixes for non-secure widevine playback" into lmp-mr1-dev by Chong Zhang · 10 years ago
  97. a9450bb am cbbe1ccc: Merge "audio policy: fix AudioPort parameter checks" into lmp-mr1-dev by Eric Laurent · 10 years ago
  98. a147c17 Merge "fixes for non-secure widevine playback" into lmp-mr1-dev by Chong Zhang · 10 years ago
  99. cbbe1cc Merge "audio policy: fix AudioPort parameter checks" into lmp-mr1-dev by Eric Laurent · 10 years ago
  100. 42e8153 fixes for non-secure widevine playback by Chong Zhang · 10 years ago