summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aospGloria Wang2010-10-0727-365/+605
|\
| * Update of DRM framework.Takeshi Aimi2010-10-0427-365/+605
* | am 949f7d90: Merge "Work to support switching transport streams mid-stream an...Andreas Huber2010-10-0716-112/+463
|\ \
| * | Work to support switching transport streams mid-stream and signalling discont...Andreas Huber2010-10-0716-112/+463
* | | am 02654f01: Merge "On this particular device the hardware video decoder spit...Andreas Huber2010-10-075-17/+56
|\ \ \ | |/ /
| * | On this particular device the hardware video decoder spits out buffers that d...Andreas Huber2010-10-075-17/+56
* | | am 37947afe: Merge "Fixed AudioFlinger not always pausing tracks" into ginger...Eric Laurent2010-10-051-3/+3
|\ \ \ | |/ /
| * | Merge "Fixed AudioFlinger not always pausing tracks" into gingerbreadEric Laurent2010-10-051-3/+3
| |\ \
| | * | Fixed AudioFlinger not always pausing tracksEric Laurent2010-10-051-3/+3
* | | | am 17bc4f65: Merge "Make sure to call AudioTrack::stop() instead of AudioTrac...Andreas Huber2010-10-054-14/+29
|\ \ \ \ | |/ / /
| * | | Make sure to call AudioTrack::stop() instead of AudioTrack::pause() after sub...Andreas Huber2010-10-054-14/+29
| |/ /
* | | am f4619308: Merge "fix [2835280] Add support for cancelling buffers to ANati...Mathias Agopian2010-10-041-4/+6
|\ \ \ | |/ /
| * | fix [2835280] Add support for cancelling buffers to ANativeWindowMathias Agopian2010-10-041-4/+6
* | | am 6f1c7bda: Merge "Fixed an issue where the reserved free space in the file ...James Dong2010-10-042-2/+15
|\ \ \ | |/ /
| * | Fixed an issue where the reserved free space in the file writer was larger th...James Dong2010-10-042-2/+15
* | | am b99f0c7e: Merge "Resilent media time stamp adjustment" into gingerbreadJames Dong2010-10-041-24/+181
|\ \ \ | |/ /
| * | Merge "Resilent media time stamp adjustment" into gingerbreadJames Dong2010-10-041-24/+181
| |\ \
| | * | Resilent media time stamp adjustmentJames Dong2010-10-041-24/+181
* | | | am aa1a694d: Merge "Make sure to finish the preparation phase even EOS occurs...Andreas Huber2010-10-041-0/+4
|\ \ \ \ | |/ / /
| * | | Make sure to finish the preparation phase even EOS occurs before we consider ...Andreas Huber2010-10-041-0/+4
* | | | am 7fa69374: Merge "Don\'t retrieve metadata unless necessary for ogg-vorbis ...Andreas Huber2010-10-041-5/+11
|\ \ \ \ | |/ / /
| * | | Don't retrieve metadata unless necessary for ogg-vorbis ringtone auto-looping.Andreas Huber2010-10-041-5/+11
| |/ /
* | | am 6c609b6a: Merge "Turn off media time adjustment by default" into gingerbreadJames Dong2010-10-011-1/+1
|\ \ \ | |/ /
| * | Merge "Turn off media time adjustment by default" into gingerbreadJames Dong2010-10-011-1/+1
| |\ \
| | * | Turn off media time adjustment by defaultJames Dong2010-10-011-1/+1
* | | | am e619a9da: Merge "Start playing live streams from the start, no the middle....Andreas Huber2010-10-011-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Start playing live streams from the start, no the middle..." into ging...Andreas Huber2010-10-011-1/+1
| |\ \ \
| | * | | Start playing live streams from the start, no the middle...Andreas Huber2010-10-011-1/+1
* | | | | am 469b8033: Merge "Remove development-only code." into gingerbreadAndreas Huber2010-10-011-15/+0
|\ \ \ \ \ | |/ / / /
| * | | | Remove development-only code.Andreas Huber2010-10-011-15/+0
| |/ / /
* | | | am d1398db3: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-10-019-357/+597
|\ \ \ \ | |/ / /
| * | | Squashed commit of the following:Andreas Huber2010-10-019-357/+597
| |/ /
* | | am 220ab887: Merge "Issue 3032913: improve AudioTrack recovery time" into gin...Eric Laurent2010-09-303-6/+26
|\ \ \ | |/ /
| * | Issue 3032913: improve AudioTrack recovery timeEric Laurent2010-09-303-6/+26
* | | am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h i...Chia-chi Yeh2010-09-283-55/+19
|\ \ \ | |/ /
| * | Merge "AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead." into...Chia-chi Yeh2010-09-283-55/+19
| |\ \
| | * | AMRNB: use Frame_Type_3GPP defined in frame_type_3gpp.h instead.Chia-chi Yeh2010-09-293-55/+19
* | | | am aeb2c62e: Merge "Fix several audio effects problems." into gingerbreadEric Laurent2010-09-283-134/+243
|\ \ \ \ | |/ / /
| * | | Fix several audio effects problems.Eric Laurent2010-09-283-134/+243
* | | | am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a seek request...Andreas Huber2010-09-283-0/+14
|\ \ \ \ | |/ / /
| * | | Merge "Properly flush the AudioTrack/AudioSink on a seek request and make sur...Andreas Huber2010-09-283-0/+14
| |\ \ \
| | * | | Properly flush the AudioTrack/AudioSink on a seek request and make sure that ...Andreas Huber2010-09-283-0/+14
* | | | | am be045061: Merge "Instead of constantly polling the AudioPlayer to see if i...Andreas Huber2010-09-284-9/+32
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS...Andreas Huber2010-09-284-9/+32
| |\ \ \ \ | | |/ / /
| | * | | Instead of constantly polling the AudioPlayer to see if it reached EOS or fin...Andreas Huber2010-09-284-9/+32
* | | | | am 4769f579: Merge "Vorbis files may have more samples encoded that should be...Andreas Huber2010-09-284-0/+98
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Vorbis files may have more samples encoded that should be used, i.e. w...Andreas Huber2010-09-284-0/+98
| |\ \ \ \ | | |/ / /
| | * | | Vorbis files may have more samples encoded that should be used, i.e. we have ...Andreas Huber2010-09-284-0/+98
* | | | | am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-286-42/+898
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-286-42/+898
| |\ \ \ \ | | |/ / / | |/| | |
generated by cgit v1.1 at 2025-03-09 17:25:37 +0000