summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | Update of DRM frameworkTakeshi Aimi2010-11-023-23/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Overload openDecryptSession() with uri parameter in order to accept URI of DRM content, Following API is added, DecryptHandle*openDecryptSession(const char* uri);. - Unify texisting three event types of processDrmInfo() so that caller of DRM framework does not have to handle many event types. - Let DrmManagerService call load/unload plugins API so that client of DRM framework does not have to manage plug-in load/unload. - Trivial fix in DrmManagerClient.java is also incorporated. Changes are made by Sony Corporation. Change-Id: If62b47fa0360718fdc943e6e6143671d7db26adc
* | | | 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
* | | | Merge "Add support for WV plugin"Gloria Wang2010-10-291-0/+4
|\ \ \ \
| * | | | Add support for WV pluginGloria Wang2010-10-291-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
* | | | | 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
| * | | am 0c636055: Merge "Mirror the preview for front-facing cameras. do not ↵Mathias Agopian2010-10-211-0/+12
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | merge" into gingerbread Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp * commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4': Mirror the preview for front-facing cameras. do not merge
| | * | Merge "Mirror the preview for front-facing cameras. do not merge" into ↵Mathias Agopian2010-10-211-0/+12
| | |\ \ | | | | | | | | | | | | | | | gingerbread
| | | * | Mirror the preview for front-facing cameras. do not mergeWu-cheng Li2010-10-201-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now overlay does ROT_90 before FLIP_V or FLIP_H. It should be FLIP_V or FLIP_H first. The formula should be changed after overlay is fixed. bug:3059865 Change-Id: Ie4366bf7f1fcac7383e8dfc74b1b865997bbbcc6
* | | | | Mirror the camera preview if the camera is front-facing.Wu-cheng Li2010-10-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | bug:3095272 Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
* | | | | 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
| * | | | am fa7a87fb: Merge "File writer size estimation improvement" into gingerbreadJames Dong2010-10-201-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26' into gingerbread-plus-aosp * commit 'fa7a87fb4b3d25b0b6b0985d65848a144d28df26': 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
* | | | Merge "Make camera source ready for handling meta-data video buffers."James Dong2010-10-191-5/+54
|\ \ \ \
| * | | | Make camera source ready for handling meta-data video buffers.James Dong2010-10-191-5/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 3042125 Change-Id: I877b265c6bf8e0593121c8d5a95ae5599cdc6fb9
* | | | | Camera framework change required for 0-memcpy recordingJames Dong2010-10-192-0/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | bug - 3042125 Change-Id: I46eb7a10b5394086b353fd73e4503beceeed76f1
* | | | Merge "Camera hal change for 0-memcpy in media recording framework"James Dong2010-10-191-51/+76
|\ \ \ \
| * | | | Camera hal change for 0-memcpy in media recording frameworkJames Dong2010-10-191-51/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o document the camera hal to clarify the reviewer's questions. bug - 3042125 Change-Id: I3edf701d084933ee8d1e3b054d222e8c9dfc42a5
* | | | | 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.
| * | | am bc96c284: Merge "For thumbnail extraction make sure we instantiate a ↵Andreas Huber2010-10-181-1/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder that allows access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder." into gingerbread Merge commit 'bc96c2848dadaa844f95e89708d9941f73bbf400' into gingerbread-plus-aosp * commit 'bc96c2848dadaa844f95e89708d9941f73bbf400': 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.
generated by cgit v1.1 at 2024-12-26 14:57:58 +0000