Gitiles
Code Review Sign In
review.evervolv.com / android_frameworks_av / 418576744155711a11cf0957f619f1dd6a0eec16
  1. 4185767 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 am: af4637c am: 7ac0d8f by Marco Nelissen · 11 years ago
  2. 3b7c222 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3 am: 0ee25ef by Marco Nelissen · 11 years ago
  3. 7726b9f resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 am: af4637c by Marco Nelissen · 11 years ago
  4. 17ec7d7 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 am: 8e55cd3 by Marco Nelissen · 11 years ago
  5. 752936b Merge "Fix typo" into nyc-dev am: 8a9b5bf by Glenn Kasten · 11 years ago
  6. 7ac0d8f resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 am: 17b0060 by Marco Nelissen · 11 years ago
  7. 0ee25ef Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 by Marco Nelissen · 11 years ago
  8. 054c89f DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 am: 5df4326 am: a070ba6 -s ours by Marco Nelissen · 11 years ago
  9. 5b1c323 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 am: 22c973a am: abb5726 -s ours by Marco Nelissen · 11 years ago
  10. 63e9ad3 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 am: 81361a5 am: 37090fa by Marco Nelissen · 11 years ago
  11. 0bb7ef7 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 am: c716312 am: 8cbd657 -s ours by Marco Nelissen · 11 years ago
  12. c6c17c3 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 am: caa1360 am: 78d00c9 -s ours by Marco Nelissen · 11 years ago
  13. 8a9b5bf Merge "Fix typo" into nyc-dev by Glenn Kasten · 11 years ago
  14. af4637c resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours am: 30a52a4 by Marco Nelissen · 11 years ago
  15. 09def5e DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 am: 5df4326 by Marco Nelissen · 11 years ago
  16. 7836fa1 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 am: 22c973a by Marco Nelissen · 11 years ago
  17. ee0467a Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 am: 81361a5 by Marco Nelissen · 11 years ago
  18. 9989e10 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 am: c716312 by Marco Nelissen · 11 years ago
  19. 74e7dbd DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 am: caa1360 by Marco Nelissen · 11 years ago
  20. 17b0060 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 am: 099db66 -s ours by Marco Nelissen · 11 years ago
  21. 8e55cd3 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 am: 562cf01 by Marco Nelissen · 11 years ago
  22. 30a52a4 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 by Marco Nelissen · 11 years ago
  23. 562cf01 Merge "Add VPX output buffer size check" into mnc-dev am: 68a43d3 by Marco Nelissen · 11 years ago
  24. 68a43d3 Merge "Add VPX output buffer size check" into mnc-dev by Marco Nelissen · 11 years ago
  25. a070ba6 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 am: c51bc92 by Marco Nelissen · 11 years ago
  26. abb5726 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 am: a9ba5e9 by Marco Nelissen · 11 years ago
  27. 37090fa Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d am: 4f38da4 by Marco Nelissen · 11 years ago
  28. 8cbd657 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 am: 8644100 by Marco Nelissen · 11 years ago
  29. 78d00c9 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 am: 28d4ca0 by Marco Nelissen · 11 years ago
  30. 5df4326 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours am: f19eec3 by Marco Nelissen · 11 years ago
  31. 22c973a Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours am: 3af5111 by Marco Nelissen · 11 years ago
  32. 81361a5 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 am: 30e2c0d by Marco Nelissen · 11 years ago
  33. c716312 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours am: 1be8671 by Marco Nelissen · 11 years ago
  34. caa1360 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours am: ccad831 by Marco Nelissen · 11 years ago
  35. c51bc92 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee am: 5ff52d6 -s ours by Marco Nelissen · 11 years ago
  36. a9ba5e9 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af am: 53af00c -s ours by Marco Nelissen · 11 years ago
  37. 4f38da4 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 am: df7dbf9 by Marco Nelissen · 11 years ago
  38. 8644100 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 am: 0ab6ee3 -s ours by Marco Nelissen · 11 years ago
  39. 28d4ca0 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b am: 01c682b -s ours by Marco Nelissen · 11 years ago
  40. f19eec3 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 am: e26d4ee by Marco Nelissen · 11 years ago
  41. 3af5111 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 am: 89036af by Marco Nelissen · 11 years ago
  42. 30e2c0d Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c am: 2828c06 by Marco Nelissen · 11 years ago
  43. 1be8671 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 am: d495a59 by Marco Nelissen · 11 years ago
  44. ccad831 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 am: a93123b by Marco Nelissen · 11 years ago
  45. 78ac0e7 Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev by Lajos Molnar · 11 years ago
  46. a558bf1 Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev by Lajos Molnar · 11 years ago
  47. cbdc988 Merge "stagefright: set pcm-encoding for raw audio tracks" into nyc-dev by Lajos Molnar · 11 years ago
  48. d40ea87 Merge "stagefright: account for alignment in MemoryDealer" into nyc-dev by Lajos Molnar · 11 years ago
  49. 26ae699 Fix typo by Glenn Kasten · 11 years ago
  50. 099db66 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa am: f79ccd5 by Marco Nelissen · 11 years ago
  51. 73ea429 Merge "Update audio services for 64 bit compilation" into nyc-dev am: 560a198 by Andy Hung · 11 years ago
  52. f79ccd5 resolve merge conflicts of c66f8dd to lmp-mr1-dev am: 77e43fa by Marco Nelissen · 11 years ago
  53. 560a198 Merge "Update audio services for 64 bit compilation" into nyc-dev by Andy Hung · 11 years ago
  54. 77e43fa resolve merge conflicts of c66f8dd to lmp-mr1-dev by Marco Nelissen · 11 years ago
  55. 5ff52d6 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours am: 1ba0a54 by Marco Nelissen · 11 years ago
  56. 53af00c Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours am: d92d909 by Marco Nelissen · 11 years ago
  57. df7dbf9 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 am: 4f0585c by Marco Nelissen · 11 years ago
  58. 0ab6ee3 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours am: f50a3b4 by Marco Nelissen · 11 years ago
  59. 01c682b DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours am: cc2a866 by Marco Nelissen · 11 years ago
  60. e26d4ee DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours am: f5959b7 -s ours by Marco Nelissen · 11 years ago
  61. 89036af Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev am: b54af92 -s ours by Marco Nelissen · 11 years ago
  62. 2828c06 Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 by Marco Nelissen · 11 years ago
  63. d495a59 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours am: 501ed9d -s ours by Marco Nelissen · 11 years ago
  64. a93123b DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours by Marco Nelissen · 11 years ago
  65. 1ba0a54 DO NOT MERGE Don\'t reject "thumbnail mode" setConfig am: 09e024f am: 50af72b -s ours by Marco Nelissen · 11 years ago
  66. d92d909 Merge "DO NOT MERGE Don\'t reject "thumbnail mode" setConfig" into lmp-dev by Marco Nelissen · 11 years ago
  67. 4f0585c Merge "Fix initialization of AAC presentation struct" into lmp-dev am: 2b9a3e1 by Marco Nelissen · 11 years ago
  68. f50a3b4 Merge "DO NOT MERGE Verify OMX buffer sizes prior to access" into klp-dev am: d579ad0639 am: f0e76eb64b -s ours by Marco Nelissen · 11 years ago
  69. cc2a866 DO NOT MERGE Verify OMX buffer sizes prior to access am: 423766c -s ours by Marco Nelissen · 11 years ago
  70. b363544 Merge "Camera: validate input in releaseRecordingFrame" into nyc-dev am: c40fcb0 by Chien-Yu Chen · 11 years ago
  71. c40fcb0 Merge "Camera: validate input in releaseRecordingFrame" into nyc-dev by Chien-Yu Chen · 11 years ago
  72. 9f954b0 Merge "Avoid parsing CC SEI payload beyond buffer end" am: 1eb3cb0 by Patrik2 Carlsson · 11 years ago
  73. 1eb3cb0 Merge "Avoid parsing CC SEI payload beyond buffer end" by Marco Nelissen · 11 years ago
  74. 2a1f3c8 Merge "media: adjust time offset in case of time lapse" into nyc-dev am: 7f7052f by Wonsik Kim · 11 years ago
  75. 7f7052f Merge "media: adjust time offset in case of time lapse" into nyc-dev by Wonsik Kim · 11 years ago
  76. e9310ba Merge "AudioTrack: fix stall if setBufferSizeInFrames() called before play()" into nyc-dev by Phil Burk · 11 years ago
  77. fc1337d Merge "AudioTrack: fix stall if setBufferSizeInFrames() called before play()" into nyc-dev by Phil Burk · 11 years ago
  78. d3934c4 MPEG4Writer: allow both input format and stream to specify CSD am: 7c9ea89 by Lajos Molnar · 11 years ago
  79. 78bd91b stagefright: set pcm-encoding for raw audio tracks by Lajos Molnar · 11 years ago
  80. 28edbba stagefright: account for alignment in MemoryDealer by Lajos Molnar · 11 years ago
  81. 7c9ea89 MPEG4Writer: allow both input format and stream to specify CSD by Lajos Molnar · 11 years ago
  82. 8fa2697 Update audio services for 64 bit compilation by Andy Hung · 11 years ago
  83. e8972b0 AudioTrack: fix stall if setBufferSizeInFrames() called before play() by Phil Burk · 11 years ago
  84. 42f2707 Camera: validate input in releaseRecordingFrame by Chien-Yu Chen · 11 years ago
  85. 5ab60be Merge "audio policy: fix HW A/V sync rerouting" into nyc-dev am: a8d309d by Eric Laurent · 11 years ago
  86. 20f18ef Merge "Use audio_session_t consistently" into nyc-dev am: 9a57e34 by Glenn Kasten · 11 years ago
  87. f91072a Fix initialization of AAC presentation struct am: dabb051 by Marco Nelissen · 11 years ago
  88. e204db2 Merge "DNG/TIFF support: Add NOTICE" into nyc-dev am: 5e3e8e7 by Eino-Ville Talvala · 11 years ago
  89. d1cb162 Merge "Camera: Update dataspace to new spec, convert for older HALs" into nyc-dev by Eino-Ville Talvala · 11 years ago
  90. 9462ca1 Merge "Dynamic policies: support for device selection" into nyc-dev am: 53ce1e0 by Jean-Michel Trivi · 11 years ago
  91. a8d309d Merge "audio policy: fix HW A/V sync rerouting" into nyc-dev by Eric Laurent · 11 years ago
  92. 14cbfca audio policy: fix HW A/V sync rerouting by Eric Laurent · 11 years ago
  93. 9a57e34 Merge "Use audio_session_t consistently" into nyc-dev by Glenn Kasten · 11 years ago
  94. 9f5c692 media: adjust time offset in case of time lapse by Wonsik Kim · 11 years ago
  95. dabb051 Fix initialization of AAC presentation struct by Marco Nelissen · 11 years ago
  96. 5e3e8e7 Merge "DNG/TIFF support: Add NOTICE" into nyc-dev by Eino-Ville Talvala · 11 years ago
  97. 41867fa DNG/TIFF support: Add NOTICE by Eino-Ville Talvala · 11 years ago
  98. 68a91b9 Merge "Camera: Update dataspace to new spec, convert for older HALs" into nyc-dev by Eino-Ville Talvala · 11 years ago
  99. 53ce1e0 Merge "Dynamic policies: support for device selection" into nyc-dev by Jean-Michel Trivi · 11 years ago
  100. 7638ca2 Dynamic policies: support for device selection by Jean-Michel Trivi · 11 years ago