Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | Merge "disable AwesomePlayer for Ogg vorbis" into lmp-dev | Chong Zhang | 2014-08-20 | 2 | -12/+14 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | disable AwesomePlayer for Ogg vorbis | Chong Zhang | 2014-08-20 | 2 | -12/+14 | |
* | | | | | | | am 472ff73c: am e0b5cf7e: Merge "Fix typo in comment" into lmp-dev | Marco Nelissen | 2014-08-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am e0b5cf7e: Merge "Fix typo in comment" into lmp-dev | Marco Nelissen | 2014-08-21 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Fix typo in comment" into lmp-dev | Marco Nelissen | 2014-08-20 | 1 | -1/+1 | |
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | ||||||
| | | * | | | | Fix typo in comment | Marco Nelissen | 2014-08-20 | 1 | -1/+1 | |
* | | | | | | | am 56b350ea: am 111333ea: Merge "handle error during flush in MediaPlayer.res... | Marco Nelissen | 2014-08-21 | 3 | -5/+18 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 111333ea: Merge "handle error during flush in MediaPlayer.reset()" into lm... | Marco Nelissen | 2014-08-21 | 3 | -5/+18 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "handle error during flush in MediaPlayer.reset()" into lmp-dev | Marco Nelissen | 2014-08-19 | 3 | -5/+18 | |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | ||||||
| | | * | | | | handle error during flush in MediaPlayer.reset() | Marco Nelissen | 2014-08-20 | 3 | -5/+18 | |
* | | | | | | | am d05795e5: am 4deb606b: Merge "Fix NuPlayer deadlock" into lmp-dev | Marco Nelissen | 2014-08-21 | 2 | -14/+20 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 4deb606b: Merge "Fix NuPlayer deadlock" into lmp-dev | Marco Nelissen | 2014-08-21 | 2 | -14/+20 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Fix NuPlayer deadlock" into lmp-dev | Marco Nelissen | 2014-08-19 | 2 | -14/+20 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Fix NuPlayer deadlock | Marco Nelissen | 2014-08-20 | 2 | -14/+20 | |
* | | | | | | | | am 62e31181: am bb137ef8: Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 c... | Robert Shih | 2014-08-20 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am bb137ef8: Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupV... | Robert Shih | 2014-08-20 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" ... | Robert Shih | 2014-08-19 | 1 | -0/+4 | |
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | ||||||
| | | * | | | | | StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder | Robert Shih | 2014-08-20 | 1 | -0/+4 | |
* | | | | | | | | am ee8b5f26: am a8143b2b: Merge "Don\'t crash for bitstream errors in AMPEG4E... | Chong Zhang | 2014-08-20 | 1 | -5/+10 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am a8143b2b: Merge "Don\'t crash for bitstream errors in AMPEG4ElementaryAsse... | Chong Zhang | 2014-08-20 | 1 | -5/+10 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "Don't crash for bitstream errors in AMPEG4ElementaryAssembler" into lm... | Chong Zhang | 2014-08-16 | 1 | -5/+10 | |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | | * | | | | | Don't crash for bitstream errors in AMPEG4ElementaryAssembler | Chong Zhang | 2014-08-19 | 1 | -5/+10 | |
| | | | |_|_|/ | | | |/| | | | ||||||
* | | | | | | | am 054e6686: am 5596d7c4: Merge "Allow audio and video flushed separately." i... | Wei Jia | 2014-08-19 | 2 | -55/+14 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 5596d7c4: Merge "Allow audio and video flushed separately." into lmp-dev | Wei Jia | 2014-08-19 | 2 | -55/+14 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "Allow audio and video flushed separately." into lmp-dev | Wei Jia | 2014-08-19 | 2 | -55/+14 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | Allow audio and video flushed separately. | Wei Jia | 2014-08-19 | 2 | -55/+14 | |
| | | | |_|/ / | | | |/| | | | ||||||
* | | | | | | | am d3df0ccb: am 3ef1e656: Merge "NuPlayerRenderer: allow flush() to be called... | Wei Jia | 2014-08-19 | 1 | -25/+43 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 3ef1e656: Merge "NuPlayerRenderer: allow flush() to be called multiple tim... | Wei Jia | 2014-08-19 | 1 | -25/+43 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp... | Wei Jia | 2014-08-19 | 1 | -25/+43 | |
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | ||||||
| | | * | | | | NuPlayerRenderer: allow flush() to be called multiple times. | Wei Jia | 2014-08-19 | 1 | -25/+43 | |
| | | |/ / / | ||||||
* | | | | | | am de244f21: am 2a1bcb83: Merge "NuPlayer: use generation to detect stale req... | Wei Jia | 2014-08-19 | 2 | -4/+31 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am 2a1bcb83: Merge "NuPlayer: use generation to detect stale requests from ol... | Wei Jia | 2014-08-19 | 2 | -4/+31 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge "NuPlayer: use generation to detect stale requests from old decoders." ... | Wei Jia | 2014-08-19 | 2 | -4/+31 | |
| | |\ \ \ \ | ||||||
| | | * | | | | NuPlayer: use generation to detect stale requests from old decoders. | Wei Jia | 2014-08-19 | 2 | -4/+31 | |
| | | |/ / / | ||||||
* | | | | | | am 5b1e1d84: am 1e2d7cd6: Merge "stagefright: Fix thumbnail generation for so... | Ronghua Wu | 2014-08-19 | 1 | -7/+1 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | am 1e2d7cd6: Merge "stagefright: Fix thumbnail generation for some clips." in... | Ronghua Wu | 2014-08-19 | 1 | -7/+1 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | Merge "stagefright: Fix thumbnail generation for some clips." into lmp-dev | Ronghua Wu | 2014-08-18 | 1 | -7/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | stagefright: Fix thumbnail generation for some clips. | Ronghua Wu | 2014-08-19 | 1 | -7/+1 | |
* | | | | | | | am 33610e35: am 5a5a2325: Merge "NuPlayer: disable deep audio buffer in offlo... | Ronghua Wu | 2014-08-19 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 5a5a2325: Merge "NuPlayer: disable deep audio buffer in offload mode." int... | Ronghua Wu | 2014-08-19 | 1 | -0/+1 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-dev | Ronghua Wu | 2014-08-18 | 1 | -0/+1 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | NuPlayer: disable deep audio buffer in offload mode. | Ronghua Wu | 2014-08-18 | 1 | -0/+1 | |
| | | | |_|_|/ | | | |/| | | | ||||||
* | | | | | | | am 1533fb3a: am 1593dc57: Merge "NuPlayerRenderer: only query audio sink for ... | Ronghua Wu | 2014-08-19 | 1 | -2/+3 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | am 1593dc57: Merge "NuPlayerRenderer: only query audio sink for position for ... | Ronghua Wu | 2014-08-19 | 1 | -2/+3 | |
| |\ \ \ \ \ \ | | |/ / / / / | ||||||
| | * | | | | | Merge "NuPlayerRenderer: only query audio sink for position for the first ent... | Ronghua Wu | 2014-08-18 | 1 | -2/+3 | |
| | |\ \ \ \ \ | ||||||
| | | * | | | | | NuPlayerRenderer: only query audio sink for position for the first entry. | Ronghua Wu | 2014-08-19 | 1 | -2/+3 | |
* | | | | | | | | am c2a02f95: am af11287b: Merge "NuPlayer: add support for proper stop" into ... | Lajos Molnar | 2014-08-19 | 2 | -3/+64 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | am af11287b: Merge "NuPlayer: add support for proper stop" into lmp-dev | Lajos Molnar | 2014-08-19 | 2 | -3/+64 | |
| |\ \ \ \ \ \ \ | | |/ / / / / / | ||||||
| | * | | | | | | Merge "NuPlayer: add support for proper stop" into lmp-dev | Lajos Molnar | 2014-08-19 | 2 | -3/+64 | |
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | ||||||
| | | * | | | | | NuPlayer: add support for proper stop | Lajos Molnar | 2014-08-08 | 2 | -3/+64 |