summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add a new API on DRM Framework for streamingKei Takahashi2012-05-2313-0/+172
* am e737cda6: audioflinger: refine latency latency calculation.Eric Laurent2012-05-223-1/+23
|\
| * audioflinger: refine latency latency calculation.Eric Laurent2012-05-223-1/+23
* | am 8d9846c0: Merge "Tell surface flinger that we want to protect output buffe...Andreas Huber2012-05-223-0/+182
|\ \ | |/
| * Merge "Tell surface flinger that we want to protect output buffers from being...Andreas Huber2012-05-223-0/+182
| |\
| | * Tell surface flinger that we want to protect output buffers from beingAndreas Huber2012-05-223-0/+182
* | | Reconcile with jb-releaseThe Android Open Source Project2012-05-220-0/+0
|\ \ \
| * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-220-0/+0
| |\ \ \
| | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-200-0/+0
| | |\ \ \
| | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | | |\ \ \
| | | | * \ \ merge in jb-release history after reset to jb-devThe Android Automerger2012-05-190-0/+0
| | | | |\ \ \ | | | |/ / / / | | |/| / / / | | | |/ / /
* | | | | | am 67e54402: Merge "Keep a copy of most recent audio played" into jb-devGlenn Kasten2012-05-227-3/+90
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge "Keep a copy of most recent audio played" into jb-devGlenn Kasten2012-05-227-3/+90
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Keep a copy of most recent audio playedGlenn Kasten2012-05-217-3/+90
* | | | | | am a6490c65: Only mark the audio player as started if it did so successfully.Andreas Huber2012-05-221-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Only mark the audio player as started if it did so successfully.Andreas Huber2012-05-221-2/+2
* | | | | | am 4575beb3: Revert "Stop audio source if AudioPlayer could not be started"Andreas Huber2012-05-221-7/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Revert "Stop audio source if AudioPlayer could not be started"Andreas Huber2012-05-221-7/+6
| | |/ / / | |/| | |
* | | | | am c9ef89cd: Revert "Revert to PV for AAC codec for FactoryROM."Dave Burke2012-05-212-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Revert "Revert to PV for AAC codec for FactoryROM."Dave Burke2012-05-212-4/+4
* | | | | am d7d79a2b: Revert to PV for AAC codec for FactoryROM.Dave Burke2012-05-212-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Revert to PV for AAC codec for FactoryROM.Dave Burke2012-05-212-4/+4
* | | | | stagefright avcenc: Use intptr_t for casting pointers to integersMartin Storsjo2012-05-213-9/+9
* | | | | stagefright avcenc: Switch tmp variables to use the right type, to avoid castingMartin Storsjo2012-05-212-53/+50
* | | | | am a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL po...James Dong2012-05-211-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into ...James Dong2012-05-211-5/+5
| |\ \ \ \
| | * | | | Fix a mediaserver crash caused by dereferencing a NULL pointer.James Dong2012-05-211-5/+5
* | | | | | am 9ec3547e: Merge "For an RTSP live stream we won\'t map rtp time to normal ...Andreas Huber2012-05-211-8/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "For an RTSP live stream we won't map rtp time to normal play time," in...Andreas Huber2012-05-211-8/+3
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | For an RTSP live stream we won't map rtp time to normal play time,Andreas Huber2012-05-211-8/+3
| | | |/ / | | |/| |
* | | | | am cd8a36fd: Merge "Add more verbose ADTS error logging to SoftAAC." into jb-devAndreas Huber2012-05-212-20/+46
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Add more verbose ADTS error logging to SoftAAC." into jb-devAndreas Huber2012-05-212-20/+46
| |\ \ \ \
| | * | | | Add more verbose ADTS error logging to SoftAAC.Andreas Huber2012-05-212-20/+46
| | |/ / /
* | | | | am 91bfadb4: If we encounter an error during buffer allocation change state backAndreas Huber2012-05-211-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | If we encounter an error during buffer allocation change state backAndreas Huber2012-05-211-0/+2
| |/ / /
| | | |
| \ \ \
*-. \ \ \ Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project2012-05-180-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| | * | | merge in nakasi-factoryrom-release history after reset to jb-devThe Android Automerger2012-05-180-0/+0
| | |\ \ \ | |/ / / /
| * | | | merge in jb-release history after reset to jb-devThe Android Automerger2012-05-170-0/+0
| |\ \ \ \
* | \ \ \ \ am 8370c7ad: Instead of asserting on malformed ADTS headers or insufficient d...Andreas Huber2012-05-181-18/+43
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Instead of asserting on malformed ADTS headers or insufficient data,Andreas Huber2012-05-181-18/+43
* | | | | | am 7c2af29e: Merge "Add throttle to have pipe fill at more stable rate" into ...Glenn Kasten2012-05-182-17/+58
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Add throttle to have pipe fill at more stable rate" into jb-devGlenn Kasten2012-05-182-17/+58
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Add throttle to have pipe fill at more stable rateGlenn Kasten2012-05-182-17/+58
* | | | | | am bf2461ec: Don\'t reconfigure stream after outputing data.Dave Burke2012-05-181-17/+40
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Don't reconfigure stream after outputing data.Dave Burke2012-05-181-17/+40
| |/ / / /
* | | | | am 874a897f: Merge "systrace for audio" into jb-devGlenn Kasten2012-05-183-5/+27
|\ \ \ \ \ | |/ / / /
| * | | | Merge "systrace for audio" into jb-devGlenn Kasten2012-05-183-5/+27
| |\ \ \ \
| | * | | | systrace for audioGlenn Kasten2012-05-173-5/+27
* | | | | | am 441fbdea: Robustness - use defaults if we see bogus sample rate / channels...Dave Burke2012-05-181-5/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Robustness - use defaults if we see bogus sample rate / channels from decoder.Dave Burke2012-05-171-5/+6