summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
* Add preferred preview size support in the camera frameworkJames Dong2010-11-301-0/+23
| | | | | | bug - 3237021 Change-Id: Ica8a3ae5cfbee462b74de98770e33277186c9a2b
* Support streaming data across binder boundaries.Andreas Huber2010-11-233-0/+77
| | | | Change-Id: Ifbac61406dcb81343765f99ccba08bd90f9274cc
* am 24a90c26: am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-222-0/+123
|\ | | | | | | | | * commit '24a90c2674270fee0783bafa54fd5d845bdf0c18': Update of DRM Framework.
| * am d9334934: Merge "Update of DRM Framework."Gloria Wang2010-11-222-0/+123
| |\ | | | | | | | | | | | | * commit 'd93349342a89a25c7a884e8543c6adc048c5f86d': Update of DRM Framework.
| | * Update of DRM Framework.Takeshi Aimi2010-11-192-0/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Access permission handling Introduce an internal function which allows the desired process to access decryption flow. This new function is just for reference and each OEM manufacturer should implement/replace with their solutions. -New API, getMetadata() This API is for retrieving media metadata from container-based DRM, such as OMA forward-lock content. This API asks DRM agent to retrieve media metadata hiddein inside of DRM special container. -New API, acquireRights() This API wraps acquireDrmInfo() and processDrmInfo(). If DRM agent has valid implementation of both APIs, Application can acquire DrmRights only by calling this API. -Bug fix in event loop of OnInfoListener. Separate OnInfo event loop from mail thread loop so as to avoid the issue that message is not dispatched when mail thread is busy. Changes are made by SEMC and Sony. Change-Id: I04ee3e0988152a71e221f2256d83253749a29da0
* | | Merge "Squashed commit of the following:"Andreas Huber2010-11-222-15/+46
|\ \ \
| * | | 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 "64-bit file size/offset support for DRM framework"Gloria Wang2010-11-221-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | 64-bit file size/offset support for DRM frameworkGloria Wang2010-11-191-3/+3
| | | | | | | | | | | | | | | | Change-Id: I0ba7147607825234df9fa28732e1bba344e82e79
* | | | am fb6f4505: am 589e8381: Merge "Improve camera documentation." into gingerbreadWu-cheng Li2010-11-193-17/+28
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'fb6f4505ba5c227cebb73f1269b0af5d92e6e5e6': Improve camera documentation.
| * | | am 589e8381: Merge "Improve camera documentation." into gingerbreadWu-cheng Li2010-11-193-17/+28
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '589e838116b0dffa696fa39336d0588124877f98': Improve camera documentation.
| | * | | Improve camera documentation.Wu-cheng Li2010-11-193-17/+28
| | | | | | | | | | | | | | | | | | | | | | | | | bug:3212606 Change-Id: Iee7106e4665c08a4c75471114010b75d63ac74ce
* | | | | 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
* | | | Merge "Implement reducing the buffer count of a Surface."Jamie Gennis2010-11-111-0/+10
|\ \ \ \
| * | | | Implement reducing the buffer count of a Surface.Jamie Gennis2010-11-111-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f979c60c06d654aa8265002836277434bc1a64f Bug: 3095167
* | | | | 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
* | | | am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated ↵James Dong2010-11-081-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | video tracks" into gingerbread * commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84': Support extracting thumbnail from rotated video tracks
| * | | am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" ↵James Dong2010-11-081-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | into gingerbread * commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e': Support extracting thumbnail from rotated video tracks
| | * | Support extracting thumbnail from rotated video tracksJames Dong2010-11-081-0/+1
| | | | | | | | | | | | | | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
| * | | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-083-3/+15
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
| | * | Support post-decode video rotation.Andreas Huber2010-11-053-3/+15
| | | | | | | | | | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
| * | | am 1653e261: Merge "Rotation support" into gingerbreadJames Dong2010-11-062-0/+2
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1653e261e84922facfe27d3d8acc455ed2b6b6da': Rotation support
| | * | Rotation supportJames Dong2010-11-052-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
| * | | am f3847e87: Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-031-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a': DO NOT MERGE
| | * | DO NOT MERGEJames Dong2010-11-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix premature release of recording frames when physical address or metadata is stored in input video buffers - bug 3158459 Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
* | | | 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
* | | | resolved conflicts for merge of a8d7b747 to masterGloria Wang2010-11-033-23/+16
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
| * | | am ef8a810b: Merge "Update of DRM framework"Gloria Wang2010-11-023-23/+16
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit 'ef8a810b3b11d177a64111125eaa44bb76624414': Update of DRM framework