summaryrefslogtreecommitdiffstats
path: root/media/libmedia/MediaProfiles.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Add Fraunhofer AAC encoder with AAC-ELD support.Dave Burke2012-04-251-3/+4
| | | | Change-Id: I6cd499d257d72f50a5b508bed97796a591a51506
* Merge "Switched to use the header files in /frameworks/native and deleted ↵James Dong2012-03-131-1/+1
|\ | | | | | | the duplicate header files in /frameworks/base"
| * Switched to use the header files in /frameworks/nativeJames Dong2012-03-121-1/+1
| | | | | | | | | | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* | Whitespace and indentationGlenn Kasten2012-03-131-2/+2
|/ | | | | | | | | | | | | | Fix indentation to be multiple of 4. Make it easier to search: sp< not sp < to "switch (...)" instead of "switch(...)" (also "if" and "while") Remove redundant blank line at start or EOF. Remove whitespace at end of line. Remove extra blank lines where they don't add value. Use git diff -b or -w to verify. Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
* Merge "Move away from MediaDebug and use ADebug instead"James Dong2012-02-101-1/+1
|\
| * Move away from MediaDebug and use ADebug insteadJames Dong2012-02-101-1/+1
| | | | | | | | Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
* | No newline or space at end of ALOG format stringGlenn Kasten2012-02-081-1/+1
|/ | | | Change-Id: I0bef580cbc818cb7c87aea23919d26f1446cec32
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-13/+13
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-1/+1
| | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor ↵Hong Teng2011-11-151-3/+7
|\ | | | | | | | | | | | | maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 * commit '716747f7cb29b45e41c2870f12d39095f4ed80c8': Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
| * Fix for issue 5309336Hong Teng2011-11-141-3/+7
| | | | | | | | | | | | -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage. Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-43/+43
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Add QVGA resolution to CamcorderProfileJames Dong2011-09-191-2/+4
| | | | | Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b related-to-bug: 5145483
* Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)Rajneesh Chowdury2011-08-191-0/+59
| | | | | | Also fixes 5118207 add other video codec support for video editor export. Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
* fix for issue 4142219Hong Teng2011-07-201-0/+64
| | | | | | Don't hard code platform-specific limitations-jni/java part Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
* Add support for platform-specific recording start time offsetJames Dong2011-05-101-0/+23
| | | | | | | | o This start time offset is used in the media framework to eliminate the recording sound in the recorded file. Change-Id: I97926a74f0743b8a4f985d51334e8d1486a318ea related-to-bug: 4390777
* Add the default camera id to mCameraIds for emulator and those devices ↵James Dong2011-03-161-0/+5
| | | | | | | | without media_profiles.xml configuration file. bug - 4109530 Change-Id: Ib83be7a7f767a4b20ac338734ada1581e7a4c5bf
* Get rid of redundant media profilesJames Dong2011-03-011-6/+172
| | | | | | bug - 3330679 Change-Id: Idc55aea32746c0c57552c5e15a289681421aa859
* Adding default profiles for specific levels.Nipun Kwatra2010-09-171-24/+75
| | | | | | | | | | | The low and high profiles should each match one of the specific profiles. So we need to add the specific profiles corresponding to the low/high profiles. This makes the default profile compliant to documentation + cts. Also fixed javadoc to account time lapse profiles. Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
* Exposing specific profile levels + hasProfile().Nipun Kwatra2010-09-101-0/+2
| | | | | | | | | - Exposing the specific resolution profile levels QUALITY_{QCIF,CIF,480P,720P,1080P} and the new time lapse profiles QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,CIF,480P,720P,1080P} - Unhiding the hasProfile() function used to test if a given profile exists. Change-Id: I5d8b9e1ba61718f304235e76d85244e428e68643
* Adding hasProfile.Nipun Kwatra2010-09-101-6/+17
| | | | | | | | | - Added hasProfile to CamcorderProfile and JNI. - Added hasCamcorderProfile to MediaProfiles. - using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera in get(). Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
* Added specific resolution and time lapse profiles.Nipun Kwatra2010-09-101-1/+48
| | | | | | | | | | | - Added enums QUALITY_{QCIF,480P,720P,1080P} QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile and corresponding ones in MediaProfiles. - Added functions createDefaultCamcorderTimeLapseLowProfile, createDefaultCamcorderTimeLapseHighProfile to set default values. - Moved javadoc for constants to the get() function. Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
* Add multiple camera support for in MediaProfiles.Chih-Chung Chang2010-07-011-16/+65
| | | | Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
* Image encoding settings java API through xml configuration fileJames Dong2010-02-241-0/+24
| | | | | | - I decided to completely remove jpeg decoding related stuff from this change I think that setting is better off if it is specified by the system properties. We don't have to include MediaProfiles.h header in skia files
* Initial check-in for xml-based encoder capabilities retrievalJames Dong2010-02-011-0/+675
- Changed the Java API as suggested - Treat /etc/media_profiles.xml as the default xml configurtion file