4880 Commits

Author SHA1 Message Date
Robert Shih
c67abec674 Fix MediaExtractor.getDrmInitData implementation for webm
Should lookup "crypto-key" in individual track formats instead of file format.

Bug: 26070802
Change-Id: I1a0f59e7bca1d311631e7ad90b9a403ac20d319b
2016-04-01 16:25:53 -07:00
Jean-Michel Trivi
7fa2caf34a Merge "AudioTrack.Builder: fix javadoc code sample" into nyc-dev 2016-04-01 21:53:23 +00:00
Jean-Michel Trivi
e27a75173f AudioTrack.Builder: fix javadoc code sample
Code sample in javadoc for AudioTrack.Builder didn't compile.

Bug 24499652

Change-Id: Ib881052bdebd74a25bb86ab73f9679b17c3ce62b
2016-04-01 21:52:42 +00:00
Jean-Michel Trivi
9cc2c5ceaa Merge "Audio recording activity notification: change callback name" into nyc-dev 2016-04-01 21:48:41 +00:00
Dongwon Kang
66ebc88626 Merge "TIF: Add setLabel(CharSequence) in TvInputInfo.Builder" into nyc-dev 2016-04-01 19:42:41 +00:00
Ronghua Wu
32e537c610 media: update dolby vision CodecProfileLevel
Bug: 25684127
Change-Id: I3d35e31b34cc0d23c68eded87d5e443c74833685
2016-04-01 18:02:41 +00:00
Jean-Michel Trivi
e6a505b775 Audio recording activity notification: change callback name
Rename AudioRecordingCallback.onRecordConfigChanged() to
  onRecordingConfigChanged() after API council review

Bug 27952000

Change-Id: I362a973781e029bca921181934599dcf60e13136
2016-04-01 09:56:28 -07:00
Dongwon Kang
d09372ad86 TIF: Add setLabel(CharSequence) in TvInputInfo.Builder
Bug: 25726241
Change-Id: I8b7cf157dffd0df2b04af0386e448b23409be1e5
2016-04-01 09:51:27 -07:00
Insun Kang
8884af3ee9 ExifInterface: Code clean up
Replaces deprecated constants with newly added constants in the actual
implementation.

Bug: 27932489
Change-Id: Id54236a05127cd7ce3bf0668c002635fb86489a9
2016-04-01 11:53:14 +09:00
Jaesung Chung
d37577d109 Merge "ExifInterface: deprecate duplicated tags" into nyc-dev 2016-03-31 23:04:43 +00:00
Hangyu Kuang
7c33a5dcce Merge "Update mediamuxer documentation that it does not support muxing B-frames." into nyc-dev 2016-03-31 21:32:43 +00:00
Dongwon Kang
775e3c288e TIF: Update javadoc with a better wording
Change-Id: I656c8a94e9d0e5b3ee9ab2b948d51573f5c4e1b2
2016-03-31 10:33:32 -07:00
Dongwon Kang
8904a1a1df Merge "TIF: Address comments on hardware manager related system APIs" into nyc-dev 2016-03-31 17:01:36 +00:00
Dongwon Kang
8f647b5cdb Merge "TIF: Add more class documentation on TvInputManager" into nyc-dev 2016-03-31 16:46:35 +00:00
Hangyu Kuang
d853da5425 Update mediamuxer documentation that it does not support muxing B-frames.
Bug:27597166
Change-Id: I79c971f68d55b19838c1de2be012aaf373c735c4
2016-03-31 16:38:18 +00:00
Tomasz Mikolajewski
e1d0cabb5f Merge "Unhide ExifThumbnail.getThumbnailRange() and make it match the comment." into nyc-dev 2016-03-31 03:47:41 +00:00
Jaesung Chung
0ae6bdfe37 ExifInterface: deprecate duplicated tags
Bug: 27932489
Change-Id: I423a4eab875aec80cf0a2e4c2911e8b5c88fd0d7
2016-03-31 11:20:38 +09:00
Tomasz Mikolajewski
2b57efb262 Unhide ExifThumbnail.getThumbnailRange() and make it match the comment.
Bug: 27579803
Change-Id: If9fe16976cfbc0760a6afb3043d35e0ee387945c
2016-03-31 10:36:26 +09:00
Dongwon Kang
5557bef5e4 TIF: Add more class documentation on TvInputManager
Bug: 25726241
Change-Id: Ib3ff49f2d9f7a3bdcee4b97f89da193fe05d663c
2016-03-30 16:10:11 -07:00
Dongwon Kang
0632d8ae71 TIF: Address comments on hardware manager related system APIs
Bug: 25726241
Change-Id: I0a3e7e8cf494d897fc04528ba719faa4150b9207
2016-03-30 13:25:45 -07:00
Jean-Michel Trivi
449362e065 Fix audio focus logging
Fix error in audio focus dispatching log: the message value (here
  MSSG_FOCUS_CHANGE, which is 0) was logged instead of the focus
  value being sent to the audio focus listener.

Bug 25790720

Change-Id: I534ce8d1059c09a52e56c51acd60405ef3c4cda1
2016-03-30 12:06:22 -07:00
Jaesung Chung
41e54ad3a8 Merge "ExifInterface: keep tags in the original tag groups" into nyc-dev 2016-03-30 10:59:24 +00:00
Jaesung Chung
4118ca8627 ExifInterface: keep tags in the original tag groups
Previously ExifInterface saved its tags in the all possible IFD tags via
setAttribute() method even it already knew the right IFD group for those
tags. In this CL, it introduces updateAttribute() and removeAttribute()
methods in order to maintain the internal IFD tags and its values
according to its original EXIF saving states in the given JPEG file.

Bug: 27583378
Change-Id: Ie49163c8c9bdd38b575ccd76938879ccddcd547b
2016-03-30 13:43:34 +09:00
Phil Burk
9a95421c26 Merge "AudioTrack: document some throws" into nyc-dev 2016-03-28 22:31:25 +00:00
Phil Burk
eeecfa4401 AudioTrack: document some throws
For setBufferSizeInFrames() and related methods.

Bug: 27384290
Change-Id: Ie5decb39d7945f304f57163c5da540cfd01903c7
Signed-off-by: Phil Burk <philburk@google.com>
2016-03-28 14:19:17 -07:00
Daichi Hirono
1337deb6ea Update the comment of MtpDevice#getObjectSizeLong
BUG=27805369

Change-Id: I63762fedf540e89e9ca811a143cb178881ef1830
2016-03-28 04:37:14 +00:00
Jae Seo
c3089b08ac TIF: Notify of visibility or label changes of TvInputInfo
Bug: 27264461
Change-Id: Iaea9c34855eb7516993e5c92c1e0369d47e59587
2016-03-25 15:17:08 -07:00
Daichi Hirono
a2b88f6339 Merge "Add getObjectSizeLong hidden API to MtpDevice class." into nyc-dev 2016-03-25 12:54:58 +00: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
Sungsoo Lim
21c03f0c61 Merge "MediaBrowser: Applying API Review" into nyc-dev 2016-03-25 04:29:56 +00:00
Jiabin Huang
2dc6cc9aa4 Merge "TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)" into nyc-dev 2016-03-25 02:26:04 +00:00
Jaesung Chung
e468a67d59 Merge "ExifInterface: fix creating pointer tags which indicate 0 offset" into nyc-dev 2016-03-24 01:43:07 +00:00
Jiabin
d48d029da4 TIF: Unhide TvRecordingClient.tune(String, Uri, Bundle)
Bug: 27762945
Change-Id: I7f9757f8ca1eb92f892fb2961717125c8b909663
2016-03-24 09:57:27 +09:00
Jaesung Chung
616a42f982 ExifInterface: fix creating pointer tags which indicate 0 offset
When saving attributes(that it writes JPEG again.), now ExifInterface
generates some uncessary pointer tags which refer to an empty EXIF IFD
group, that makes a warning message by ExifInterface when reading again,
which warns that the value of the pointer tag pointing to is invalid.

Bug: 27583378
Change-Id: Id0170c5644541565c98fe4978284098e6664c395
2016-03-23 10:22:48 -07:00
Jaesung Chung
976bbaccc4 Merge "ExifInterface: close the resource after reading EXIF data explicitly" into nyc-dev 2016-03-23 02:30:42 +00:00
Jaesung Chung
203ed4d500 Merge "ExifInterface: fix regression of re-writing JPEG" into nyc-dev 2016-03-23 02:30:29 +00:00
Jaesung Chung
c247791db2 ExifInterface: close the resource after reading EXIF data explicitly
- In case of giving an argument of the image file name or descriptor,
 we created a InputStream at the inside of ExifInterface, close them
 properly.
- Developers should take care of closing input streams when they use
 input streams since they made those input streams.

Bug: 27636804
Change-Id: I9a3a75b1b55dcb2718a60e14814a04cad939d22c
2016-03-22 19:20:29 -07:00
Jaesung Chung
42ac0d0015 ExifInterface: fix regression of re-writing JPEG
Bug: 27583378
Change-Id: I052dfedbb1393705eba378de5eaf3636ed0e65ea
2016-03-22 19:12:42 -07:00
Dongwon Kang
7b0864cc68 Merge "MediaResourceMonitor: Change argument type from string to int" into nyc-dev 2016-03-22 23:50:03 +00:00
Dongwon Kang
6d8587a81c MediaResourceMonitor: Change argument type from string to int
Bug: 27529962
Change-Id: I29c165ccf6b44b0ca6812f1ccae758d67b225e0d
2016-03-22 15:21:01 -07:00
Jaesung Chung
285bbbbda4 Merge "ExifInterface: fix logs" into nyc-dev 2016-03-22 05:39:27 +00:00
Jaesung Chung
f2a1076cd3 Merge "ExifInterface: fix writing STRING and SRATIONAL formats" into nyc-dev 2016-03-22 05:38:27 +00:00
Jaesung Chung
c2916968aa ExifInterface: fix logs
- Give more explanations on dealing with files failed to process.
- Log and return immediately when handling lost JPEG files.
- Minor fixes in logging.

Bug: 27583378, Bug: 27587980
Change-Id: Id9a3d137e5f173fa0e6313402e5dc482a5efd57c
2016-03-21 22:13:46 -07:00
Jeff Sharkey
8953147400 Merge "Mark even more Bundles as defusable." into nyc-dev 2016-03-21 21:10:14 +00:00
Phil Burk
566e7212ab Merge "Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO" into nyc-dev 2016-03-21 19:30:23 +00:00
Jeff Sharkey
f0ec2e0050 Mark even more Bundles as defusable.
Bug: 27766193
Change-Id: Ib027ac7b40c7a575a76f289faabde9655338865e
2016-03-21 12:37:57 -06:00
Phil Burk
621dbc8740 Audio ENCODING_IEC61937: enforce use of CHANNEL_OUT_STEREO
Prevent developers from using a channelMask that will fail.

Bug: 27721209
Change-Id: I87ad67caedaedf6ed2230165cb1687a2a0b74703
Signed-off-by: Phil Burk <philburk@google.com>
2016-03-21 11:15:02 -07:00
Paul McLean
455388bdb8 Fix a javadoc @see error
Bug: 26194337
Change-Id: I7945058e0948238e9b2be7e5d8a7dc3ac4d814dc
2016-03-21 09:50:18 -06:00
Jae Seo
3b9be6700f TIF: Annotate constants
Bug: 20980990
Change-Id: I3fac9f19cc705c9d94d2ff24075830f2d65588c8
2016-03-18 16:15:39 -07:00
Jaesung Chung
f9e0f20b28 Merge "ExifInterface: do not throw an Exception when XMP" into nyc-dev 2016-03-18 07:17:45 +00:00