summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "API Support for both synchronous and queued commands, optionally ↵Andreas Huber2010-12-072-3/+9
|\ | | | | | | associated metadata."
| * API Support for both synchronous and queued commands, optionally associated ↵Andreas Huber2010-12-062-3/+9
| | | | | | | | | | | | metadata. Change-Id: Idb90d64cb638942210c5822b3cba2f05b087d601
* | Remove check if the target video resolution is not supported by CameraSourceJames Dong2010-12-051-0/+2
|/ | | | | | | | and clean up Camera is CameraSource could not created. bug - 3254411 Change-Id: I43497c450e7007de5ce027e2912b1421119e8887
* Prepare for publishing MediaMetadataRetriever as public APIJames Dong2010-12-033-7/+4
| | | | | | | | | | step one: o replaced captureFrame with getFrameAtTime o removed getMode bug - 2433195 Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
* Support streaming data across binder boundaries.Andreas Huber2010-11-233-0/+77
| | | | Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
* Squashed commit of the following:Andreas Huber2010-11-222-15/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Merge "Removed uncessary FILE structure pointer for I/O"James Dong2010-11-193-4/+2
|\
| * Removed uncessary FILE structure pointer for I/OJames Dong2010-11-193-4/+2
| | | | | | | | | | | | o also move the fd owner from caller to callee in the Writers Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
* | Fix issue 3157123.Eric Laurent2010-11-193-2/+4
|/ | | | | | | Use a Mutex wherever atomic operations were used in AudioTrack, AudioRecord, AudioFlinger and AudioEffect classes. Change-Id: I6f55b2cabdcd93d64ef19446735b8f33720f8dbc
* 64-bit file size/offset support for media frameworkJames Dong2010-11-185-15/+17
| | | | Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
* Merge "Add getUri() for streaming"Gloria Wang2010-11-181-0/+3
|\
| * Add getUri() for streamingGloria Wang2010-11-181-0/+3
| | | | | | | | Change-Id: I56e15e67cc5f4d0f41c9e2985404a4d89d757e7e
* | Merge "Add new audio mode for audio communications other than telelphony."Jean-Michel Trivi2010-11-172-3/+4
|\ \
| * | Add new audio mode for audio communications other than telelphony.Jean-Michel Trivi2010-11-162-3/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | The audio mode MODE_IN_CALL signals the system the device a phone call is currently underway. There was no way for audio video chat or VoIP applications to signal a call is underway, but not using the telephony resources. This change introduces a new mode to address this. Changes in other parts of the system (java and native) are required to take this new mode into account. The generic AudioPolicyManager is updated to not use its phone state variable directly, but to use two new convenience methods, isInCall() and isStateInCall(int) instead. Change-Id: Id744cd26520ea1d1a4795eabe6a1f0c58789af76
* | Remove all traces of legacy renderer support in stagefright.Andreas Huber2010-11-165-90/+0
|/ | | | Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
* Remove legacy PV stuffJames Dong2010-11-153-210/+0
| | | | Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
* Merge "Separate the key for audio sampling rate and video frame rate in ↵James Dong2010-11-121-1/+2
|\ | | | | | | MetaData.h"
| * Separate the key for audio sampling rate and video frame rate in MetaData.hJames Dong2010-11-111-1/+2
| | | | | | | | Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
* | Add support for audio recording source in generic audio policy mgr.Jean-Michel Trivi2010-11-121-1/+4
|/ | | | | | | | | Update the platform-independent audio policy manager to pass the nature of the audio recording source to the audio policy client interface through the AudioPolicyClientInterface::setParameters() method. Change-Id: I6b4fd0f8a3acea0d7d30bbad98edd1977dc012bf
* Add color format query support to QueryCodecs()James Dong2010-11-111-0/+1
| | | | Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
* Fix memory leak when 0-memcpy quirk is usedJames Dong2010-11-111-0/+2
| | | | | | | o minor change to the original patch by Andreas: call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
* Add recording source for voice communicationJean-Michel Trivi2010-11-091-1/+2
| | | | | | | Add a recording source used to designate a recording stream for voice communications such as VoIP. Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
* Rotation supportJames Dong2010-11-091-0/+1
| | | | | | | | | | | | | | - We only support 0, 90, 180, and 270 degree clockwise rotation - Some players are known to ignore composition matrix in the MP4 file, although this is part of the MP4 file standard. Both QT and YT are supporting the rotation The original patch (65a73f4e8c79d05c0d9001b660325748d4ecf37b) was not merged. The only change I made is to reuse the same kKeyRotation in MetaData.h; and thus do not neeed to use kKeyRotationDegree. Change-Id: Ib328716d4842201c4adf57e4ddfe1f1ac1ae4d8a
* Fix a build break due to the missing kKeyRotationJames Dong2010-11-081-0/+1
| | | | Change-Id: I6bf030c946abe7a95f8f7bc464e6507fb02cf39c
* Merge "Use meta data in the media recording framework"James Dong2010-11-051-0/+5
|\
| * Use meta data in the media recording frameworkJames Dong2010-11-041-0/+5
| | | | | | | | | | | | o This patch allows us to do 720p video recording Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
* | Merge "Add support for WV DRM"Gloria Wang2010-11-051-0/+2
|\ \ | |/ |/|
| * Add support for WV DRMGloria Wang2010-11-051-0/+2
| | | | | | | | Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
* | Fix a MediaBuffer leak in Stagefright.Jamie Gennis2010-11-031-0/+2
|/ | | | Change-Id: I548e60b07cf1676476874b156cfbc4ffefdfa2b9
* Added support for dock headset observerPraveen Bharathi2010-11-011-1/+7
| | | | | Change-Id: I06b2e65e3bfa10735e6c7fd3349afa9ae7d45292 Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
* Stop using OMX_COLOR_FormatAndroidPrivateStart.Jamie Gennis2010-11-011-14/+4
| | | | | | | | | This removes the use (and definition) of the Android-private range of OMX color formats from Stagefright. Instead we will just be interpreting the video color format of an OMX port as an Android pixel format if the port is in native buffer mode. Change-Id: I3ea50703336a88249e7563bc7022dfedbeac506e
* Squashed commit of the following:Andreas Huber2010-10-293-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0d5694ba2d399dd0869532a4d6256448185a1be0 Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:59:23 2010 -0700 suspend() and resume() methods on VideoView are back but don't do anything. They need to be back because they were public before. Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425 commit 16192891ed7d349ee97e47d1729d20a2d0d247b8 Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:47:05 2010 -0700 Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming." This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25. Conflicts: api/current.xml Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5 commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:44:16 2010 -0700 Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093." This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f. commit f2ed03550887986f39d36b5dabcd9e919949c7cf Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:44:08 2010 -0700 Revert "Release MediaPlayer if suspend() returns false." This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268. commit 441ecce678bd24e9660a72c8627b5bd94433ff8b Author: Andreas Huber <andih@google.com> Date: Fri Oct 29 11:40:46 2010 -0700 manually. Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87 Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
* Add two creation flags to OMXCodec::Create()James Dong2010-10-251-0/+5
| | | | | | | o This allows to force to use software codecs or hardware codecs o If request cannot be fullfilled, Create() returns NULL. Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
* resolved conflicts for merge of 965f960e to masterGloria Wang2010-10-255-0/+33
|\ | | | | | | Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
| * resolved conflicts for merge of 9084631d to gingerbread-plus-aospGloria Wang2010-10-255-0/+33
| |\ | | | | | | | | | Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
| | * DRM framework support:Gloria Wang2010-10-255-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
* | | Merge "OMX extension to support storing meta data in video input buffers ↵James Dong2010-10-222-0/+29
|\ \ \ | | | | | | | | | | | | during recording"
| * | | OMX extension to support storing meta data in video input buffers during ↵James Dong2010-10-212-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recording bug - 3042125 Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
* | | | am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" ↵James Dong2010-10-211-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | into gingerbread Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99' * commit '8ad6335d2c22900de5b46460473495b5bcea9f99': File writer size estimation improvement
| * | File writer size estimation improvementJames Dong2010-10-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Do not count the reserved space for moov if the meta data size is small o Do not count the extra 1KB disturbing small file estimation. o Reduce the default minimum reserved space from 4 KB to 3 KB. o Estimate the moov size based on both duration AND file size limit is set and set it to the smaller estimated value. low risk change bug - 3111983 Change-Id: I6ac2adb979d8cc12d6b4f1813d000c989add0199
* | | Add decode-to-ANativeWindow support to Stagefright.Jamie Gennis2010-10-203-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support to Stagefright for doing OMX video decoding directly into buffers dequeued from an ANativeWindow. It does this by registering the dequeued buffers with the OMX component using an Android-specific OMX extension, and then exchanging buffers between the OMX component and the ANativeWindow. Change-Id: Ida66f836503255a68d378c6903d96dfe9747ce87
* | | Make camera source ready for handling meta-data video buffers.James Dong2010-10-191-5/+54
| | | | | | | | | | | | | | | | | | bug - 3042125 Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
* | | am 9b2f18df: am bc96c284: Merge "For thumbnail extraction make sure we ↵Andreas Huber2010-10-191-1/+5
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread Merge commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2' * commit '9b2f18df2436b6c2d9735e65119b92f320bb57e2': For thumbnail extraction make sure we instantiate a decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder.
| * | For thumbnail extraction make sure we instantiate a decoder that allows ↵Andreas Huber2010-10-181-1/+5
| | | | | | | | | | | | | | | | | | | | | access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. related-to-bug: 3106534 Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
* | | am 746c6a1c: am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX ↵Andreas Huber2010-10-1810-0/+6937
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | headers formerly included from external/opencore." into gingerbread Merge commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4' * commit '746c6a1c6d70769ee4b08b9a7b87d0c5aa65c2e4': Check-in of a copy of the Khronos OpenMAX headers formerly included from external/opencore.
| * | Check-in of a copy of the Khronos OpenMAX headers formerly included from ↵Andreas Huber2010-10-1510-0/+6937
| | | | | | | | | | | | | | | | | | | | | external/opencore. Change-Id: Ie2ecf9558d4ee80cb5a2bbe66ad49f2165a7b09c related-to-bug: 3101573
* | | resolved conflicts for merge of a127c07c to masterKenny Root2010-10-142-0/+8
|\ \ \ | |/ / | | | | | | Change-Id: Ifdfc6681cba00f36456eaf7a97f34a75b9d0c086
| * | Merge "Support for writing to MPEG2 transport stream files." into gingerbreadAndreas Huber2010-10-132-0/+8
| |\ \
| | * | Support for writing to MPEG2 transport stream files.Andreas Huber2010-10-122-0/+8
| | | | | | | | | | | | | | | | Change-Id: If3b7a807bc224a4b1cb2236537c3ebdc5aee0d97
* | | | am 28b93967: am 165c6579: Merge "HTTP Live content that are tagged as ↵Andreas Huber2010-10-141-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | complete are now seekable." into gingerbread Merge commit '28b93967d0e702304c7edec854a29d5ab88bfce0' * commit '28b93967d0e702304c7edec854a29d5ab88bfce0': HTTP Live content that are tagged as complete are now seekable.