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

7230 Commits

Author SHA1 Message Date
Mathias Agopian
377d7bd543 Merge "always pass the BufferQueue explicitely to consumers" 2013-07-16 02:17:56 +00:00
michaelwr
20555cb645 Merge "Add a keycode to switch audio tracks (1/2)" 2013-07-16 01:38:46 +00:00
Igor Murashkin
d7bf1778df camera2: Implement CameraDevice#getCameraInfo 
Bug: 9529161
Change-Id: Ie37d1e07bb8416cbb141f4d49e52337bf7236610
 2013-07-15 13:37:08 -07:00
Mathias Agopian
b550929b7a always pass the BufferQueue explicitely to consumers 
Change-Id: I32e380979a3f4c6b1dfb440cc5b5c3d30d7607db
 2013-07-12 22:06:31 -07:00
Igor Murashkin
b9dd637f83 camera2 api: Generate metadata keys and enums from XML 
Change-Id: I9b04b5933c5922fc522e9216f4deebcd6fc24d78
 2013-07-12 17:25:50 -07:00
Jaekyun Seok
bfdad8ecad Add a keycode to switch audio tracks (1/2) 
A key to switch audio tracks is general on media devices like blu-ray.

Bug: 9728155
Change-Id: Ib61822b8aa9c143a8febc3cff4707fa775119448
 2013-07-12 17:23:29 +09:00
Xia Wang
796c93b110 Add option for video playback test to accept media source path. 
This allows the stress test to be able to streaming video over network.

Change-Id: Ie0089c1ba2a076c9c1325934643c2f22f2ca9866
 2013-07-11 19:30:51 -07:00
Igor Murashkin
b519cc52ec camera2 api: Add CameraMetadata get/set support 
* Add a Rational class
* Can get/set Key<T> where T is a primitive (or Rational)
* Can get/set Key<T> where T is a primitive array
* Can get/set Key<T> where T is an enum (synthetic constructor only)

Not implemented yet:
* When T is anything else, i.e. Rect, Size, etc

Bug: 9529161
Change-Id: I64438024a1e8327a38dd2672652626f0ffbb70e3
 2013-07-11 13:06:56 -07:00
Oliver Woodman
dae9aa3f37 am 9ad7b946: am 0661dd15: Merge "Expose latency methods through AudioManager and AudioTrack." into jb-mr2-dev 
* commit '9ad7b946fe9a5dd706205e90046ddc1bd6cb8ad0':
  Expose latency methods through AudioManager and AudioTrack.
 2013-07-02 01:33:56 -07:00
Oliver Woodman
e64716ad01 Expose latency methods through AudioManager and AudioTrack. 
There's a longer term plan to fix audio/video sync, but
this gets the Java level to parity with the native level,
and allows applications in Java to achieve sync in the
same way as the native media player. APIs are left as hidden
for now.

Bug: 9587132
Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
 2013-07-01 22:30:18 +01:00
Zhijun He
534046d2b1 ImageReader: get correct jpeg size. 
the jpeg size was set to the buffer width, which is the max jpeg buffer size.
the right size can be obtained by parsing the camera3_jpeg_blob data sent by
hal.

Also correct the buffer size check when crop is not set.

Bug: 9254294
Change-Id: Ic73de47ef97efa4eb356a399c1576715e2eacbfd
 2013-07-01 11:03:41 -07:00
Oliver Woodman
86bebb4c78 Merge "Expose latency methods through AudioManager and AudioTrack." 2013-06-27 10:40:08 +00:00
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
Igor Murashkin
70725500dc Initial camera device implementation 
* Working streaming preview requests only
* Almost everything else returns empty objects that don't do anything

Bug: 9213377
Change-Id: Ie6f02a7c0952b0f5ebc41905425b15cae221f7d3
 2013-06-26 13:19:45 -07:00
Igor Murashkin
e363fbb264 Partial CameraManager implementation 
Bug: 9213377
Change-Id: I8f89fb94d7081a71b38e5cd0ad89116d219b4c33
 2013-06-26 13:19:44 -07:00
Oliver Woodman
61dcdf3764 Expose latency methods through AudioManager and AudioTrack. 
There's a longer term plan to fix audio/video sync, but
this gets the Java level to parity with the native level,
and allows applications in Java to achieve sync in the
same way as the native media player. APIs are left as hidden
for now.

Change-Id: Iaf70baac1ffb50ef48e03355163158568fbd0fe9
 2013-06-26 16:33:54 +01: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
Marco Nelissen
85c28e8183 Forgot something 
Change-Id: Ia579213303e79b282a7ba472b39576d4b160a739
 2013-06-14 09:18:35 -07:00
Marco Nelissen
c2f9024b13 Fix build 
We don't need a separate test for invoke() because there are other
tests that exercise it.

Change-Id: I8c8f3593e7e9eed3c53997453f0f66ba8374e79e
 2013-06-14 09:14:28 -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
Igor Murashkin
cf88be6dc8 Merge "camera: Add Java binder proxies for some existing binder interfaces" 2013-06-11 20:45:19 +00:00
Zhihai Xu
bcc6ae88f9 Merge "Let RemoteControlDisplay know more about playback position" into jb-mr2-dev 2013-06-11 19:38:59 +00:00
Igor Murashkin
4491d684f4 camera: Add Java binder proxies for some existing binder interfaces 
Note that anything not in the AIDL interfaces, will NOT be magically
compatible if you just add it there. It probably requires a change in
frameworks/av/camera as well.

Bug: 9213377
Change-Id: I91d3efb755ed2e3ace139f83573f86efdccccd06
 2013-06-11 11:36:38 -07: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