summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Expand)AuthorAgeFilesLines
* am cf393faa: Merge "resolved conflicts for merge of c1c45a4d to gingerbread-p...Gloria Wang2010-11-031-23/+6
|\
| * 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
* | | Stop using OMX_COLOR_FormatAndroidPrivateStart.Jamie Gennis2010-11-011-6/+1
* | | Merge "Notify surfaceflinger about (changes to) the crop rectangle output by ...Andreas Huber2010-11-011-0/+11
|\ \ \
| * | | Notify surfaceflinger about (changes to) the crop rectangle output by the dec...Andreas Huber2010-11-011-0/+11
* | | | Media scanner support for FL(Forward Lock) DRM file typesGloria Wang2010-11-011-1/+1
|/ / /
* | | After seeking display the first new video frame right away without concern fo...Andreas Huber2010-11-011-0/+6
* | | Merge "Added some debugging log messages at stop()"James Dong2010-10-291-1/+5
|\ \ \
| * | | Added some debugging log messages at stop()James Dong2010-10-291-1/+5
* | | | Merge "- register DRM sniffer only when drmserver is up - notify DRM agents t...Gloria Wang2010-10-292-8/+15
|\ \ \ \ | |/ / / |/| | |
| * | | - register DRM sniffer only when drmserver is upGloria Wang2010-10-292-8/+15
* | | | Squashed commit of the following:Andreas Huber2010-10-296-70/+0
|/ / /
* | | Merge "Added profile and level translation in SW video encoders"James Dong2010-10-292-5/+188
|\ \ \
| * | | Added profile and level translation in SW video encodersJames Dong2010-10-272-5/+188
* | | | Upgrade to the latest version of libwebm to fix YouTube webm playback.Andreas Huber2010-10-283-3533/+5067
|/ / /
* | | Better support for MP4A-LATM RTP disassembly. This used to fail if mNumSubFra...Andreas Huber2010-10-274-20/+382
* | | am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visuali...Marco Nelissen2010-10-271-9/+12
|\ \ \ | |/ /
| * | 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
* | | | Merge "Remove annoying warning during mpeg4 extraction."Andreas Huber2010-10-271-1/+1
|\ \ \ \
| * | | | Remove annoying warning during mpeg4 extraction.Andreas Huber2010-10-271-1/+1
* | | | | Merge "FileSource may fail to open a file in which case subsequent code deref...Andreas Huber2010-10-271-1/+1
|\ \ \ \ \
| * | | | | FileSource may fail to open a file in which case subsequent code dereferences...Andreas Huber2010-10-271-1/+1
| |/ / / /
* | | | | Fix for simulator build breakKristian Monsen2010-10-271-1/+1
|/ / / /
* | | | am e1e82745: am 2088e371: Merge "Assume that all of the decoded vorbis audio ...Andreas Huber2010-10-261-6/+14
|\ \ \ \ | |/ / /
| * | | 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
* | | | Merge "Add two creation flags to OMXCodec::Create()"James Dong2010-10-261-1/+10
|\ \ \ \
| * | | | Add two creation flags to OMXCodec::Create()James Dong2010-10-251-1/+10
* | | | | A temporary fix for "Waiting for service drm.drmManager".Gloria Wang2010-10-261-1/+1
|/ / / /
* | | | Merge "Remove OMX.PV.* components from OMXCodec.cpp"James Dong2010-10-251-30/+6
|\ \ \ \
| * | | | Remove OMX.PV.* components from OMXCodec.cppJames Dong2010-10-251-30/+6
* | | | | Merge "Don't change the video recording frame rate if it is not requested."James Dong2010-10-252-3/+35
|\ \ \ \ \
| * | | | | Don't change the video recording frame rate if it is not requested.James Dong2010-10-252-3/+35
| |/ / / /
* | | | | resolved conflicts for merge of 965f960e to masterGloria Wang2010-10-2510-41/+797
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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
* | | | | We don't have access to the md5 implementation on the simulator, let's disabl...Andreas Huber2010-10-251-0/+10
| |_|/ / |/| | |
* | | | Merge "OMX extension to support storing meta data in video input buffers duri...James Dong2010-10-225-0/+68
|\ \ \ \
| * | | | OMX extension to support storing meta data in video input buffers during reco...James Dong2010-10-215-0/+68
* | | | | am 6123e0f7: am 1bd8a8c8: Merge "Turn the media time adjustment in file write...James Dong2010-10-211-2/+5
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" int...James Dong2010-10-211-18/+38
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | 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
* | | | Fix a copy & paste logging error.Jamie Gennis2010-10-201-1/+1
* | | | Merge "Fix the non-ANW video decode path."Jamie Gennis2010-10-201-2/+4
|\ \ \ \