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

6977 Commits

Author SHA1 Message Date
Elliott Hughes
84f4ad8071 am 87c5eeb4: Merge "Fix a JNI local reference leak in JNIMediaPlayerListener::notify." 
* commit '87c5eeb48b1a0c498eae9bd2877fb33678d90b8a':
  Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
 2013-11-13 15:21:51 -08:00
Elliott Hughes
99f752149b Fix a JNI local reference leak in JNIMediaPlayerListener::notify. 
Bug: https://code.google.com/p/android/issues/detail?id=62137
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
 2013-11-13 15:10:40 -08:00
Marco Nelissen
f5cfe708a6 am e8acd367: Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together." 
* commit 'e8acd367acb82bd80deed31467adcdd9ab83248b':
  When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together.
 2013-08-07 08:42:54 -07:00
Marco Nelissen
e8acd367ac Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together." 2013-08-07 15:39:39 +00:00
Xia Wang
3a5e2013a1 am ebbcc18e: am 4032217e: Merge "Add option for video playback test to accept media source path." into jb-mr2-dev 
* commit 'ebbcc18eaa8a69579fadae484630aa1ba447c031':
  Add option for video playback test to accept media source path.
 2013-08-05 15:58:48 -07:00
Elliott Hughes
dcb1a58cf9 If media wants ASCII lowercasing, it needs to ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
 2013-08-02 10:03:53 -07:00
jangwon.lee
3ed02535fd When deleting a db file, 
Context.deleteDatabase() has to be called instead of File.delete()
to guarantee all db related files
like journal, wal, shm, etc are deleted together.

Signed-off-by: jangwon.lee<jangwon.lee@lge.com>

Change-Id: I3c3d7dfa13ffbe709ab7d8a5c7cfe6cfa2864fea
 2013-07-31 07:18:25 +00:00
Marco Nelissen
f38b528701 Merge "MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well" 2013-07-30 17:11:55 +00:00
Jean-Baptiste Queru
6c0fe0df4e Merge "MediaFormat: Fix the documentation link to the AAC profile constants" 2013-07-29 23:03:00 +00:00
Oscar Rydhé
425916e4c5 Fix NullpointerException in MediaMetadataRetriever 
According to the API documentation and the ICS implementation
the setDataSource(String) method throws an
IllegalArgumentException if path is null. In JB a
NullpointerException is thrown instead. This fix restores
the earlier behaviour.

Change-Id: Ic47baadf91076acc227d92d84f6b8d1d6ecd0c03
 2013-07-26 18:18:17 +00:00
Martin Storsjo
816af56eac MediaFormat: Fix the documentation link to the AAC profile constants 
Change-Id: If1780436baa2884cea05ccd8ab74745af790eb17
 2013-07-25 12:53:46 +03:00
Martin Storsjo
158754b1bf MediaFormat: Explain that KEY_COLOR_FORMAT is used with decoders as well 
If reading the decoded pixel data (instead of letting the system
render it), this is critical for interpreting the data correctly.

The video MediaCodec CTS tests use this MediaFormat key in this
way as well.

Therefore, make sure the documentation reflects the actual use of
this field - claiming that it is encoder-only is misleading.

Change-Id: I9bfd295a95dd3e7d1fa3189886fd243b07bb82cc
 2013-07-25 10:52:54 +03: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
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
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
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
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
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
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
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
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
Jason Noguchi
b809577f46 am b318f7b9: Merge "Refactor of camera stress test to add camera test helper. Also add additional functional tests for: flash, exposure, white balance, and focus mode. Also add pairwise tests." into jb-mr2-dev 
* commit 'b318f7b900a3cc0899b6e2a4bd79b9894f29d74f':
  Refactor of camera stress test to add camera test helper. Also add additional functional tests for: flash, exposure, white balance, and focus mode.  Also add pairwise tests.
 2013-05-29 18:26:44 -07:00
Jason Noguchi
b318f7b900 Merge "Refactor of camera stress test to add camera test helper. Also add additional functional tests for: flash, exposure, white balance, and focus mode. Also add pairwise tests." into jb-mr2-dev 2013-05-30 01:23:48 +00: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
673903a275 Merge "android.media.MediaMuxer: remove SAMPLE_SYNC_FLAG" into jb-mr2-dev 2013-05-29 19:11:03 +00: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
Jason Noguchi
c6cedc84f4 Refactor of camera stress test to add camera test helper. Also add 
additional functional tests for: flash, exposure, white balance, and
focus mode.  Also add pairwise tests.

Slight refactor to add camera test helper and also additional
tests for: flash, exposure, white balance, and focus mode

Bug: 9174937

Change-Id: I3d26b545dc8ff972c8173066df59a2e572a837ef
 2013-05-28 15:28:32 -07:00
Yu Shan Emily Lau
03367e2971 am b830d527: Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 
* commit 'b830d527deb75a36aa78367026d6631a9b4e1126':
  Update test with CamercorderProfile video size.
 2013-05-24 18:53:47 -07:00
Yu Shan Emily Lau
b830d527de Merge "Update test with CamercorderProfile video size." into jb-mr2-dev 2013-05-25 01:51:40 +00:00
Yu Shan Emily Lau
9c539e8511 Update test with CamercorderProfile video size. 
Bug:9114681
Change-Id: Id8ac6e98849715d21cd4a983fc13935debea5e5f
 2013-05-23 22:02:28 -07:00
Jeff Tinker
eaa9ce7064 am 606ab470: Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev 
* commit '606ab4706df372974cc86eb1bb1c50d79422d7cc':
  Improve exception error messages to help diagnose app errors
 2013-05-22 12:14:15 -07:00
Jeff Tinker
09d6ad37f7 am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev 
* commit '2161b7cb79576b82a8f3bb964e25739e488d4c29':
  Fix invalid keyType translation in MediaDrm.getKeyRequest
 2013-05-22 12:14:13 -07:00
Jeff Tinker
606ab4706d Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev 2013-05-22 19:12:39 +00:00
Jeff Tinker
17b8922785 Fix invalid keyType translation in MediaDrm.getKeyRequest 
bug: 9070897
Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
 2013-05-21 13:00:58 -07:00
Jeff Tinker
eada5376d9 Improve exception error messages to help diagnose app errors 
bug: 9072051

Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
 2013-05-21 12:55:59 -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