summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am 00557baf: am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gi...Andreas Huber2010-08-181-4/+4
|\
| * am 4dda6ddb: Merge "Make the OggExtractor less verbose." into gingerbreadAndreas Huber2010-08-181-4/+4
| |\
| | * Merge "Make the OggExtractor less verbose." into gingerbreadAndreas Huber2010-08-181-4/+4
| | |\
| | | * Make the OggExtractor less verbose.Andreas Huber2010-08-161-4/+4
* | | | am 31eb1ac1: am 0324ce9a: Merge "Be more lenient when validating ESDS informa...Andreas Huber2010-08-181-0/+8
|\ \ \ \ | |/ / /
| * | | am 0324ce9a: Merge "Be more lenient when validating ESDS information in mp4 a...Andreas Huber2010-08-181-0/+8
| |\ \ \ | | |/ /
| | * | Be more lenient when validating ESDS information in mp4 audio tracks. Allow t...Andreas Huber2010-08-181-0/+8
| | |/
| * | resolved conflicts for merge of 0b7bd95d to gingerbread-plus-aospJean-Baptiste Queru2010-08-171-2/+2
| |\ \
| | * | Fix compilation errors in libmedia, libstagefright.Rene Bolldorf2010-08-172-4/+4
* | | | MTP: Remove retry loop from MTP server codeMike Lockwood2010-08-181-38/+17
* | | | MTP: Compatibility fixes for transferring stringsMike Lockwood2010-08-183-3/+9
* | | | am f54da15b: am eff30e3d: Change the default time scale for audio/video track...James Dong2010-08-162-14/+63
|\ \ \ \ | |/ / /
| * | | am eff30e3d: Change the default time scale for audio/video track during recor...James Dong2010-08-162-14/+63
| |\ \ \ | | | |/ | | |/|
| | * | Change the default time scale for audio/video track during recordingJames Dong2010-08-162-14/+63
* | | | am 4fc2c928: am b7208196: Use audio clock as the reference media clockJames Dong2010-08-161-0/+65
|\ \ \ \ | |/ / /
| * | | am b7208196: Use audio clock as the reference media clockJames Dong2010-08-131-0/+65
| |\ \ \ | | |/ /
| | * | Use audio clock as the reference media clockJames Dong2010-08-131-0/+65
* | | | am 38a9f405: am e95d192f: Mainly fix two mistakes that I made:James Dong2010-08-122-2/+2
|\ \ \ \ | |/ / /
| * | | am e95d192f: Mainly fix two mistakes that I made:James Dong2010-08-122-2/+2
| |\ \ \ | | |/ /
| | * | Mainly fix two mistakes that I made:James Dong2010-08-122-2/+2
* | | | am 2f020449: am 5f96138b: Merge "Support getting codec, width, and height in ...Mike Dodd2010-08-121-21/+29
|\ \ \ \ | |/ / /
| * | | am 5f96138b: Merge "Support getting codec, width, and height in URL for gtalk...Mike Dodd2010-08-121-21/+29
| |\ \ \ | | |/ /
| | * | Merge "Support getting codec, width, and height in URL for gtalk playback." i...Mike Dodd2010-08-121-21/+29
| | |\ \
| | | * | Support getting codec, width, and height in URL for gtalk playback.Mike Dodd2010-08-121-21/+29
* | | | | am 73af0a92: am 72ac1f26: Fix software avc encoder crash at EOS.Andreas Huber2010-08-121-2/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 72ac1f26: Fix software avc encoder crash at EOS.Andreas Huber2010-08-121-2/+0
| |\ \ \ \ | | |/ / /
| | * | | Fix software avc encoder crash at EOS.Andreas Huber2010-08-121-2/+0
| | |/ /
* | | | am b408f549: am d790c648: Add lost preview surface detection in the JNI layer...James Dong2010-08-121-0/+9
|\ \ \ \ | |/ / /
| * | | am d790c648: Add lost preview surface detection in the JNI layer Throws an IO...James Dong2010-08-121-0/+9
| |\ \ \ | | |/ /
| | * | Add lost preview surface detection in the JNI layerJames Dong2010-08-121-0/+9
* | | | am 3bf8c342: am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a...Andreas Huber2010-08-122-2/+2
|\ \ \ \ | |/ / /
| * | | am ae3a1f45: Merge "Fix the h.263 assembler to properly subset a buffer\'s ra...Andreas Huber2010-08-122-2/+2
| |\ \ \ | | |/ /
| | * | Merge "Fix the h.263 assembler to properly subset a buffer's range if it alre...Andreas Huber2010-08-122-2/+2
| | |\ \
| | | * | Fix the h.263 assembler to properly subset a buffer's range if it already has...Andreas Huber2010-08-122-2/+2
* | | | | am 53895c6a: am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbreadAndreas Huber2010-08-121-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | am 66aa0f3d: Merge "APacketSource is too verbose." into gingerbreadAndreas Huber2010-08-121-1/+1
| |\ \ \ \ | | |/ / /
| | * | | Merge "APacketSource is too verbose." into gingerbreadAndreas Huber2010-08-121-1/+1
| | |\ \ \ | | | |/ /
| | | * | APacketSource is too verbose.Andreas Huber2010-08-121-1/+1
* | | | | am 8473db02: am 708ec39c: Don\'t send late frames to software encoders for en...James Dong2010-08-124-2/+29
|\ \ \ \ \ | |/ / / /
| * | | | am 708ec39c: Don\'t send late frames to software encoders for encodingJames Dong2010-08-124-2/+29
| |\ \ \ \ | | |/ / /
| | * | | Don't send late frames to software encoders for encodingJames Dong2010-08-124-2/+29
* | | | | am 8aa244ea: am 45cb3cfa: Merge "Handle large audio lost" into gingerbreadJames Dong2010-08-121-9/+17
|\ \ \ \ \ | |/ / / /
| * | | | am 45cb3cfa: Merge "Handle large audio lost" into gingerbreadJames Dong2010-08-121-9/+17
| |\ \ \ \ | | |/ / /
| | * | | Merge "Handle large audio lost" into gingerbreadJames Dong2010-08-121-9/+17
| | |\ \ \
| | | * | | Handle large audio lostJames Dong2010-08-101-9/+17
* | | | | | am f4e26da1: am b6541f0a: Merge "Fix a crash due to unnecessary check on the ...James Dong2010-08-121-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am b6541f0a: Merge "Fix a crash due to unnecessary check on the codec config ...James Dong2010-08-121-2/+2
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "Fix a crash due to unnecessary check on the codec config data for H263...James Dong2010-08-121-2/+2
| | |\ \ \ \
| | | * | | | Fix a crash due to unnecessary check on the codec config data for H263 video ...James Dong2010-08-111-2/+2
| | | |/ / /
* | | | | | am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into g...James Dong2010-08-122-5/+7
|\ \ \ \ \ \ | |/ / / / /