summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* 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-301-0/+8
|\ \ | |/
| * Issue 3032913: improve AudioTrack recovery timeEric Laurent2010-09-301-0/+8
* | 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-282-126/+211
|\ \ \ | |/ /
| * | Fix several audio effects problems.Eric Laurent2010-09-282-126/+211
* | | 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-283-8/+27
|\ \ \ \ | |/ / /
| * | | Merge "Instead of constantly polling the AudioPlayer to see if it reached EOS...Andreas Huber2010-09-283-8/+27
| |\ \ \ | | |/ /
| | * | Instead of constantly polling the AudioPlayer to see if it reached EOS or fin...Andreas Huber2010-09-283-8/+27
* | | | am 4769f579: Merge "Vorbis files may have more samples encoded that should be...Andreas Huber2010-09-283-0/+96
|\ \ \ \ | |/ / /
| * | | Merge "Vorbis files may have more samples encoded that should be used, i.e. w...Andreas Huber2010-09-283-0/+96
| |\ \ \ | | |/ /
| | * | Vorbis files may have more samples encoded that should be used, i.e. we have ...Andreas Huber2010-09-283-0/+96
* | | | am 3a9cc8ce: Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-284-42/+820
|\ \ \ \ | |/ / /
| * | | Merge "Squashed commit of the following:" into gingerbreadAndreas Huber2010-09-284-42/+820
| |\ \ \ | | |/ / | |/| |
| | * | Squashed commit of the following:Andreas Huber2010-09-274-42/+820
* | | | am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files corr...Dave Sparks2010-09-281-2/+4
|\ \ \ \ | |/ / /
| * | | Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.Dave Sparks2010-09-271-2/+4
| | |/ | |/|
* | | am bf47092e: Merge "Fix track duration calculation if the start timestamp is ...James Dong2010-09-271-3/+36
|\ \ \ | |/ /
| * | Merge "Fix track duration calculation if the start timestamp is non-zero" int...James Dong2010-09-271-3/+36
| |\ \ | | |/ | |/|
| | * Fix track duration calculation if the start timestamp is non-zeroJames Dong2010-09-271-3/+36
* | | am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHTTPDataSource"...Andreas Huber2010-09-271-1/+6
|\ \ \ | |/ /
| * | Merge "Support other kinds of HTTP redirect in NuHTTPDataSource" into gingerb...Andreas Huber2010-09-271-1/+6
| |\ \
| | * | Support other kinds of HTTP redirect in NuHTTPDataSourceAndreas Huber2010-09-271-1/+6
| | |/
* | | am 9627847d: Merge "Fix error in AudioEffect command status reporting." into ...Eric Laurent2010-09-273-13/+23
|\ \ \ | |/ /
| * | Fix error in AudioEffect command status reporting.Eric Laurent2010-09-243-13/+23
* | | am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbreadEric Laurent2010-09-242-19/+14
|\ \ \ | |/ /
| * | fix problem in AudioEffect JNI setup.Eric Laurent2010-09-242-19/+14
| |/
* | am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NAL...Andreas Huber2010-09-231-1/+9
|\ \ | |/
| * Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the ...Andreas Huber2010-09-231-1/+9
| |\
| | * Depending on our preference to write 2-byte or 4-byte NALs, patch the codec s...Andreas Huber2010-09-231-1/+9
* | | am 7864c72b: Merge "Fix issue 3022800." into gingerbreadEric Laurent2010-09-2320-122/+241
|\ \ \ | |/ /
| * | Fix issue 3022800.Eric Laurent2010-09-2320-122/+241
* | | am 903fc221: Ignore errors from correction parameter query and config for M4v...James Dong2010-09-231-2/+9
|\ \ \ | |/ /
| * | Ignore errors from correction parameter query and config for M4v and H263 enc...James Dong2010-09-231-2/+9
* | | am 697bd76e: Merge "Use the advertised profile and level from M4V and H263 vi...James Dong2010-09-231-4/+4
|\ \ \ | |/ /
| * | Use the advertised profile and level from M4V and H263 video encodersJames Dong2010-09-221-4/+4
| |/