summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Renable the captureFrame unit testsJames Dong2010-11-291-22/+11
| | | | | | | | o We need to make sure that /sdcard/media_api/metadata rwx to the test app before tests Change-Id: Iaa2d58bb2d380bf7e93ec71f77c4c769d65b1d85
* Remove empty Widevine make filesGloria Wang2010-11-241-10/+0
| | | | Change-Id: I0e58070231d00a13da4c46e7c8c4b824c5c12263
* Merge "Added new bitrate values"Shyam Pallapothu2010-11-241-0/+3
|\
| * Added new bitrate valuesGil Dobjanschi2010-11-241-0/+3
| | | | | | | | Change-Id: I2e6ab51d9a845beca02f84cefc66663fbf89aabf
* | Merge "Support streaming data across binder boundaries."Andreas Huber2010-11-249-4/+491
|\ \
| * | Support streaming data across binder boundaries.Andreas Huber2010-11-239-4/+491
| | | | | | | | | | | | Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
* | | Merge changes Ia5fec45a,I74927f73,I5a3c0b07Mike Lockwood2010-11-236-7/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: MTP: Fix typo in MtpServer::doGetObjectPropList MTP: Implement GetPartialObject command MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
| * | | MTP: Fix typo in MtpServer::doGetObjectPropListMike Lockwood2010-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia5fec45a238c49a6797a4ac55457ddb5d6521408 Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | MTP: Implement GetPartialObject commandMike Lockwood2010-11-233-3/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows host to read partial contents of files on the device Change-Id: I74927f7394224d674e1d150a4b72a51d9358459b Signed-off-by: Mike Lockwood <lockwood@android.com>
| * | | MTP: Use DateTime form in GetObjectPropDesc for date/time properties.Mike Lockwood2010-11-233-3/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I5a3c0b07a9f2958b86947256606e6a824dbe93a6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | Merge "Do not getConfig on video encoder on output port"James Dong2010-11-231-26/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Do not getConfig on video encoder on output portJames Dong2010-11-231-26/+28
| |/ / | | | | | | | | | Change-Id: Id53e01dd8f3ec0c9ca94bb1d6dfccd7696254a2d
* | | Rename MtpCursor to PtpCursorMike Lockwood2010-11-234-34/+34
| | | | | | | | | | | | | | | Change-Id: I8ce257641388b195f3e17995d323355b19355dc1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | MTP: Remove static library build for linux host.Mike Lockwood2010-11-231-29/+0
| | | | | | | | | | | | | | | Change-Id: Iefdd386b91dba0579ca952aca40b7114535e1d4e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Rename MtpClient and MtpCursor to PtpClient and PtpCursorMike Lockwood2010-11-236-63/+63
| | | | | | | | | | | | | | | Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | Rename android.provider.Mtp to android.provider.PtpMike Lockwood2010-11-236-66/+66
|/ / | | | | | | | | | | | | | | | | | | | | We are only supporting the PTP subset of MTP in host mode and have no plans for full MTP, so calling it Mtp was misleading. Also moved ACTION_MTP_SESSION_END Intent name to android.provider.MediaStore and added it to the public API. Change-Id: Ie35d15864d5972e65a39b982aa51316ecca3725a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 3e18dfab: am 4da48ec8: Merge "Notify the playback status to DRM agents ↵Gloria Wang2010-11-221-7/+12
|\ \ | |/ |/| | | | | | | | | before the playback starts" * commit '3e18dfab3417e139c7ec3896cea9e303fdc8fa63': Notify the playback status to DRM agents before the playback starts
| * am 4da48ec8: Merge "Notify the playback status to DRM agents before the ↵Gloria Wang2010-11-221-7/+12
| |\ | | | | | | | | | | | | | | | | | | playback starts" * commit '4da48ec88338af2df6f9abba850fb4c65918bb82': Notify the playback status to DRM agents before the playback starts
| | * Notify the playback status to DRM agents before the playback startsGloria Wang2010-11-221-7/+12
| | | | | | | | | | | | Change-Id: I288eae2d35ab175c720bb0dd9f69e3e08ada9b8a
* | | Merge "Begin transition was invalidated when the image duration was changed."Gil Dobjanschi2010-11-221-13/+22
|\ \ \
| * | | Begin transition was invalidated when the image duration was changed.Gil Dobjanschi2010-11-221-13/+22
| | | | | | | | | | | | | | | | Change-Id: I0118813a66c65d8b3746fc2c689cf9d8da651aa3
* | | | Merge "Squashed commit of the following:"Andreas Huber2010-11-2213-679/+513
|\ \ \ \
| * | | | Squashed commit of the following:Andreas Huber2010-11-2213-679/+513
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0870f7bdd10a7cd36087d723d1957d8e1b967ca7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 12:57:04 2010 -0800 set_surface_crop doesn't seem to work right yet, stop using it in the SoftwareRenderer. Change-Id: If0a24f78b7810a6cecaa82eb4f23d0f90c22cc42 commit 4767b52bee3a54ae117a8708d6832276a44e6a6a Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 11:14:57 2010 -0800 info->mMediaBuffer may still be NULL at this point... Change-Id: I25a71569015b1bb87f1ea7efff7588958774426f commit 0cef79874e1f1ddb10b7402177a87d3cffc7de92 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 10:55:12 2010 -0800 QCOM's YVU420 color format conversion has now been tested. Change-Id: I7fef4b642a928af15d42f006f7cdc107d5ff1d67 commit 84fe05a6c969ede0ce8a85a530e110afca07c7a7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 09:59:50 2010 -0800 Removed remaining traces of suspend/resume. Proper reporting of video dimensions based on cropping rectangle. Change-Id: Ib238b80cbc1f19e7d312f2422eb5e9ab6b06b1bc commit 50970cdc837c5c498bcf0cb61b436196ca9e2ef7 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:11:06 2010 -0800 Revamped Software Renderer respects the crop rectangle. Removed obsolete ADRENO support code. Change-Id: I984cbc8a99c4d97e09e7d1b1292099c88b9ae535 commit 8abbc6a5608bff650f968540f24a2eab75f254ed Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:10:41 2010 -0800 The metadata retriever now respects the crop rectangle while capturing a video frame. Change-Id: Id3377176060086d16717f62c77ce26fabe899050 commit 2d42e4466609d304e88bd2cdd6eb7b297340cc21 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:09:50 2010 -0800 Changed ColorConverter APIs to be more general. Clients can now refer to crop rectangles in both source and destination. Change-Id: Ief151d736818396d0389ec04e7df5650e3ad7c04 commit 273184303d54a54febd3e9c3dd4df30507ea78b5 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 15:04:06 2010 -0800 The stagefright commandline tool now writes the extracted video frame to /sdcard/out.jpg Change-Id: Ieb2ab3fda7a7cd9294beccb8db0eed75096eeef4 commit 2d43390328cadf4ba94c1c3c02e4fb30baa29690 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 14:36:55 2010 -0800 The AVC software decoder now properly advertises the cropping rectangle. Change-Id: Idb7a8a7e2fde5740f0fc34b7e8c92eca2577104b commit 9a7ed23c2fac8ce19dce7a34a603acee945a89f6 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 13:40:39 2010 -0800 OMXCodec now signals a format change if the cropping rectangle changes. ...and puts the cropping info into its output format. Change-Id: I3ffbd8e877ba286fe06a82c536ef20d92548d2e2 commit efe0323947029df1c502599ccc288c8d676dfd31 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 11:29:39 2010 -0800 Stagefright's MetaData object now supports rectangle items. Change-Id: I5667bb5ee6622c76104b99fb57f60abb802a8504 Change-Id: I27cb78f2c5e0353f95fdfc5cb53991949ed75b70
* | | | | Unhide android.media.AudioManager.MODE_IN_COMMUNICATIONJean-Michel Trivi2010-11-221-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unhide new constant for an audio mode for a system state when the device has a VoIP (as opposed to telephony) call established. Update the setMode and getMode javadoc to link to the mode constants that can be set or retrieved. Change-Id: I90c4417679f215eb66e5305086fd077beddaa59c
* | | | | Fixed an issue in SampleTable where the table index was incorrectly wrapped ↵James Dong2010-11-211-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | around to -1 bug - 3198642 Change-Id: Ia0544172502fc771f48fce22d5c1db19ac3554bb
* | | | Merge "Fixed MediaPlayer unit test issues"James Dong2010-11-197-12/+12
|\ \ \ \
| * | | | Fixed MediaPlayer unit test issuesJames Dong2010-11-197-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o We used to have two different "idle" state with OpenCore. Now, with SF, we have a single and consistent "idle" state. bug - 3198642 Change-Id: I2bbb5e8b6c2d8166841a6e99a1c2c4a47e00b574
* | | | | am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2': StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
| * | | | resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
| | * | | StagefrightMediaScanner: Call endFile() for MIDI and OGG files.Hiroshi Takekawa2010-11-191-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addStringTag() caches non-ascii metadata strings for later processing, and then endFile() will be called at the end of processFile() to convert non-ascii strings from locale's charset to utf-8 if required. Stagefright's processFile() failed to call endFile() when the processing file is a MIDI file or an OGG file. This patch fixes this problem to populate metadata correctly. Reviewed by: Brad Fitzpatrick, Marco Nelissen. Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
| * | | | am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: ↵Jean-Baptiste Queru2010-11-191-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*" * commit '14ac9546367d4df37eead55f6762b944b49f33b2': build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
| | * | | build failed with g++ v. 4.4.5Matthias Bady2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char* Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
| * | | | am f6bd761f: Use back-facing camera as default in camera/camcorder ↵Wu-cheng Li2010-11-082-5/+29
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | profile.do not merge * commit 'f6bd761f9407a35cc1c4a4b9e199e6a0dc8e4943': Use back-facing camera as default in camera/camcorder profile.do not merge
| | * | | | Use back-facing camera as default in camera/camcorder profile.do not mergeWu-cheng Li2010-11-092-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:3173302 Change-Id: I11eaed32bb393206b560834d52c412f3e5a1a7d9
* | | | | | Merge "Removed uncessary FILE structure pointer for I/O"James Dong2010-11-196-58/+74
|\ \ \ \ \ \
| * | | | | | Removed uncessary FILE structure pointer for I/OJames Dong2010-11-196-58/+74
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | o also move the fd owner from caller to callee in the Writers Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
* | | | | | Merge "Fix issue 3157123."Eric Laurent2010-11-194-41/+45
|\ \ \ \ \ \
| * | | | | | Fix issue 3157123.Eric Laurent2010-11-194-41/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a Mutex wherever atomic operations were used in AudioTrack, AudioRecord, AudioFlinger and AudioEffect classes. Change-Id: I6f55b2cabdcd93d64ef19446735b8f33720f8dbc
* | | | | | | Merge "CameraBrowser: temporarily move to system partition"Mike Lockwood2010-11-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | CameraBrowser: temporarily move to system partitionMike Lockwood2010-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied871109f98bdeba7456aacefc537d70a81ee8c9 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "CameraBrowser improvements:"Mike Lockwood2010-11-197-73/+116
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | CameraBrowser improvements:Mike Lockwood2010-11-197-73/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace menu for importing and deleting files with buttons. Automatically close activities when camera is disconnected. Change-Id: I88351e7c337c796057ce3f7da46fc287305f2220 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "PTP: Fix permissions problems with files imported via PTP"Mike Lockwood2010-11-193-4/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | PTP: Fix permissions problems with files imported via PTPMike Lockwood2010-11-193-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I630a89c67e5b3d6d0c29e6c257f84e1909fa4de2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Merge "Fix an artifact of going from off_t to off64_t"Andreas Huber2010-11-191-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix an artifact of going from off_t to off64_tAndreas Huber2010-11-191-1/+1
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
* | | | | | | | Merge "Remove command line mtp host tool"Mike Lockwood2010-11-194-655/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Remove command line mtp host toolMike Lockwood2010-11-194-655/+0
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I don't need this any more, and don't have time to finish nor maintain it. Change-Id: I35c5d003e1ad163d429832eb1d0c8d880058c7f1 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | Squashed commit of the following:Andreas Huber2010-11-197-168/+27
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 610ed879d57785cb0457f7f127889496d325f732 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:28:52 2010 -0800 HTTP header keys are to be treated case insensitive. Change-Id: I9690880528a6b0f611958de7996c2753948a03c3 commit 554a2499a293d8d53907d01d972a9cfe9b92738e Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:22:45 2010 -0800 Remove one more legacy "string" implementation. Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
* | | | | | PTP: Improve performance and reliability of file importingMike Lockwood2010-11-1910-250/+127
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now the file copy is done completely within the media process rather than pushing data to the client via ContProvider.openFile(). File system writes are now interleaved with USB reads, which allows us to copy the data faster and prevents the camera from timing out during transfer. File is automatically inserted in the media provider after a successful import and a Uri is returned to the client. BUG: 2994234 Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972 Signed-off-by: Mike Lockwood <lockwood@android.com>