summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Merge "NuPlayer: set controlledByApp to true when creating Surface." into lmp...Wei Jia2014-08-271-1/+1
|\
| * NuPlayer: set controlledByApp to true when creating Surface.Wei Jia2014-08-261-1/+1
* | Merge "Fix SoundPool lockup" into lmp-devMarco Nelissen2014-08-261-6/+8
|\ \
| * | Fix SoundPool lockupMarco Nelissen2014-08-261-6/+8
| |/
* | Merge "do string compare with mime immediately after we get the value" into l...Chong Zhang2014-08-261-2/+6
|\ \ | |/ |/|
| * do string compare with mime immediately after we get the valueChong Zhang2014-08-261-2/+6
* | Merge "Revert "disable AwesomePlayer for Ogg vorbis"" into lmp-devRachad Alao2014-08-252-14/+12
|\ \
| * | Revert "disable AwesomePlayer for Ogg vorbis"Rachad Alao2014-08-252-14/+12
* | | Merge "NuPlayer: remember and resubmit CSDs after flush" into lmp-devLajos Molnar2014-08-254-21/+117
|\ \ \
| * | | NuPlayer: remember and resubmit CSDs after flushLajos Molnar2014-08-234-21/+117
* | | | Merge "HTTPLiveSource: check for NULL before getTrackCount/Info" into lmp-devRobert Shih2014-08-251-2/+10
|\ \ \ \
| * | | | HTTPLiveSource: check for NULL before getTrackCount/InfoRobert Shih2014-08-181-2/+10
* | | | | stagefright: process CSD regardless of what port was last queuedLajos Molnar2014-08-231-3/+2
| |/ / / |/| | |
* | | | Merge "MediaCodec: handle errors during flushing." into lmp-devWei Jia2014-08-231-6/+10
|\ \ \ \
| * | | | MediaCodec: handle errors during flushing.Wei Jia2014-08-221-6/+10
* | | | | Merge "wait for flush to finish before returning setSurface" into lmp-devChong Zhang2014-08-233-0/+29
|\ \ \ \ \
| * | | | | wait for flush to finish before returning setSurfaceChong Zhang2014-08-223-0/+29
* | | | | | Merge "add buffering update to GenericSource" into lmp-devChong Zhang2014-08-224-6/+112
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | add buffering update to GenericSourceChong Zhang2014-08-224-6/+112
* | | | | | Merge "ACodec: handle errors related to native window." into lmp-devWei Jia2014-08-222-6/+13
|\ \ \ \ \ \
| * | | | | | ACodec: handle errors related to native window.Wei Jia2014-08-222-6/+13
* | | | | | | Merge "NuPlayerDriver: fix current position for stop and pause." into lmp-devWei Jia2014-08-222-17/+44
|\ \ \ \ \ \ \
| * | | | | | | NuPlayerDriver: fix current position for stop and pause.Wei Jia2014-08-222-17/+44
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge "move cache prefill to GenericSource's message handler" into lmp-devChong Zhang2014-08-223-98/+142
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | move cache prefill to GenericSource's message handlerChong Zhang2014-08-213-98/+142
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "print warning if offset != buffer size" into lmp-devChong Zhang2014-08-221-0/+5
|\ \ \ \ \ \
| * | | | | | print warning if offset != buffer sizeChong Zhang2014-08-191-0/+5
| | |_|/ / / | |/| | | |
* | | | | | stagefright: allow to resubmit CSDs for SoftAAC2Lajos Molnar2014-08-221-208/+201
* | | | | | SoftAAC2: allow reconfiguring output after multiple output buffersRobert Shih2014-08-221-10/+1
* | | | | | Merge "Fix SoundPool and MediaPlayerService buffer overflow" into lmp-devAndy Hung2014-08-223-13/+57
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix SoundPool and MediaPlayerService buffer overflowAndy Hung2014-08-213-13/+57
* | | | | | Merge "NuPlayerDriver: include lapsed time when reporting current position." ...Wei Jia2014-08-212-1/+12
|\ \ \ \ \ \
| * | | | | | NuPlayerDriver: include lapsed time when reporting current position.Wei Jia2014-08-202-1/+12
* | | | | | | Merge "disable AwesomePlayer for Ogg vorbis" into lmp-devChong Zhang2014-08-202-12/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | disable AwesomePlayer for Ogg vorbisChong Zhang2014-08-202-12/+14
* | | | | | Merge "Fix typo in comment" into lmp-devMarco Nelissen2014-08-201-1/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix typo in commentMarco Nelissen2014-08-201-1/+1
* | | | | | 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
* | | | | | Merge "Fix NuPlayer deadlock" into lmp-devMarco Nelissen2014-08-192-14/+20
|\ \ \ \ \ \
| * | | | | | Fix NuPlayer deadlockMarco Nelissen2014-08-202-14/+20
* | | | | | | 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
| | |_|_|_|/ | |/| | | |
* | | | | | 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
| | |_|_|/ | |/| | |
* | | | | 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
| | |_|/ / | |/| | |
* | | | | 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
| |/ / /
* | | | Merge "NuPlayer: use generation to detect stale requests from old decoders." ...Wei Jia2014-08-192-4/+31
|\ \ \ \
generated by cgit v1.1 at 2024-05-30 20:06:22 +0000