summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge changes Ibe7e6d4b,Icf8904db into jb-mr1-devJohn Grossman2012-08-1327-6348/+519
|\
| * Move the AAH RTP code out of framework and into vendor.John Grossman2012-08-1321-6196/+1
| * Add the ability to dynamicaly register MediaPlayer types.John Grossman2012-08-139-217/+583
* | Merge "Signal end of stream if no more fragments are going to be available." ...Andreas Huber2012-08-132-1/+15
|\ \ | |/ |/|
| * Signal end of stream if no more fragments are going to be available.Andreas Huber2012-08-092-1/+15
* | am 3ca352c4: am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and...Jean-Baptiste Queru2012-08-102-6/+40
|\ \
| * \ am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-102-6/+40
| |\ \
| | * \ Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"Jean-Baptiste Queru2012-08-102-6/+40
| | |\ \
| | | * | MPEG2TSWriter: Write a proper CRC in PAT and PMTPaul Fariello2012-07-102-6/+40
* | | | | am 31a593b9: am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity count...Jean-Baptiste Queru2012-08-102-7/+19
|\ \ \ \ \ | |/ / / /
| * | | | am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT a...Jean-Baptiste Queru2012-08-102-7/+19
| |\ \ \ \ | | |/ / /
| | * | | Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"Jean-Baptiste Queru2012-08-102-7/+19
| | |\ \ \ | | | |/ /
| | | * | MPEG2TSWriter: Write proper continuity counters for PAT and PMTPaul Fariello2012-07-102-7/+19
* | | | | am ff4c64d6: am c64a1787: Merge "Fix initialization of audio mixer track reso...Jean-Baptiste Queru2012-08-101-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."Jean-Baptiste Queru2012-08-101-1/+5
| |\ \ \ \ | | |/ / /
| | * | | Merge "Fix initialization of audio mixer track resources for MIPS."Jean-Baptiste Queru2012-08-101-1/+5
| | |\ \ \
| | | * | | Fix initialization of audio mixer track resources for MIPS.Paul Lind2012-08-011-1/+5
* | | | | | Merge "Handle malformed raw AAC/AMR writer better" into jb-mr1-devJames Dong2012-08-102-3/+19
|\ \ \ \ \ \
| * | | | | | Handle malformed raw AAC/AMR writer betterJames Dong2012-08-092-3/+19
* | | | | | | Camera2: Swap AF notification order, minor bug fix.Eino-Ville Talvala2012-08-102-5/+5
* | | | | | | Camera2: Add trigger support, and implement autofocusEino-Ville Talvala2012-08-104-7/+190
* | | | | | | Merge "Update state only if calls to native window are successful" into jb-mr...James Dong2012-08-101-3/+13
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Update state only if calls to native window are successfulJames Dong2012-08-091-3/+13
* | | | | | | Merge "Fix static sample table processing, add support for h.263 video." into...Andreas Huber2012-08-094-56/+53
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix static sample table processing, add support for h.263 video.Andreas Huber2012-08-094-56/+53
| |/ / / / /
* | | | | | Remove some unused forward lock codeJames Dong2012-08-082-61/+0
|/ / / / /
* | | | | Tune the overrun correctionGlenn Kasten2012-08-081-2/+2
* | | | | am 51af4af2: am e28df5b9: Merge "Store correct time stamps in recorded mp4 fi...Jean-Baptiste Queru2012-08-082-6/+17
|\ \ \ \ \ | |/ / / /
| * | | | am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-082-6/+17
| |\ \ \ \ | | |/ / /
| | * | | Merge "Store correct time stamps in recorded mp4 files"Jean-Baptiste Queru2012-08-082-6/+17
| | |\ \ \
| | | * | | Store correct time stamps in recorded mp4 filesJohannes Carlsson2012-07-302-6/+17
| | | | |/ | | | |/|
* | | | | Merge "AudioFlinger: fix timed audio" into jb-mr1-devJohn Grossman2012-08-0813-24/+261
|\ \ \ \ \
| * | | | | AudioFlinger: fix timed audioJohn Grossman2012-08-0813-24/+261
* | | | | | Merge "AudioFlinger: Better handling for master volume/mute" into jb-mr1-devJohn Grossman2012-08-082-244/+178
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioFlinger: Better handling for master volume/muteJohn Grossman2012-08-082-244/+178
* | | | | | Merge "Change audio flinger to user HAL master mute if available" into jb-mr1...John Grossman2012-08-082-10/+115
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Change audio flinger to user HAL master mute if availableJohn Grossman2012-08-082-10/+115
* | | | | | am ef620093: am efee0095: Merge "Correct ID3::StringSize calculation for UCS-...Jean-Baptiste Queru2012-08-081-1/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."Jean-Baptiste Queru2012-08-081-1/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge "Correct ID3::StringSize calculation for UCS-2 data."Jean-Baptiste Queru2012-08-081-1/+2
| | |\ \ \ \
| | | * | | | Correct ID3::StringSize calculation for UCS-2 data.Jesper Tragardh2012-07-111-1/+2
| | | | |/ / | | | |/| |
* | | | | | am 662b15c3: am a858aa96: Merge "avcenc: Remove redundant zero-initialization...Jean-Baptiste Queru2012-08-082-10/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated...Jean-Baptiste Queru2012-08-082-10/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge "avcenc: Remove redundant zero-initialization of allocated memory"Jean-Baptiste Queru2012-08-082-10/+0
| | |\ \ \ \
| | | * | | | avcenc: Remove redundant zero-initialization of allocated memoryMartin Storsjo2012-07-122-10/+0
* | | | | | | am 44237a8d: am b71298ee: Merge "avcenc: Initialize all memory allocated by t...Jean-Baptiste Queru2012-08-082-2/+5
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Mall...Jean-Baptiste Queru2012-08-082-2/+5
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback f...Jean-Baptiste Queru2012-08-082-2/+5
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | avcenc: Initialize all memory allocated by the CBAVC_Malloc callback functionMartin Storsjo2012-07-122-2/+5
* | | | | | | am 68d44b06: am 0ab18f85: Merge "avcenc: Remove useless casts"Jean-Baptiste Queru2012-08-081-2/+2
|\ \ \ \ \ \ \ | |/ / / / / /