summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Added ability to instantiate various implementations of the VideoEditorGil Dobjanschi2010-09-294-13/+141
* am 10b15c08: am d6877fa4: Merge "AMRNB: use Frame_Type_3GPP defined in frame_...Chia-chi Yeh2010-09-283-55/+19
|\
| * 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
* | | | Update code for new BT APIs.Jaikumar Ganesh2010-09-281-56/+62
* | | | Merge "Save overlays to XML"Gil Dobjanschi2010-09-284-9/+143
|\ \ \ \
| * | | | Save overlays to XMLGil Dobjanschi2010-09-284-9/+143
* | | | | am b047e3cd: am aeb2c62e: Merge "Fix several audio effects problems." into gi...Eric Laurent2010-09-282-126/+211
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 387bdcda: am 88a995ed: Merge "Properly flush the AudioTrack/AudioSink on a...Andreas Huber2010-09-283-0/+14
|\ \ \ \ \ | |/ / / /
| * | | | 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 d6c30e8c: am be045061: Merge "Instead of constantly polling the AudioPlaye...Andreas Huber2010-09-283-8/+27
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 c889bbfa: am 4769f579: Merge "Vorbis files may have more samples encoded t...Andreas Huber2010-09-283-0/+96
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 9d591860: am 3a9cc8ce: Merge "Squashed commit of the following:" into ging...Andreas Huber2010-09-284-42/+820
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 7dff9dfd: am 269dea1c: Merge "Fix media.player dumpsys to output open/mapp...Dave Sparks2010-09-281-2/+4
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | 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
| | | |/ | | |/|
* | | | Merge "Validate Overlay and effect duration and start time."Gil Dobjanschi2010-09-286-16/+86
|\ \ \ \
| * | | | Validate Overlay and effect duration and start time.Gil Dobjanschi2010-09-286-16/+86
* | | | | MtpCursor: Fix long to int truncation bugMike Lockwood2010-09-282-3/+2
* | | | | MtpCursor: Remove some unused variablesMike Lockwood2010-09-281-13/+1
|/ / / /
* | | | work on review comments and code formating.Dharmaray Kundargi2010-09-272-12/+53
* | | | Merge "MTP: Fix local reference leaks."Mike Lockwood2010-09-271-2/+19
|\ \ \ \
| * | | | MTP: Fix local reference leaks.Mike Lockwood2010-09-271-2/+19
* | | | | Merge "Bug fix: getDuration vs. getDurationTimeline"Gil Dobjanschi2010-09-276-35/+119
|\ \ \ \ \
| * | | | | Bug fix: getDuration vs. getDurationTimelineGil Dobjanschi2010-09-276-35/+119
* | | | | | Merge changes I424ba760,Ic0826085Mike Lockwood2010-09-272-46/+290
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | MTP: Implement extra object properties for audio, video and image filesMike Lockwood2010-09-272-46/+290
| |/ / / /
* | | | | am a9f17c8b: am bf47092e: Merge "Fix track duration calculation if the start ...James Dong2010-09-271-3/+36
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 fa5c8fc4: am abaabb2c: Merge "Support other kinds of HTTP redirect in NuHT...Andreas Huber2010-09-271-1/+6
|\ \ \ \ \ | |/ / / /
| * | | | 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 1b37df95: am 9627847d: Merge "Fix error in AudioEffect command status repo...Eric Laurent2010-09-273-13/+23
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |