1034 Commits

Author SHA1 Message Date
Colin Cross
95311818f0 Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584
am: 6d0b466935

Change-Id: I9602684e0ac91f7c08dafe70309433bb233ceeaf
2016-10-03 20:27:46 +00:00
Colin Cross
08f5f1f03a Fix struct vs. class mismatch in forward definitions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.

Bug: 31752268
Test: m -j
Change-Id: Ib7227295e7b94c79cdc52e19c71be4066a11cedc
2016-09-30 21:07:26 -07:00
Chih-hung Hsieh
68b9ebcd59 Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c
am: d1dd5ae76b

Change-Id: I71778eb5a253ebf5342f863d34e178513d386783
2016-09-10 17:20:37 +00:00
Chih-hung Hsieh
5e91082b3c Merge "Fix google-explicit-constructor warnings in media utils." 2016-09-10 17:07:53 +00:00
Chih-hung Hsieh
c80db139b3 Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c
am: 17f1fc6c76

Change-Id: If968940949e97633e99832a3edc1d3003662dac2
2016-08-30 22:41:26 +00:00
Chih-Hung Hsieh
ae1aadc04f Fix google-explicit-constructor warnings in soundpool.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: Id1183b2929242cdf1fd0a1558d0e70194a1de9bb
2016-08-29 14:53:50 -07:00
Chih-Hung Hsieh
bd42349f7e Fix google-explicit-constructor warnings in media utils.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1

Change-Id: I13958693f28fae9016124a43cd211e5302ed8d51
2016-08-29 14:49:57 -07: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
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
Yujie Qin
d09b020ce5 Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev
am: e09415344d

Change-Id: Id85ebdb2541c6145da39cf20684f85728f2ba0b6
2016-06-16 20:05:17 +00:00
Yujie Qin
cad1666867 Report error correctly for the implementation of
StreamInterface::GetData()

Bug: 28889197
Change-Id: Id07755e1b3637f85b6176a59935ad3a5597cfb05
2016-06-16 11:42:41 +02:00
Eric Laurent
c8e1206ad5 Merge "Delete Visualizer before lpJniStorage" am: 03c209b2a3
am: 913e2f83b2

* commit '913e2f83b223486ac1461dab86758848f9ad08e1':
  Delete Visualizer before lpJniStorage

Change-Id: I76aa735d8f0a100e0e106050c90966bd003235bc
2016-06-07 18:13:09 +00:00
ganxiaolin
7b9f5be914 Delete Visualizer before lpJniStorage
It is related to Change: Id17bea8a6ca7132042b9bfefed398a715c139be7
Fix ANR because of bug of Visualizer.
If lpJniStorage was delete first, callback_data_lock become a invalid value.
At mReceiver.periodicCapture() in CaptureThread, it will lock callback_data_lock.
Thus, CaptureThread will wait a invalid memory forever and visualizer wait CaptureThread exiting and causing ANR.

Signed-off-by: ganxiaolin <ganxiaolin@xiaomi.com>
2016-06-06 11:09:05 +08:00
Chih-Hung Hsieh
0b5608015b Merge "Fix misc-macro-parentheses warnings in audio media jni." am: 9ecb10d1b5
am: ca3f49d594

* commit 'ca3f49d594f5c00e6b5d6817bcdb0af02e7224e6':
  Fix misc-macro-parentheses warnings in audio media jni.

Change-Id: I3828c9720f7fe91bc60058daeca2d598f0302d32
2016-05-24 18:56:37 +00:00
Chih-Hung Hsieh
0ca16ef3b8 Fix misc-macro-parentheses warnings in audio media jni.
Bug: 28705665
Change-Id: Iff476943a0a2c2ae68778d1f4bca5d3e9e04bd26
2016-05-19 15:14:54 -07:00
Wei Jia
613dc4cc1d Merge "android_media_MediaSync: Do not pass NULL to AString ctor." into nyc-dev
am: c4e8471ba4

* commit 'c4e8471ba4afb0d2cae0d9e29f5c14b4bbfe4524':
  android_media_MediaSync: Do not pass NULL to AString ctor.

Change-Id: Id138df3cfe1ee989d4abf52ae283b63419e7047a
2016-05-17 21:39:01 +00:00
Wei Jia
838a4ed101 android_media_MediaSync: Do not pass NULL to AString ctor.
Bug: 28643582
Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75
2016-05-16 17:40:02 -07:00
Sungsoo Lim
2505b200a2 Merge "ExifInterface: Set mPosition in AssetStream with proper values" into nyc-dev
am: a7ad6e912f

* commit 'a7ad6e912f82124b9a7e6f2d14a2ccbae79d16f2':
  ExifInterface: Set mPosition in AssetStream with proper values

Change-Id: I59abff01d593647048fe42e7b0dd546f9a68ebdd
2016-05-10 22:12:07 +00:00
Sungsoo Lim
2584cda885 ExifInterface: Set mPosition in AssetStream with proper values
Bug: 28649955
Change-Id: I25ab833f54e4ee853d3b89af513b4ecd7dc02df9
2016-05-07 18:45:07 +09:00
Jeff Tinker
4d1543fd80 Merge "Remove MediaDrm stack from mediaserver" into nyc-dev
am: 892a6a3

* commit '892a6a343d3c53caef3388f83861af814c8ba20a':
  Remove MediaDrm stack from mediaserver

Change-Id: I9f5194d388c2814d336a10f95755d3036b7d7464
2016-04-27 05:27:06 +00:00
Jeff Tinker
d12b7c0600 Remove MediaDrm stack from mediaserver
Part of media security hardening

MediaDrm was temporarily allowed to
run in either mediaserver or mediadrmserver
while all nexus devices were implementing
support for the native_handle representation
of secure buffers.  Now that all nexus
devices support native_handle, the MediaDrm
stack can be removed from mediaserver.

b/22990512

Change-Id: I96a5222f94cd1580ac411de5b48beb44b99cc8d7
2016-04-27 00:49:15 +00:00
Daichi Hirono
4ab0f745d5 Merge "Handle API review comments from the council." into nyc-dev
am: b9c64cd2c0

* commit 'b9c64cd2c06933eda7ff1e691b80c53a74ff09d7':
  Handle API review comments from the council.

Change-Id: I9f082a99d5c8cbce3aaa9708f5f0ea75cc5a9ed6
2016-04-22 00:12:20 +00:00
Daichi Hirono
b9c64cd2c0 Merge "Handle API review comments from the council." into nyc-dev 2016-04-22 00:00:33 +00:00
Insun Kang
b3f8a968e2 Merge "ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail" into nyc-dev
am: 801d416

* commit '801d4161dd9e872bec73d855d21d030ba39a8b91':
  ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail

Change-Id: I4ab59b2b7ced0cf9449fdc780692cfcb707d8df4
2016-04-20 21:11:41 +00:00
Insun Kang
82c2ce1d16 ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail
Bug: 26923978
Change-Id: I929802ae7ff878a80a43058d3c6fa922c706edf6
2016-04-19 17:56:10 +09:00
Daichi Hirono
399df701a1 Handle API review comments from the council.
* MtpEvent: Remove public constructor since properties cannot be set
   directly.
 * MtpEvent: Move event constants from MtpConstants to MtpEvent class.
 * getPartialObject64: the byte[] must have indices of Integer.MAX_VALUE
   at most. Document as such.
 * sendObjectInfo: what happens if the transfer doesn’t succeed? How is
   the app notified? If there is a reason for the failure communicated,
   how does the app find this out? Add docs.
 * Add isOperationSupported(int) and isEventSupported(int) helpers.

Change-Id: Ifd80016d2ddd3b66d5c45f6da76b6133f0c9a617
Fixes: 28146379
2016-04-18 13:03:29 +09:00
Jaesung Chung
468a0796cb Merge "ExifInterface: keep the original metadata data instead of strings" into nyc-dev
am: 865cef4

* commit '865cef475dd4b0ffcb4df0dd62cb86d4ce65ab08':
  ExifInterface: keep the original metadata data instead of strings

Change-Id: Ie02b5ac90a8dde0389ace4bcae081f8bd4e064a0
2016-04-16 02:46:14 +00:00
Jaesung Chung
0e7d22535d ExifInterface: keep the original metadata data instead of strings
This CL makes ExifInterface store the tag values as the original forms
and the format validiation is added that compares the given value and
the data format specificed in EXIF specification in order to keep the
valid tag values only.

Bug: 27583378, Bug: 27614052, Bug: 28075709
Change-Id: If60bbddefe74c4b87b4ce64b5fc79e467e36a5b9
2016-04-15 23:27:21 +00:00
Jaesung Chung
2129b9cc17 Merge "ExifInterface: return only a JPEG-compressed thumbnail of RAW images" into nyc-dev
am: 02f9e23

* commit '02f9e23525bd3ae97528041bc0eaf25d43d8fc53':
  ExifInterface: return only a JPEG-compressed thumbnail of RAW images

Change-Id: If826f5f7612e06d94c0cf17505bf468851d96faa
2016-04-15 00:29:09 +00:00
Jaesung Chung
02f9e23525 Merge "ExifInterface: return only a JPEG-compressed thumbnail of RAW images" into nyc-dev 2016-04-15 00:19:09 +00:00
Philip Cuadra
e7c8b947c9 Merge "Increase the SoundPoolThread queue size to 128 entries." into nyc-dev
am: a6dea12

* commit 'a6dea121e81e4759718ec7f522f7d9b9926df59a':
  Increase the SoundPoolThread queue size to 128 entries.

Change-Id: Icfa989ea5ec3e62c6a27ab2a4b3af123fb7bf1f1
2016-04-13 17:28:35 +00:00
Jaesung Chung
742e89f67d ExifInterface: return only a JPEG-compressed thumbnail of RAW images
Bug: 26923978
Change-Id: I120723c9e28a24d6fb3b7034892e0196484ee5e4
2016-04-14 01:54:45 +09:00
Philip Cuadra
1f1f4bf91d Increase the SoundPoolThread queue size to 128 entries.
SoundPoolThread queue is undersized, bump it up to 128 entries.  This
improves the performance of loading camera by unblocking the thread that
asks SoundPool to load sounds.  Longer term, an API for setting this
number of entries should be added.

Bug: 28087906

Change-Id: Ie5cea5d11844cf035ca13979c188f2c57a8e333a
2016-04-11 23:01:04 +00:00
Marco Nelissen
d0198f27e8 Merge "Expand mediaextractor dumpsys" into nyc-dev
am: aaacd00

* commit 'aaacd001fba22ef5ed9ca882749919034f1720c4':
  Expand mediaextractor dumpsys

Change-Id: Ie70b95d73a0994285c55dca1729cd782331b35bd
2016-04-07 17:33:13 +00:00
Marco Nelissen
aaacd001fb Merge "Expand mediaextractor dumpsys" into nyc-dev 2016-04-07 17:26:19 +00:00
Jaesung Chung
288d70f79b Merge "Fix build" into nyc-dev
am: 5905bf7

* commit '5905bf738c175edfc63bf2e5ee28a43d83977e2d':
  Fix build

Change-Id: Icabf911c0eb4a96e88032312fd6fb6785b043932
2016-04-06 12:55:34 +00:00
Jaesung Chung
fd3446e0aa Fix build
Change-Id: I38aa2f70fef3cb5b4a6fe42a3e4aa8e0a16e6fe0
2016-04-06 21:44:13 +09:00
Marco Nelissen
7a83ee9a32 Merge "Fix MTP_TYPE_UINT128 data conversion issue" am: ba23e45
am: 287dfa1

* commit '287dfa10cd6d5c6eb7cb39e20e1b6532c320927c':
  Fix MTP_TYPE_UINT128 data conversion issue

Change-Id: I72aa6c2bcd009a2e0607832c44dc4b96c5da6b1f
2016-04-05 18:11:26 +00:00
Andy Hung
9a99629eaa Merge "Stop SoundPool decode if NdkMediaCodec returns null buffers" into nyc-dev 2016-03-30 17:06:18 +00:00
Wanwu Peng
8937f1aa8b Fix MTP_TYPE_UINT128 data conversion issue
If type is MTP_TYPE_UINT128, use MtpDataPacket.putUInt128()
not MtpDataPacket.putInt128() to write data to the packet.

Change-Id: Icb9994e24ac216f3bb07d0a2b3cd7ccf3f8c6f3f
2016-03-30 16:32:11 +02:00
Andy Hung
0474773aab Stop SoundPool decode if NdkMediaCodec returns null buffers
Also increase error checking.

Bug: 27346228
Change-Id: Ib94505f852344298f88a3fdcbd65ca8031084188
2016-03-29 15:43:02 -07:00
Daichi Hirono
1337deb6ea Update the comment of MtpDevice#getObjectSizeLong
BUG=27805369

Change-Id: I63762fedf540e89e9ca811a143cb178881ef1830
2016-03-28 04:37:14 +00:00
Marco Nelissen
73c74698d0 Expand mediaextractor dumpsys
Bug: 22775369
Change-Id: I87452084bb5405280c48085fb909aa247055ea01
2016-03-25 09:33:13 -07:00
Daichi Hirono
787821bce4 Add getObjectSizeLong hidden API to MtpDevice class.
In the MTP spec, the object size is stored in MtpObjectInfo as unsigned
32-bit integer and fetched by the getObjectInfo operation. For the
objects that are more than 4GB, the object size is provided as one of
extra properties, which are fetched by different operation.

The CL adds to getObjectSizeLong hidden method to Java MtpDevice class
so that client code can obtain 4GB+ object size.

BUG=27805369

Change-Id: I8a5b85c8db39734f00e49709c61b271eb48ff33d
2016-03-25 20:06:13 +09:00
Glenn Kasten
58ae278294 Merge "Use audio_session_t consistently" into nyc-dev 2016-03-17 14:22:53 +00:00
Lajos Molnar
bd4acc2f9b Merge "media: don't expose private keys in MediaFormat" into nyc-dev 2016-03-15 19:22:28 +00:00
Yin-Chia Yeh
7b79090252 Camera: fix expectation of BLOB buffer size
Bug: 27340302
Change-Id: I7f40065661d06bba210c3cb888598623fad0e56c
2016-03-14 16:17:38 -07:00
Lajos Molnar
c04399feab media: don't expose private keys in MediaFormat
Bug: 25684127
Change-Id: Ie263d290037633291b791ca78ba7cf4d6b3de9c8
2016-03-14 14:07:22 -07:00
Glenn Kasten
33b840444f Use audio_session_t consistently
Also prefer AudioManager.AUDIO_SESSION_ID_GENERATE over
AudioSystem.AUDIO_SESSION_ALLOCATE, because
AudioSystem.AUDIO_SESSION_ALLOCATE is @hide.

Bug: 27562099
Change-Id: I5924554feb919db7f2390f5b062faedd515421af
2016-03-10 10:35:49 -08:00
Jaesung Chung
6e08d2b082 ExifInterface: add RAW input stream support
And also the following things are included:

- Remove mInputStream.
- Update javadoc accordingly.

Bug: 11224701
Change-Id: I30b4c29ac800ae396fca8f6b2c2c0f68028a44b3
2016-03-09 17:22:11 +09:00