summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* stagefright: warnings be gone, some are now errors, use clangLajos Molnar2015-04-1795-227/+295
* Merge "NuPlayerDriver: Maintain the timeStamp after seek"Wei Jia2015-04-171-0/+3
|\
| * NuPlayerDriver: Maintain the timeStamp after seekHaynes Mathew George2015-04-171-0/+3
* | Merge "stagefright: initial timed id3 support in hls"Robert Shih2015-04-1720-84/+402
|\ \
| * | stagefright: initial timed id3 support in hlsRobert Shih2015-04-1620-84/+402
| |/
* | MediaSync: sanity check native sample rate.Wei Jia2015-04-161-0/+5
|/
* MediaCodec: hold input buffers during FLUSHED stateChong Zhang2015-04-162-2/+12
* Merge "Work around lack of pitch adjustment in Timestretcher"Andy Hung2015-04-161-12/+40
|\
| * Work around lack of pitch adjustment in TimestretcherAndy Hung2015-04-161-12/+40
* | am 6705a49f: am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end ...Marco Nelissen2015-04-164-1/+33
|\ \
| * \ am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video...Marco Nelissen2015-04-164-1/+33
| |\ \
| | * \ am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out...Marco Nelissen2015-04-164-1/+33
| | |\ \
| | | * \ am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | |\ \
| | | | * \ Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | | |\ \
| | | | | * | Signal EOS at end of mpeg video to flush out final sampleMarco Nelissen2015-04-154-1/+33
* | | | | | | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-1633-29/+552
|\ \ \ \ \ \ \
| * | | | | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-1533-29/+552
* | | | | | | | Merge "CameraService: Add support for module init, some logging updates"Eino-Ville Talvala2015-04-164-72/+120
|\ \ \ \ \ \ \ \
| * | | | | | | | CameraService: Add support for module init, some logging updatesEino-Ville Talvala2015-04-154-72/+120
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: fr...Lajos Molnar2015-04-161-0/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBu...Lajos Molnar2015-04-161-0/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |
| | * | | | | | am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | | |\ \ \ \
| | | | | * | | | libstagefright: free mMoovBoxBufferSuresh Choudhary2015-04-161-0/+2
* | | | | | | | | am f16511ca: am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set t...Lajos Molnar2015-04-161-2/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct au...Lajos Molnar2015-04-161-2/+4
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate ...Lajos Molnar2015-04-161-2/+4
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera re...Lajos Molnar2015-04-161-2/+4
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"Lajos Molnar2015-04-161-2/+4
| | | | |\ \ \ \ \
| | | | | * | | | | MPEG4Writer: Set the correct audio bit rate for camera recorded contentDaniel Bonnevier2015-04-151-2/+4
| | | | | | |_|_|/ | | | | | |/| | |
* | | | | | | | | am 655084f9: am e7a53499: am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,I...Lajos Molnar2015-04-1611-11/+3668
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am e7a53499: am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f...Lajos Molnar2015-04-1611-11/+3668
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | | * | | | | Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | | | * | | | stagefright: add SoftAVCEnc using libavcVenkatarama Avadhani2015-04-155-6/+1680
| | | | | * | | | stagefright: add SoftAVCDec using libavcVenkatarama Avadhani2015-04-155-5/+1017
| | | | | * | | | stagefright: add SoftMPEG2 decoder using libmpeg2Venkatarama Avadhani2015-04-155-0/+971
| | | | |/ / / /
* | | | | | | | Merge "camera2: remove unnecessary flashlight error messages"Chien-Yu Chen2015-04-161-15/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | camera2: remove unnecessary flashlight error messagesChien-Yu Chen2015-04-151-15/+18
* | | | | | | | | Merge "Camera3: allow reconfiguring the input stream"Chien-Yu Chen2015-04-151-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Camera3: allow reconfiguring the input streamChien-Yu Chen2015-04-151-5/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | audio policy: add binder calls for audio source controlEric Laurent2015-04-1510-0/+147
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge "fix NuPlayerDecoder discontinuity handling with async mode"Chong Zhang2015-04-151-4/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | fix NuPlayerDecoder discontinuity handling with async modeChong Zhang2015-04-151-4/+0
* | | | | | | | | Merge "AudioPolicyManager: notification of dynamic policy mix activity"Jean-Michel Trivi2015-04-1512-6/+139
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-1412-6/+139
* | | | | | | | | | Merge "Camera: allow non-supported template"Yin-Chia Yeh2015-04-151-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Camera: allow non-supported templateYin-Chia Yeh2015-04-141-3/+3