summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"Jean-Baptiste Queru2012-08-087-35/+35
|\ \ \ \ | | |/ / | |/| |
| * | | avcenc: Switch malloc/free callbacks to use pointers instead of intsMartin Storsjo2012-07-107-35/+35
| |/ /
* | | Merge "mediacodec: Return an error on getOutputFormat if there is no output f...Jean-Baptiste Queru2012-08-081-1/+2
|\ \ \ | |_|/ |/| |
| * | mediacodec: Return an error on getOutputFormat if there is no output format yetMartin Storsjo2012-07-131-1/+2
| |/
* | Merge "Shutter sound is heard at the end of the recorded video"Eino-Ville Talvala2012-08-011-1/+1
|\ \ | |/ |/|
| * Shutter sound is heard at the end of the recorded videoPatric Frederiksen2012-07-101-1/+1
|/
* Reconcile with jb-releaseThe Android Open Source Project2012-07-030-0/+0
|\
| * merge in jb-release history after reset to jb-devThe Android Automerger2012-07-020-0/+0
| |\
* | \ am 109347d4: audioflinger: fix regression in attachAuxEffect().Eric Laurent2012-07-021-4/+1
|\ \ \ | |/ /
| * | audioflinger: fix regression in attachAuxEffect().Eric Laurent2012-07-021-4/+1
* | | am 717e1286: audioflinger: fix auxiliary effect attachmentEric Laurent2012-07-012-0/+65
|\ \ \ | |/ /
| * | audioflinger: fix auxiliary effect attachmentEric Laurent2012-06-292-0/+65
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-250-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-220-0/+0
| |\ \ | | |/ | |/|
* | | am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb...Jamie Gennis2012-06-222-60/+58
|\ \ \ | |/ /
| * | Merge "SurfaceMediaSource: keep refs to current buffers" into jb-devJamie Gennis2012-06-222-60/+58
| |\ \
| | * | SurfaceMediaSource: keep refs to current buffersJamie Gennis2012-06-222-60/+58
* | | | Reconcile with jb-releaseThe Android Open Source Project2012-06-220-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
* | | | am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
| | |/ | |/|
* | | Reconcile with jb-releaseThe Android Open Source Project2012-06-190-0/+0
|\ \ \ | | |/ | |/|
| * | merge in jb-release history after reset to jb-devThe Android Automerger2012-06-160-0/+0
| |\ \ | | |/ | |/|
| | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-140-0/+0
| | |\
| | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-130-0/+0
| | | |\
| | | | * merge in jb-release history after reset to jb-devThe Android Automerger2012-06-120-0/+0
| | | | |\
* | | | | \ am eb15716b: Change definition of warmup periodGlenn Kasten2012-06-181-2/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Change definition of warmup periodGlenn Kasten2012-06-151-2/+5
* | | | | | am 972af221: FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-181-6/+14
|\ \ \ \ \ \ | |/ / / / /
| * | | | | FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-151-6/+14
* | | | | | am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
| |\ \ \ \ \
| | * | | | | Fix track selection code in AwesomePlayerInsun Kang2012-06-151-1/+1
* | | | | | | am 0a14c4ce: Make CPU frequency statistics optionalGlenn Kasten2012-06-153-4/+24
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Make CPU frequency statistics optionalGlenn Kasten2012-06-143-4/+24
| |/ / / / /
* | | | | | am 362ebcbf: DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-141-1/+1
* | | | | | am 7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
| |\ \ \ \ \
| | * | | | | stagefright: set scaling mode for blank framesJamie Gennis2012-06-141-0/+8
* | | | | | | am 192cbbad: Fix audio track pause.Eric Laurent2012-06-141-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fix audio track pause.Eric Laurent2012-06-141-0/+1
| |/ / / / /
* | | | | | am 82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb...Marco Nelissen2012-06-142-7/+16
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Better handle invalid duration in Xing/VBRI tags" into jb-devMarco Nelissen2012-06-142-7/+16
| |\ \ \ \ \
| | * | | | | Better handle invalid duration in Xing/VBRI tagsMarco Nelissen2012-06-132-7/+16
| | | |/ / / | | |/| | |
* | | | | | am e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-devGlenn Kasten2012-06-141-0/+4
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Shorten dumpsys media.audio_flinger output" into jb-devGlenn Kasten2012-06-141-0/+4
| |\ \ \ \ \
| | * | | | | Shorten dumpsys media.audio_flinger outputGlenn Kasten2012-06-131-0/+4
| | |/ / / /
* | | | | | am 49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-143-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-143-6/+6
| |\ \ \ \ \ | | |_|/ / / | |/| | | |