drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,496 Commits 1 Branch 0 Tags
Commit Graph

2067 Commits

Author SHA1 Message Date
Zhijun He
212e78df9e ImageReader: Implementation of ImageReader and Image APIs 
Used for direct image data access from producer like camera or video decoder.

Bug: 9254294
Change-Id: I1853af03f4487ac3585d86202f6140854471fa89
 2013-06-26 15:56:27 -07:00
hkuang
63a6473a56 Change the comments to incorporate change for VP9 decoder. 
Change-Id: I9a4f3af9278c90962856516df5930e8924c28f9d
 2013-06-26 00:35:41 +00:00
Chong Zhang
e0dae4b493 Merge "MediaRouter: grey out wifi displays that's in use" 2013-06-15 00:36:15 +00:00
Scott Main
343233c4ed am 3717cf6b: am 07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev 
* commit '3717cf6bc2e92d58d8de9f039165d1e6c73de8a0':
  additional documentation for media codec info
 2013-06-14 17:11:53 -07:00
Scott Main
3717cf6bc2 am 07d6d9e7: Merge "additional documentation for media codec info" into jb-mr2-dev 
* commit '07d6d9e74c1f79de791b37b1cb738fa398915879':
  additional documentation for media codec info
 2013-06-14 17:08:33 -07:00
Scott Main
c06bb7f5b9 additional documentation for media codec info 
Change-Id: I3b4e5baccab6da2dfc8dff8d03872bb5b346a4ad
 2013-06-14 11:56:15 -07:00
Marco Nelissen
2d2cd32cc7 Make MediaPlayer.invoke() public-and-hidden again 
It's used in a bunch of other places in other repos that I don't
want to touch.

Change-Id: I6f2ec6f8066286de9b52499fc71f3f08953c3cb4
 2013-06-14 09:47:27 -07:00
Chong Zhang
ab87a63997 MediaRouter: grey out wifi displays that's in use 
bug 9229799

Change-Id: I9f5fd2107f60c492d42c74e575e6483838a51267
 2013-06-13 20:17:39 -07:00
Marco Nelissen
3e72eb5245 Remove unused MediaPlayer methods 
Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
 2013-06-13 15:25:25 -07:00
Zhihai Xu
352e56ee97 am 36e90664: am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 
* commit '36e90664c7b74bd90b56b17afb407729f7949108':
  Let RemoteControlDisplay know more about playback position
 2013-06-11 14:13:56 -07:00
Marco Nelissen
8d7f9f813d am 3826e8bd: am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 
* commit '3826e8bd6e30dbda90f330e4b3facbccc8c4bb9e':
  Unhide MediaExtractor.getPsshInfo()
 2013-06-11 14:13:51 -07:00
Zhihai Xu
36e90664c7 am bcc6ae88: Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 
* commit 'bcc6ae88f97caa7591a7507a90ec1152ee7cab7a':
  Let RemoteControlDisplay know more about playback position
 2013-06-11 14:11:19 -07:00
Marco Nelissen
3826e8bd6e am 37490462: Merge "Unhide MediaExtractor.getPsshInfo()" into jb-mr2-dev 
* commit '374904621a79eb12416da4a26be515ae9a2d243a':
  Unhide MediaExtractor.getPsshInfo()
 2013-06-11 14:10:26 -07:00
Zhihai Xu
bcc6ae88f9 Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 2013-06-11 19:38:59 +00:00
Marco Nelissen
ecba2e4b95 Unhide MediaExtractor.getPsshInfo() 
b/9373882

Change-Id: I2af42656d6a7eb19e8e9ec798b615dab0d9d33cb
 2013-06-10 15:06:28 -07:00
Jean-Michel Trivi
1b16cc3de5 Let RemoteControlDisplay know more about playback position 
The BT stack needs to differentiate between applications that use
 the new RemoteControlClient APIs to pass a playback position but
 don't have one yet, and applications that use the legacy API and
 will never pass a position.

Bug 9294855

Change-Id: I05cba82a073e6e0aaea1d8bbf9cc8c99da715f58
 2013-06-07 15:48:22 -07:00
Eino-Ville Talvala
b2675542c2 Initial commit of new camera API, mostly just the interface. 
- New core API classes in android.hardware.photography
- android.media.Image and android.media.ImageReader classes for
  application access to direct hardware image buffers.
- Additions to android.graphics.ImageFormat to describe new image
  types needed by new camera API.
- Some documentation included; very little implementation.

Bug: 9111736
Change-Id: I0680f35944d1cb8845b7dc0c67edc8c0f0864573
 2013-06-07 21:29:45 +00:00
Scott Main
febfd26d10 am e125116f: am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev 
* commit 'e125116fc8767ecf431c80f5659a8a90032acb97':
  javadoc cleanup for audioeffect
 2013-06-04 11:17:14 -07:00
Scott Main
e125116fc8 am e4ef3849: Merge "javadoc cleanup for audioeffect" into jb-mr2-dev 
* commit 'e4ef3849c58225206fd5cba1b33c08968c5e6021':
  javadoc cleanup for audioeffect
 2013-06-04 09:45:32 -07:00
Scott Main
1d154187a9 javadoc cleanup for audioeffect 
Change-Id: I87917309d1da6529e16d72ad2b4ec9ce04d10569
 2013-06-03 17:34:29 -07:00
Andreas Huber
4a02d4c609 am c41a0eff: am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 
* commit 'c41a0eff938f825ef235b92efa7a31c3b7f8bfb4':
  Listen for HTTP proxy changes and propagate the information to the media
 2013-06-03 08:48:30 -07:00
Andreas Huber
c41a0eff93 am be22605d: Merge "Listen for HTTP proxy changes and propagate the information to the media" into jb-mr2-dev 
* commit 'be22605d1eacfb4137b6984b72a3eda004b911a1':
  Listen for HTTP proxy changes and propagate the information to the media
 2013-06-03 08:46:20 -07:00
Andreas Huber
d5f9fa574d Listen for HTTP proxy changes and propagate the information to the media 
framework.

related-to-bug: 8873723

Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda
(cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
 2013-05-31 21:33:13 +00:00
ztenghui
d554dc3643 am 43590eb7: am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev 
* commit '43590eb76cac78f780dd318492c5fe6093e2fa88':
  MediaMuxer sample code update, no functional change
 2013-05-31 11:09:11 -07:00
ztenghui
43590eb76c am 4f0002e6: Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev 
* commit '4f0002e6de601f6727475a3296618120b62d7f12':
  MediaMuxer sample code update, no functional change
 2013-05-31 11:07:35 -07:00
ztenghui
4f0002e6de Merge "MediaMuxer sample code update, no functional change" into jb-mr2-dev 2013-05-31 18:05:43 +00:00
ztenghui
34a5b011cd MediaMuxer sample code update, no functional change 
bug:9213533

Change-Id: I0d42ec58576d9fd797dba9c9c9f5ebed1170a818
 2013-05-31 10:50:08 -07:00
Jeff Brown
718aefb6ff am 6474d840: am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '6474d8407cb1551608fc403861e11cf514f8558e':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:02:31 -07:00
Jeff Brown
6474d8407c am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
 2013-05-30 18:00:08 -07:00
Jeff Brown
636af7a1cb Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev 2013-05-31 00:54:41 +00:00
Jean-Michel Trivi
905c2b1117 am 7d2e3939: am c1d47c50: Merge "Monitor device rotation" into jb-mr2-dev 
* commit '7d2e3939964fb6512f370059a33206d2c9ec7a0e':
  Monitor device rotation
 2013-05-30 15:15:18 -07:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity. 
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
 2013-05-30 14:44:18 -07:00
Jean-Michel Trivi
7d2e393996 am c1d47c50: Merge "Monitor device rotation" into jb-mr2-dev 
* commit 'c1d47c50d61063dc41214beb93aeea32f77f2550':
  Monitor device rotation
 2013-05-30 09:03:41 -07:00
Jean-Michel Trivi
c1d47c50d6 Merge "Monitor device rotation" into jb-mr2-dev 2013-05-30 16:00:15 +00:00
Lajos Molnar
ddcbb64a2a am fabd32c1: am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit 'fabd32c1fb353c4e1437f1472de5ec2810bda329':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:25:35 -07:00
Lajos Molnar
fabd32c1fb am 673903a2: Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 
* commit '673903a2759067b29bed7e309211000d365e0ad3':
  android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG
 2013-05-29 15:18:48 -07:00
Lajos Molnar
ecca7f60a6 android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG 
SAMPLE_SYNC_FLAG is not used by MediaMuxer; instead,
MediaCodec.BUFFER_FLAG_SYNC_FRAME is used, which has
the same value.

Remove this now, so that users will not have to translate
MediaCodec flags to MediaMuxer flags, even though MediaMuxer
takes in MediaCodec.BufferInfo objects to specify these flags.

Change-Id: I4b2f2039ca16debf4788a530a36bdd06d516f417
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug: 9169479
 2013-05-29 12:08:18 -07:00
Jean-Michel Trivi
bb6f8711a7 Monitor device rotation 
If requested by ro.audio.monitorOrientation property, set orientation
 information as audio system parameter on configuration changes.

Bug 9095903

Change-Id: I669d4084eade3c14feb63f644bdd5b74fddc8857
 2013-05-28 17:33:16 -07:00
Jeff Brown
2feefe01e9 am b7871af2: am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit 'b7871af2fbde70c7cf4812d5710b2729588bac54':
  Add route description API.
 2013-05-17 12:46:08 -07:00
Jeff Brown
b7871af2fb am 50ab525a: Merge "Add route description API." into jb-mr2-dev 
* commit '50ab525af62ef5e1f9cf3433a161f2e874da6116':
  Add route description API.
 2013-05-17 12:44:37 -07:00
Jeff Brown
56d4b744b3 Add route description API. 
Bug: 8175766
Change-Id: I65dbc10fc04f9ff8f6abc1bda23fbf5baa227737
 2013-05-16 14:41:30 -07:00
Jeff Brown
83d551898d am f8e54846: am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 
* commit 'f8e54846146c234aa9a201f54eea70df93ee56e2':
  Add an API to determine if a route is connecting.
 2013-05-10 16:16:45 -07:00
Jeff Brown
f8e5484614 am 9766caed: Merge "Add an API to determine if a route is connecting." into jb-mr2-dev 
* commit '9766caedf0657615f739d4e441ab9f2fa71aa709':
  Add an API to determine if a route is connecting.
 2013-05-10 16:13:44 -07:00
Jeff Brown
a27b8fb429 Add an API to determine if a route is connecting. 
Bug: 8175766
Change-Id: I54d5f31d4e7d79c471c0e1bbc438cd8ebb4f8a1e
 2013-05-09 21:56:42 -07:00
Jeff Brown
89efc6e6c1 am da58f92b: am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'da58f92bfaf875074656a55103c819e6f4dda341':
  Add an API to allow a callback to request active scans.
 2013-05-09 17:09:24 -07:00
Jeff Brown
1f59cbb20a am 507a3c77: am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '507a3c77d583643f4a884c5d7b0c5e6bce3222bb':
  Fix bug managing wifi display routes.
 2013-05-09 17:09:22 -07:00
Jeff Brown
da58f92bfa am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev 
* commit 'b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
  Add an API to allow a callback to request active scans.
 2013-05-09 16:23:43 -07:00
Jeff Brown
507a3c77d5 am 2298d68e: Merge "Fix bug managing wifi display routes." into jb-mr2-dev 
* commit '2298d68e72afa9cf311af394b61f92f75385bbbf':
  Fix bug managing wifi display routes.
 2013-05-09 16:23:40 -07:00
Jeff Brown
66f3b39ec4 Add an API to allow a callback to request active scans. 
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.

Bug: 8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
 2013-05-09 14:44:08 -07:00
Jeff Brown
77e59fef24 Fix bug managing wifi display routes. 
We could sometimes crash due to some inconsistencies in the
way the wifi display routes were updates when connecting,
disconnecting or scanning wifi displays.

Bug: 8837094
Change-Id: I10c7ccb163ec33c4ea107dfcb5074741049fe955
 2013-05-09 13:42:57 -07:00