summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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.
| | * | 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.
| * | | am ff7a7a45: Merge "Check-in of a copy of the Khronos OpenMAX headers ↵Andreas Huber2010-10-1510-0/+6937
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | formerly included from external/opencore." into gingerbread Merge commit 'ff7a7a455c15077e2b691efa370619f06058f697' into gingerbread-plus-aosp * commit 'ff7a7a455c15077e2b691efa370619f06058f697': 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
| * | | am 312644cd: Merge "Support for writing to MPEG2 transport stream files." ↵Andreas Huber2010-10-132-0/+8
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7' into gingerbread-plus-aosp * commit '312644cdbb39522fe9cac028b15b907ce0e8e0f7': Support for writing to MPEG2 transport stream files.
| | * | 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.
| * | | | am 165c6579: Merge "HTTP Live content that are tagged as complete are now ↵Andreas Huber2010-10-131-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekable." into gingerbread Merge commit '165c6579660c22edafb61fee2a0cf39334a2a905' into gingerbread-plus-aosp * commit '165c6579660c22edafb61fee2a0cf39334a2a905': HTTP Live content that are tagged as complete are now seekable.
| | * | | HTTP Live content that are tagged as complete are now seekable.Andreas Huber2010-10-121-0/+1
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I9d0d2f009f883e5baf3e9de8c5c0aa05760e4bde related-to-bug: 2368598
* | | | am 2b4f1f4c: am f72dd019: Merge "Disable 10secs forward/backward seeking for ↵Andreas Huber2010-10-102-3/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread Merge commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7' * commit '2b4f1f4cb814f7a7df8d2cb9fcb5210bfe7999c7': Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
| * | | am f72dd019: Merge "Disable 10secs forward/backward seeking for rtsp as seek ↵Andreas Huber2010-10-082-3/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread Merge commit 'f72dd0190ee64914161d361be1213eda8cab7b90' into gingerbread-plus-aosp * commit 'f72dd0190ee64914161d361be1213eda8cab7b90': Disable 10secs forward/backward seeking for rtsp as seek is a very expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality.
| | * | Merge "Disable 10secs forward/backward seeking for rtsp as seek is a very ↵Andreas Huber2010-10-082-3/+5
| | |\ \ | | | | | | | | | | | | | | | expensive operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality." into gingerbread
| | | * | Disable 10secs forward/backward seeking for rtsp as seek is a very expensive ↵Andreas Huber2010-10-082-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operation there. Decouple the 10sec forward/backward button functionality from seekbar functionality. Change-Id: I016e79b688774f8ee91ac53216197b5fb9cb41b2 related-to-bug: 3073955
* | | | | am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" ↵Eric Laurent2010-10-101-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c' * commit '4f21e517d09b9d793d20d64547df330fba705b3c': Added getter for session Id to AudioSink
| * | | | am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbreadEric Laurent2010-10-081-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5' into gingerbread-plus-aosp * commit 'b37fcbfd7f9d65b90b43e0242903030c5a6517b5': Added getter for session Id to AudioSink
| | * | | Added getter for session Id to AudioSinkEric Laurent2010-10-071-0/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a method to expose the audio session id at AudioSink interface so that the AudioPlayer in stagefright can retrieve it. Also: - Fixed audio effect send level not being initialized in mediaplayer. - Fixed compilation error when LOGV is enabled in mediaplayer JNI Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
* | | | am 9580b8ce: resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aospGloria Wang2010-10-104-24/+55
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382' * commit '9580b8ce6553ddde03db594fd4fd4f59ca61c382': Update of DRM framework.
| * | | resolved conflicts for merge of e6ad0e47 to gingerbread-plus-aospGloria Wang2010-10-074-24/+55
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I63b00932b0f8b975da31aa9a010369db2d49fd76
| | * | Update of DRM framework.Takeshi Aimi2010-10-044-24/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change "void" type of return value to "int" for returning status. - Add some of overloaded Java APIs which accept database Uri as input. - Add asynchronous APIs - Add OnEventListener and OnErrorListener for asynchronous APIs - Disable debug log - Change decrypt() API to accept an optional buffer needed by some of DRM schemes Changes are incorporated by Sony Corporation. Change-Id: I414a165e22cc79be6ea7cd28041788aa2b6b8f7c
* | | | am bb708373: am 949f7d90: Merge "Work to support switching transport streams ↵Andreas Huber2010-10-102-2/+4
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | mid-stream and signalling discontinuities to the decoder." into gingerbread Merge commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43' * commit 'bb70837397e3fb437b7b4443b37d7a83c11e6e43': Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
| * | | am 949f7d90: Merge "Work to support switching transport streams mid-stream ↵Andreas Huber2010-10-072-2/+4
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | and signalling discontinuities to the decoder." into gingerbread Merge commit '949f7d9066e09768e570686a5695aaba4a1dafd0' into gingerbread-plus-aosp * commit '949f7d9066e09768e570686a5695aaba4a1dafd0': Work to support switching transport streams mid-stream and signalling discontinuities to the decoder.
generated by cgit v1.1 at 2024-07-04 21:30:26 +0000