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

11550 Commits

Author SHA1 Message Date
Daichi Hirono
0398eb5c1b Specify primary mime type for each format code. 
MediaFile#getMimeTypeForFormatCode returns mimetype for MTP format
code. However MTP format code is ambiguous and some format code can be
mapped to several mime types.  Before the fix, the method returns mime
type that is last registered to internal static map.

The CL explicitly specifies the primary mime type for each format code
to prevent from unintentionally changing mime type returned for a format
code.

FIX=30266194

Change-Id: I142ccb9719d439b0378121bcdcd4b804b1505952
 2016-07-21 17:08:09 +09:00
Jin Park
1c1b2b18d3 ExifInterface: Add ORF file parse support 
A ORF file has a unique way of storing its data. This CL adds code
that checks whether a file is a ORF file format and parses the data
according to specifications.

Bug: 29409358
Change-Id: I498408a9e02dfe567c2d427b037c30b06af74d7e
 2016-07-21 13:49:01 +09:00
Jin Seok Park
f635d5b83a Merge "ExifInterface: Remove unnecessary logging of exceptions" 2016-07-21 02:43:48 +00:00
Jin Park
68bda838d0 ExifInterface: Remove unnecessary logging of exceptions 
ExifInterface currently logs exceptions when it encounters invalid
markers and when the file format is unsupported by Piex Library.
This CL suppresses such logs with the DEBUG marker.

Bug: 30252745
Change-Id: Ia69183eaa5bf7ac2ff1dc95c0919b23b4a9f8c4e
 2016-07-21 10:27:57 +09:00
Robert Shih
89cfd17196 Merge "MediaExtractor: Javadoc should mention INTERNET permission" 2016-07-21 00:53:13 +00:00
Robert Shih
a1c7483429 MediaExtractor: Javadoc should mention INTERNET permission 
Bug: 10673034
Change-Id: Iea1196c76b09fa5b8f5b2d11a461eeb4c6578a1b
 2016-07-20 17:46:11 -07:00
Bryan Mawhinney
a687bed569 Merge \\"Add .mov to MediaScanner video file types\\" into nyc-mr1-dev am: 881bc352ee 
am: 642e50621a

Change-Id: I706bf8992bf8090b5c818418b14278a7bf9e3637
 2016-07-20 19:18:16 +00:00
Bryan Mawhinney
642e50621a Merge \"Add .mov to MediaScanner video file types\" into nyc-mr1-dev 
am: 881bc352ee

Change-Id: I323e40003c87b2b892b1cb0712507cabc7b1d1d5
 2016-07-20 19:13:04 +00:00
Bryan Mawhinney
881bc352ee Merge "Add .mov to MediaScanner video file types" into nyc-mr1-dev 2016-07-20 18:58:30 +00:00
Stephen Hines
5018a61b9c Merge \\\\"Disable warning triggered in Clang r271374\\\\" am: bba87840d3 am: 4643acaa34 am: 46b64ae00e 
am: 64baa7025d

Change-Id: I6f9fc52c50481b84db81410aa567cb2639279bb4
 2016-07-20 00:16:12 +00:00
Pirama Arumuga Nainar
64baa7025d Merge \\\"Disable warning triggered in Clang r271374\\\" am: bba87840d3 am: 4643acaa34 
am: 46b64ae00e

Change-Id: If4fb63fc20ba9cd10bd10c8255f2275a29477801
 2016-07-19 23:59:37 +00:00
Stephen Hines
46b64ae00e Merge \\"Disable warning triggered in Clang r271374\\" am: bba87840d3 
am: 4643acaa34

Change-Id: Ie8f5bcee02f0235d06f7b0f5b11efd592026fce1
 2016-07-19 23:52:00 +00:00
Pirama Arumuga Nainar
4643acaa34 Merge \"Disable warning triggered in Clang r271374\" 
am: bba87840d3

Change-Id: I03686c2e9c341d927b295c150aea8eea37f69338
 2016-07-19 23:41:20 +00:00
Mikhail Naganov
232ac757fb Merge "Protect MIDI framework against client blocks in MidiReceiver.onSend" 2016-07-19 22:50:06 +00:00
Chien-Yu Chen
01d65bebc7 Merge \\"ImageReader: Make close thread safe\\" into nyc-mr1-dev am: 2f8bf1f024 
am: 8b29ace33b

Change-Id: I94b195e2a7f43ed010ca3cebe933593c6960cfc6
 2016-07-19 21:16:56 +00:00
Chien-Yu Chen
8b29ace33b Merge \"ImageReader: Make close thread safe\" into nyc-mr1-dev 
am: 2f8bf1f024

Change-Id: I9954f6b7b7ab997391acbe3f16cbce36d9c5de3c
 2016-07-19 21:12:07 +00:00
Pirama Arumuga Nainar
b6709700db Disable warning triggered in Clang r271374 
http://b/28149048
http://b/29823425

Disable -Wconstant-conversion that gets triggered in
native/imageproc/to_rgba.c.

Test: Tested build, boot and common usage for Arm, Arm64, x86, x86_64,
Mips images in AOSP and internal branch.

Change-Id: Ia8dbe49a1a8577599244642cbd2e3bb17ec1f83c
 2016-07-19 20:31:39 +00:00
Bryan Mawhinney
c9cb80e9e6 Add .mov to MediaScanner video file types 
Bug: 16162336
Change-Id: I34467c707494690a9e3e3890f295dd1f7df86c86
 2016-07-19 16:01:55 +01:00
Chien-Yu Chen
ca979b9d89 ImageReader: Make close thread safe 
Bug: 30191606
Change-Id: Ic5b53c416a7fe3ebcaad2ab78f2e9aef3b790c88
 2016-07-18 17:14:27 -07:00
Robert Shih
76beadac3e Merge "android_media_MediaRecorder: NULL check after getMediaRecorder" 2016-07-18 23:00:52 +00:00
Robert Shih
04167d34f5 android_media_MediaRecorder: NULL check after getMediaRecorder 
Bug: 22416023
Change-Id: I47cc0c5750722735ab11cbc408f2d28c4d4bdd2f
 2016-07-18 13:41:32 -07:00
Glenn Kasten
2ed8f215f1 Define low latency output stream (formerly primary) 
Bug: 29164107
Change-Id: Ic31ee9bc85f39026918f9a7b7f379454d99b0009
 2016-07-18 11:43:38 -07:00
Robert Shih
6f5be322d2 MediaRecorder: fix OnInfo related documentation 
The original documentation said MediaRecorder.OnInfoListener was called for
error cases.

Bug: 25424209
Change-Id: Ic8d2dee67b15a64604a959e7e6964436da92d6ba
 2016-07-15 18:39:42 -07:00
Lajos Molnar
77e3a344b7 Merge \\"media: document new temporal layering schema values.\\" into nyc-mr1-dev am: 12f860f5a2 
am: 878069382e

Change-Id: Iffd7f35b5c6e53ddcc4728a422839298b13503da
 2016-07-15 05:59:39 +00:00
Lajos Molnar
98d9779533 Merge \\"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\\" into nyc-mr1-dev am: 991c240a88 
am: 525d917ac9

Change-Id: I6c5088ec6b2b7810acf2c3e6835b205f80eded06
 2016-07-15 05:59:32 +00:00
Lajos Molnar
878069382e Merge \"media: document new temporal layering schema values.\" into nyc-mr1-dev 
am: 12f860f5a2

Change-Id: Ifb3c99ca6e4b2a9dcec6d58afacbcba474ea4d73
 2016-07-15 05:53:37 +00:00
Lajos Molnar
525d917ac9 Merge \"media: clarify MediaFormat.KEY_I_FRAME_INTERVAL\" into nyc-mr1-dev 
am: 991c240a88

Change-Id: Id1e1bfdb65b10f5e7b99a0e164afc05ca2518dbf
 2016-07-15 05:53:28 +00:00
Lajos Molnar
12f860f5a2 Merge "media: document new temporal layering schema values." into nyc-mr1-dev 2016-07-15 05:44:04 +00:00
Lajos Molnar
be00432071 media: clarify MediaFormat.KEY_I_FRAME_INTERVAL 
Bug: 30096321
Change-Id: I908b669caf5443fb272a2d274b7cbf7227913b3e
 2016-07-15 05:15:24 +00:00
Lajos Molnar
2cfca129d6 media: document new temporal layering schema values. 
Also fix doc as these are advertised on the output port.

Bug: 30150921
Bug: 27596987
Change-Id: Ia95876ade36bc82eea0e9795dea0268abbd1c1ef
 2016-07-14 19:56:35 -07:00
Lajos Molnar
cbf82bd3ab Merge \\"media: clarify notes in MediaCodec doc\\" into nyc-mr1-dev am: 82d886434d 
am: 1d356c895b

Change-Id: I086a5de8bb581d5d908dacee82e4d93403e73320
 2016-07-15 00:39:10 +00:00
Lajos Molnar
1d356c895b Merge \"media: clarify notes in MediaCodec doc\" into nyc-mr1-dev 
am: 82d886434d

Change-Id: Iacc43f3db9a41a0373227fc09f3590cf275ec34f
 2016-07-15 00:35:12 +00:00
Lajos Molnar
82d886434d Merge "media: clarify notes in MediaCodec doc" into nyc-mr1-dev 2016-07-15 00:25:30 +00:00
Wei Jia
44d76c7a72 Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev 
am: 9604b3803c

Change-Id: Ibbb2272be91fb6c79795566cb9928bfb8adde002
 2016-07-14 01:14:42 +00:00
Wei Jia
7a963e183d Merge \\"Fix disabling lockscreen for demo users.\\" into nyc-mr1-dev am: 407fd1ea62 
am: 3b098778c6

Change-Id: I66a5393837e3ec0286be28f766a603da844ce6fc
 2016-07-13 23:31:10 +00:00
Wei Jia
509cbb6385 MediaDataSource: add DrmInitialization for IDataSource. 
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
 2016-07-13 23:24:20 +00:00
Sudheer Shanka
3b098778c6 Merge \"Fix disabling lockscreen for demo users.\" into nyc-mr1-dev 
am: 407fd1ea62

Change-Id: I5625a9ef9fd35ee0cbf6cad7651f7a39eee8f059
 2016-07-13 23:15:03 +00:00
Wei Jia
407fd1ea62 Merge "MediaPlayer: fix typo for OnInfoListener." into nyc-mr1-dev 2016-07-13 22:05:00 +00:00
Jean-Michel Trivi
6e4d0a234a Merge \\"Optimize audio playback restriction check\\" into nyc-mr1-dev am: 69c6166684 
am: 96a8ee3aec

Change-Id: I0b78ebbfe10a56d2ce27af0b9317de93e29e4c13
 2016-07-13 22:03:02 +00:00
Jean-Michel Trivi
96a8ee3aec Merge \"Optimize audio playback restriction check\" into nyc-mr1-dev 
am: 69c6166684

Change-Id: If626176f014e65f0248c5ae80d9196dd27076ec4
 2016-07-13 21:57:24 +00:00
Jean-Michel Trivi
69c6166684 Merge "Optimize audio playback restriction check" into nyc-mr1-dev 2016-07-13 21:50:59 +00:00
Mikhail Naganov
382cb48848 Protect MIDI framework against client blocks in MidiReceiver.onSend 
Make the server-side socket non-blocking when creating MidiOutputPort
for clients. Thus if a client ceases to read from its side of the
socket pair, the server will just fail to write instead of blocking.

One drawback is that the MidiOutputPort on the client can't indicate
that it has become dysfunctional, but it's not possible without
changing the API.

Bug: 29413812
Change-Id: I9dfcbdd214a815cea8fd1365324fd78ca459268a
 2016-07-13 13:50:17 -07:00
Jean-Michel Trivi
1293c060c8 Optimize audio playback restriction check 
Order the playback restriction checks from the most likely
  restriction to the least likely.

Bug 30073948

Change-Id: I6431d15a2ed8b5831f937eab8db940d942082b0e
 2016-07-13 19:30:56 +00:00
Eric Laurent
a5a6a47e94 Merge \\"Make Dolby TrueHD audio format public\\" into nyc-mr1-dev am: eb8de29269 
am: 50768af5e1

Change-Id: Id634ea390d59dc0f39b3ce1b5ce440f6aad54634
 2016-07-13 16:06:14 +00:00
Eric Laurent
50768af5e1 Merge \"Make Dolby TrueHD audio format public\" into nyc-mr1-dev 
am: eb8de29269

Change-Id: I2cfe7a072d7bdbce4a1fad357b1608c1f9624688
 2016-07-13 16:01:29 +00:00
Eric Laurent
eb8de29269 Merge "Make Dolby TrueHD audio format public" into nyc-mr1-dev 2016-07-13 15:54:04 +00:00
Jin Park
ffe4efc319 ExifInterface: Add RAF file parse support 
A RAF format file has a unique way of storing its data. This CL adds
code that checks whether a file is a RAF file format and parses the
data according to specifications.

Bug: 29409358
Change-Id: If37d4ba8de47cdbacd524a07148ba6c14f873259
 2016-07-13 07:10:16 +00:00
Jin Seok Park
bc0f0f4351 Merge "ExifInterface: Extract primary image length/width values" 2016-07-13 07:08:55 +00:00
Jin Park
559c028fc8 ExifInterface: Extract primary image length/width values 
The primary image may not contain the tags for ImageLength and
ImageWidth values if it uses the JFIF specification. This CL searches
the data to retrieve those necessary values.

Bug: 29409358
Change-Id: I850768af38b7b723e93833a70a2238f3fe1cc29b
 2016-07-13 14:29:58 +09:00
Wei Jia
0474f567ba Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-mr1-dev am: e7982e05f6 
am: 47efffff85

Change-Id: I49c99beced2fefd0dd9f1ce8e7365e60c0834a7e
 2016-07-13 02:15:42 +00:00