1391 Commits

Author SHA1 Message Date
Jean-Michel Trivi
820b9e0d3b Add recording source for voice communication
Add a recording source used to designate a recording stream for
voice communications such as VoIP.

Change-Id: I4091d67069b1a0170c1a5ca5e6acd51eb0aa08f9
2010-11-09 14:32:43 -08:00
James Dong
b9d7e01eb8 Rotation support
- 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
2010-11-09 11:48:29 -08:00
James Dong
2bff83930d Fix a build break due to the missing kKeyRotation
Change-Id: I6bf030c946abe7a95f8f7bc464e6507fb02cf39c
2010-11-08 20:09:22 -08:00
James Dong
d1959717c2 am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
* commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84':
  Support extracting thumbnail from rotated video tracks
2010-11-08 19:25:41 -08:00
James Dong
c4a2ead2aa am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
* commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e':
  Support extracting thumbnail from rotated video tracks
2010-11-08 18:19:40 -08:00
James Dong
53ebc72fd8 Support extracting thumbnail from rotated video tracks
Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
2010-11-08 16:52:59 -08:00
Joe Onorato
1a542c7b8e The CHEEK_TOUCH stuff never worked. Remove it.
Bug: 3104906
Change-Id: Ia37236ba1775fc3ec8c111e2e0b85b105e0dea6a
2010-11-08 13:02:58 -08:00
Jeff Brown
3915bb845b Tell system server whether the app handled input events.
Refactored ViewRoot, NativeActivity and related classes to tell the
dispatcher whether an input event was actually handled by the application.

This will be used to move more of the global default key processing
into the system server instead of the application.

Change-Id: If06b98b6f45c543e5ac5b1eae2b3baf9371fba28
2010-11-08 12:49:43 -08:00
Andreas Huber
2e1a896724 resolved conflicts for merge of 31dc911a to gingerbread-plus-aosp
Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
2010-11-08 11:56:08 -08:00
James Dong
d8166a719e am 1653e261: Merge "Rotation support" into gingerbread
* commit '1653e261e84922facfe27d3d8acc455ed2b6b6da':
  Rotation support
2010-11-06 14:22:05 -07:00
Andreas Huber
31dc911aee Support post-decode video rotation.
Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
2010-11-05 17:03:17 -07:00
James Dong
65a73f4e8c Rotation support
- 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
2010-11-05 15:47:52 -07:00
James Dong
32af3a2f56 Merge "Use meta data in the media recording framework" 2010-11-05 18:18:30 +00:00
Gloria Wang
91460d7f49 Merge "Add support for WV DRM" 2010-11-05 17:45:26 +00:00
Gloria Wang
c2c22e7e20 Add support for WV DRM
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
2010-11-05 10:33:58 -07:00
James Dong
05c2fd50d2 Use meta data in the media recording framework
o This patch allows us to do 720p video recording

Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
2010-11-04 17:40:02 -07:00
Jamie Gennis
f0c5c1e8ce Fix a MediaBuffer leak in Stagefright.
Change-Id: I548e60b07cf1676476874b156cfbc4ffefdfa2b9
2010-11-03 16:15:10 -07:00
Gloria Wang
e3afc288dd resolved conflicts for merge of a8d7b747 to master
Change-Id: I8a4b72c9f9a10de8bbc285e00e2dd5cb9f498349
2010-11-03 11:39:04 -07:00
James Dong
a3f5b615d7 am f3847e87: Merge "DO NOT MERGE" into gingerbread
* commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a':
  DO NOT MERGE
2010-11-03 09:25:08 -07:00
James Dong
6786fccf5a DO NOT MERGE
Fix premature release of recording frames when physical address or metadata is stored in input video buffers

- bug 3158459

Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
2010-11-02 19:30:01 -07:00
Jeff Brown
b0418da0e7 Add plumbing for volume mute key.
Full support for the volume mute key will be implemented in a
later change.

Bug: 2912307
Change-Id: I98c27d6360f159c8b7447e04b45f442eff87b38a
2010-11-02 17:31:39 -07:00
Gloria Wang
a8d7b7477d am ef8a810b: Merge "Update of DRM framework"
* commit 'ef8a810b3b11d177a64111125eaa44bb76624414':
  Update of DRM framework
2010-11-02 14:59:51 -07:00
Praveen Bharathi
21e941bf43 Added support for dock headset observer
Change-Id: I06b2e65e3bfa10735e6c7fd3349afa9ae7d45292
Signed-off-by: Praveen Bharathi <pbharathi@motorola.com>
2010-11-01 18:41:19 -07:00
Jamie Gennis
044ace6bde Stop using OMX_COLOR_FormatAndroidPrivateStart.
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
2010-11-01 16:54:01 -07:00
Takeshi Aimi
c7b3ccc564 Update of DRM framework
- 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
2010-11-02 08:06:06 +09:00
Gloria Wang
b417115a72 Merge "Add support for WV plugin" 2010-10-29 16:58:15 -07:00
Gloria Wang
6793a04d62 Add support for WV plugin
Change-Id: I0b9d0488f123c05ad2d94315236458f479e00b78
2010-10-29 16:44:37 -07:00
Kenny Root
03034739eb Merge "Add path to get different DPI drawables" 2010-10-29 14:20:04 -07:00
Andreas Huber
69b8d69aad Squashed commit of the following:
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
2010-10-29 13:20:06 -07:00
Kenny Root
55fc850cf9 Add path to get different DPI drawables
Allow a caller to request a different density than their current display
allows. This can mean a device displaying mdpi can get a resource that's
in hdpi and have it pretend to be in mdpi resolution. If a drawable
that's returned is not in the requested density, it will set it at the
appropriate density to be scaled up later on.

The API for this is hidden currently.

Bug: 3134688
Change-Id: I6c3908cbdef4907b8d3f1576df9e3b0e7af1755a
2010-10-29 12:47:07 -07:00
Jeff Brown
88e7b31ba1 resolved conflicts for merge of df3cccf3 to master
Change-Id: I425496a9fc4e9cbc50ad6938e9dccb14827d9558
2010-10-27 22:18:43 -07:00
Jeff Brown
df3cccf3dc am 120a4594: Drop all dispatcher state when dispatcher is disabled. 2010-10-27 19:31:24 -07:00
Jeff Brown
120a459485 Drop all dispatcher state when dispatcher is disabled.
This patch makes the dispatcher drop all of its state when it is
disabled (when the screen turns off).  This ensures that the dispatcher
does not get stuck thinking a pointer is still down if the screen
turned off while the user was touching the display (such as a fat touch
while hitting the power button).

Bug: 3098344
Change-Id: If50ef5804870aa1acd3179fd4b40e3cda58dd39d
2010-10-27 18:43:51 -07:00
James Dong
170a929648 Add two creation flags to OMXCodec::Create()
o This allows to force to use software codecs or hardware codecs
o If request cannot be fullfilled, Create() returns NULL.

Change-Id: I02b56a9229abb56d49703fe80ac18571d33f3748
2010-10-25 18:21:55 -07:00
Gloria Wang
cbb053c3c9 resolved conflicts for merge of 965f960e to master
Change-Id: I63cec8ffb3593216da1de03428134d89e75b9338
2010-10-25 16:56:49 -07:00
Gloria Wang
b8791479af resolved conflicts for merge of 9084631d to gingerbread-plus-aosp
Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
2010-10-25 16:11:18 -07:00
Gloria Wang
d5770917a5 DRM framework support:
- 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
2010-10-25 12:16:56 -07:00
Wu-cheng Li
d55f7e56b9 Mirror the camera preview if the camera is front-facing.
bug:3095272
Change-Id: Ib1c1d1edc06a33e9d4d2dcb42bc1dd2c25b1310c
2010-10-25 15:02:44 +08:00
Jeff Brown
3ae4ac8538 am 2ef36763: am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '2ef36763700eff5679d6012e7f078c57f1a4c465'

* commit '2ef36763700eff5679d6012e7f078c57f1a4c465':
  Add unit tests for native input and fix bugs identified.
2010-10-24 14:36:23 -07:00
Jeff Brown
2ef3676370 am 860c2df4: Merge "Add unit tests for native input and fix bugs identified." into gingerbread
Merge commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f' into gingerbread-plus-aosp

* commit '860c2df4132a2a0be9bcb0e91bfb7e79588c000f':
  Add unit tests for native input and fix bugs identified.
2010-10-24 14:31:41 -07:00
Jeff Brown
c3db858de9 Add unit tests for native input and fix bugs identified.
Fixed a bug where we would lose the first touch point when swiping out of
the virtual key area.

Fixed a bug where we would not send an ACTION_MOVE event in cases where
individual pointers went down/up and the remaining pointers actually moved.
This is important since many applications do not handle pointer movements
during ACTION_POINTER_DOWN or ACTION_POINTER_UP.  In the case of
ACTION_POINTER_UP the movement was completely lost since all pointers were
dispatched using their old location rather than the new location.

Improved motion event validation to check for duplicate pointer ids.

Added an input source constant that was missing from the NDK api but
defined in the framework api.

Added a timestamp when reporting added/removed devices in EventHub.

Bug: 3070082
Change-Id: I3206a030f43b7616e2f48006e5a9d522c4d92e56
2010-10-23 03:52:57 -07:00
James Dong
2351e69a13 Merge "OMX extension to support storing meta data in video input buffers during recording" 2010-10-22 14:07:41 -07:00
Dianne Hackborn
bff26d156d am 86f1b643: am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit '86f1b643d10e0b5b17ae01db3b81020db87b3295'

* commit '86f1b643d10e0b5b17ae01db3b81020db87b3295':
  Fix issue #3117918: No way to finish a native activity
2010-10-21 20:27:15 -07:00
Dianne Hackborn
86f1b643d1 am bf5efba2: Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread
Merge commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc' into gingerbread-plus-aosp

* commit 'bf5efba238f81330f4b473e92b6931b85baa1cbc':
  Fix issue #3117918: No way to finish a native activity
2010-10-21 20:17:50 -07:00
Dianne Hackborn
bf5efba238 Merge "Fix issue #3117918: No way to finish a native activity" into gingerbread 2010-10-21 19:09:44 -07:00
Dianne Hackborn
db28a94d49 Fix issue #3117918: No way to finish a native activity
Change-Id: Ic53e712f7ab5412d72a31b96ecba252344b91644
2010-10-21 19:07:37 -07:00
Mathias Agopian
46beb43357 am 0c636055: Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread
Merge commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4' into gingerbread-plus-aosp

* commit '0c636055351f2e1d26138cf7b3bf3c82553e68c4':
  Mirror the preview for front-facing cameras. do not merge
2010-10-21 16:26:02 -07:00
Mathias Agopian
0c63605535 Merge "Mirror the preview for front-facing cameras. do not merge" into gingerbread 2010-10-21 16:20:07 -07:00
James Dong
387e38dd87 OMX extension to support storing meta data in video input buffers during recording
bug - 3042125

Change-Id: I7543809fa4ff61d48da35eec6c2bd5eaa7e8cead
2010-10-21 14:06:17 -07:00
James Dong
9165145342 am 8ad6335d: am fa7a87fb: Merge "File writer size estimation improvement" into gingerbread
Merge commit '8ad6335d2c22900de5b46460473495b5bcea9f99'

* commit '8ad6335d2c22900de5b46460473495b5bcea9f99':
  File writer size estimation improvement
2010-10-21 13:49:00 -07:00