1. 4d86a4b Merge "stagefrights: propagate bitrate to muxers" into nyc-dev am: 70bdd112d8 by Lajos Molnar · 9 years ago
  2. 70bdd11 Merge "stagefrights: propagate bitrate to muxers" into nyc-dev by TreeHugger Robot · 9 years ago
  3. 4e95edc Merge "stagefright: fix hdr/color metadata handling for .mkv files" into nyc-dev by Lajos Molnar · 9 years ago
  4. c0dd7b2 Merge changes Ia03716ca,If3d6c8fd into nyc-dev am: 2008b88e58 by Lajos Molnar · 9 years ago
  5. 1048f0f Merge "stagefright: fix hdr/color metadata handling for .mkv files" into nyc-dev by TreeHugger Robot · 9 years ago
  6. 2008b88 Merge changes Ia03716ca,If3d6c8fd into nyc-dev by TreeHugger Robot · 9 years ago
  7. 2cd9322 Merge "stagefright: support webm container in muxer cmdline" into nyc-dev by Lajos Molnar · 9 years ago
  8. 29d7654 Merge "stagefright: support webm container in muxer cmdline" into nyc-dev by Lajos Molnar · 9 years ago
  9. 0ce6e96 stagefright: support webm container in muxer cmdline by Lajos Molnar · 9 years ago
  10. ad91cd2 stagefrights: propagate bitrate to muxers by Lajos Molnar · 9 years ago
  11. dd5fd51 Merge "RTSPSource: pause internally when buffering starts." into nyc-dev by Wei Jia · 9 years ago
  12. 01f6947 Merge "RTSPSource: pause internally when buffering starts." into nyc-dev by Wei Jia · 9 years ago
  13. d637d29 stagefright: fix hdr/color metadata handling for .mkv files by Lajos Molnar · 9 years ago
  14. de84b0e Audio Policy: engine configurable: remove sign bit from conf files by Franois Gaffie · 9 years ago
  15. 36455ed Merge "audio policy: engine configurable: aligment with legacy" into nyc-dev by François Gaffie · 9 years ago
  16. 96866e9 Merge "Fix warning in audio policy service" into nyc-dev am: ec71c9ee92 by Eric Laurent · 9 years ago
  17. f489ff8 Audio Policy: engine configurable: remove sign bit from conf files by François Gaffie · 9 years ago
  18. 54e01ea Merge "audio policy: engine configurable: aligment with legacy" into nyc-dev by Eric Laurent · 9 years ago
  19. ec71c9e Merge "Fix warning in audio policy service" into nyc-dev by Eric Laurent · 9 years ago
  20. a1395f6 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c am: 5f44938fe9 am: ff8818df6f am: 266eacc66e -s ours by Wei Jia · 9 years ago
  21. 886e911 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c am: 5f44938fe9 am: ff8818df6f by Wei Jia · 9 years ago
  22. 266eacc resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c am: 5f44938fe9 by Wei Jia · 9 years ago
  23. ff8818d resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf am: 87406db29c by Wei Jia · 9 years ago
  24. 5f44938 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 am: f4285f22bf by Wei Jia · 9 years ago
  25. 87406db resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 by Wei Jia · 9 years ago
  26. f4285f2 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 am: 6b52fd6b67 by Wei Jia · 9 years ago
  27. 6b52fd6 resolve merge conflicts of 823bd74 to lmp-mr1-dev am: 67ca3caf10 by Wei Jia · 9 years ago
  28. 67ca3ca resolve merge conflicts of 823bd74 to lmp-mr1-dev by Wei Jia · 9 years ago
  29. d86071d audio policy: engine configurable: aligment with legacy by François Gaffie · 9 years ago
  30. 823bd74 Merge "MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track." into lmp-dev by Wei Jia · 9 years ago
  31. 30f2090 Merge "stagefright: allow ABitReader to fail gracefully" into nyc-dev by Lajos Molnar · 9 years ago
  32. 05b849ec stagefright: do not fail on bad bitstreams in HevcParameterSets by Lajos Molnar · 9 years ago
  33. 2f4555e stagefright: add safe versions of parseUE and parseSE by Lajos Molnar · 9 years ago
  34. 9f39f8d Fix warning in audio policy service by Eric Laurent · 9 years ago
  35. 5c8f37f Merge "stagefright: allow ABitReader to fail gracefully" into nyc-dev by Lajos Molnar · 9 years ago
  36. 3be85f9 stagefright: allow ABitReader to fail gracefully by Lajos Molnar · 9 years ago
  37. c3a1ad4 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 am: e83713c198 -s ours am: 63a4f82181 am: c65002b096 am: 28561389e9 am: 02d1d04498 -s ours by Wei Jia · 9 years ago
  38. a2ebcc0 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 am: e83713c198 -s ours am: 63a4f82181 am: c65002b096 am: 28561389e9 by Wei Jia · 9 years ago
  39. 02d1d04 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 am: e83713c198 -s ours am: 63a4f82181 am: c65002b096 by Wei Jia · 9 years ago
  40. 2856138 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 am: e83713c198 -s ours am: 63a4f82181 by Wei Jia · 9 years ago
  41. c65002b DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 am: e83713c198 -s ours by Wei Jia · 9 years ago
  42. 63a4f82 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 am: e67ec85275 by Wei Jia · 9 years ago
  43. e83713c DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours am: 4223af4708 by Wei Jia · 9 years ago
  44. e67ec85 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours am: 1ed4ec584b -s ours by Wei Jia · 9 years ago
  45. 4223af4 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 am: 3d1df4f411 -s ours by Wei Jia · 9 years ago
  46. b09a6d0 resolve merge conflicts of 5d8e380 to nyc-mr1-dev by Andy Hung · 9 years ago
  47. 1ed4ec5 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 am: e2ca751723 by Wei Jia · 9 years ago
  48. 3d1df4f DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. am: b016207fc2 by Wei Jia · 9 years ago
  49. e2ca751 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. by Wei Jia · 9 years ago
  50. a1bcbfe Merge "audio flinger: fix audio patch release" into nyc-dev am: 5290766537 by Eric Laurent · 9 years ago
  51. 5d8e380 Merge "AudioTrack: Fix timestamp startup condition" into nyc-dev by Andy Hung · 9 years ago
  52. 5290766 Merge "audio flinger: fix audio patch release" into nyc-dev by Eric Laurent · 9 years ago
  53. 0666cc5 audio flinger: fix audio patch release by Eric Laurent · 10 years ago
  54. e31eeb4 MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. by Wei Jia · 10 years ago
  55. b016207 DO NOT MERGE MPEG4Extractor: ensure kKeyTrackID exists before creating an MPEG4Source as track. by Wei Jia · 10 years ago
  56. 69488c4 AudioTrack: Fix timestamp startup condition by Andy Hung · 9 years ago
  57. 517f189 Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev by Lajos Molnar · 9 years ago
  58. 76016cc Merge "stagefright: get profile/level from codec-specific-data" into nyc-dev by Lajos Molnar · 9 years ago
  59. 07b2fbf stagefright: get profile/level from codec-specific-data by Lajos Molnar · 9 years ago
  60. c9ff200 RTSPSource: pause internally when buffering starts. by Wei Jia · 9 years ago
  61. ce2b51c Merge "Add memory heap checks for mediaserver and audioserver" into nyc-dev by Andy Hung · 9 years ago
  62. f3d9908 Merge "Add memory heap checks for mediaserver and audioserver" into nyc-dev by Andy Hung · 9 years ago
  63. add074c Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check am: b2379ba0a3 by Eric Laurent · 9 years ago
  64. e2f42cb Merge "audioflinger: Pass pid of process creating track or opening record" into nyc-dev by Haynes Mathew George · 9 years ago
  65. b2379ba Fix android.permission.CAPTURE_AUDIO_OUTPUT permission check by Eric Laurent · 9 years ago
  66. a0e10ff Merge "audioflinger: Pass pid of process creating track or opening record" into nyc-dev by Eric Laurent · 9 years ago
  67. 21a1e4d Merge "cameraserver: add input group" into nyc-mr1-dev by Zhijun He · 9 years ago
  68. 944409b Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 am: daaece7f7c am: 413afa2586 -s ours by Marco Nelissen · 9 years ago
  69. ce71a85 Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 am: daaece7f7c by Marco Nelissen · 9 years ago
  70. 9ea77cd audioflinger: Pass pid of process creating track or opening record by Haynes Mathew George · 9 years ago
  71. 3e0d258 Merge "Camera: fix deadlock" into nyc-dev am: 7dd4ae63fe by Yin-Chia Yeh · 9 years ago
  72. 413afa2 Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 by Marco Nelissen · 9 years ago
  73. 7dd4ae6 Merge "Camera: fix deadlock" into nyc-dev by Yin-Chia Yeh · 9 years ago
  74. daaece7 Merge "limit mediaserver memory" into mnc-dev am: d64810330b am: 7b86b75190 by Marco Nelissen · 9 years ago
  75. 7b86b75 Merge "limit mediaserver memory" into mnc-dev am: d64810330b by Marco Nelissen · 9 years ago
  76. d648103 Merge "limit mediaserver memory" into mnc-dev by Marco Nelissen · 9 years ago
  77. 11c8392 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 am: c5774baa39 am: 9c0ffb143f am: d20ead8456 -s ours by Marco Nelissen · 9 years ago
  78. 34f2112 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 am: c5774baa39 am: 9c0ffb143f by Marco Nelissen · 9 years ago
  79. 07b745e Add memory heap checks for mediaserver and audioserver by Andy Hung · 9 years ago
  80. d20ead8 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 am: c5774baa39 by Marco Nelissen · 9 years ago
  81. 0d38a3c Merge "NuPlayer: remove the condition on sending BUFFERING_START event." into nyc-dev by Wei Jia · 9 years ago
  82. 9c0ffb1 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours am: ad96965739 by Marco Nelissen · 9 years ago
  83. c5774ba Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad am: 5440301701 -s ours by Marco Nelissen · 9 years ago
  84. 8b99c13 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 am: 6d44675bb4 am: 3d5d8388ba by Marco Nelissen · 9 years ago
  85. 4ecb8af Merge "NuPlayer: remove the condition on sending BUFFERING_START event." into nyc-dev by Wei Jia · 9 years ago
  86. d4b8036 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 am: 6d44675bb4 by Marco Nelissen · 9 years ago
  87. ad96965 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 am: 1094b530ad by Marco Nelissen · 9 years ago
  88. 3d5d838 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 am: 19db724cf7 by Marco Nelissen · 9 years ago
  89. bfe8207 NuPlayer: remove the condition on sending BUFFERING_START event. by Wei Jia · 9 years ago
  90. 6d44675 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours am: 8fd39c4420 by Marco Nelissen · 9 years ago
  91. 19db724 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce am: 4e61b921f0 -s ours by Marco Nelissen · 9 years ago
  92. fe2fc3d stagefright: add flags to NuMediaExtractor::getTrackFormat am: 768a2537a8 by Lajos Molnar · 9 years ago
  93. c1ae788 stagefright: get stream header information from MPEG2 video tracks by Lajos Molnar · 9 years ago
  94. 5440301 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours am: 61a1371ea1 by Marco Nelissen · 9 years ago
  95. 8fd39c4 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 am: 57dc6d9dce by Marco Nelissen · 9 years ago
  96. 6c1ad0d limit mediaserver memory by Marco Nelissen · 9 years ago
  97. 1094b53 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours am: cbe776167a -s ours by Marco Nelissen · 9 years ago
  98. 4e61b92 Merge "limit mediaserver memory" into lmp-dev am: 41e0a503e6 am: 76f9ec33f0 by Marco Nelissen · 9 years ago
  99. 61a1371 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 am: e816dcc0b3 -s ours by Marco Nelissen · 9 years ago
  100. cbe7761 Merge "DO NOT MERGE limit mediaserver memory" into klp-dev am: f8429c0c14 am: 38ab87c3e3 by Marco Nelissen · 9 years ago