summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | Merge "disable AwesomePlayer for Ogg vorbis" into lmp-devChong Zhang2014-08-202-12/+14
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | disable AwesomePlayer for Ogg vorbisChong Zhang2014-08-202-12/+14
* | | | | | | am 472ff73c: am e0b5cf7e: Merge "Fix typo in comment" into lmp-devMarco Nelissen2014-08-211-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am e0b5cf7e: Merge "Fix typo in comment" into lmp-devMarco Nelissen2014-08-211-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix typo in comment" into lmp-devMarco Nelissen2014-08-201-1/+1
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Fix typo in commentMarco Nelissen2014-08-201-1/+1
* | | | | | | am 56b350ea: am 111333ea: Merge "handle error during flush in MediaPlayer.res...Marco Nelissen2014-08-213-5/+18
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 111333ea: Merge "handle error during flush in MediaPlayer.reset()" into lm...Marco Nelissen2014-08-213-5/+18
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "handle error during flush in MediaPlayer.reset()" into lmp-devMarco Nelissen2014-08-193-5/+18
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | handle error during flush in MediaPlayer.reset()Marco Nelissen2014-08-203-5/+18
* | | | | | | am d05795e5: am 4deb606b: Merge "Fix NuPlayer deadlock" into lmp-devMarco Nelissen2014-08-212-14/+20
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 4deb606b: Merge "Fix NuPlayer deadlock" into lmp-devMarco Nelissen2014-08-212-14/+20
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix NuPlayer deadlock" into lmp-devMarco Nelissen2014-08-192-14/+20
| | |\ \ \ \ \
| | | * | | | | Fix NuPlayer deadlockMarco Nelissen2014-08-202-14/+20
* | | | | | | | am 62e31181: am bb137ef8: Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 c...Robert Shih2014-08-201-0/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am bb137ef8: Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupV...Robert Shih2014-08-201-0/+4
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoder" ...Robert Shih2014-08-191-0/+4
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | StagefrightRecorder: add VIDEO_ENCODER_VP8 case in setupVideoEncoderRobert Shih2014-08-201-0/+4
* | | | | | | | am ee8b5f26: am a8143b2b: Merge "Don\'t crash for bitstream errors in AMPEG4E...Chong Zhang2014-08-201-5/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a8143b2b: Merge "Don\'t crash for bitstream errors in AMPEG4ElementaryAsse...Chong Zhang2014-08-201-5/+10
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Don't crash for bitstream errors in AMPEG4ElementaryAssembler" into lm...Chong Zhang2014-08-161-5/+10
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | Don't crash for bitstream errors in AMPEG4ElementaryAssemblerChong Zhang2014-08-191-5/+10
| | | | |_|_|/ | | | |/| | |
* | | | | | | am 054e6686: am 5596d7c4: Merge "Allow audio and video flushed separately." i...Wei Jia2014-08-192-55/+14
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5596d7c4: Merge "Allow audio and video flushed separately." into lmp-devWei Jia2014-08-192-55/+14
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Allow audio and video flushed separately." into lmp-devWei Jia2014-08-192-55/+14
| | |\ \ \ \ \
| | | * | | | | Allow audio and video flushed separately.Wei Jia2014-08-192-55/+14
| | | | |_|/ / | | | |/| | |
* | | | | | | am d3df0ccb: am 3ef1e656: Merge "NuPlayerRenderer: allow flush() to be called...Wei Jia2014-08-191-25/+43
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 3ef1e656: Merge "NuPlayerRenderer: allow flush() to be called multiple tim...Wei Jia2014-08-191-25/+43
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "NuPlayerRenderer: allow flush() to be called multiple times." into lmp...Wei Jia2014-08-191-25/+43
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | NuPlayerRenderer: allow flush() to be called multiple times.Wei Jia2014-08-191-25/+43
| | | |/ / /
* | | | | | am de244f21: am 2a1bcb83: Merge "NuPlayer: use generation to detect stale req...Wei Jia2014-08-192-4/+31
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 2a1bcb83: Merge "NuPlayer: use generation to detect stale requests from ol...Wei Jia2014-08-192-4/+31
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "NuPlayer: use generation to detect stale requests from old decoders." ...Wei Jia2014-08-192-4/+31
| | |\ \ \ \
| | | * | | | NuPlayer: use generation to detect stale requests from old decoders.Wei Jia2014-08-192-4/+31
| | | |/ / /
* | | | | | am 5b1e1d84: am 1e2d7cd6: Merge "stagefright: Fix thumbnail generation for so...Ronghua Wu2014-08-191-7/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 1e2d7cd6: Merge "stagefright: Fix thumbnail generation for some clips." in...Ronghua Wu2014-08-191-7/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "stagefright: Fix thumbnail generation for some clips." into lmp-devRonghua Wu2014-08-181-7/+1
| | |\ \ \ \
| | | * | | | stagefright: Fix thumbnail generation for some clips.Ronghua Wu2014-08-191-7/+1
* | | | | | | am 33610e35: am 5a5a2325: Merge "NuPlayer: disable deep audio buffer in offlo...Ronghua Wu2014-08-191-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5a5a2325: Merge "NuPlayer: disable deep audio buffer in offload mode." int...Ronghua Wu2014-08-191-0/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "NuPlayer: disable deep audio buffer in offload mode." into lmp-devRonghua Wu2014-08-181-0/+1
| | |\ \ \ \ \
| | | * | | | | NuPlayer: disable deep audio buffer in offload mode.Ronghua Wu2014-08-181-0/+1
| | | | |_|_|/ | | | |/| | |
* | | | | | | am 1533fb3a: am 1593dc57: Merge "NuPlayerRenderer: only query audio sink for ...Ronghua Wu2014-08-191-2/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 1593dc57: Merge "NuPlayerRenderer: only query audio sink for position for ...Ronghua Wu2014-08-191-2/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "NuPlayerRenderer: only query audio sink for position for the first ent...Ronghua Wu2014-08-181-2/+3
| | |\ \ \ \ \
| | | * | | | | NuPlayerRenderer: only query audio sink for position for the first entry.Ronghua Wu2014-08-191-2/+3
* | | | | | | | am c2a02f95: am af11287b: Merge "NuPlayer: add support for proper stop" into ...Lajos Molnar2014-08-192-3/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am af11287b: Merge "NuPlayer: add support for proper stop" into lmp-devLajos Molnar2014-08-192-3/+64
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "NuPlayer: add support for proper stop" into lmp-devLajos Molnar2014-08-192-3/+64
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | | * | | | | NuPlayer: add support for proper stopLajos Molnar2014-08-082-3/+64