summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* Avoid using String.format in MediaRecorderHenrik Backlund2011-01-241-5/+5
* am 4da48ec8: Merge "Notify the playback status to DRM agents before the playb...Gloria Wang2010-11-221-7/+12
|\
| * Notify the playback status to DRM agents before the playback startsGloria Wang2010-11-221-7/+12
* | resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
|\ \ | |/
| * StagefrightMediaScanner: Call endFile() for MIDI and OGG files.Hiroshi Takekawa2010-11-191-8/+10
* | am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: frameworks/base/m...Jean-Baptiste Queru2010-11-191-1/+1
|\ \ | |/
| * build failed with g++ v. 4.4.5Matthias Bady2010-11-181-1/+1
* | am f6bd761f: Use back-facing camera as default in camera/camcorder profile.do...Wu-cheng Li2010-11-082-5/+29
|\ \
| * | Use back-facing camera as default in camera/camcorder profile.do not mergeWu-cheng Li2010-11-092-5/+29
* | | am 1b2efbca: Merge "Update a comment about when setOrientationHint() should b...James Dong2010-11-081-1/+1
|\ \ \ | |/ /
| * | Merge "Update a comment about when setOrientationHint() should be called" int...James Dong2010-11-081-1/+1
| |\ \
| | * | Update a comment about when setOrientationHint() should be calledJames Dong2010-11-081-1/+1
* | | | am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" i...James Dong2010-11-083-1/+66
|\ \ \ \ | |/ / /
| * | | Support extracting thumbnail from rotated video tracksJames Dong2010-11-083-1/+66
| |/ /
* | | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-088-90/+230
|\ \ \ | |/ /
| * | Support post-decode video rotation.Andreas Huber2010-11-058-89/+228
* | | am 1653e261: Merge "Rotation support" into gingerbreadJames Dong2010-11-063-19/+84
|\ \ \ | |/ /
| * | Merge "Rotation support" into gingerbreadJames Dong2010-11-053-19/+84
| |\ \
| | * | Rotation supportJames Dong2010-11-053-19/+84
* | | | am 0467b0ab: Merge "Add a new public API to support recording rotated videos"...James Dong2010-11-061-0/+25
|\ \ \ \ | |/ / /
| * | | Add a new public API to support recording rotated videosJames Dong2010-11-051-0/+25
| |/ /
* | | am c0fa1d47: Merge "Revert "Support rotation in media recorder"" into gingerb...James Dong2010-11-033-39/+0
|\ \ \ | |/ /
| * | Revert "Support rotation in media recorder"James Dong2010-11-033-39/+0
* | | am c181a082: Merge "Support rotation in media recorder" into gingerbreadHiroshi Lockheimer2010-11-033-0/+39
|\ \ \ | |/ /
| * | Support rotation in media recorderJames Dong2010-11-033-0/+39
* | | am f3847e87: Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-031-3/+29
|\ \ \ | |/ /
| * | DO NOT MERGEJames Dong2010-11-021-3/+29
* | | resolved conflicts for merge of c1c45a4d to gingerbread-plus-aospGloria Wang2010-11-022-24/+14
|\ \ \ | | |/ | |/|
| * | - Move the business rule management down to DRM agents.Gloria Wang2010-11-012-24/+14
* | | am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This ...Yu Shan Emily Lau2010-10-271-0/+1
|\ \ \ | | |/ | |/|
| * | Merge "Add the mediaplayer release in the test validation. This is to ensure ...Yu Shan Emily Lau2010-10-271-0/+1
| |\ \
| | * | Add the mediaplayer release in the test validation. This is to ensure the med...Yu Shan Emily Lau2010-10-261-0/+1
* | | | am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. ...Marco Nelissen2010-10-271-9/+12
|\ \ \ \ | |/ / /
| * | | Fix off-by-two and other bugs in the visualization code.Marco Nelissen2010-10-271-9/+12
* | | | am 2088e371: Merge "Assume that all of the decoded vorbis audio data is valid...Andreas Huber2010-10-261-6/+14
|\ \ \ \ | |/ / /
| * | | Assume that all of the decoded vorbis audio data is valid unless the source i...Andreas Huber2010-10-261-6/+14
* | | | resolved conflicts for merge of 9084631d to gingerbread-plus-aospGloria Wang2010-10-2510-41/+797
|\ \ \ \ | | |_|/ | |/| |
| * | | DRM framework support:Gloria Wang2010-10-2510-41/+793
* | | | Fixes for simulator build on lucidMike Lockwood2010-10-245-5/+5
* | | | am b6a2256e: Merge "Fix issue 3126094." into gingerbreadEric Laurent2010-10-221-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix issue 3126094.Eric Laurent2010-10-221-0/+1
* | | | am 1bd8a8c8: Merge "Turn the media time adjustment in file writer back on" in...James Dong2010-10-211-2/+5
|\ \ \ \ | |/ / /
| * | | Turn the media time adjustment in file writer back onJames Dong2010-10-211-2/+5
* | | | am fa7a87fb: Merge "File writer size estimation improvement" into gingerbreadJames Dong2010-10-201-18/+38
|\ \ \ \ | |/ / /
| * | | File writer size estimation improvementJames Dong2010-10-191-18/+38
| | |/ | |/|
* | | am 52bea277: Merge "If we encounter video stream EOS while seeking we may sti...Andreas Huber2010-10-192-18/+37
|\ \ \ | |/ /
| * | If we encounter video stream EOS while seeking we may still need to seek audio.Andreas Huber2010-10-192-18/+37
* | | am d68cda47: An attempt to unregister a handler that\'s no longer registered ...Andreas Huber2010-10-181-3/+8
|\ \ \ | |/ /
| * | An attempt to unregister a handler that's no longer registered should not cau...Andreas Huber2010-10-181-3/+8
* | | am bc96c284: Merge "For thumbnail extraction make sure we instantiate a decod...Andreas Huber2010-10-182-2/+46
|\ \ \ | |/ /
generated by cgit v1.1 at 2025-01-13 06:51:44 +0000