| 5dacbef0448c20718725376d6d3d30d6a1983d3f |
13-Jun-2017 |
Eino-Ville Talvala <etalvala@google.com> |
ImageReader: Set BufferItem mGraphicBuffer to null when returning it
The ImageReader JNI layer needs to maintain a list of BufferItems that
back the Java Image objects. At start, we allocate maxImages of these
in a list, and acquire and release them from this list as the
application acquires and releases Images.
However, on release, the contents of the BufferItem are not adjusted,
so it can retain a reference to a GraphicBuffer until the BufferItem
is reused.
Test: Camera CTS passes, memory usage drops after camera bursts
Bug: 62652080
Change-Id: I9aade5e32cbe0af0c15a3886e16ada1a70392b74
(cherry picked from commit 0af9435572aa4ef66c61a62605f6eb3f8d218d8b)
ndroid_media_ImageReader.cpp
|
| 3c0f5d296e61d38e4bf4396d87cd4f59fdde32c4 |
16-May-2017 |
Andy Hung <hunga@google.com> |
VolumeShaper: Enable xOffset from Java
Previously only accessible from native.
Also improve documentation and comments.
Test: CTS VolumeShaperTest, Ducking
Bug: 38353147
Change-Id: I27bb34f0a5d28f80d138111bbeeb92653b5195c5
ndroid_media_VolumeShaper.h
|
| 32d516381c712354ce37a08dbc6c3c7e5f266faa |
16-May-2017 |
Andy Hung <hunga@google.com> |
AudioEffect: return DEAD_OBJECT for FAILED_TRANSACTION
Test: CTS AudioSecurityTest
Bug: 38346284
Change-Id: I96b4995c2d11b4a33c4b2fa6987922e26c91d336
udioeffect/android_media_AudioEffect.cpp
|
| 94dd36cae9f4f9032132b49e2cd24d573a9a465b |
09-May-2017 |
Jeff Tinker <jtinker@google.com> |
Fix drm hal resource leaks
bug:36408047
test: manual testing to verify leaks are fixed
Change-Id: Ic6a29572874a9fe30f36e7fdabb68d2ddeffb278
ndroid_media_MediaCrypto.cpp
|
| 07ad459c84b565ea216854a64e726a16c5824640 |
02-May-2017 |
Eino-Ville Talvala <etalvala@google.com> |
ImageWriter: Attach non-opaque Images as well.
With all the work under the hood of ImageReader/Writer in the last few
releases, this is much more straightforward to enable.
Only trick is to ensure that the Image detached from the ImageReader
correctly clears out its planes, if present.
Bug: 19962027
Test: Camera CTS still passes on angler, sailfish, ryu
Change-Id: Ic8a1f3e2f45cf15971d76e308a5af25eb2fd66f1
ndroid_media_ImageWriter.cpp
|
| bebeaf9ae3251e24a214951e6559cd40f15ef4fb |
20-Apr-2017 |
Wei Jia <wjia@google.com> |
MediaPlayer: fix new API seekTo to address API review.
Test: compiles
Bug: 36790516
Bug: 37514763
Change-Id: I91307d10e6c9bc65779651c056053b3a025b0d50
ndroid_media_MediaPlayer.cpp
|
| 10353e36018224b86ef2918d1d68107459d445cf |
14-Apr-2017 |
Ray Essick <essick@google.com> |
Rework getMetrics() api per API council
Reworking the media metrics getMetrics() calls (currently in MediaCodec,
MediaExtractor, MediaPlayer, and MediaRecorder) to fit new direction
from the API Council.
Drop the MediaMetricsSet that we had in the first round; go back
to a PersistableBundle as the return type. Moves the key definitions
from MediaMetricsSet.MediaCodec to MediaCodec.MetricsConstants
Bug: 37083862
Test: ran the corresponding CTS tests
Change-Id: I7905959ad2109887dd8fd16f0eb2831247abab2a
ndroid_media_MediaCodec.cpp
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaMetricsJNI.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
|
| fd89a95f35a149b234a02d3d48a4179582e64dfe |
13-Apr-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge changes from topic 'api-review' into oc-dev
* changes:
MediaCas: combine openSession methods
MediaCas: address comments for API reviews
|
| addc39ec27f3eb9b61ad8565804201a866d16abd |
31-Mar-2017 |
Chong Zhang <chz@google.com> |
MediaCas: address comments for API reviews
- Wrap session id byte array in Session object
- Move session operations from MediaCas to Session
- Remove position prarameters on descramble() method
- Retrieve cas info for a track by getCasInfo() instead
of getDrmInitData().
bug: 22804304
bug: 36791613
bug: 36783335
Change-Id: Ib3ad8d6a2f679c0e60d2bb025ac5999339722306
ndroid_media_MediaDescrambler.cpp
|
| 916d8ac650865cd05808d48bad68b69bebbc95ab |
23-Mar-2017 |
Zhijun He <zhijunhe@google.com> |
ImageReader/Writer: add usage flag support
Also add an ImageWriter ctor to take additional arugment (format)
Test: ImageReader and Writer CTS tests
Bug: 32766711
Change-Id: I99e3862dd5b9a85c9df7879c14c84b68a35718ec
ndroid.mk
ndroid_media_ImageReader.cpp
ndroid_media_ImageWriter.cpp
|
| ed5b028693e60dd0e0eb081876a05683b7319ba1 |
05-Apr-2017 |
Ray Essick <essick@google.com> |
Move MediaMetrics into its own library
Changes for the new HAL structure have brought about a build time
circular dependency between libmedia and libmediadrm. This set of
changes the media metrics code into its own library and arranges
for the relevant consumers of the media metrics code to link
to this new library (where they had previously picked it up by
including libmedia).
Bug: 36990807
Test: build, boot.
ndroid.mk
|
| 845eef05ffea53f4ce7a1e0551896be874c4f302 |
04-Apr-2017 |
Mathias Agopian <mathias@google.com> |
Remove useless GraphicBuffer() constructor
Test: compiled & run
Bug: 36869708
Change-Id: Ie825979cd03874904b6f953ece4a05d4a0d52253
ndroid_media_ImageWriter.cpp
|
| dadee0c33e6cb659978ce4fa6aa21f7c384fc43c |
14-Mar-2017 |
Chong Zhang <chz@google.com> |
MediaCas: rethrow MediaCas specific exception
Translate ServiceSpecificException from aidl to CAS-specific
exceptions. Also, throw CAS specific exception for descramble().
bug: 22804304
Change-Id: I6d68c335c87fbb95fd8cc227e432eed4e5951550
ndroid_media_MediaDescrambler.cpp
ndroid_media_MediaDescrambler.h
|
| e30d5723e4f20bf078ea3326b4ca77db88a5de59 |
20-Mar-2017 |
Jerry Zhang <zhangjerry@google.com> |
Merge "Add support for MTP perceived device type property." am: b6ed343e85 am: 7644b885c7
am: 136f37b88f
Change-Id: I446cd52e5fd8cda48e9af46ee3faee5578cae286
|
| 5204ad0a2aa5903d9edf2e8814d0224afd1313cf |
16-Mar-2017 |
Ray Essick <essick@google.com> |
Merge "Integrate API Council feedback into Media Metrics APIs"
|
| f2d0e40bf01fa133dd6b36f3716005d53fa9776c |
09-Mar-2017 |
Ray Essick <essick@google.com> |
Integrate API Council feedback into Media Metrics APIs
Integrates the API Council's feedback into the Media Metrics
related APIs.
-- return types for the getMetrics() calls
-- definition of keys in the set of data that comes back
Bug: 35811992
Test: booted, CTS subset, checked dumpsys media.metrics output
Change-Id: Ib750f9631bd3453be3132760273ccfff0a891f88
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
|
| b8feaa5eaaddc6b70879a69a07925c5b8729c75f |
11-Mar-2017 |
Paul Mclean <pmclean@google.com> |
Merge "Switching Native MIDI API to an "opaque pointers" model."
|
| 71f672b98a0c31001ca28de86d9ac99fef0812b1 |
05-Mar-2017 |
Paul McLean <pmclean@google.com> |
Switching Native MIDI API to an "opaque pointers" model.
Test: manual
Change-Id: Ic181008427e6e81106d867cc3a70deef8c591841
idi/android_media_midi_MidiDevice.cpp
|
| 252f3b20bb158ddde6ffa687eff9c4d070919091 |
09-Mar-2017 |
Robert Shih <robertshih@google.com> |
JNI ImageReader: propagate exceptions when creating surface planes
Bug: 36082388
Test: Manual
Change-Id: I4a0ad08c9b3c53aa7ca702e1c6e2d486b788f3ff
ndroid_media_ImageReader.cpp
|
| d4f1e86190fbe6b280635902a3cd734d65eded52 |
06-Mar-2017 |
Andy Hung <hunga@google.com> |
VolumeShaper: Update Builder methods and Object overrides
Builder methods now throw IllegalArgumentExceptions on invalid
conditions.
Object hashCode, toString, equals updated for element-wise structural
equivalence.
Test: CTS VolumeShaperTest
Bug: 31015569
Change-Id: I02860a51da58d8207145a9b8a5d2cb13806774b4
ndroid_media_VolumeShaper.h
|
| 227bdecf0272c0327e8641f0c4e6bbbcf54a24b1 |
04-Mar-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "fallout of cleaning-up libutils includes"
|
| df7707cb4f34138b423dde493fccfa4e7fb50c20 |
01-Mar-2017 |
Mathias Agopian <mathias@google.com> |
fallout of cleaning-up libutils includes
Test: run & compile
Bug: n/a
Change-Id: I0f6a0be03f4b120b1b5876aae0c0618c025d9f2b
ndroid_media_ImageReader.cpp
|
| c276c59eb5d0f36a1133ad718e5e1244390f4688 |
01-Sep-2016 |
Mikhail Naganov <mnaganov@google.com> |
nativemidi: Prototype demonstrating native access to IMidiDeviceServer
Framework changes and a demo app
Comment and finalized Native MIDI API
Replaced fixed PortRegistry tables with std::map.
more error handling.
Removed not-very-useful MidiDeviceManager class.
Made Java API functions @hide.
Bug: 30252756
Test: Manual
Change-Id: Iae98e589f38ef6d625ff0842401193fe98c5d881
ndroid.mk
idi/android_media_midi_MidiDevice.cpp
|
| d5927ae8833780395f8fc5070d0a0a4f8f668292 |
03-Jan-2017 |
Chong Zhang <chz@google.com> |
MediaCas: add framework APIs
Java API changes to support MediaCas framework.
Also add partial-frame related enums to MediaCodec,
MediaCodecInfo, and MediaExtractor as a way to indicate
a input frame contains partial data.
Test: basic test app and test plugin to execise the code path;
impelenting playback of CAS-secured MPEG2TS streams, including
a Widevine-based CAS plugin, locally modified ExoPlayer and
Android TV Tuner input.
bug: 22804304
Change-Id: Ia4ba1d4046f7588e42bfb21e726390457d2fc8e3
ndroid.mk
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaDescrambler.cpp
ndroid_media_MediaDescrambler.h
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
ndroid_media_MediaPlayer.cpp
|
| 8020105fb2d020e0015fe35434b53c51b908881b |
17-Feb-2017 |
Ray Essick <essick@google.com> |
Merge "Metrics for android.media.MediaRecorder"
|
| 06b25fb2367d1962da5445d1c3c033c73a4b95eb |
07-Feb-2017 |
Hassan Shojania <shojania@google.com> |
Modular DRM for MediaPlayer
Bug: 34559906
Test: Manual through the test app
Change-Id: I1b1ca61e74f250d63ff5ff462905facb81fe44e0
ndroid_media_MediaPlayer.cpp
|
| b0bd62f96cd81f5209ea01e4f484f5b35a389cc0 |
13-Feb-2017 |
Ray Essick <essick@google.com> |
Metrics for android.media.MediaRecorder
Implementation of getMetrics() API and underlying metrics gathering
for android.media.MediaRecorder.
Bug: 35150984
Test: hacked CTS, observing of 'dumpsys media.metrics'
ndroid_media_MediaRecorder.cpp
|
| 035d4ec772b0cde2a8d4b05d2daa9b9cbe11e117 |
24-Jan-2017 |
Andy Hung <hunga@google.com> |
VolumeShaper: Initial implementation
The VolumeShaper is used to apply a volume
envelope to an AudioTrack or a MediaPlayer.
Test: CTS
Bug: 30920125
Bug: 31015569
Change-Id: If8b4bed29760aa3bd15a4b54cae60e40b4f518ee
ndroid_media_MediaPlayer.cpp
ndroid_media_VolumeShaper.h
|
| ba5ce2c0f8c8b7349225d7367a422cf505ff419e |
07-Feb-2017 |
Ray Essick <essick@google.com> |
API android.media.MediaExtractor.getMetrics()
adds the API getMetrics() to android.media.MediaExtractor
includes plumbing through JNI to the underlying mediaextractor
code in frameworks/av.
Tested with some CTS modifications; a more formal set of CTS
updates will be along later.
Bug: 35094936
Test: modified CTS to invoke new API and output results
Change-Id: Id8d56c9c3273b86bbd11e248bdf5004be90b91ef
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
|
| e9b8348027074996b08796816e0ce0998169a881 |
31-Jan-2017 |
Edwin Wong <edwinwong@google.com> |
Merge "Pass application packagename to drm plugin."
|
| 0b52e95c3fe5e8de93276678d7db9a17b217622e |
23-Jan-2017 |
Hassan Shojania <shojania@google.com> |
Modular DRM for MediaPlayer
Bug: 34559906
Test: Manual through the test app
Change-Id: If76e2898e6064c5661193872b907b1720838c678
ndroid_media_MediaPlayer.cpp
|
| 0e0fee1e3a04023c9ec122d3bd7da54e9565c3e7 |
26-Jan-2017 |
Ray Essick <essick@google.com> |
API access to mediametrics
provide SDK/API access to media metrics for user apps. This lets the
apps metrics data for their instances of player and codecs. Others
to come.
Bug: 34715803
Test: booted, invoked new APIs to verify desired results
Change-Id: Iaae6406aadef30adc893952961ac154a7c4c761d
ndroid.mk
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaMetricsJNI.cpp
ndroid_media_MediaMetricsJNI.h
ndroid_media_MediaPlayer.cpp
|
| 60d820b05069778db60c1f1af8d4704261961c67 |
26-Jan-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "media: Add new MediaMuxer constructor that takes FileDescriptor."
|
| 61c74c6a4b0e30a3bd618cdf8c7d7e85edf139d9 |
20-Jan-2017 |
Hangyu Kuang <hkuang@google.com> |
media: Add new MediaMuxer constructor that takes FileDescriptor.
Test: Run new mediamuxer CTS test.
Bug: 34221063
Change-Id: Iaad4f0254782dca3e5994e80af0848482847c618
ndroid_media_MediaMuxer.cpp
|
| 23dfee521a7782bf901344beec6f94614e0b02b8 |
16-Jan-2017 |
Wei Jia <wjia@google.com> |
mediaplayer: add buffering settings API
Test: compiles, ensured that params is passed all the way to source
Bug:32524218
Change-Id: I90d65e10012ecc1a78989eba80d025d513ceaadf
ndroid_media_BufferingParams.h
ndroid_media_MediaPlayer.cpp
|
| 13bb2f4ddadcfee8e82a0eea3cb76a2448bb2ccb |
15-Dec-2016 |
Jerry Zhang <zhangjerry@google.com> |
Add support for MTP perceived device type property.
Property value is based on the particular device.
This allows some hosts (windows) to apply a device
specific icon in file explorer.
Test: Connect device to windows, verify new icon
Bug: 25360563
Change-Id: I9d3468ca8c01a6f0d42ad543aef11ed265b6c825
ndroid_mtp_MtpDatabase.cpp
|
| e176ee1222931d67aaea0a3df96262728cc31031 |
04-Jan-2017 |
Hangyu Kuang <hkuang@google.com> |
media: Add new API to set next output file.
Only support recording to MP4 file now. When the recorded file is approcaching
file size limit, application will receive
MEDIA_RECORDER_INFO_MAX_FILESIZE_APPROACHING callback from mediarecorder.
Application could use setNextOutputFile to set the next output file before or
after receiving this callback. Upon reaching filesize limit, recorder will swap
the output file internally and notify application with
MEDIA_RECORDER_INFO_NEXT_OUTPUT_FILE_STARTED.
Test: Hack camera app to record more than filesize limit.
Bug: 28150626
Change-Id: I2daf8f798fe3631d6b7ef48ebea3a64ab4566f2d
ndroid_media_MediaRecorder.cpp
|
| 4d1d84e8a05a35673d76db0eb4f7954015a24d18 |
04-Jan-2017 |
Edwin Wong <edwinwong@google.com> |
Pass application packagename to drm plugin.
Get the application packagename to be used as part of a unique
identifier for drm plugin.
Test: Stream movies through Play Movies, Netflix and
Gts MediaCodecCencPlayer tests.
Verify the application's packagename is reachable in the drm plugin's
debug log.
bug: 27101531
Change-Id: I6473b58d78bc34191aca5896bb1f5fb79107ae47
ndroid_media_MediaDrm.cpp
ndroid_media_MediaDrm.h
|
| f271c6d266f37d600b65ada8e4e4a32d5044a49a |
22-Dec-2016 |
Alex Klyubin <klyubin@google.com> |
resolve merge conflicts of b53d984 to master
Change-Id: I3fe63a5c0193c720b8ec4ca53834096de8433f26
|
| abdc2b47b3b6736e202663dee93f37e53f4e3ebf |
21-Dec-2016 |
Alex Klyubin <klyubin@google.com> |
Make users of MtpServer fill in DeviceInfo field values
This is part of weaning apps off accessing system identifiers via
system properties API. Apps should use android.os.Build API instead.
Bug: 33700679
Test: Enable MTP mode then check that mtp-detect output same as before this commit
Change-Id: I4e6696cdee18b9c3e987c432c095911e85a997db
ndroid_mtp_MtpServer.cpp
|
| d9291d55f6aa39a63311d7b1b6585f7a73aafd68 |
13-Dec-2016 |
Jerry Zhang <zhangjerry@google.com> |
Merge "Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers." am: 1975240f17 am: 830874dbe7 am: 88672d7d29
am: 11dc0eccfb
Change-Id: Ibafebe4877052595cb34626bde9ac6fba1983fb0
|
| bb598ee16f4b61978c88358e8f96153395cdb7ad |
24-Oct-2016 |
Jerry Zhang <zhangjerry@google.com> |
Modify UsbDeviceManager stack to allow MtpServer to use FunctionFS drivers.
Functionfs requires MtpServer to write descriptors before the device can be
configured. This adds a new configure call that will occur only when
functions are changed (new argument added to updateUsbStateBroadcast for this)
and be called after sys.usb.config is changed but before the waitForState
call to ensure compatibility with configfs devices.
Bug: 30976142
Change-Id: I7e94a5847d3b19c0fd75139e1b15a3f2a1cea01d
Test: Manual
ndroid_mtp_MtpServer.cpp
|
| 400752a79009ceacc05f53a2bec3db1fa067b9e1 |
01-Dec-2016 |
Wei Jia <wjia@google.com> |
Merge "MediaPlayer: enable same seek modes as in MediaMetadataRetriever."
|
| ebc2b694d1b5dc6b8a2cd2825e11f914e542cc56 |
04-Nov-2016 |
Wei Jia <wjia@google.com> |
MediaPlayer: enable same seek modes as in MediaMetadataRetriever.
Test: manually check result of mediaplayer.seekTo
Bug: 32557491
Change-Id: Ib507fbfb86a24fcf9b42758e89e595a4a58d33b5
ndroid_media_MediaPlayer.cpp
|
| 7e5e1b0d726cb785b93108ed125710fbd33e5f97 |
22-Nov-2016 |
Marco Nelissen <marcone@google.com> |
No need to initialize the file sniffers anymore
Bug: 33166870
Change-Id: I9f944fcb7d63ca4eb31aec5e7e97e3e0e499cc39
ndroid_media_MediaExtractor.cpp
|
| 8e48c6939bd81dcbc596f0a4b11bfaea73aed00b |
19-Oct-2016 |
Jean-Michel Trivi <jmtrivi@google.com> |
Refactor SoundPool for appOps handling through PlayerBase
Modified the signature of the abstract volume methods so
it is clear at the subclass level whether the volume
command is for a mute or a volume control.
Changed the implementations in the subclasses
accordingly.
Removed appOps handling inside SoundPool and made it
inherit from PlayerBase.
Moved handling of the camera sound restriction from
SoundPool to PlayerBase.
Added support in SoundPool native implementation for
muting, as each player has its own volume.
Test: play a long file with SoundPool and enter DnD mode
Bug: 30955183
Bug: 28249605
Change-Id: I0fcd7480f9a455c06aa4f7092486f5c65bc9d7db
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/android_media_SoundPool.cpp
|
| 618c1a9ae6ba0ca0ec679ed062cf5856d1438276 |
11-Nov-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Make AmrInputStream use MediaCodec"
am: 866658261f
Change-Id: Id25833efb8baa54e729bdc823e5849819c53cd64
|
| 01d023e966f88052c634c8c70bfff2d1f7c1c18c |
13-Oct-2016 |
Marco Nelissen <marcone@google.com> |
Make AmrInputStream use MediaCodec
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
ndroid.mk
ndroid_media_AmrInputStream.cpp
ndroid_media_MediaPlayer.cpp
|
| 2a6aae0857d68da7d0e617f5f6b93b1d2399312c |
08-Nov-2016 |
Marco Nelissen <marcone@google.com> |
Drm APIs are in libmediadrm instead of libmedia
Test: build/boot
Change-Id: I4a6929d2d524d5f2f7ffa06f68a3c1041804e125
ndroid.mk
|
| 1d10b88f404929f63b1b30eed9d31a755db6cb21 |
07-Nov-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Use libaudioclient"
am: 0a05c49248
Change-Id: I134c9c5b95e446fcc18e2b35a3eca2a4a794e8c8
|
| 74abdda6a068b2a1e1afd809138a14b8bdbdbbe9 |
03-Nov-2016 |
Marco Nelissen <marcone@google.com> |
Use libaudioclient
Test: build/boot
Change-Id: I7c730bfd47297f311e00798b5927888ddc3f5062
udioeffect/Android.mk
oundpool/Android.mk
|
| 9a9e54cfb7435517890d99a90759cf281e0a9270 |
04-Nov-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Use libaudioclient"
|
| 946d11d2169a28c827a4719934405ebdf2ab0b66 |
04-Nov-2016 |
John Reck <jreck@google.com> |
Merge "Re-unite sources with their headers"
am: e43444a00b
Change-Id: I8f3ef6a1ddcf78d28f7444b6e83c552b8305fd8c
|
| 03b5d506bc2735e080863712d9d2e8ce6f7ecb43 |
04-Nov-2016 |
John Reck <jreck@google.com> |
Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.
Also fixes -Werror issues that resulted in
no longer being -isystem.
Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
Merged-In: Ic4312eb61b197af114dded5691d5ae1ec82923f7
(cherry picked from commit f6113af2d6f6eebee68d3ac510fe96d38a7a39e9)
ndroid.mk
|
| f6113af2d6f6eebee68d3ac510fe96d38a7a39e9 |
04-Nov-2016 |
John Reck <jreck@google.com> |
Re-unite sources with their headers
Move all the includes for androidfw under
a common base path for that library instead
of frameworks/base/includes.
Also fixes -Werror issues that resulted in
no longer being -isystem.
Test: builds
Change-Id: Ic4312eb61b197af114dded5691d5ae1ec82923f7
ndroid.mk
|
| 20edcbc89cc66283c892551433f74f00c1244a15 |
03-Nov-2016 |
Marco Nelissen <marcone@google.com> |
Use libaudioclient
Test: build/boot
Change-Id: I7c730bfd47297f311e00798b5927888ddc3f5062
udioeffect/Android.mk
oundpool/Android.mk
|
| b3a22bcb7685aa7ed19b3d4ccac98f7e76fa8076 |
26-Oct-2016 |
Marco Nelissen <marcone@google.com> |
Remove unneeded libraries from libmedia_jni
Test: built and booted
Change-Id: I9bd8dd0001688eabc0d58563b652eb11a69efba8
ndroid.mk
|
| c7555a087168f3099e5ff3c55b6c10dc7db17e75 |
18-Oct-2016 |
Mikhail Naganov <mnaganov@google.com> |
Merge "Split audio effects headers"
|
| b828b77985416c4d870771a02cd523397726c215 |
14-Sep-2016 |
Philip P. Moltmann <moltmann@google.com> |
Properly close USB device connection in Mtp device
Test: Built
Fixes: 32073045
Change-Id: I05179377532c1bd4dff1f4a4e0e837cb645317e3
ndroid_mtp_MtpDevice.cpp
|
| 49cc2c8483c7cd058c6b305fd512ee99064565e0 |
15-Oct-2016 |
Mikhail Naganov <mnaganov@google.com> |
Split audio effects headers
There can be different use cases with the code that imports
headers from audio_effects (each subsequent case is a more
specialized version of the previous one):
1. The code only needs access to general structures
like effect_descriptor_t:
==> include system/audio_effect.h
Example: AudioSystem in libmedia
2. The code that needs access to effect UUID and parameter
enums:
==> include system/audio_effects/effect_foo.h
Examples: media framework effects interfaces, libwilhelm
3. The code that needs to call into HAL:
==> include hardware/audio_effect.h
Examples: libaudiohal (implementation part) and libeffects
4. The code that implements a particular effect:
==> include audio_effects/effect_foo.h
Examples: cts/.../CTSTestEffect.cpp
stuff in hardware/, vendor/
Change-Id: I201dfa20ddc7aac797fd35934c0f06658f1e60be
Test: make
udioeffect/Android.mk
|
| e1a81fcc654713de56fda8d57d098c595ec88823 |
13-Oct-2016 |
Marco Nelissen <marcone@google.com> |
Make AmrInputStream use MediaCodec
Bug: 32114618
Test: ran CTS test
Change-Id: I9fe77689bf0bcd1bc8f6c5a4d62135271c7bef8b
ndroid.mk
ndroid_media_AmrInputStream.cpp
ndroid_media_MediaPlayer.cpp
|
| 5608a200cab45df5c8d8bbfd48d54ee6787a8a00 |
05-Oct-2016 |
Glenn Kasten <gkasten@google.com> |
Merge "Use AUDIO_IO_HANDLE_NONE instead of 0"
|
| a543ca6c05a52537814d9719ac55f44e3bc11e3c |
03-Oct-2016 |
Colin Cross <ccross@android.com> |
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935 am: 95311818f0
am: e9b5b70114
Change-Id: I80205377a19c45927a11fc14ab72c13a7479570b
|
| e9b5b7011442a20728c64704a6f35c2ddc3420c5 |
03-Oct-2016 |
Colin Cross <ccross@android.com> |
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584 am: 6d0b466935
am: 95311818f0
Change-Id: I45b57d37d08699afc070699d07485cb83c51850a
|
| 95311818f045335d7db1e89e123414c53a480a31 |
03-Oct-2016 |
Colin Cross <ccross@android.com> |
Merge "Fix struct vs. class mismatch in forward definitions" am: 8f1011d584
am: 6d0b466935
Change-Id: I9602684e0ac91f7c08dafe70309433bb233ceeaf
|
| 08f5f1f03a4607c67058cb764a0a85be11a3d33d |
01-Oct-2016 |
Colin Cross <ccross@android.com> |
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
ndroid_media_MediaCodec.h
|
| 4273dd03a83fd5f9ba25f3b7c3a4add7bce7206c |
27-Sep-2016 |
Wonsik Kim <wonsik@google.com> |
MediaCodec refactoring part 1-a: buffers become separate class
MediaCodecBuffer is meant to replace ABuffer and MediaBuffer in
communication between framework components. As the first step, replace
use of ABuffer in MediaCodec with MediaCodecBuffer, and adjust related
classes accordingly.
MediaCodec.getBuffer() and related APIs now returns MediaCodecBuffers;
thus change MediaCodec clients to use MediaCodecBuffer accordingly.
Test: manually tested for key use cases (Camera, YouTube and Play Movies)
Change-Id: Iba7ce131645e75ce5ddbf497fb793ab38b7f245b
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| de1fb0bbb86418a04e3d0176671023627ee97de9 |
16-Sep-2016 |
rago <rago@google.com> |
resolve merge conflicts of a80bdc3 to nyc-mr1-dev-plus-aosp
am: addb7af2c0
Change-Id: I1ec6f29ee51d575002a50b305c2ac4a87afc5c3e
|
| addb7af2c082e68f582035e6a71d3af922c31b7e |
16-Sep-2016 |
rago <rago@google.com> |
resolve merge conflicts of a80bdc3 to nyc-mr1-dev-plus-aosp
Change-Id: If5b6322e611cc1171f767d48001d9672bfd0024d
|
| 8dc9afa9666507930f30ec0d11e2dba7db2ae142 |
15-Sep-2016 |
rago <rago@google.com> |
Fix scope for visualizer object release
Bug: 30684284
Change-Id: I4170511c6c7f36aa1bce3e439054bc6b8a4a2623
udioeffect/android_media_Visualizer.cpp
|
| 0c712a9edee113ff6ad464bed529fbe170546411 |
14-Sep-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c am: d1dd5ae76b am: 68b9ebcd59
am: da6d274a7d
Change-Id: I87b449706cc87c9e9ca722f483d23d40729da7e1
|
| da6d274a7d551d57cf019953024462cad97bb475 |
10-Sep-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c am: d1dd5ae76b
am: 68b9ebcd59
Change-Id: I49a2d607d1d0adfe5a4297a83771336c4cd9c870
|
| 68b9ebcd592a969d827d8eb5c7d63f45c29391b6 |
10-Sep-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix google-explicit-constructor warnings in media utils." am: 5e91082b3c
am: d1dd5ae76b
Change-Id: I71778eb5a253ebf5342f863d34e178513d386783
|
| 5e91082b3c78c657047cd6ff53e60e2928b2c093 |
10-Sep-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix google-explicit-constructor warnings in media utils."
|
| 20651bc46751d635838a86969158e92818337c09 |
01-Sep-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76 am: c80db139b3
am: cb98cac6d3
Change-Id: Id22ce0c86caa79f2eabf4201f6a0267d13270a00
|
| cb98cac6d30f8f672baaf936e461d0f23df31f65 |
31-Aug-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c am: 17f1fc6c76
am: c80db139b3
Change-Id: I6a5f93e80d4ef18286fcb45987b6f9bbd7425f88
|
| c80db139b39ef4bf573846fd167c5fabd54bba23 |
31-Aug-2016 |
Chih-hung Hsieh <chh@google.com> |
Merge "Fix google-explicit-constructor warnings in soundpool." am: feee33ce2c
am: 17f1fc6c76
Change-Id: If968940949e97633e99832a3edc1d3003662dac2
|
| ae1aadc04f9cee280c3c328a533e2ceeb4b71d47 |
29-Aug-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix google-explicit-constructor warnings in soundpool.
* Add explicit keyword to conversion constructors.
Bug: 28341362
Test: build with WITH_TIDY=1
Change-Id: Id1183b2929242cdf1fd0a1558d0e70194a1de9bb
oundpool/SoundPool.h
oundpool/SoundPoolThread.h
|
| bd42349f7e97f172d5496ecaf2273994ced43b0d |
29-Aug-2016 |
Chih-Hung Hsieh <chh@google.com> |
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
ndroid_media_Utils.h
|
| 87e901cccac957a19edce9108f85177b85140fbc |
10-Mar-2016 |
Glenn Kasten <gkasten@google.com> |
Use AUDIO_IO_HANDLE_NONE instead of 0
since parameter type is audio_io_handle_t
Change-Id: Ic556df530148b8390d56b0fc2d2a2d71e12b3ca9
udioeffect/android_media_AudioEffect.cpp
|
| 0dd9e9cac829431981fb2740bf6e889559ed50f5 |
09-Aug-2016 |
Jin Park <jinpark@google.com> |
ExifInterface: Remove JNI code
This CL finalizes porting piex into ExifInterface by removing JNI
methods and class as well as methods handling data received from
JNI method calls.
Bug: 29409358
Change-Id: I8f6c761e50cb29476dc0784f58908ec35e3c70e9
ndroid.mk
ndroid_media_ExifInterface.cpp
ndroid_media_MediaPlayer.cpp
|
| 4158f4a3237b4293351f9c80e6ed933edd72a79b |
23-Jul-2016 |
Eino-Ville Talvala <etalvala@google.com> |
ImageReader: Add discardFreeBuffers method am: 2e2aaf6e04
am: bc20c106df
Change-Id: I215c711f13531821907cd442b2aca707f46bd87d
|
| bc20c106df3977e57bc55aaa7351d6b51d092d20 |
22-Jul-2016 |
Eino-Ville Talvala <etalvala@google.com> |
ImageReader: Add discardFreeBuffers method
am: 2e2aaf6e04
Change-Id: I142f1b011a045aa0f5af7c33eb76b059eb67e30d
|
| 2e2aaf6e0497302bc03c218949d29b01f469316e |
22-Jul-2016 |
Eino-Ville Talvala <etalvala@google.com> |
ImageReader: Add discardFreeBuffers method
This method (currently @hide) discards all cached buffers for
the ImageReader, which can be useful to free up memory at the
cost of reallocationt time if more buffers are needed later.
It has no effect on acquired Images, filled Images waiting to be
acquired, or buffers being actively used by the source rendering to the
Surface.
Bug: 28695173
Change-Id: I427a8ba4ad73a267083f843dbf228bfc53a730d9
ndroid_media_ImageReader.cpp
|
| f635d5b83ad2c108b7a802cec3dba76129c97dc3 |
21-Jul-2016 |
Jin Seok Park <jinpark@google.com> |
Merge "ExifInterface: Remove unnecessary logging of exceptions"
|
| 68bda838d02877b2d21f94a386a1cacfd5addb1b |
21-Jul-2016 |
Jin Park <jinpark@google.com> |
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
ndroid_media_ExifInterface.cpp
|
| 04167d34f5eb2b3a0cc50f4271cf18b33f5483d9 |
27-Jan-2016 |
Robert Shih <robertshih@google.com> |
android_media_MediaRecorder: NULL check after getMediaRecorder
Bug: 22416023
Change-Id: I47cc0c5750722735ab11cbc408f2d28c4d4bdd2f
ndroid_media_MediaRecorder.cpp
|
| 44d76c7a7287249db5512696fc5ca067751963b3 |
14-Jul-2016 |
Wei Jia <wjia@google.com> |
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-dev
am: 9604b3803c
Change-Id: Ibbb2272be91fb6c79795566cb9928bfb8adde002
|
| 509cbb6385f242a019920357a26411085ac74b9d |
08-Jul-2016 |
Wei Jia <wjia@google.com> |
MediaDataSource: add DrmInitialization for IDataSource.
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
(cherry picked from commit a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4)
ndroid_media_MediaDataSource.cpp
ndroid_media_MediaDataSource.h
|
| 0474f567ba1689e0c11df3917e332c1317afccda |
13-Jul-2016 |
Wei Jia <wjia@google.com> |
Merge \\"MediaDataSource: add DrmInitialization for IDataSource.\\" into nyc-mr1-dev am: e7982e05f6
am: 47efffff85
Change-Id: I49c99beced2fefd0dd9f1ce8e7365e60c0834a7e
|
| 47efffff85c3836db6832e74f8d495df0833dd81 |
13-Jul-2016 |
Wei Jia <wjia@google.com> |
Merge \"MediaDataSource: add DrmInitialization for IDataSource.\" into nyc-mr1-dev
am: e7982e05f6
Change-Id: I7376c0f985f1a625190481e134b24501e26ab7d2
|
| a03dc2b5eb94a906eeeda5bf0afbcfb60588abb4 |
08-Jul-2016 |
Wei Jia <wjia@google.com> |
MediaDataSource: add DrmInitialization for IDataSource.
Bug: 29342399
Bug: 28901867
Change-Id: Ib2049566582aa08783ff588dd25afef4e1c0b5e2
ndroid_media_MediaDataSource.cpp
ndroid_media_MediaDataSource.h
|
| 452e8fe55946aba95939d4f5a6e709936ea3df0d |
05-Jul-2016 |
Daichi Hirono <hirono@google.com> |
Add NonNull and Nullable annotations to MtpDevice.
BUG=26758882
Change-Id: I5fa7130b671c71aefca848c109bf37389f57b9da
ndroid_mtp_MtpDevice.cpp
|
| d09b020ce5c9d85beb6ec85457c9ba3b7e3bf42a |
16-Jun-2016 |
Yujie Qin <yujieqin@google.com> |
Merge \"Report error correctly for the implementation of StreamInterface::GetData()\" into nyc-dev
am: e09415344d
Change-Id: Id85ebdb2541c6145da39cf20684f85728f2ba0b6
|
| cad166686787a494b6689b8adb013e016adfcd90 |
16-Jun-2016 |
Yujie Qin <yujieqin@google.com> |
Report error correctly for the implementation of
StreamInterface::GetData()
Bug: 28889197
Change-Id: Id07755e1b3637f85b6176a59935ad3a5597cfb05
ndroid_media_Utils.cpp
|
| c8e1206ad57f5a359b1e4a193f50f143c9028439 |
07-Jun-2016 |
Eric Laurent <elaurent@google.com> |
Merge "Delete Visualizer before lpJniStorage" am: 03c209b2a3
am: 913e2f83b2
* commit '913e2f83b223486ac1461dab86758848f9ad08e1':
Delete Visualizer before lpJniStorage
Change-Id: I76aa735d8f0a100e0e106050c90966bd003235bc
|
| 7b9f5be9149dc84cd16842757ee6fe04f3092dc1 |
06-Jun-2016 |
ganxiaolin <ganxiaolin@xiaomi.com> |
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>
udioeffect/android_media_Visualizer.cpp
|
| 0b5608015b1175c52acbcb97ca8337cde7d66397 |
24-May-2016 |
Chih-Hung Hsieh <chh@google.com> |
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
|
| 0ca16ef3b8f42f74fdd3d32e7826f9df670bdf90 |
20-May-2016 |
Chih-Hung Hsieh <chh@google.com> |
Fix misc-macro-parentheses warnings in audio media jni.
Bug: 28705665
Change-Id: Iff476943a0a2c2ae68778d1f4bca5d3e9e04bd26
ndroid_media_MediaDrm.cpp
ndroid_media_ResampleInputStream.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| 613dc4cc1d902aa9f4ac5a0db375c6e9972ec256 |
17-May-2016 |
Wei Jia <wjia@google.com> |
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
|
| 838a4ed101ef46ecd707087bee68ed19f87c6cc8 |
17-May-2016 |
Wei Jia <wjia@google.com> |
android_media_MediaSync: Do not pass NULL to AString ctor.
Bug: 28643582
Change-Id: I75eaf61007adffdd7e3b07aebb37c12a8e71cf75
ndroid_media_MediaSync.cpp
|
| 2505b200a2bbedd2faeac1eaf82e44f54a984c9b |
11-May-2016 |
Sungsoo Lim <sungsoo@google.com> |
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
|
| 2584cda885964370f612a2b9251f7d6cf9ebf29a |
07-May-2016 |
Sungsoo Lim <sungsoo@google.com> |
ExifInterface: Set mPosition in AssetStream with proper values
Bug: 28649955
Change-Id: I25ab833f54e4ee853d3b89af513b4ecd7dc02df9
ndroid_media_Utils.cpp
|
| 4d1543fd80175e08cedb71acdb58eeeb4bd51416 |
27-Apr-2016 |
Jeff Tinker <jtinker@google.com> |
Merge "Remove MediaDrm stack from mediaserver" into nyc-dev
am: 892a6a3
* commit '892a6a343d3c53caef3388f83861af814c8ba20a':
Remove MediaDrm stack from mediaserver
Change-Id: I9f5194d388c2814d336a10f95755d3036b7d7464
|
| d12b7c0600a9568549f8571c43dcfa22cdbb03ac |
23-Apr-2016 |
Jeff Tinker <jtinker@google.com> |
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
ndroid.mk
ndroid_media_MediaCrypto.cpp
ndroid_media_MediaDrm.cpp
|
| 4ab0f745d5ac0b0fe213c484adeee949dabf60f7 |
22-Apr-2016 |
Daichi Hirono <hirono@google.com> |
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
|
| b9c64cd2c06933eda7ff1e691b80c53a74ff09d7 |
22-Apr-2016 |
Daichi Hirono <hirono@google.com> |
Merge "Handle API review comments from the council." into nyc-dev
|
| b3f8a968e27779a0f4cfe0864af4df6f8bdbefe0 |
20-Apr-2016 |
Insun Kang <insun@google.com> |
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
|
| 82c2ce1d16f9f2775791c13347a8f5c6759de2e2 |
19-Apr-2016 |
Insun Kang <insun@google.com> |
ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail
Bug: 26923978
Change-Id: I929802ae7ff878a80a43058d3c6fa922c706edf6
ndroid_mtp_MtpDatabase.cpp
|
| 399df701a16704b002475300a535683005d7af8b |
13-Apr-2016 |
Daichi Hirono <hirono@google.com> |
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
ndroid_mtp_MtpDevice.cpp
|
| 468a0796cbed366d9db01c0e86e9429b51645842 |
16-Apr-2016 |
Jaesung Chung <jaesung@google.com> |
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
|
| 0e7d22535d4b3d3b9e6f520c5837b2d52629529c |
06-Apr-2016 |
Jaesung Chung <jaesung@google.com> |
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
ndroid_media_ExifInterface.cpp
|
| 2129b9cc17a11782e7e438245610dd330b9c2874 |
15-Apr-2016 |
Jaesung Chung <jaesung@google.com> |
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
|
| 02f9e23525bd3ae97528041bc0eaf25d43d8fc53 |
15-Apr-2016 |
Jaesung Chung <jaesung@google.com> |
Merge "ExifInterface: return only a JPEG-compressed thumbnail of RAW images" into nyc-dev
|
| e7c8b947c923ee36edc016d45f3d6c23bdfa87b5 |
13-Apr-2016 |
Philip Cuadra <philipcuadra@google.com> |
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
|
| 742e89f67df160475a157af375c5ab72bba0c308 |
13-Apr-2016 |
Jaesung Chung <jaesung@google.com> |
ExifInterface: return only a JPEG-compressed thumbnail of RAW images
Bug: 26923978
Change-Id: I120723c9e28a24d6fb3b7034892e0196484ee5e4
ndroid_media_ExifInterface.cpp
ndroid_mtp_MtpDatabase.cpp
|
| 1f1f4bf91dd66fba527bf4d8765e484e08ddb971 |
11-Apr-2016 |
Philip Cuadra <philipcuadra@google.com> |
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
oundpool/SoundPoolThread.h
|
| d0198f27e8f9a58449ea78b5c9242c057e6ab169 |
07-Apr-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Expand mediaextractor dumpsys" into nyc-dev
am: aaacd00
* commit 'aaacd001fba22ef5ed9ca882749919034f1720c4':
Expand mediaextractor dumpsys
Change-Id: Ie70b95d73a0994285c55dca1729cd782331b35bd
|
| aaacd001fba22ef5ed9ca882749919034f1720c4 |
07-Apr-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Expand mediaextractor dumpsys" into nyc-dev
|
| 288d70f79b395029143b06a742829a695fa2da62 |
06-Apr-2016 |
Jaesung Chung <jaesung@google.com> |
Merge "Fix build" into nyc-dev
am: 5905bf7
* commit '5905bf738c175edfc63bf2e5ee28a43d83977e2d':
Fix build
Change-Id: Icabf911c0eb4a96e88032312fd6fb6785b043932
|
| fd3446e0aa62ff1af3cfd068ed5910575a5907b8 |
06-Apr-2016 |
Jaesung Chung <jaesung@google.com> |
Fix build
Change-Id: I38aa2f70fef3cb5b4a6fe42a3e4aa8e0a16e6fe0
ndroid_mtp_MtpDatabase.cpp
|
| 7a83ee9a320669c6346a6a634e79cab4dbb5e462 |
05-Apr-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Fix MTP_TYPE_UINT128 data conversion issue" am: ba23e45
am: 287dfa1
* commit '287dfa10cd6d5c6eb7cb39e20e1b6532c320927c':
Fix MTP_TYPE_UINT128 data conversion issue
Change-Id: I72aa6c2bcd009a2e0607832c44dc4b96c5da6b1f
|
| 9a99629eaa79a7e6c3bcc0ecf674bd7981fef5a0 |
30-Mar-2016 |
Andy Hung <hunga@google.com> |
Merge "Stop SoundPool decode if NdkMediaCodec returns null buffers" into nyc-dev
|
| 8937f1aa8b7ac50f60bf1f391382d4c4055c449d |
02-Mar-2016 |
Wanwu Peng <wanwu.peng@sonymobile.com> |
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
ndroid_mtp_MtpDatabase.cpp
|
| 0474773aab24594f4f4d395bf058d6f5b16db958 |
30-Mar-2016 |
Andy Hung <hunga@google.com> |
Stop SoundPool decode if NdkMediaCodec returns null buffers
Also increase error checking.
Bug: 27346228
Change-Id: Ib94505f852344298f88a3fdcbd65ca8031084188
oundpool/SoundPool.cpp
|
| 1337deb6eac47b9eeef0999a928caba0cfca7126 |
28-Mar-2016 |
Daichi Hirono <hirono@google.com> |
Update the comment of MtpDevice#getObjectSizeLong
BUG=27805369
Change-Id: I63762fedf540e89e9ca811a143cb178881ef1830
ndroid_mtp_MtpDevice.cpp
|
| 73c74698d094e57af60d55afc790a72a966ae263 |
07-Mar-2016 |
Marco Nelissen <marcone@google.com> |
Expand mediaextractor dumpsys
Bug: 22775369
Change-Id: I87452084bb5405280c48085fb909aa247055ea01
ndroid_media_MediaDataSource.cpp
ndroid_media_MediaDataSource.h
|
| 787821bce4a07f9b9434180210bf99e6bd2639c9 |
24-Mar-2016 |
Daichi Hirono <hirono@google.com> |
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
ndroid_mtp_MtpDevice.cpp
|
| 58ae278294017abca0dffc95f006ae646c88db89 |
17-Mar-2016 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_session_t consistently" into nyc-dev
|
| bd4acc2f9b64b2694d3dd3d77a5758c91b565f3c |
15-Mar-2016 |
Lajos Molnar <lajos@google.com> |
Merge "media: don't expose private keys in MediaFormat" into nyc-dev
|
| 7b7909025276dc9c78afb68c84a77f2ee5456b4d |
15-Mar-2016 |
Yin-Chia Yeh <yinchiayeh@google.com> |
Camera: fix expectation of BLOB buffer size
Bug: 27340302
Change-Id: I7f40065661d06bba210c3cb888598623fad0e56c
ndroid_media_Utils.cpp
|
| c04399feab8e51531975a4b404327511b094bbf6 |
10-Mar-2016 |
Lajos Molnar <lajos@google.com> |
media: don't expose private keys in MediaFormat
Bug: 25684127
Change-Id: Ie263d290037633291b791ca78ba7cf4d6b3de9c8
ndroid_media_Utils.cpp
|
| 33b840444f5a481dd31e129079d3c0cf3acdf80e |
08-Mar-2016 |
Glenn Kasten <gkasten@google.com> |
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
ndroid_media_MediaPlayer.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| 6e08d2b082acfc773907733f2ddab4e9b60616e1 |
25-Feb-2016 |
Jaesung Chung <jaesung@google.com> |
ExifInterface: add RAW input stream support
And also the following things are included:
- Remove mInputStream.
- Update javadoc accordingly.
Bug: 11224701
Change-Id: I30b4c29ac800ae396fca8f6b2c2c0f68028a44b3
ndroid_media_ExifInterface.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
|
| 0ab416269a866c8afa8f65d9351afa2407abee4c |
26-Feb-2016 |
Zhijun He <zhijunhe@google.com> |
ImageReader/Writer: refactor and cleanup
Below changes are included:
* Defer the buffer lock to Image#getPlanes call. This will save quite a bit
CPU cycles associated with lock buffer if the application doesn't really
want to access the data.
* Refactor the code: move some common code to some utility class, and use
one unified consumer (BufferItemConsumer) in ImageReader native implementation.
The code refactoring will also make it easier to support non-opaque image
attach/detach.
Bug: 22356918
Bug: 19962027
Change-Id: I4fb865b0ea3deb6650afc64c32a5906f30e8ccbd
ndroid_media_ImageReader.cpp
ndroid_media_ImageWriter.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
|
| b849eeab26a8635dbc3dc08127bfbbc7135fc47c |
07-Mar-2016 |
Jeff Tinker <jtinker@google.com> |
Merge "Add error code to MediaCodec.CryptoException" into nyc-dev
|
| d393216f8a2186eebdb8615c61787ae599c1432f |
05-Mar-2016 |
Jeff Tinker <jtinker@google.com> |
Add error code to MediaCodec.CryptoException
Added a code to represent unsupported operations
bug: 25929554
Change-Id: Id8bfa092f29de073db19c4d7444f89249ea2cdd5
ndroid_media_MediaCodec.cpp
|
| e883f6c299fb9d9444faf9313f06046c873ac4ce |
04-Mar-2016 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix uninitialized crypto pattern" into nyc-dev
|
| e872ac45f79ca2c0b538df891d983e3d5e037574 |
04-Mar-2016 |
Jeff Tinker <jtinker@google.com> |
Fix uninitialized crypto pattern
Apps built against an older API don't have the recently
added pattern field in MediaCodec.CryptoInfo which causes
the crypto pattern fields to be uninitialized. This change
ensures the pattern is initialized in all cases.
bug: 27477422
Change-Id: I5796bf5fbca93dba5bf9a2b74c1c6638b9e90f65
ndroid_media_MediaCodec.cpp
|
| 11c2eaab97e07953f9f7301c3200c79225d70975 |
03-Mar-2016 |
Lajos Molnar <lajos@google.com> |
Merge "media: correctly return cached size for MediaDataSource"
am: 6ca2cb4991
* commit '6ca2cb499112871fd840597184dc75ba26fdeae8':
media: correctly return cached size for MediaDataSource
|
| f78c984e05b70b473b9246beee989d3b4799d37f |
03-Mar-2016 |
Lajos Molnar <lajos@google.com> |
media: correctly return cached size for MediaDataSource
Bug: 27431229
Change-Id: I884e43960789c139b48964deba8f56b3bc3ba590
ndroid_media_MediaDataSource.cpp
|
| 7c7fef1585b7ec36d181b0f797f2713cb2dde291 |
03-Mar-2016 |
Lajos Molnar <lajos@google.com> |
media: correctly return cached size for MediaDataSource
Bug: 27431229
Change-Id: I884e43960789c139b48964deba8f56b3bc3ba590
ndroid_media_MediaDataSource.cpp
|
| 5d2d7788f1759b0f3d2c057af0b3ea61b0354fee |
18-Dec-2015 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Switch to auto-gen C++ binder interfaces
- Move camera AIDL files to frameworks/av
- Update makefiles to point to new AIDL locations
- Adjust camera2 implementation to match modifications to AIDL needed
for native AIDL auto-generation
- Move Surface.aidl to frameworks/native to allow use in
native AIDL. Use android::view::Surface in Surface JNI to
serialize Surface objects to ensure parceling compatibility.
- Adjust service binder tests to new interface
Bug: 25091611
Change-Id: I85b817374b34a4540fa145328dbe4bbf7f746baf
ndroid.mk
ndroid_media_MediaRecorder.cpp
|
| 300efaa0eac384ddf9d29d0f6e5390a8a1974353 |
01-Mar-2016 |
Daichi Hirono <hirono@google.com> |
Merge "Fix argument type in MtpDatabase#getObjectPropertyValue." into nyc-dev
|
| 486ad2e73c1c24c0585d414b18bd623c54ac1547 |
29-Feb-2016 |
Daichi Hirono <hirono@google.com> |
Fix argument type in MtpDatabase#getObjectPropertyValue.
In MTP code, we use jint for ID (e.g. object handle) and code (property
code). But getObjectPropertyValue takes jlong and it causes missing
property values in Java code. Previously we passed the long value to
Map<Integer, MtpPropertyGroup>#get(Integer) and the compiler somehow
accepted the code. However it actually takes Long at runtime, so the
properties are never found.
BUG=26437284
Change-Id: I79defd325ea5d20c4dce84d891d984e24abcacc5
ndroid_mtp_MtpDatabase.cpp
|
| 42d8b7d7abe4ecab049e020c3836dae97660dd4d |
29-Feb-2016 |
Yujie Qin <yujieqin@google.com> |
Merge "Use new API from PIEX" into nyc-dev
|
| 596e1d3b7a7080b44a293095d81a61175ac60c49 |
25-Feb-2016 |
Jaesung Chung <jaesung@google.com> |
Merge "Revert "Revert "ExifInterface: switch from using jhead to java implementation""" into nyc-dev
|
| 15ef59e081846b43660635391d536361c3253a22 |
25-Feb-2016 |
Jaesung Chung <jaesung@google.com> |
Revert "Revert "ExifInterface: switch from using jhead to java implementation""
This reverts commit 3c233ee291cfe1b765184920b6b7a69cb1bb82d9.
Bug: 27349581
Change-Id: Ib9f687e79ec36692fa7505ba3852099eb3e44573
ndroid.mk
ndroid_media_ExifInterface.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
|
| b21622d4773c64b9815818e71f8011ca17e79974 |
25-Feb-2016 |
Sungsoo Lim <sungsoo@google.com> |
Merge "Revert "ExifInterface: switch from using jhead to java implementation"" into nyc-dev
|
| 3c233ee291cfe1b765184920b6b7a69cb1bb82d9 |
25-Feb-2016 |
Sungsoo Lim <sungsoo@google.com> |
Revert "ExifInterface: switch from using jhead to java implementation"
This reverts commit bf24c9fcb3e66b25c90c0cd51f8bf4f401f6c3d6.
Change-Id: Id278e831a9c03f615208fd6eab51c65f7bb019eb
ndroid.mk
ndroid_media_ExifInterface.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
|
| 9ad5278e2babd4cc2764b0537febae8189f6306c |
25-Feb-2016 |
Jaesung Chung <jaesung@google.com> |
Merge "ExifInterface: switch from using jhead to java implementation" into nyc-dev
|
| bf24c9fcb3e66b25c90c0cd51f8bf4f401f6c3d6 |
17-Feb-2016 |
Jaesung Chung <jaesung@google.com> |
ExifInterface: switch from using jhead to java implementation
Bug: 26044456, Bug: 11224701
Change-Id: I881ef0ead24bcec76c0fa5a7dd0b74cc71c77285
ndroid.mk
ndroid_media_ExifInterface.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
|
| 38e8a7f89f1461c596a7eecce7355e750e8a9b07 |
24-Feb-2016 |
Zhijun He <zhijunhe@google.com> |
Merge "ImageReader: override the flexible YUV compatible formats"
am: 90804668a8
* commit '90804668a8a3fcbc661a6fba32737d1468194941':
ImageReader: override the flexible YUV compatible formats
|
| 01f6390ff4a8f3186ac7a6fb4c6f1485a5163bcf |
23-Feb-2016 |
Yujie Qin <yujieqin@google.com> |
Use new API from PIEX
Bug: 26894354
Change-Id: I7080c6ec4a45a746652ab226e63490a0baa1c359
ndroid_media_ExifInterface.cpp
|
| 3a171a764298f7667655231055d3d0f1905fdf73 |
18-Feb-2016 |
Zhijun He <zhijunhe@google.com> |
ImageReader: override the flexible YUV compatible formats
For gralloc HAL v0.1 devices, if the producer buffer format is NV21 or YV12,
the returned flexFormat will be NV21 or YV12, which causes CTS failure
for ImageReader decoder test. This change overrides the NV21 or YV12 image
formats to HAL_PIXEL_FORMAT_YCbCr_420_888 for such case. With this, the
ImageReader will work for the devices with older gralloc HAL implementations
for HAL_PIXEL_FORMAT_YCbCr_420_888 compatible formats.
Bug: 27136665
Change-Id: Ib4722f1f8dc20ad6561088755e4ab9d2e68f1b47
ndroid_media_ImageReader.cpp
|
| 9cc3f881df13583c93ca08668281413be6412414 |
18-Feb-2016 |
Zhijun He <zhijunhe@google.com> |
ImageReader: override the flexible YUV compatible formats
For gralloc HAL v0.1 devices, if the producer buffer format is NV21 or YV12,
the returned flexFormat will be NV21 or YV12, which causes CTS failure
for ImageReader decoder test. This change overrides the NV21 or YV12 image
formats to HAL_PIXEL_FORMAT_YCbCr_420_888 for such case. With this, the
ImageReader will work for the devices with older gralloc HAL implementations
for HAL_PIXEL_FORMAT_YCbCr_420_888 compatible formats.
Bug: 27136665
Change-Id: Ib4722f1f8dc20ad6561088755e4ab9d2e68f1b47
ndroid_media_ImageReader.cpp
|
| dc614f86a5a61d0b4287796dfa028c637f615d34 |
12-Feb-2016 |
Jeff Tinker <jtinker@google.com> |
Add mediadrm service
Part of media security hardening
This is an intermediate step toward moving
mediadrm to a new service separate from mediaserver.
This first step allows mediadrmservice to run based
on the system property media.mediadrmservice.enable
so it can be selectively enabled on devices that
support using native_handles for secure buffers.
bug: 22990512
Change-Id: I9af073d8383f25657938d07be90c21c0dc6126b7
ndroid_media_MediaCrypto.cpp
ndroid_media_MediaDrm.cpp
|
| f202143597b384686cd8ad8b6258541f96dfec96 |
28-Jan-2016 |
Wei Jia <wjia@google.com> |
Merge "MediaDataSource: add getFlags()"
|
| 8f7a8f1eba590f4a0bb21988fc2a876dcb72dccd |
28-Jan-2016 |
Anton Daubert <adaubert@google.com> |
Fix the initialize of PreviewImageData to its default values.
Bug: 26762780, 26837999
Change-Id: Ifc268beb84903576b8c82681fddf2f51ffc4a2ec
ndroid_media_Utils.cpp
|
| 376c5a8d34493a847a513e64cf3a654556f98017 |
28-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Merge "Implement MtpDevice#getPartialObject64 in Java API."
|
| c8718b57b7edcc31ffbd06025ae0e7aaa67a9d60 |
28-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Merge "Add varietions of MtpDevice's mehtods using long."
|
| e0e6654a31ad01fe4712dec0358ad95f8d3c8c8d |
15-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Add varietions of MtpDevice's mehtods using long.
BUG=26525304
Change-Id: I0a0b187910cf498720d8e7b8fbe9b0590e67e65e
ndroid_mtp_MtpDevice.cpp
|
| 038832b9001f66bd2cbebaf1312a7ada2e512114 |
22-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Implement MtpDevice#getPartialObject64 in Java API.
BUG=26703522
Change-Id: I08510e3a179b7dc8bf247a9e997dc8a160138fc2
ndroid_mtp_MtpDevice.cpp
|
| 9f774342aa60e50efff71e7456a755045add8aff |
28-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
Merge "Fix GpsTimeStamp format string"
|
| fbc164ba3c2105265b031503bdfebdbcd7256fbe |
27-Jan-2016 |
Wei Jia <wjia@google.com> |
MediaDataSource: add getFlags()
Bug: 26533748
Change-Id: I980b833da47b54d94ecc5fedbd75ce69e59925fb
ndroid_media_MediaDataSource.cpp
ndroid_media_MediaDataSource.h
|
| 04e18bb2fa6a0497589d01a6009854ab4eccd9b1 |
27-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
Fix GpsTimeStamp format string
Bug: 26816278
Change-Id: If3694ec44f5a5d6109c1895eac305d0a1a7e1ca2
ndroid_media_ExifInterface.cpp
|
| d4c505c9b4d5b0e743301e3f385895efdb9785d4 |
27-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
Fix build
Change-Id: I91e10406da341e226180b14dd2446cadbdab5684
ndroid_media_Utils.cpp
|
| 800133d4eb5c6bc4c88f236362e0cca4f7e2fc54 |
27-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
Merge "Enable reading a thumbnail from RAW image files in MtpDatabase"
|
| 8409c0691fb128fef6244305977342776bddf919 |
19-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
Enable reading a thumbnail from RAW image files in MtpDatabase
Also introduce new supported RAW image file formats, PEF and SRW.
RAW image file formats are not defined in PTP 1.2 specification except
for DNG. They are mostly built on top of TIFF or TIFF/EP. (Fuji's RAF
is the exception).
In this CL, image file formats are classified newly as below:
DNG: dng
TIFF: cr2, nrw, arw, rw2, orf, pef, srw
TIFF/EP: nef
Unknown Image Formats(FORMAT_DEFINED): wbmap, webp, raf
I referred to the following documents for defining MTP formats of RAW
images:
* http://www.rags-int-inc.com/PhotoTechStuff/RawStandards/RawSummary.html
* https://en.wikipedia.org/wiki/Raw_image_format
Bug: 26552863, Bug: 26626825
Change-Id: Ia218f6320c4c1ff051a23ca0060ceac46134b0d7
ndroid_media_ExifInterface.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
ndroid_mtp_MtpDatabase.cpp
|
| e76958297a52de290e8d985a8a5d56c12ba8c779 |
25-Jan-2016 |
Yin-Chia Yeh <yinchiayeh@google.com> |
Merge "ImageReader: fix missing pixel stride"
|
| 148954a657941ea95ef17da5b3ce40b9145f8755 |
21-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Add eventsSupported property to MtpDeviceInfo.
The property provides the set of event code that are supported by
MtpDevice.
BUG=26147375
Change-Id: I54be75e4bb52ddfe9aba8630538ddd32d1a641c8
ndroid_mtp_MtpDevice.cpp
|
| b99a7f13591faf9ce4c50375853b7ab2fce468a7 |
23-Jan-2016 |
Yin-Chia Yeh <yinchiayeh@google.com> |
ImageReader: fix missing pixel stride
Change-Id: Ie34cb51fee90e2d5624663fa23da4093fec435e2
ndroid_media_ImageReader.cpp
|
| 1c78b60a4969ae46fde459e9b2848c641ba7aa64 |
19-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
Merge "ExifInterface: add support for reading metadata from RAW images"
|
| fe968dfc12fd4e0ef633ca88dfc403678bf4d16a |
15-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
ExifInterface: add support for reading metadata from RAW images
This CL depends on piex (github.com/google/piex),
which is owned by Google Photos's RAW team.
piex is capable of reading EXIF data that contains
metadata, and finding the positions in an image of
thumbnail and preview images from RAW images.
piex supports DNG, CR2, NEF, NRW, ARW, RW2, ORF
and RAF image file formats.
ExifInterface gets thumbnail and metadata information
from the above RAW image formats via piex.
Bug: 26177215
Change-Id: I529f8032bcb2a9d3d9e857ff1365a26a4f040066
ndroid.mk
ndroid_media_ExifInterface.cpp
ndroid_media_MediaPlayer.cpp
|
| cc1251b9b23daa6e03000a9857c9e1a58c7e9e76 |
14-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Merge "Change offset and size arguments of MtpDevice#getPartialObject to Java long."
|
| 2dd48256e9657b013dd6fa0ca86d1d7c7c730428 |
12-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Change offset and size arguments of MtpDevice#getPartialObject to Java
long.
To represents full range of 32-bit unsigned integer, we should use
jlong instead of jint.
BUG=26284424
Change-Id: Id3fa9e3daa778c204ab8e38f821d454c709c317a
ndroid_mtp_MtpDevice.cpp
|
| c8c0de38d17c9e884566a361505fbb18efa4ee52 |
12-Jan-2016 |
Jeff Tinker <jtinker@google.com> |
Merge "Support AES-CBC sample encryption in MediaDrm"
|
| 2a9a43369b4717bcf6b372f6798f72e80e938e30 |
11-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Reland "Add event parameters to MtpEvent."
The CL was previously reviewed at ag/842930.
> We can obtain detailed information of MtpEvent from devices. e.g. object
> handle of changed object. The CL adds the detailed information as
> properties of MtpEvent class.
>
> BUG=26480986
Change-Id: I93afad9caf118d74cd0923d70242133c4fb2a648
ndroid_mtp_MtpDevice.cpp
|
| d4ea5d3eb630476a43da2adb4ac518360bd64758 |
18-Dec-2015 |
Jeff Tinker <jtinker@google.com> |
Support AES-CBC sample encryption in MediaDrm
bug:23719082
Change-Id: I06eb39bd8ad9b55ea0da4011258cac62a8c21ae1
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 1d4779c29a95114c89ec353a8899c0cc8eee3ba5 |
06-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Add operationsSupported to device info.
Because not all MTP devices support getPartialObject, we need to check
supported operation of MTP devices. The CL adds operationsSupported
field to MtpDeviceInfo class.
BUG=26147375
Change-Id: Iaad968fb4497a5ad11bf6489097abea99c3cbac7
ndroid_mtp_MtpDevice.cpp
|
| d713c9d65ac19b659b7fcb6b72f0d2c5d311559a |
07-Jan-2016 |
Glenn Kasten <gkasten@google.com> |
Merge "Use FCC_2 and FCC_8 to highlight channel count assumptions"
|
| 9c180dd38701a10041537389057b4c0f784907f8 |
07-Jan-2016 |
Andreas Gampe <agampe@google.com> |
Media: Fix MtpDevice call
The signature was changed last minute. Update the media side.
Bug: 26284424
Change-Id: Ia8fb665221f60d3eadd2c32831a12aa21c6c5e9c
ndroid_mtp_MtpDevice.cpp
|
| 3ad1a8ee94969bb2c4fae56579fe953cbdeeee7e |
07-Jan-2016 |
Daichi Hirono <hirono@google.com> |
Add missing style change to android_mtp_MtpDevice.cpp.
BUG=26284424
Change-Id: I0e288712a8fccfb3dd21fa927388bacf5ce155d0
ndroid_mtp_MtpDevice.cpp
|
| 52da3ad906afbfc5bc57328985543ebc5f7cdb44 |
24-Dec-2015 |
Daichi Hirono <hirono@google.com> |
Add getPartialObject to Java MtpDevice class.
BUG=26284424
Change-Id: Id05dc6297a1682999eee4e72972fb883fa49a5d1
ndroid_mtp_MtpDevice.cpp
|
| bd2c3d65d6b62b5a359268246e7ebe96904bd851 |
14-Dec-2015 |
Glenn Kasten <gkasten@google.com> |
Use FCC_2 and FCC_8 to highlight channel count assumptions
Bug: 21656069
Change-Id: I20a74575eddf6e28f1777d04eeab396f28bcc0cc
oundpool/SoundPool.cpp
|
| 44581ff4db54bbaa30365ed210e67a0369576100 |
08-Dec-2015 |
Yin-Chia Yeh <yinchiayeh@google.com> |
Camera: add RAW_PRIVATE format
Also add necessary plumbing for RAW_PRIVATE to work for ImageReader.
Bug: 25596619
Change-Id: Ic90f3f44264ac46fae1fafbc27ac64b5319f0970
ndroid_media_ImageReader.cpp
|
| 67b39bfa08954d4b3ad15a3af9ec4e64bd925cd8 |
09-Dec-2015 |
Jeff Tinker <jtinker@google.com> |
Merge "Remove unused MediaDrm.unprovisionDevice"
|
| dade24c12a5972d92dd16267acf6c11229276e2c |
09-Dec-2015 |
Jeff Tinker <jtinker@google.com> |
Remove unused MediaDrm.unprovisionDevice
bug:25726218
Change-Id: Ibbd51aaa1ee4c21c9ec8b162fc6e378ab7ba6e7b
ndroid_media_MediaDrm.cpp
|
| dc6bb24a3c2c830c909523e8d7d999fb556fb77d |
04-Dec-2015 |
Zhijun He <zhijunhe@google.com> |
media: improve ImageReader/Writer native memory management
* Hook up the native allocation registration with ImageWriter, such that GC
can get some hint when clean up the large memory object.
* Close all pending images when closing ImageReader. This could avoid native
mem leaks for some bad app practice. For example, some apps may hold images
in background service when activity is paused/destroyed, which could cause
huge native memory leaks even ImageReader is closed.
* make Image close thread safe: it is possible the clients close the image
in listener thread and the client main thread.
* Some minor code refactor to reduce the code duplication.
Bug: 25088440
Change-Id: I37d22b52aeb8d2521bf9c702b0f54c05905473e0
ndroid_media_ImageReader.cpp
ndroid_media_ImageWriter.cpp
|
| b0545b6b1ef4550b03c3de8cde1e72f9b31ee6cb |
03-Dec-2015 |
Andy Hung <hunga@google.com> |
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread am: 0a887bcd5c am: 7c798c13a7 am: 94cefd6adb am: a30685ef8d
am: ae4b789619
* commit 'ae4b7896195727dfd8d00b90f25074206bf21775':
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
|
| 0a887bcd5c5a8056735d221ad71afcff1f6eb1a6 |
01-Dec-2015 |
Andy Hung <hunga@google.com> |
DO NOT MERGE SoundPool: add lock for findSample access from SoundPoolThread
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.
Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
(cherry picked from commit 0275a982abecee683f16c827d405eafe51fb67ae)
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| 0275a982abecee683f16c827d405eafe51fb67ae |
01-Dec-2015 |
Andy Hung <hunga@google.com> |
SoundPool: add lock for findSample access from SoundPoolThread
Sample decoding still occurs in SoundPoolThread
without holding the SoundPool lock.
Bug: 25781119
Change-Id: I11fde005aa9cf5438e0390a0d2dfe0ec1dd282e8
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| 3ccb34d7070d73ba6c7842801b070b41de32b842 |
10-Nov-2015 |
Jeff Tinker <jtinker@google.com> |
Improve MediaCodec.CryptoException log messages
The message being logged is "Unknown error" even for
known error types. This change provides more descriptive
error strings, for the case when the message isn't
explicitly provided by the DRM plugin.
Change-Id: Ic86478d7685cd33e21ecd2f875ef7dbed351e52e
related-to-bug: 25477595
ndroid_media_MediaCodec.cpp
|
| 83995063178674f1cd18f32d1e7c37046680d8bd |
31-Aug-2015 |
Wonsik Kim <wonsik@google.com> |
Implement pause/resume functionality to MediaRecorder
Bug: 20092236
Change-Id: I02b9f11e210d15f6efe52d44f64ad8a3bc566d96
ndroid_media_MediaRecorder.cpp
|
| aeaa12c34e0b47df7f3079516177e791b5f2a0d7 |
28-Sep-2015 |
Daichi Hirono <hirono@google.com> |
Merge "Add readEvent method to MtpDevice."
|
| 0b494663a4cb177fc6f05988c9bda2ef6277333d |
10-Sep-2015 |
Daichi Hirono <hirono@google.com> |
Add readEvent method to MtpDevice.
BUG=23368533
Change-Id: Ibefff559fa7dd0bee17e2812bd7cdd129108d804
ndroid_mtp_MtpDevice.cpp
|
| 434a481b2191562582c79be29f24c2e0b5ca60d0 |
24-Sep-2015 |
Elliott Hughes <enh@google.com> |
am ea1831d2: am b57dd722: resolved conflicts for a884d81e to stage-aosp-master
* commit 'ea1831d211ea0e6b2d161c714bb0786369ef2df5':
constify JNINativeMethod function pointer tables
|
| b57dd722f1dc0663417da37d3a82f8283ad3c982 |
24-Sep-2015 |
Elliott Hughes <enh@google.com> |
resolved conflicts for a884d81e to stage-aosp-master
Change-Id: Ice485967fa96f13786024b6939b826638e906ff0
|
| 76f6a86de25e1bf74717e047e55fd44b089673f3 |
19-Sep-2015 |
Daniel Micay <danielmicay@gmail.com> |
constify JNINativeMethod function pointer tables
Change-Id: I4036c924958221cbc644724f8eb01c5de3cd7954
ndroid_media_AmrInputStream.cpp
ndroid_media_ImageReader.cpp
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodecList.cpp
ndroid_media_MediaCrypto.cpp
ndroid_media_MediaDrm.cpp
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaHTTPConnection.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaMuxer.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaProfiles.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
ndroid_media_ResampleInputStream.cpp
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
ndroid_mtp_MtpServer.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| 2f01c806e06632f8b9db8ea127d704e13811cb8e |
15-Sep-2015 |
Marco Nelissen <marcone@google.com> |
Stop SoundPool on error instead of continuing
otherwise we might end up looping forever.
Change-Id: I86e33de5387e3acd148d9bba83d18224bb79fd95
oundpool/SoundPool.cpp
|
| 56abfa5ce678c8022a8777db706ac092e45c88c3 |
08-Sep-2015 |
Aaron Vaage <vaage@google.com> |
Merge "Resolving createByteBufferFromABuffer null input"
|
| e5b641e6effda54945577e9348df86213b38baeb |
04-Sep-2015 |
Aaron Vaage <vaage@google.com> |
Resolving createByteBufferFromABuffer null input
It was found that createByteBufferFromABuffer was recieving a NULL buffer in bug
22726278. Based on returning NULL when buffer->base() == NULL, returning NULL
when buffer == NULL. This does not fix bug 22726278 - but address a problem found
while looking into it.
Bug: 22726278
Change-Id: I933b6a4a535d803576a4cdd7a1ffaf4a428c3201
ndroid_media_MediaCodec.cpp
|
| b80a3cfd05fc7492dd59b7f8d4337eb5e29088c2 |
24-Aug-2015 |
Tomasz Mikolajewski <mtomasz@google.com> |
Add support for uploading files via MTP.
Change-Id: Id1811ab70cb28be471e0a99999e9ad5380deac49
ndroid_mtp_MtpDevice.cpp
|
| 87763e6a91a54e7995cfda9b7e80162f02ac4cbc |
10-Aug-2015 |
Tomasz Mikolajewski <mtomasz@google.com> |
Wire uploading to MtpDocumentsProvider.
This patch does not yet allow to upload files, but uploading (creating)
directories already works.
Bug: 22545670
Change-Id: If4d5a53aa26f791475bb1a783e0ac9540d6760c1
ndroid_mtp_MtpDevice.cpp
|
| b04990599a1a05cc922b0fe9dd98128440efb56a |
06-Aug-2015 |
Tomasz Mikolajewski <mtomasz@google.com> |
Add API for uploading files to MTP devices.
Bug: 22545670
Change-Id: I038c54db06b7cf780bd027d76693e98c685d57a7
ndroid_mtp_MtpDevice.cpp
|
| 74d4ff8ab389a64cc16ef84dfbbfe6b2b2f34aea |
04-Aug-2015 |
Tomasz Mikolajewski <mtomasz@google.com> |
Add API for streamed reading on MTP devices.
The existing APIs required to copy all bytes to memory, which will fail in
case of very large files, like movies.
Bug: 22908937
Change-Id: I23bdcbdbf08b7c1b1017591799bbb94e53249a57
ndroid_mtp_MtpDevice.cpp
|
| d08debcf42d820fa8ef9916077a7bfc0a36f2db5 |
02-Jul-2015 |
Lajos Molnar <lajos@google.com> |
MediaSync: fix flush handling and deadlock
- clear pending video frames
- flush audio track
- reset clock
- restart audio track after flush
- don't hold lock during callback
Bug: 22234976
Change-Id: I681df950b67d7f9f77a9c5783279f1c8c91be856
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
|
| 69421363c6a81a788b963d2f4cb5fdeaa8bd4200 |
08-Jul-2015 |
Chien-Yu Chen <cychen@google.com> |
Merge "ImageWriter: Exception when Surface is abandoned" into mnc-dev
|
| e0ee63046ad062040aafc977585fb461a2acf666 |
07-Jul-2015 |
Chien-Yu Chen <cychen@google.com> |
ImageWriter: Exception when Surface is abandoned
Throw IllegalStateException when queueing or dequeueing an
image if the input surface is already abandoned by the consumer.
Also fix a crash when planes are not initialized when closing
ImageWriter.
Bug: 22279111
Change-Id: I8301920d64a53c45b29e947e52ff323733abbf16
ndroid_media_ImageWriter.cpp
|
| 96a2a957e42e04be817b60bb27199f3846f00fc9 |
02-Jul-2015 |
Jeff Tinker <jtinker@google.com> |
Report specific exception type on decrypt with invalid session
bug: 22235465
Change-Id: Ic1e1a86529d4f2246b9768799aacde5cd1070d04
ndroid_media_MediaCodec.cpp
|
| be2e38e01c5c23d1ac240313ecb8f71251c448c3 |
19-Jun-2015 |
Chien-Yu Chen <cychen@google.com> |
Merge "ImageReader: Fix format workarounds for legacy devices" into mnc-dev
|
| 1f98e79abd97e295d1e1f309102691c7e1c422c5 |
19-Jun-2015 |
Eric Laurent <elaurent@google.com> |
Merge "audio effect JNI: fix global ref leak." into mnc-dev
|
| 077999844f306d31d3ea9593b7e7b2f06e7f7483 |
19-Jun-2015 |
Eric Laurent <elaurent@google.com> |
audio effect JNI: fix global ref leak.
Remove one more global ref leak in AudioEffect
and Visualizer JNI.
Bug: 21629892.
Change-Id: Id77fc2d10f3dc9d3154d6a1cf0f8cc0f83683584
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| 969a06475c18a34fcd1cf181c290d3ef3d0673f7 |
19-Jun-2015 |
Jeff Tinker <jtinker@google.com> |
Merge "Improve robustness of MediaDrm after mediaserver crash" into mnc-dev
|
| aca98de43368a68d1d47c205d8ec8395d4b81376 |
18-Jun-2015 |
Chien-Yu Chen <cychen@google.com> |
Merge "ImageWriter: Remove exception for closing twice" into mnc-dev
|
| 0375cb042d54a6d7c93795b4d117b138f02bd1e0 |
18-Jun-2015 |
Chien-Yu Chen <cychen@google.com> |
ImageWriter: Remove exception for closing twice
because close() will be called again when GC kicks in.
Bug: 20945169
Change-Id: If3c5a13be241977ccf4692d5301c423b7ff38918
ndroid_media_ImageWriter.cpp
|
| 0782aab077b32613c6715190135008dbf3dc5d6d |
12-Jun-2015 |
Chien-Yu Chen <cychen@google.com> |
ImageReader: Fix format workarounds for legacy devices
Legacy shim overrides HAL_PIXEL_FORMAT_BLOB to
HAL_PIXEL_FORMAT_RGBA_8888. Make ImageReader aware of the
workaround when returning the format.
Remove the workaround in legacy shim that overrides YUV_420_888
to YV12 because allocating YUV_420_888 buffers with SW access
is supported on Flo.
Bug: 21707937
Change-Id: I84a8610c82ae986a0064873f611e4f257baf1774
ndroid_media_ImageReader.cpp
|
| 314b7f3af3b253593f45778ba67a519e74829aa4 |
16-Jun-2015 |
Jeff Tinker <jtinker@google.com> |
Improve robustness of MediaDrm after mediaserver crash
If DEAD_OBJECT is returned from binder calls due to
mediaserver crash, throw new MediaDrmResetException.
This allows the app to detect the condition and handle
it properly.
bug: 20614102
Change-Id: Id08b08fb612672fd94383f0470f5fa3f267b944f
ndroid_media_MediaDrm.cpp
|
| cd17a84a860769049806c8a7fe80d274edcd950d |
11-Jun-2015 |
Eino-Ville Talvala <etalvala@google.com> |
Merge "Add more specific consumer names for common buffer queue endpoints." into mnc-dev
|
| fb48b0142467b9edac7dd9cc4322234aafc754b3 |
11-Jun-2015 |
Dan Albert <danalbert@google.com> |
Merge "Fix format string mismatch. Clang build fix." into mnc-dev
|
| 1102e21b5dd0f79072e826932d0a3e3cb2f8c285 |
10-Jun-2015 |
Dan Albert <danalbert@google.com> |
Fix format string mismatch. Clang build fix.
The gralloc usage flags are an enum, which is backed by an
implementation defined type. Both gcc and clang are making this a long
long. All the values are hard coded to fit within 8 hex characters
though, so just make the cast.
Change-Id: I4a9778a24c2cbf7fb663371d208e30c4921e170d
ndroid_media_ImageWriter.cpp
|
| 5c768f4c8584d93fae3f5e87c8fdcc88ecfba002 |
10-Jun-2015 |
Jean-Michel Trivi <jmtrivi@google.com> |
SoundPool monitors AppOps for OP_PLAY_AUDIO
Fix performance regression in SoundPool by not checking SoundPool
can play audio everytime it's about to play.
Instead check for permission in constructor and register a listener
for changes on OP_PLAY_AUDIO.
Bug 20018833
Change-Id: I4e7a633d23b98653a149681d18a387cd560efe4d
oundpool/android_media_SoundPool.cpp
|
| 53858ced4cfe4717d90b298e7fb4ffa18effcfcf |
10-Jun-2015 |
Lajos Molnar <lajos@google.com> |
Merge "media: hook up OnFrameRenderedListener events to framework events" into mnc-dev
|
| ef9db7d81b0ce1093944b9e3d5efb6ab756f5cbc |
09-Jun-2015 |
Eino-Ville Talvala <etalvala@google.com> |
Add more specific consumer names for common buffer queue endpoints.
Change-Id: I744bdcba6e60e5efd8865f725b09a9f791d76160
ndroid_media_ImageReader.cpp
|
| 76f81331886c0972e5f7432e4edd8c36ef1048e6 |
05-Jun-2015 |
Eric Laurent <elaurent@google.com> |
Use only strong references to AudioEffect
Modify AudioEffect and Visualizer JNI to use strong references to
native AudioEffect object.
Bug: 21629892.
Change-Id: I4c2dea0b2e16d807d6dc5d6b09e02e4652d48873
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| d8578577b02cf6360402eb8726e964d18b46434d |
06-Jun-2015 |
Lajos Molnar <lajos@google.com> |
media: hook up OnFrameRenderedListener events to framework events
Bug: 20503131
Change-Id: Ife6d4862d14daf5b9659307af57417bd3532e8fe
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 4575acf1e72827dd6fd6cb645abfb3ba9043fa47 |
03-Jun-2015 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix bug in MediaCrypto.setMediaDrmSession" into mnc-dev
|
| eb8a51f359e4e1f4187eb14fa5e584979d26768b |
01-Jun-2015 |
Robert Shih <robertshih@google.com> |
Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev
|
| 025af8b0de1c4697a54f6b7363e27111a00eb284 |
01-Jun-2015 |
Jeff Tinker <jtinker@google.com> |
Fix bug in MediaCrypto.setMediaDrmSession
MediaCryptoException was being thrown unexpectedly
bug: 21565802
Change-Id: I44768cac1e85a01c8d775b8432d11711ae978b0d
ndroid_media_MediaCrypto.cpp
|
| 07830aa6ba4804880df3cb39f8932aa6b3906a8a |
28-May-2015 |
Robert Shih <robertshih@google.com> |
MediaPlayer: trigger onError instead of exception on stale native notifications
This change also reverted commit 2c838fbd87ad5685c0008b419ea02421159b9b70,
"MediaPlayer: add mPreparing to weed out unwanted prepared messages".
Bug: 21266735
Change-Id: I392342519420bee2fde1fe1915c51d24101ca27d
ndroid_media_MediaPlayer.cpp
|
| 626f0dc73bc1007d16688eddf29ea58ec26f424e |
29-May-2015 |
Glenn Kasten <gkasten@google.com> |
Merge "Deprecations are warnings not errors" into mnc-dev
|
| 85d99546a0dd6e38c2d60903c3b3e73577e1207c |
18-May-2015 |
Glenn Kasten <gkasten@google.com> |
Deprecations are warnings not errors
Change-Id: Ib77f45fdc27ea53f1dd181f48c76810d03f8dcdb
ndroid.mk
oundpool/Android.mk
|
| 16144ac3789f6dbe36a7011cf23305f072a7bfcb |
28-May-2015 |
Glenn Kasten <gkasten@google.com> |
Merge "Add comments to indicate code review was done for bugs" into mnc-dev
|
| 410239b6bf0318d1fc8fa32da1fdedb4173e648f |
22-May-2015 |
Robert Shih <robertshih@google.com> |
MediaPlayer: add mPreparing to weed out unwanted prepared messages
Bug: 21266735
Change-Id: Ie4fe76533c9b7f505c57ba63df7992f2490942cc
ndroid_media_MediaPlayer.cpp
|
| 14d226a2cd7b39e17a3f0bfdab79e645f7146f53 |
18-May-2015 |
Glenn Kasten <gkasten@google.com> |
Add comments to indicate code review was done for bugs
Bug: 20818955
Bug: 20890069
Change-Id: I243205b99b198eb1b5a1a027b27cbb7d5aaaa8db
oundpool/SoundPool.cpp
|
| 921ded795f80e60fa5ba8430fc167e982f0725e2 |
16-May-2015 |
Andy Hung <hunga@google.com> |
Merge "Fix SoundPool.unload() return value" into mnc-dev
|
| a6238ef3891bbbdb1c42d3e7954c4cd55527cef6 |
16-May-2015 |
Andy Hung <hunga@google.com> |
Fix SoundPool.unload() return value
Bug: 21209627
Change-Id: Ifd5c5f349894744c192cad10c5c875882566ec53
oundpool/SoundPool.cpp
|
| 7020a1377a65fb7f61a5bd36c254f99f0827932b |
16-May-2015 |
Jeff Tinker <jtinker@google.com> |
Merge "MediaDrm API Updates per api council review" into mnc-dev
|
| 5ffbae64920bf38e16c5831996f00c3d28ae1186 |
14-May-2015 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API Updates per api council review
bug: 21044671
Change-Id: Ifb34e7b8cb53f7bd5737c0869fc6c1f731ba1c9c
ndroid_media_MediaDrm.cpp
|
| 758e6a8f70b28e1584588b06b12d227deeefba74 |
14-May-2015 |
Zhijun He <zhijunhe@google.com> |
Merge "ImageReader: Image getFormat should return the Image buffer format" into mnc-dev
|
| 7fc802bbf750a8ed6be0e1858ebcf9740dda15cb |
14-May-2015 |
Chong Zhang <chz@google.com> |
Merge "MediaDataSource: address API council comments" into mnc-dev
|
| bc10185fa1669a151568feb72277785d323fc344 |
14-May-2015 |
Chong Zhang <chz@google.com> |
MediaDataSource: address API council comments
- throw IOExecption on fatal errors
- add offset argument to readAt
- and fix a crash in MediaExtractor
bug: 21045118
bug: 21163225
Change-Id: I3c0ff42e539868b9374a4f1f3a9852143f68ba68
ndroid_media_MediaDataSource.cpp
ndroid_media_MediaExtractor.cpp
|
| 6c307879b75f3eac2179b23ac309df0e4ce9cedd |
14-May-2015 |
Jean-Michel Trivi <jmtrivi@google.com> |
AudioTrack in SoundPool uses audio_attributes_t parameter
Bug 20731155
Change-Id: I62ce9d5c5a88aaf534cfd1861378215f9253248d
oundpool/SoundPool.cpp
|
| 80283cd747d247780a5336bad6b41811175fd282 |
13-May-2015 |
Chong Zhang <chz@google.com> |
Merge "MediaCodec: rename usePersistentInputSurface to setInputSurface" into mnc-dev
|
| 9560ddb48af0e2da7743452f8d9d6d9cd34d8438 |
13-May-2015 |
Chong Zhang <chz@google.com> |
MediaCodec: rename usePersistentInputSurface to setInputSurface
bug: 21045402
Change-Id: I510a3a694367b8e5a21f4a4fa2a338031fed8991
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaRecorder.cpp
|
| ea4eb326cfc4a8221be5fdab9639d468c632aee2 |
09-May-2015 |
Wei Jia <wjia@google.com> |
Merge "MediaSync: address API review." into mnc-dev
|
| c53ad69bcc920cdbdb15685ddad1d864631bb4f7 |
08-May-2015 |
Ronghua Wu <ronghuawu@google.com> |
media: merge CodecException's getErrorCode and getReason.
And unhide getErrorCode.
Bug: 20950388
Change-Id: I19c5ddaadfcdd446777e341f73edb75ca184d32f
ndroid_media_MediaCodec.cpp
|
| 2d61e2b97c92ac2de80ebb3782b728ae5cdf5306 |
09-May-2015 |
Wei Jia <wjia@google.com> |
MediaSync: address API review.
Rename *Settings to *Params;
Remove size parameter from MediaSync.queueAudio();
Bug: 20887706
Change-Id: I4c572da92ada51458031a482b96b3f624224e608
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
ndroid_media_PlaybackParams.h
ndroid_media_PlaybackSettings.h
ndroid_media_SyncParams.cpp
ndroid_media_SyncParams.h
ndroid_media_SyncSettings.cpp
ndroid_media_SyncSettings.h
|
| 9eb9dd326ae93cd84eb9bbc740f753fe8d8c7a13 |
06-May-2015 |
Chih-Hung Hsieh <chh@google.com> |
Fix clang warnings on unused variable, mismatched tag, print format.
BUG: 20890093
Change-Id: I91588f481d80b69823bc9d104b8bd09167ee5373
ndroid_media_MediaSync.h
|
| 7c3997d96a2571295a97457264832d54b05ee966 |
06-May-2015 |
Zhijun He <zhijunhe@google.com> |
ImageReader: Image getFormat should return the Image buffer format
Also return buffer size correctly.
Bug: 19527410
Change-Id: I9a912afc61d577571c1b2a7f6df21da40838e925
ndroid_media_ImageReader.cpp
|
| d80d6f6b056e23a8d017fe8f3900f6a88e27aa1b |
05-May-2015 |
Wei Jia <wjia@google.com> |
MediaSync: clean up configureAudioTrack and configureSurface.
Bug: 19666434
Change-Id: I8b112843d430c0730a879abc9aa25f143bdcf09d
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
|
| 4971de2a2efe448171b87471ad65e986c3608c21 |
02-May-2015 |
Lajos Molnar <lajos@google.com> |
Merge "media: hook up MediaCodec.setSurface" into mnc-dev
|
| 03359161734eb0bdfacb6ff91be8617b9c5eccab |
01-May-2015 |
Chong Zhang <chz@google.com> |
MediaRecorder: implement persistent input surface APIs
Bug: 19127604
Bug: 19489395
Change-Id: Ic8e151b97ea6b85fc65f724d3e68e1cb6b500866
ndroid_media_MediaRecorder.cpp
|
| 8034d60f6e044deafe48501dfbfe17c31284bc17 |
28-Apr-2015 |
Chong Zhang <chz@google.com> |
MediaCodec: implement persistent input surface APIs
Bug: 19127604
Bug: 19489395
Change-Id: If0d723c9ecd6fe81d9df210bd2fd026b8603ea4a
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 5e02ba977ede1e38c9f206057ec3f0f1e89ba943 |
02-May-2015 |
Lajos Molnar <lajos@google.com> |
media: hook up MediaCodec.setSurface
Bug: 11990461
Change-Id: Id2dc952594c21c6be68e4ffd039c7f74006a2374
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 05ebffe6bf6cdacc6de4b3bbf480c31869a81661 |
30-Apr-2015 |
Lajos Molnar <lajos@google.com> |
media: Hook up MediaPlayer and MediaSync to new settings
Bug: 19666434
Change-Id: Ib815a80a991d4be9ce179514ac517c54f98234fd
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
ndroid_media_SyncSettings.cpp
ndroid_media_SyncSettings.h
|
| db672b03a2de26127b40dbe50c794b5697b01c37 |
30-Apr-2015 |
John Reck <jreck@google.com> |
Merge "Change how Java Bitmaps are accessed in a few places" into mnc-dev
|
| ed207b92747234eac88dd3664ecfb535e45d8ed1 |
10-Apr-2015 |
John Reck <jreck@google.com> |
Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead
Attempt #2 to land this, original issue was in getSkBitmap
and should be fixed
Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
ndroid_media_MediaMetadataRetriever.cpp
|
| 1b12db9e6225171da87ed9586daeabf76b53c05a |
30-Apr-2015 |
Ronghua Wu <ronghuawu@google.com> |
Merge "media: set codec exception reason." into mnc-dev
|
| f3d3856f3e7b76765dfef6e94a4031c008f53b99 |
30-Apr-2015 |
Andy Hung <hunga@google.com> |
Merge "Check for null codec from AMediaCodec_createDecoderByType" into mnc-dev
|
| 26eca01c490f643fc2558be4c5477a1d433a8a07 |
29-Apr-2015 |
Andy Hung <hunga@google.com> |
Check for null codec from AMediaCodec_createDecoderByType
NULL codec can now occur if codec cannot be created.
Bug: 20566134
Change-Id: I08d54e733a01d0614313673dc49a6f5e702633ac
oundpool/SoundPool.cpp
|
| fa5ecdc4ac6d7a8db2bb9e4a6a60a3189025df30 |
28-Apr-2015 |
Svet Ganov <svetoslavganov@google.com> |
Respect the record audio app op - framework
Change-Id: I5696d2ef22738ccffaf8bd7a0ee68cbc3dea3bf1
ndroid_media_MediaRecorder.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| fb621e8737392ef10acbba083b46aedf6583c9a4 |
28-Apr-2015 |
Ronghua Wu <ronghuawu@google.com> |
media: set codec exception reason.
Bug: 19620911
Change-Id: I13c007bc82b367680e9a15dc6caed6ef8a81d0a6
ndroid_media_MediaCodec.cpp
|
| 3316452ffa74ea9a44d157c4d0cacdca3ad99fc9 |
27-Apr-2015 |
Dan Stoza <stoza@google.com> |
ImageWriter: Change detach to sp<GraphicBuffer>
Changes the call to IGBP::detachNextBuffer to return an
sp<GraphicBuffer> instead of an ANativeWindowBuffer*.
Bug: 20092217
Change-Id: I59d6acef7120de5040c6710aeecfa1633ec7f736
ndroid_media_ImageWriter.cpp
|
| 18191b4a52086168385f3d05877d5545b9e6ab59 |
24-Apr-2015 |
Zhijun He <zhijunhe@google.com> |
Merge "ImageWriter: fix and cleanup the closed Image Handling"
|
| a58271419ee5b4d8d2a6e25c602a0c40719f33e0 |
22-Apr-2015 |
Zhijun He <zhijunhe@google.com> |
ImageWriter: fix and cleanup the closed Image Handling
Attempting to access an Image after it is closed will result in an ISE.
Also fixed some minor doc issues.
Bug: 19872785
Change-Id: I91f037b2b2f243fcbd905d5a646b505bc9c10638
ndroid_media_ImageWriter.cpp
|
| 25b802d47249702b9e5d175b3e7144934b67553d |
23-Apr-2015 |
Wei Jia <wjia@google.com> |
MediaSync: fix message delay based on play time for pending audio frames.
Bug: 19666434
Change-Id: Ia9ad3858d4ddccf8aa476f2506785f1d76f90b32
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
|
| c98f58efd147c574faa4a4f9956b5ab95e3027a5 |
23-Apr-2015 |
Lajos Molnar <lajos@google.com> |
media: add SyncSettings to MediaSync and MediaPlayer
Bug: 18249558
Change-Id: I76d7e20d0e0c2d1d24bf60ade6386986573476f0
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaSync.cpp
ndroid_media_SyncSettings.cpp
ndroid_media_SyncSettings.h
|
| b3d5fd252851071f2f7e3dd66be84683750379ab |
22-Apr-2015 |
Lajos Molnar <lajos@google.com> |
media: use PlaybackSettings in MediaSync and MediaPlayer
Bug: 19666434
Change-Id: Ic5e517534a26f4e3b0294205e0b93f95338bf072
ndroid_media_MediaPlayer.cpp
ndroid_media_PlaybackSettings.h
|
| c1b33d665c8caf5760f68c45c6ca0baa649b832a |
22-Apr-2015 |
John Reck <jreck@google.com> |
GraphicsJNI Canvas cleanup
Change-Id: I72e142986a8bc9f464c1951b6b5187919de3462e
ndroid.mk
|
| 8222a7ec81552276de1814541201c424b392d90b |
21-Apr-2015 |
John Reck <jreck@google.com> |
Merge "Revert "Change how Java Bitmaps are accessed in a few places""
|
| edc22fba5921f5c2d3502727e707f959b8c3a460 |
21-Apr-2015 |
John Reck <jreck@google.com> |
Revert "Change how Java Bitmaps are accessed in a few places"
Bug: 20207616
This reverts commit a771b9861d11671c780092d35c0062eeefcf37c0.
Change-Id: Ifd891cc075274a7986e987229e0fed5a04ed9ff0
ndroid_media_MediaMetadataRetriever.cpp
|
| 9d4efdf2802f06ccf7031610891f75af70ea5538 |
17-Apr-2015 |
John Reck <jreck@google.com> |
Revert "A bunch more cleanups"
This reverts commit c294d128d03bc9a9982b273a82516c04583438cc.
Change-Id: Id1ebb236950f7c36c6d86e1dd95566d3a200748d
ndroid.mk
|
| 56d16568c0233dacec8f3c20cc987b2b68298e7a |
16-Apr-2015 |
Chris Watkins <watk@google.com> |
Merge "Unhide the android.media.[Media]DataSource interface."
|
| 03b3dccffe3657d07fe22fa958e3aca6564b438f |
16-Apr-2015 |
Wei Jia <wjia@google.com> |
Merge "MediaSync: pass the error code of setPlaybackRate from native code to JAVA."
|
| 0feab71799d2290595d42dec401903cb7d983c40 |
15-Apr-2015 |
Wei Jia <wjia@google.com> |
MediaSync: pass the error code of setPlaybackRate from native code to JAVA.
Bug: 19666434
Change-Id: I9c892b1e487b3bcdce49ff067e42995194cf6585
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
|
| 9e9ec943ce7620bbfcadc2f8986a80ac58003e47 |
16-Apr-2015 |
Ronghua Wu <ronghuawu@google.com> |
media: add reason to CodecException ctor.
Bug: 19620911
Change-Id: I3e9d1824c438253e9a7c303478f3cb75d0bb5c75
ndroid_media_MediaCodec.cpp
|
| 4eaa2938084353a54dc259466172909329a048cc |
20-Mar-2015 |
Chris Watkins <watk@google.com> |
Unhide the android.media.[Media]DataSource interface.
This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.
MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)
Only NuPlayer supports this new data source.
The change introduces:
* IDataSource: The binder interface for DataSource.
* JMediaDataSource: The native counterpart to the java interface. It
implements IDataSource.
* CallbackDataSource: A stagefright DataSource that wraps an IDataSource.
Change-Id: I6d9c1167b4a7384c469b1e928f31791a7ebed716
ndroid.mk
ndroid_media_MediaDataSource.cpp
ndroid_media_MediaDataSource.h
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaHTTPConnection.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
|
| f7a61483bc2a763145b0f1b6e6809c44cdc97187 |
15-Apr-2015 |
John Reck <jreck@google.com> |
Merge "A bunch more cleanups"
|
| 4823dee929011e669b9db7fad62ae7ba4a81e4bd |
15-Apr-2015 |
Ronghua Wu <ronghuawu@google.com> |
Merge "Revert "media: add new MediaCodec Callback onCodecReleased.""
|
| c294d128d03bc9a9982b273a82516c04583438cc |
14-Apr-2015 |
John Reck <jreck@google.com> |
A bunch more cleanups
Switch a few places to using android::canvas
instead of SkCanvas as well which eliminated
some JNI
Change-Id: I8f98b56442a06362b82b984cd1bd3a92398d8dbc
ndroid.mk
|
| 41eedcf3114f853e506a4d0d969db3b94bb187ba |
14-Apr-2015 |
Ronghua Wu <ronghuawu@google.com> |
Revert "media: add new MediaCodec Callback onCodecReleased."
This reverts commit 4c302e8b141cd490733130e86e44fa4f216de457.
Change-Id: I563ba6419cf61968bf356c5b096445dde55abac2
ndroid_media_MediaCodec.cpp
|
| 69fec1aafcffdc8a3095135bebd78abc18956165 |
14-Apr-2015 |
Ronghua Wu <ronghuawu@google.com> |
Merge "media: add CodecCapabilities.getMaxSupportedInstances."
|
| 073f36c6c1bc937a55393f7fe9a21b95e822bfda |
13-Apr-2015 |
John Reck <jreck@google.com> |
Merge "Change how Java Bitmaps are accessed in a few places"
|
| ee2997577db8d9e3e52593b9ca454386f703d710 |
25-Mar-2015 |
Ronghua Wu <ronghuawu@google.com> |
media: add CodecCapabilities.getMaxSupportedInstances.
Bug: 19620911
Change-Id: I11a55121490eba5027498a27c7719133acd1a39a
ndroid_media_MediaCodecList.cpp
|
| a771b9861d11671c780092d35c0062eeefcf37c0 |
10-Apr-2015 |
John Reck <jreck@google.com> |
Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead
Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
ndroid_media_MediaMetadataRetriever.cpp
|
| dfb0e6236b573f1dea1e5182a38aa22a7dc10dc1 |
11-Apr-2015 |
Wei Jia <wjia@google.com> |
MediaSync: fix a typo.
Bug: 19666434
Change-Id: I31e959f49d2539e11a9f23f9f9d7eb785ec08512
ndroid_media_MediaSync.cpp
|
| e833b534c9fe87c88fb4e6bce823e90565d5ab04 |
11-Apr-2015 |
Wei Jia <wjia@google.com> |
Merge "MediaSync: add getTimestamp in MediaSync."
|
| 217ec0adfc35302a6cc6b04bc78bf8fd82ffc8a5 |
10-Apr-2015 |
Wei Jia <wjia@google.com> |
MediaSync: add getTimestamp in MediaSync.
Bug: 19666434
Change-Id: Ieae70b13864e3eb5abae3577f209f4b926418731
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
|
| 6f6ef118a791c0f888db4addc6543e1f67700ead |
10-Apr-2015 |
Jeff Tinker <jtinker@google.com> |
Add a method to associate MediaDrm session with MediaCrypto
Previously, to associate a MediaDrm session with MediaCrypto,
the MediaDrm sessionId was passed as initData to the MediaCrypto
constructor. This is not ideal for two reasons: it's pretty
obscure and you can't change the association without tearing
down the MediaCodec/MediaCrypto and starting all over. Use
cases like key rotation require being able to update the
MediaDrm session post-construction. This CL addresses both of
these issues.
bug: 19570317
Change-Id: Ie3d3eda16651b598cdd41f2180074a43cb6c0884
ndroid_media_MediaCrypto.cpp
|
| 74797f843c209520e6cc5b74249e3e118556a61b |
01-Apr-2015 |
Jeff Tinker <jtinker@google.com> |
Add expiration update and keys change events
In support of unprefixed EME
bug: 19771612
bug: 19771431
Change-Id: Iddef695cfa1a56363a4c173249597e415cb93f50
ndroid_media_MediaDrm.cpp
|
| 4c302e8b141cd490733130e86e44fa4f216de457 |
19-Mar-2015 |
Ronghua Wu <ronghuawu@google.com> |
media: add new MediaCodec Callback onCodecReleased.
Bug: 19620911
Change-Id: I2912c570678861daf1516757dda2160ffddcfa8d
ndroid_media_MediaCodec.cpp
|
| ce9d6f9c75e2254f3704996e232e57e0c8f686d8 |
30-Mar-2015 |
Zhijun He <zhijunhe@google.com> |
ImageReader/Writer: implement opaque format operations
Implement attach/detach for image reader and writer.
Bug: 19872821
Change-Id: Ib45a054c6be0b56b370fa8d709b47b0298ba5ea7
ndroid_media_ImageReader.cpp
ndroid_media_ImageWriter.cpp
|
| 071a8b71d1212e218a3ebf7dbb8908a4acf5cf6d |
10-Mar-2015 |
Wei Jia <wjia@google.com> |
MediaSync: add MediaSync JAVA API
Bug: 19666434
Change-Id: Iab6941f6d81cb95a3b86be14b239287acb0d0eee
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaSync.cpp
ndroid_media_MediaSync.h
|
| c09ccc5631d61f94200df2bb37262364bb598211 |
01-Apr-2015 |
Andy Hung <hunga@google.com> |
Merge "Fix SoundPool track recycling for fast tracks"
|
| 37ec99b19ce7a5d40d16ccc2f578aca66bd7a25d |
31-Mar-2015 |
Yin-Chia Yeh <yinchiayeh@google.com> |
Merge "Add RAW12 image format"
|
| 32ccb69fdeeeb236d9c5f2a4335b44d1d0c4b042 |
28-Mar-2015 |
Andy Hung <hunga@google.com> |
Fix SoundPool track recycling for fast tracks
Bug: 19970735
Change-Id: I075d04a688383139484f24ba4be2829c5220c57e
oundpool/SoundPool.cpp
|
| b4f01b966bd2ebf89623f9c65462b8b8b7034461 |
24-Mar-2015 |
John Spurlock <jspurlock@google.com> |
Remove the ability to disable audio service.
Running in a configuration without audio service is not fully tested.
Remove the configuration option for now. Also remove unused delegation
layer in SoundPool.
Bug: 19891112
Change-Id: I47be0e32d54b8ef8fa25cf47b85eacf8a4969500
oundpool/Android.mk
oundpool/android_media_SoundPool.cpp
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| 4cdc2de0e4bb01b903fad12b0251fb41498e71ba |
16-Mar-2015 |
Jeff Tinker <jtinker@google.com> |
Report key request message type for unprefixed EME
bug: 19771299
Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
ndroid_media_MediaDrm.cpp
|
| d1cbc684053986c6c9efc6220bd79d654932b3d0 |
23-Mar-2015 |
Zhijun He <zhijunhe@google.com> |
media: fix build break
clang/llvm complains the timestamp print formating.
Change-Id: Ie4bff9cbec90994709097d087d1c1f2a7d1465cf
ndroid_media_ImageWriter.cpp
|
| f6a09e510649ae4701bb5ad4c40d102d59a5608c |
25-Feb-2015 |
Zhijun He <zhijunhe@google.com> |
ImageReader/Writer: Add ImageWriter and Opaque ImageReader
ImageWriter/Reader API change, including below changes
* Interface for Opaque ImageReader
* ImageWriter Interface and implementation
* Image class minor update to support ImageWriter opaque ImageReader
detach/attach interface are defined but yet to be implemented.
Change-Id: Ic7c0d2df73c80b1a81a7316d8c4556bf7703c309
ndroid.mk
ndroid_media_ImageReader.cpp
ndroid_media_ImageWriter.cpp
ndroid_media_MediaPlayer.cpp
|
| 11d444f0b789ead8b10506d24956d243274c724b |
21-Mar-2015 |
Yin-Chia Yeh <yinchiayeh@google.com> |
Add RAW12 image format
Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
ndroid_media_ImageReader.cpp
|
| 2bec0fe3a7287c65db14fbb6fad784e38179efc4 |
18-Mar-2015 |
Andy Hung <hunga@google.com> |
Merge "Revert "Revert "soundpool: update sample rate when reusing audiotrack"""
|
| 9bd868fe7ae712507211fff14b30981195dc96ce |
18-Mar-2015 |
Andy Hung <hunga@google.com> |
Merge "Revert "Revert "soundpool: reuse channel for same sample if available"""
|
| bc4537393b02b39433e07fed4ed57186d8e5959f |
18-Mar-2015 |
Andy Hung <hunga@google.com> |
Revert "Revert "soundpool: update sample rate when reusing audiotrack""
This reverts commit b801f73343194cd081f675a5dc2b3e90959cf6d1.
Change-Id: I0f6ee7fc981d65040f32e7852a5f66fd391b329d
oundpool/SoundPool.cpp
|
| 0c4b81bd3ef3fd5eb0f7d1b8e2c6168b95020134 |
18-Mar-2015 |
Andy Hung <hunga@google.com> |
Revert "Revert "soundpool: reuse channel for same sample if available""
This reverts commit 18c225d05480e7b80b312ef90d15789b34ce6bbc.
Change-Id: If91b4b0fb94df1d910cbaa0a7944001b2baa7be3
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| 5609a323664d1e4402172d34f81db9be72c02654 |
13-Mar-2015 |
Jeff Tinker <jtinker@google.com> |
am 0d22633e: am 62632e25: Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"
* commit '0d22633e07a6911403383a22bb3164f53b4f4409':
Handle NULL keys and NULL values in MediaDrm JNI HashMap
|
| 62632e25f57989d5e5ac406e21f037a3e2f39b9c |
13-Mar-2015 |
Jeff Tinker <jtinker@google.com> |
Merge "Handle NULL keys and NULL values in MediaDrm JNI HashMap"
|
| 67cf4a06c7f12389ccf131627bfcdfe8409fa598 |
12-Mar-2015 |
Ronghua Wu <ronghuawu@google.com> |
Merge "drm: add EVENT_SESSION_RECLAIMED for resource manager."
|
| a080050e4209cab9c81ae2144eed9c7c67e87f17 |
10-Mar-2015 |
Glenn Kasten <gkasten@google.com> |
Merge "Revert "soundpool: reuse channel for same sample if available""
|
| 01771a9f7d9a76dd9bf8adb14717c9bea288ff97 |
10-Mar-2015 |
Glenn Kasten <gkasten@google.com> |
Merge "Revert "soundpool: update sample rate when reusing audiotrack""
|
| 0e9a8f6a8e5d4d58fc358d47848fed52a94cae04 |
10-Mar-2015 |
Andy Hung <hunga@google.com> |
Merge "Fix SoundPool playback of multichannel files."
|
| 805f3c9428f9ebd5080aec48d3d9d77dbf4b41a9 |
26-Feb-2015 |
Eino-Ville Talvala <etalvala@google.com> |
Add DEPTH image formats, support in ImageReader
- Add an explicit mapping between public ImageFormat/
PixelFormat enums and internal HAL format/dataspace.
- Add DEPTH16 and DEPTH_POINT_CLOUD formats
- Wire up mapping layer to ImageReader to support depth
formats
Change-Id: I8197eccef900cc91baddcfcb934ccd4d8c972eff
ndroid_media_ImageReader.cpp
|
| 18c225d05480e7b80b312ef90d15789b34ce6bbc |
09-Mar-2015 |
Glenn Kasten <gkasten@google.com> |
Revert "soundpool: reuse channel for same sample if available"
This reverts commit 570576b51b8123ab05b36707ec752cf966292ca5.
Bug: 19635137
Change-Id: I8385ac4c151a375c19c3606698081c947b6216e3
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| b801f73343194cd081f675a5dc2b3e90959cf6d1 |
09-Mar-2015 |
Glenn Kasten <gkasten@google.com> |
Revert "soundpool: update sample rate when reusing audiotrack"
This reverts commit a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9.
Bug: 19635137
Change-Id: I1f53a432936dd3d51459e7d8cd86421bde399150
oundpool/SoundPool.cpp
|
| a1c3516a243d00428ff2b470409d47cc9f5c9523 |
07-Mar-2015 |
Andy Hung <hunga@google.com> |
Fix SoundPool playback of multichannel files.
Bug: 17188507
Change-Id: Ia4e43c7f8889181b998673b75b1f3bbf8c43f429
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| a92d6e28ad26184d4b2b90b6a7ae5f69edcbeca1 |
06-Mar-2015 |
Lajos Molnar <lajos@google.com> |
Merge "media: update AMessage to use handler instead of handler-id"
|
| f4faeac3525fe1ce3707ab785a1651aec367589d |
05-Mar-2015 |
John Reck <jreck@google.com> |
Cleanup Bitmap JNI attempt #2
Original version missed a spot
This reverts commit c02977e3bbfaaedcb1b1d67e1692becc7dddd59b.
Change-Id: I56244ce10d709fcdef42a001fe4c6ba7b6bbb04d
ndroid_media_MediaMetadataRetriever.cpp
|
| b9a468eb193a374bf82279817aa592b3f5901c98 |
05-Mar-2015 |
Chad Jones <chadj@google.com> |
Merge "Revert "Cleanup Bitmap JNI""
|
| c02977e3bbfaaedcb1b1d67e1692becc7dddd59b |
05-Mar-2015 |
Chad Jones <chadj@google.com> |
Revert "Cleanup Bitmap JNI"
This reverts commit b2915245b74b3b5541b123e38403f8e26426b4b7.
Change-Id: Idd7d7f33eec4ea5024c83de6b10d3d1a6ab2b17a
ndroid_media_MediaMetadataRetriever.cpp
|
| 35da7d904b4eb6ef215ea57cef35bac31f05defd |
05-Mar-2015 |
John Reck <jreck@google.com> |
Merge "Cleanup Bitmap JNI"
|
| b2915245b74b3b5541b123e38403f8e26426b4b7 |
04-Mar-2015 |
John Reck <jreck@google.com> |
Cleanup Bitmap JNI
Fix a bunch of places where mNativeBitmap was being
poked at directly, switch them either to the NDK API
or to GraphicsJNI where it made sense
Change-Id: I6b3df3712d6497cba828c2d3012e725cb4ebb64d
ndroid_media_MediaMetadataRetriever.cpp
|
| 63834f4d23a97b27d830a301328329c7ef682bd5 |
04-Mar-2015 |
Lajos Molnar <lajos@google.com> |
media: update AMessage to use handler instead of handler-id
Bug: 19607784
Change-Id: Ia18746830816bcade510e5137bf8ce6258181ac0
ndroid_media_MediaCodec.cpp
|
| a6d72095eda4163a70c0ba07cb74a1abac40fe48 |
04-Mar-2015 |
Ronghua Wu <ronghuawu@google.com> |
drm: add EVENT_SESSION_RECLAIMED for resource manager.
Bug: 19265536
Change-Id: Ifa15a4c7d3a7c20cb00bd4aefb57d239c0efaafa
ndroid_media_MediaDrm.cpp
|
| a7d57a6f0068b1e2a0f07ca427cfba198b12a9b9 |
03-Mar-2015 |
Dhananjay Kumar <dhakumar@codeaurora.org> |
soundpool: update sample rate when reusing audiotrack
User might update playback rate while calling Play on a sample.
Update sample rate if reusing existing audio track.
Change-Id: I7007c335fa405baf663a322408b92b9df53efdb0
Signed-off-by: Glenn Kasten <gkasten@google.com>
oundpool/SoundPool.cpp
|
| 570576b51b8123ab05b36707ec752cf966292ca5 |
30-Jan-2015 |
Haynes Mathew George <hgeorge@codeaurora.org> |
soundpool: reuse channel for same sample if available
Reuse channel for same sample if the channel completed
current playback and is not reallocated to another sample,
i.e. not stolen by other sample.
authored-by: Ashish Jain <ashishj@codeaurora.org>
Change-Id: Ibe7ee318c7dc11f3c4fd3a2f57d861318b10973b
Signed-off-by: Glenn Kasten <gkasten@google.com>
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| d93fcf400222e4d8b27a1025f6aa307839239b9f |
10-Feb-2015 |
Wei Jia <wjia@google.com> |
MediaPlayer: add setPlaybackRate JAVA API.
Bug: 19196501
Change-Id: I43daced7d9b53bcaca4e6a8d81ca729b32efc79f
ndroid_media_MediaPlayer.cpp
|
| 64cc1d03596bcda1f2d0bdc35d92546bb03eb406 |
20-Feb-2015 |
Eino-Ville Talvala <etalvala@google.com> |
ImageReader: Switch to RAW16 from RAW_SENSOR
Change-Id: I6362a997b0895686f988896de0463d834354f238
ndroid_media_ImageReader.cpp
|
| 9408ce362e6c01656f280696af3aabd190d53356 |
11-Feb-2015 |
Marco Nelissen <marcone@google.com> |
am 6da3cc59: am 396f131d: Merge "Fix memory leak"
automerge: fb14e77
* commit 'fb14e77f45fbad139a0b0c9278bd003964b8f987':
Fix memory leak
|
| fb14e77f45fbad139a0b0c9278bd003964b8f987 |
11-Feb-2015 |
Marco Nelissen <marcone@google.com> |
am 6da3cc59: am 396f131d: Merge "Fix memory leak"
* commit '6da3cc59a0e77e723a8413d2443b0f1bc5821b03':
Fix memory leak
|
| 06524dccbc35cdeed92d0b5ec96b42d43518d7ed |
11-Feb-2015 |
Marco Nelissen <marcone@google.com> |
Fix memory leak
Change-Id: Id691f9b32f9daeb23a01b17c5418b4d74a294cda
oundpool/SoundPool.cpp
|
| 969f0708d9832cd1691e3100fd0c342b56ec2e78 |
04-Feb-2015 |
Elliott Hughes <enh@google.com> |
am 4c49b1fb: am b2d7ca7c: am fd2c1307: Merge "Fix build."
* commit '4c49b1fb774d59d3a6e8a6bb5a4549828504c5af':
Fix build.
|
| 4c49b1fb774d59d3a6e8a6bb5a4549828504c5af |
04-Feb-2015 |
Elliott Hughes <enh@google.com> |
am b2d7ca7c: am fd2c1307: Merge "Fix build."
* commit 'b2d7ca7c6ffbb460dd8a8f8cbac8b627a3e27718':
Fix build.
|
| f953ca2ec8e418d54ab7d4585302db22964bcb70 |
04-Feb-2015 |
Elliott Hughes <enh@google.com> |
Fix build.
Change-Id: Ic14b6de7e7e58ce42ae4cc5ca945e4896e3b7b8f
ndroid_media_Utils.cpp
|
| 51b29be528c12e63db69a4dad48181dcacaa2539 |
29-Jan-2015 |
Lajos Molnar <lajos@google.com> |
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766 automerge: 2a8dc00
automerge: df876a1
* commit 'df876a110c4b6d55b4a9df57621aa38ff06c6de8':
ImageReader: add support for compatible flexYUV buffers
|
| df876a110c4b6d55b4a9df57621aa38ff06c6de8 |
29-Jan-2015 |
Lajos Molnar <lajos@google.com> |
Merge "ImageReader: add support for compatible flexYUV buffers" into lmp-mr1-dev automerge: 8514766
automerge: 2a8dc00
* commit '2a8dc00eedeb2b8a9fa3560d8afa4cfd7c17d395':
ImageReader: add support for compatible flexYUV buffers
|
| 4fb442617cdea52b11ed622b5cf0490337928ec1 |
23-Jan-2015 |
Lajos Molnar <lajos@google.com> |
ImageReader: add support for compatible flexYUV buffers
Bug: 17906609
Change-Id: Ia21aff632b9a92f4e391b3917a7774af46fd81a0
ndroid_media_ImageReader.cpp
|
| 565bca4e198f19e5b77cd6e44cfb5a26b67e6309 |
28-Jan-2015 |
Marco Nelissen <marcone@google.com> |
am 3ea395dd: am 4e853598: Merge "Fix printf format"
automerge: 2c2415a
* commit '2c2415a552b62016886af62419080ca7ac327871':
Fix printf format
|
| 0a3f0b020e4b1b025d8dc6c7cc9c34edc07ef902 |
28-Jan-2015 |
Marco Nelissen <marcone@google.com> |
am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"
automerge: 6e14c57
* commit '6e14c5705c5acf9d6036060252f257a084cd7578':
Make SoundPool use MediaCodec
|
| 2c2415a552b62016886af62419080ca7ac327871 |
27-Jan-2015 |
Marco Nelissen <marcone@google.com> |
am 3ea395dd: am 4e853598: Merge "Fix printf format"
* commit '3ea395ddc7785bf8fb6df1e5e6ed142c9336a7eb':
Fix printf format
|
| 6cd6110773bf83638f21a76d388dc2b7037df0d8 |
27-Jan-2015 |
Marco Nelissen <marcone@google.com> |
Fix printf format
Change-Id: Ied2f10bb59fe0e13b23bf1f9913ab3b081348a28
oundpool/SoundPool.cpp
|
| 6e14c5705c5acf9d6036060252f257a084cd7578 |
27-Jan-2015 |
Marco Nelissen <marcone@google.com> |
am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec"
* commit '99985d98c23b32acc0014031d7b88ee4eed21a4b':
Make SoundPool use MediaCodec
|
| c26f67051e12af7c2f17b71db39e01c1e0302fb1 |
26-Jan-2015 |
Mike Lockwood <lockwood@google.com> |
am 2d1e078a: am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
* commit '2d1e078ac45a646ee55bb9aca022dafd143ff95b':
MTP: Fix partial implementation of 5 new audio specific properties
|
| 2d1e078ac45a646ee55bb9aca022dafd143ff95b |
26-Jan-2015 |
Mike Lockwood <lockwood@google.com> |
am 5ac22aa6: am 2b144a16: Merge "MTP: Fix partial implementation of 5 new audio specific properties" into lmp-mr1-dev
* commit '5ac22aa60f773917981f42e64fbc28615871fd3e':
MTP: Fix partial implementation of 5 new audio specific properties
|
| 372be8970c6ab68c295fb74dbb878ab1d443d90e |
04-Dec-2014 |
Marco Nelissen <marcone@google.com> |
Make SoundPool use MediaCodec
Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
oundpool/Android.mk
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/SoundPoolThread.cpp
oundpool/SoundPoolThread.h
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| 71827748105252791854b87da8e0e0c66ff0d2cb |
23-Jan-2015 |
Mike Lockwood <lockwood@google.com> |
MTP: Fix partial implementation of 5 new audio specific properties
In change Ic5b3fb75309893caae1a4f4b56068a543847f1f7, we added partial
support for the MTP properties:
MTP_PROPERTY_AUDIO_WAVE_CODE,
MTP_PROPERTY_BITRATE_TYPE
MTP_PROPERTY_AUDIO_BITRATE
MTP_PROPERTY_NUMBER_OF_CHANNELS
MTP_PROPERTY_SAMPLE_RATE
However we were not returning any values for these properties in the result
of the MTP GetObjectPropList command. Strangely, this triggers a nasty bug
in Windows 7 that results in data loss. When copying a directory containing
several MP3 files from one location on the device to another, Windows will
copy only some of the files to the new location, but delete all of the originals.
Finishing the implementation of these new object properties for some unknown
reason stops this bad behavior in Windows 7.
Bug: 19018427
Change-Id: I5fd3b91a89b31827d3100686445cef6795fe0f3f
ndroid_mtp_MtpDatabase.cpp
|
| 67f304e2ca0d7a93730669b143bb30ef6a3f7199 |
31-Dec-2014 |
Haitao Feng <haitao.feng@intel.com> |
Use NULL instead of 0 when invoking CallStaticVoidMethod
static void CallStaticVoidMethod is variable argument function.
if pass 0 to the function like: CallStaticVoidMethod(......, 0),
0 will be treated as INT data type.but in the CallStaticVoidMethod
implement 0 will be treated as pointer data type.Pointer in 64bit
system occupied 8 bytes, but in 64bit system int occupied 4 bytes.
if call function like: CallStaticVoidMethod(......, 0),
only low 4 bytes will be assigned 0.Turned out it actually call
function like this: CallStaticVoidMethod(......, 0xXXXXXXXX00000000).
intent to pass NULL to function but passed non-NULL parameter to
the function.this will cause GCDaemon crash.
Bug: 18911458
Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
ndroid_media_MediaRecorder.cpp
udioeffect/android_media_Visualizer.cpp
|
| a6f7099343366fc427e8ae4e409d0058c23a8c96 |
06-Jan-2015 |
Narayan Kamath <narayan@google.com> |
am 031acc4b: am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
* commit '031acc4b3920336e58c56abb99322cbeb9be9e5c':
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
|
| 031acc4b3920336e58c56abb99322cbeb9be9e5c |
06-Jan-2015 |
Narayan Kamath <narayan@google.com> |
am 3787decd: am 5137415e: Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
* commit '3787decd8d41320ec9201405ec4cc893b2c99d78':
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
|
| 5137415e391d8491d92535b17445ab646a3fcb5d |
06-Jan-2015 |
Narayan Kamath <narayan@google.com> |
Merge "Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod."
|
| 8bd6a203ca753e9181564221e4faf7703d520b78 |
31-Dec-2014 |
Haitao Feng <haitao.feng@intel.com> |
Use NULL instead of 0 for pointer arguments of CallStaticVoidMethod.
CallStaticVoidMethod is varargs function, and calling it with
a literal 0 like CallStaticVoidMethod(..., 0) will treat the
argument as a 4 byte int in both 32 and 64 bit processes.
This is incorrect for pointer arguments where NULL should be
used instead.
Reviewed-by: Liao, Bruce <bruce.liao@intel.com>
Signed-off-by: Yong Yao <yong.yao@intel.com>
Change-Id: I9d700d3790a80dbee6826f64baf9ef5d81ca390f
ndroid_media_MediaRecorder.cpp
udioeffect/android_media_Visualizer.cpp
|
| c82be5f27f1dd9da665b0ca52590cc30ede4e78a |
05-Jan-2015 |
Narayan Kamath <narayan@google.com> |
am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"
automerge: b7974bd
* commit 'b7974bd31d06d439cb75f8a3a0ad032fa689c729':
Race-condition in SoundPool during release
|
| b7974bd31d06d439cb75f8a3a0ad032fa689c729 |
05-Jan-2015 |
Narayan Kamath <narayan@google.com> |
am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release"
* commit 'dd65a4f735a311fe60c065449e394974807ff297':
Race-condition in SoundPool during release
|
| ea4cdd44541d76adea9b0b185740796d6cf6ac64 |
05-Jan-2015 |
Narayan Kamath <narayan@google.com> |
Merge "Race-condition in SoundPool during release"
|
| 969ac0b2f3cdc33e9620bc6d73ae6c9d0396f493 |
12-Dec-2014 |
Jeff Tinker <jtinker@google.com> |
Merge "Revert "Fix Crash when sending null in HashMap to getKeyRequest""
|
| 2888e90701bdce0f04e7ab08f08b6a3cccb1bf9d |
12-Dec-2014 |
Jeff Tinker <jtinker@google.com> |
Revert "Fix Crash when sending null in HashMap to getKeyRequest"
This reverts commit 5bec0266358f28a91b38f8aefbcb918219aa4ce9.
Change-Id: I78c2f04be03dbdf8da6ea1e1f600c7c12668e433
ndroid_media_MediaDrm.cpp
|
| 17a0826e5de70657279f4564c4ed6de819cb3768 |
11-Dec-2014 |
Chih-hung Hsieh <chh@google.com> |
am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
automerge: d1aa67b
* commit 'd1aa67b8e19ae96bd2ae4e6719d13902a8b6d845':
Adjust format strings to work on both 32-bit and 64-bit builds
|
| d1aa67b8e19ae96bd2ae4e6719d13902a8b6d845 |
11-Dec-2014 |
Chih-hung Hsieh <chh@google.com> |
am b0dd6d3a: am 4c23a0ec: Merge "Adjust format strings to work on both 32-bit and 64-bit builds"
* commit 'b0dd6d3a8a7f11454239facf0ee9b2dd2390945e':
Adjust format strings to work on both 32-bit and 64-bit builds
|
| fe6a5ae92481d52093ae8accfbcda3793816d3ec |
10-Dec-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 28089cc3: Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033 automerge: 6d98265
* commit '28089cc39b0247d5e854a1a44cd8af17464b9e36':
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
|
| 28089cc39b0247d5e854a1a44cd8af17464b9e36 |
10-Dec-2014 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode." into lmp-mr1-dev automerge: 3ef5033
automerge: 6d98265
* commit '6d9826546d89e03cea170ebb5b3f292d5f4a027b':
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
|
| f4a637d0be2e028d1e78c8bf90ad17ec3f84b5f3 |
21-Nov-2014 |
Ruben Brunk <rubenbrunk@google.com> |
Camera2: Allow rendering to arbitrary surface sizes in LEGACY mode.
Bug: 16030677
Change-Id: Ida04e04f41983b9126609522dd12064a7bf9645f
ndroid_media_ImageReader.cpp
|
| 46c82b4cd241a447834ed2f5a6be16777b7a990b |
30-Nov-2014 |
Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> |
Adjust format strings to work on both 32-bit and 64-bit builds
Adjust format strings to not produce Clang warnings in both 32-bit and
64-bit builds
Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaMuxer.cpp
ndroid_media_MediaRecorder.cpp
|
| 1d5f99b973d641236b436f090fd8f001134680a0 |
25-Nov-2014 |
chh <chh@google.com> |
am d7572b84: am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"
* commit 'd7572b84efdb694618fca550a3fb5ccc4a7ccd5f':
Remove unused variables and functions, don't warn about unused parameters
|
| 816219a1fab97e54b153fd7c8f5d2a04405efb0a |
25-Nov-2014 |
Chih-hung Hsieh <chh@google.com> |
am 243a42a7: am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '243a42a7993761845e7042f1845de50aba2ffc7a':
Fix class vs. struct mismatch
|
| d7572b84efdb694618fca550a3fb5ccc4a7ccd5f |
25-Nov-2014 |
chh <chh@google.com> |
am 3ec380d3: am fc545733: Merge "Remove unused variables and functions, don\'t warn about unused parameters"
* commit '3ec380d365cbe5fac23ff19897512cf492a7a8a4':
Remove unused variables and functions, don't warn about unused parameters
|
| 243a42a7993761845e7042f1845de50aba2ffc7a |
25-Nov-2014 |
Chih-hung Hsieh <chh@google.com> |
am 43ea037b: am 481c4b64: Merge "Fix class vs. struct mismatch"
* commit '43ea037b4c61e332d7419ac069a62e314166fdd7':
Fix class vs. struct mismatch
|
| fc54573373ff965aa40cccdc1ab11c1c880c8930 |
25-Nov-2014 |
chh <chh@google.com> |
Merge "Remove unused variables and functions, don't warn about unused parameters"
|
| 99d61edfda1f80d13f1f1c96fbec41278f3da709 |
17-Nov-2014 |
Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> |
Fix class vs. struct mismatch
Don't refer to classes as structs and view versa -- causes warnings in
clang (in code built with -Werror)
Change-Id: I4d7f461bcf6fe4e43a14ad2f28ee0e0ddea95abc
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid_media_MediaExtractor.h
ndroid_media_MediaHTTPConnection.h
|
| 35d6a4f75bc3e02e5983fb800bc7538d51d01a45 |
29-Sep-2014 |
Daniel Broms <daniel.broms@sonymobile.com> |
Handle NULL keys and NULL values in MediaDrm JNI HashMap
If getKeyRequest() of MediaDrm was called with a HashMap containing
NULL keys or NULL values then the mediaserver crashed.
This modification adds NULL checks and throw
IllegalArgumentException as expected.
Change-Id: Ide82efe0f6bd28c8ac3f9aa048d9794f2ccc8fac
ndroid_media_MediaDrm.cpp
|
| 4048a4bcb1ea709ddb83a4fde3ff5c53e642f7d0 |
23-Nov-2014 |
Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org> |
Remove unused variables and functions, don't warn about unused parameters
Remove unused variables and static functions clang complains about,
disable warnings about unused parameters (needed for clang and for gcc
with -Wextra enabled)
Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
ndroid_mtp_MtpServer.cpp
|
| 2670d5ad59ffb6f34ddbc4578e9321ce1c0410b5 |
21-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix Crash when sending null in HashMap to getKeyRequest"
|
| 47249598cbada478d7e0b8dca200599c50ea6e69 |
21-Nov-2014 |
Dan Albert <danalbert@google.com> |
am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
Add appropriate casts for char16_t.
|
| 582bdf9a5961a32de27556832e23e0611c4d1cbb |
21-Nov-2014 |
Dan Albert <danalbert@google.com> |
am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t."
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
Add appropriate casts for char16_t.
|
| 6698749dd4d4d6513b26aa9071af290b956b68a7 |
20-Nov-2014 |
Dan Albert <danalbert@google.com> |
Add appropriate casts for char16_t.
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.
Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
ndroid_media_MediaRecorder.cpp
ndroid_mtp_MtpDatabase.cpp
|
| 5bec0266358f28a91b38f8aefbcb918219aa4ce9 |
11-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
Fix Crash when sending null in HashMap to getKeyRequest
Merge of partner https://android-review.googlesource.com/#/c/115665
Change-Id: I50235dc09be584165155019a70708377ca9688a0
ndroid_media_MediaDrm.cpp
|
| e726680652ecd235496afeb3207b463e0aa83955 |
17-Nov-2014 |
Marco Nelissen <marcone@google.com> |
am 52e2b6f7: Merge "Update calls to IInterface::asBinder()"
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
Update calls to IInterface::asBinder()
|
| 97069dd4fd5454ba057ccf2854d7f925c337884c |
14-Nov-2014 |
Marco Nelissen <marcone@google.com> |
Update calls to IInterface::asBinder()
to use the new static version.
Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
ndroid_media_MediaHTTPConnection.cpp
|
| dce97407dcf54ae9725c2d29224f6ed8dfd994b8 |
14-Nov-2014 |
Marco Nelissen <marcone@google.com> |
Update calls to IInterface::asBinder()
to use the new static version.
Change-Id: I88ee037c66aa254f466d3a51ddc358bd37cf44b5
ndroid_media_MediaHTTPConnection.cpp
|
| 3733efc8c15c0253cb26f99ef6951a2495bbd3e1 |
14-Nov-2014 |
Mike Lockwood <lockwood@google.com> |
am b8cb45fd: am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev
* commit 'b8cb45fddf5618ca0e8e9b36368a729785599e7c':
MTP: Update JNI for new packet getters
|
| b8cb45fddf5618ca0e8e9b36368a729785599e7c |
13-Nov-2014 |
Mike Lockwood <lockwood@google.com> |
am 01816640: am eb205b88: Merge "MTP: Update JNI for new packet getters" into lmp-mr1-dev
* commit '0181664081db2149aa465332c33c5cb413a4348c':
MTP: Update JNI for new packet getters
|
| 9c803fa52606aeb27d4d098161722fb111dd1b23 |
13-Nov-2014 |
Mike Lockwood <lockwood@google.com> |
MTP: Update JNI for new packet getters
Bug:18113092
Change-Id: I5d7473af1b57235fbc078c297a309e4a301c9fbd
ndroid_mtp_MtpDatabase.cpp
|
| ed86e19af2e36397a1cd5b89105b1bf0de47414e |
08-May-2014 |
Dariusz Iwanoczko <dariusz.iwanoczko@sonymobile.com> |
Race-condition in SoundPool during release
There is race between SoundPoolThread and SoundPool / AudioManager
threads during releasing SoundPool.
AudioManager deletes a global reference before setting SoundPool
callback to NULL. If, at that time, a call to the SoundPool::notify
fuction happens then mCallback is valid but mUserData is not.
The following log will show up to indicate the problem:
JNI ERROR (app bug): accessed deleted global reference 0xXXXXXXXX
This fix is to clear the SoundPool's callback before releasing global
reference.
Change-Id: I5e6d647edc0444340db879428048e2c0a068a8b4
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| baa73b056cbd4627a84b39a6267065ae56677220 |
11-Nov-2014 |
Andreas Gampe <agampe@google.com> |
am cba06c22: resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp
* commit 'cba06c2272c8bce7d10b2a7ee762d12043f3252a':
Frameworks/base: Wall Werror in media/jni
|
| cba06c2272c8bce7d10b2a7ee762d12043f3252a |
11-Nov-2014 |
Andreas Gampe <agampe@google.com> |
resolved conflicts for merge of 6957369d to lmp-mr1-dev-plus-aosp
Change-Id: Ie3bd0e24c69c0c7ae500b8eb4a1198650e993a19
|
| 5a15d0d31b877ef512b3379eac033c6bb041c86a |
11-Nov-2014 |
Andreas Gampe <agampe@google.com> |
Frameworks/base: Wall Werror in media/jni
Turn on -Wall -Werror in media/jni. Fix warnings.
Change-Id: I9da54ad379d8172ee535b52ee2b0637a2533f4e3
ndroid.mk
ndroid_media_AmrInputStream.cpp
ndroid_media_ImageReader.cpp
ndroid_media_MediaCodecList.cpp
ndroid_media_MediaCrypto.cpp
ndroid_media_MediaDrm.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaMuxer.cpp
ndroid_media_MediaProfiles.cpp
ndroid_media_MediaScanner.cpp
ndroid_media_ResampleInputStream.cpp
ndroid_media_Utils.cpp
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
udioeffect/Android.mk
udioeffect/android_media_Visualizer.cpp
oundpool/Android.mk
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| ceb5bdf42a31511bb599fdeb30a16a7c0af2d911 |
07-Nov-2014 |
Dan Stoza <stoza@google.com> |
am 1437146a: am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
* commit '1437146a3e63cd932a29116f032847d4585cb4cd':
Add a BufferItem parameter to onFrameAvailable
|
| d17793ea2a93af6ba9bc64c77502f48aa32814e4 |
07-Nov-2014 |
Dan Stoza <stoza@google.com> |
Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev
|
| 9e522f343258e3f273f0f30135482804d47e8410 |
06-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
am 0d8d6ba8: am e7f66ada: am fc4e6f70: Merge "Add missing secure stop methods" into lmp-mr1-dev
* commit '0d8d6ba807078b70eae53e676443ef5ac7598560':
Add missing secure stop methods
|
| fc4e6f70f64676ab375c3e233b6c07e3bc56cb64 |
06-Nov-2014 |
Jeff Tinker <jtinker@google.com> |
Merge "Add missing secure stop methods" into lmp-mr1-dev
|
| bf5d162b910749e36d8d039383215633fdbe19c4 |
05-Nov-2014 |
Eric Laurent <elaurent@google.com> |
am c3a61d98: am 29218f24: am e43bf082: Merge "AudioEffect JNI: use new max preprocessing constant" into lmp-mr1-dev
* commit 'c3a61d98387507ed0c24e54f9e056014e23d9d7a':
AudioEffect JNI: use new max preprocessing constant
|
| b27a8a5bcc40054f6d775d070bc2de6eb996d1c2 |
05-Nov-2014 |
Eric Laurent <elaurent@google.com> |
AudioEffect JNI: use new max preprocessing constant
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
udioeffect/android_media_AudioEffect.cpp
|
| 2c34b5e8136eac0332dac294cb06a6a98eac1c14 |
04-Nov-2014 |
Dan Stoza <stoza@google.com> |
Add a BufferItem parameter to onFrameAvailable
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents.
Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
ndroid_media_ImageReader.cpp
|
| 1b51c72e910a91e79efe34c6252e01862516e73d |
31-Oct-2014 |
Jeff Tinker <jtinker@google.com> |
Add missing secure stop methods
b/18053197
b/18076411
Change-Id: Ide9ecab2fd2021f3544491f23ae84c394c48ac14
ndroid_media_MediaDrm.cpp
|
| cdf4a6244d61774722fbebf9b18b8f82cf873949 |
24-Oct-2014 |
Hochi Huang <hochi.huang@mediatek.com> |
am 2a4425c1: am 35658cc4: am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676 automerge: 8659bf1
* commit '2a4425c1725e483a60cc7dec833176873148c1d4':
[FM]Fix FM App record fail Buganizer ID: 17975676
|
| 35658cc42e381cba50c386464608e546c08a8b55 |
24-Oct-2014 |
Hochi Huang <hochi.huang@mediatek.com> |
am 4a7873f1: [FM]Fix FM App record fail Buganizer ID: 17975676
* commit '4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3':
[FM]Fix FM App record fail Buganizer ID: 17975676
|
| 4a7873f19afecb01ef06b0f3dc4dde0a13a17ab3 |
22-Oct-2014 |
Hochi Huang <hochi.huang@mediatek.com> |
[FM]Fix FM App record fail Buganizer ID: 17975676
Signed-off-by: Hochi Huang <hochi.huang@mediatek.com>
Review: https://partner-android-review.git.corp.google.com/#/c/185235
Change-Id: I024db429b8ff56851c814857691b06ea5e69198a
ndroid_media_MediaRecorder.cpp
|
| c6d00062451873cd2a02cb258fccfe6bea7724b4 |
03-Oct-2014 |
Mike Lockwood <lockwood@google.com> |
am 5d4a1aae: am 2039b757: am 63ffd78a: MtpDatabase: Increase size of string buffer in JNI code
* commit '5d4a1aaed561dbbe87b05bc40ddb5dc2df46e699':
MtpDatabase: Increase size of string buffer in JNI code
|
| 63ffd78aaab0b0d04012312f0378b0c73b737a2a |
24-Sep-2014 |
Mike Lockwood <lockwood@google.com> |
MtpDatabase: Increase size of string buffer in JNI code
Fixes problems handling files that have full path length > 255 characters
Bug: 17383223
Change-Id: I2a1ebedee8dd86b3060f14c2d1af636fc9bc95cb
ndroid_mtp_MtpDatabase.cpp
|
| b73767f3bb16ed936c7bf7e0e473aee74d657477 |
01-Oct-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am e6098661: am df261085: am 4d9face6: am 7432b884: am b3c802f2: Merge "camera2: Use valid dimensions for RGBA8888 gralloc buffers." into lmp-dev
* commit 'e60986611fe891b47f72b47873ed87deb2e3afc2':
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
|
| 0c79884076405bc36c0fb4f1bce27f883b97d64c |
30-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Use valid dimensions for RGBA8888 gralloc buffers.
Bug: 17675571
- All of the mistakes were made. Unmake them.
Change-Id: I23ff7a553347d4d9588c728219f4bf0604ba2e38
ndroid_media_ImageReader.cpp
|
| 48ca9cd9f852fb38504bd045007ab88102d6fae2 |
29-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 6c583ef7: am c6c331ee: am 174355d6: am d0f17b98: am 6f34ad71: Merge "camera2: Fix native ImageReader test segfaults." into lmp-dev
* commit '6c583ef7ea34a2ac2eb490237908587bcbddb0e3':
camera2: Fix native ImageReader test segfaults.
|
| 31798f33184fd59dd3d3cc55e6373d9f91d220b6 |
26-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Fix native ImageReader test segfaults.
Bug: 17675571
- Check for JPEG footer in correct location from ImageReader
when using the RGBA override.
- Add additional error checks in produceFrame method.
- Avoid allocating extra space for jpeg buffers due to
incorrect width calculations.
Change-Id: I926f37e8b3e5c4bad24c16dcee48d52adb1706dd
ndroid_media_ImageReader.cpp
|
| 4656e6bb168a9045f9e6137f3e1c7876f9bf2dea |
25-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
am 043d6fff: am 01105fee: am ae7ff48d: am 6a7dcedf: am 8acfdc7b: Merge "camera2: Hide JPEGs in RGBA gralloc buffers." into lmp-dev
* commit '043d6fffee2b2fe3aa8821914ba761eae964cf2e':
camera2: Hide JPEGs in RGBA gralloc buffers.
|
| 0fd198ad89ec9c600bb1761b10d938146c28bb98 |
24-Sep-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Hide JPEGs in RGBA gralloc buffers.
Bug: 17379185
- WAR for SW Write usage flags being unavailable on
certain devices for JPEG (blob) format buffers.
Change-Id: Ic7299785b743f35dd47264b9d1cea01a88b71d91
ndroid_media_ImageReader.cpp
|
| c206aa58fecaabbed91d1ca556ccf75f0256bd41 |
11-Sep-2014 |
Eric Laurent <elaurent@google.com> |
am 7a3c88e0: am 6bc4e4b4: am 0b381432: Merge "AudioEffect JNI: fix queryEffects()" into lmp-dev
* commit '7a3c88e004b664d3bb20b56b029d29d629541399':
AudioEffect JNI: fix queryEffects()
|
| 4fc28d78cb925c2780abf02c6826e77f8f8a230a |
11-Sep-2014 |
Eric Laurent <elaurent@google.com> |
AudioEffect JNI: fix queryEffects()
Some effects supported by the platform may not be
returned to JAVA layer because not visible by applications.
The size of the array of effect descriptors
returned must be adjusted so that no entry in the array is null.
Bug: 17453177.
Change-Id: I3baaacf24bcb0fa45ce50461a1ac3d6eaa67f4b9
udioeffect/android_media_AudioEffect.cpp
|
| 02fe289de9db0ed582642e26316362df3f7396d7 |
10-Sep-2014 |
Jeff Tinker <jtinker@google.com> |
am 52b59f6c: am 6a884aad: am 50bb6215: Merge "Add support for max-res decode" into lmp-dev
* commit '52b59f6cb7155bf21abff70d25f0751a3f101830':
Add support for max-res decode
|
| b00ab012bf3d325f81813fb949d6cc20702ccd7e |
10-Sep-2014 |
Jeff Tinker <jtinker@google.com> |
Merge "Add support for max-res decode" into lmp-dev
|
| 44e21a21b013ea34e4347945b949cc4f8f47f8ac |
29-Aug-2014 |
Jeff Tinker <jtinker@google.com> |
am 576dc318: am d83b4f16: am b8ccb705: Merge "Fix exception message string formatting in MediaDrm" into lmp-dev
* commit '576dc3188364d54137151913230b01ab18af2324':
Fix exception message string formatting in MediaDrm
|
| 336d3eabc0d57fd2d1b8a9aa4ade7a0450cf183e |
29-Aug-2014 |
Jeff Tinker <jtinker@google.com> |
Add support for max-res decode
bug: 16034599
Change-Id: I12124aef03518600a27de45bae24eef9c9735be5
ndroid_media_MediaCodec.cpp
|
| 2979986b576ffbf0e22057cf135626bc54b9880b |
27-Aug-2014 |
Jeff Tinker <jtinker@google.com> |
Fix exception message string formatting in MediaDrm
bug: 17281760
Change-Id: If527234d2efb1507eca8703027e3cbdd53961b9e
ndroid_media_MediaDrm.cpp
|
| f642d52941151ad0b69e4519b72a15e77a48bd7e |
14-Aug-2014 |
Lajos Molnar <lajos@google.com> |
am e3cd62bf: am 4f1245eb: am 266abcaf: Merge "media: release allocated strings on error" into lmp-dev
* commit 'e3cd62bf63706c663f85f31b7925efd85a41efc3':
media: release allocated strings on error
|
| 021a3443c6f86ece7f59fa9291cc0ba70ba71b1f |
07-Aug-2014 |
Mike Reed <reed@google.com> |
SkBitmap::Config is deprecated
Change-Id: I0bbd929074474ae3c1d497c2f645417e4876d9e3
ndroid_media_MediaMetadataRetriever.cpp
|
| 018b70f5de79e614fff3297c617e2416dbf34d77 |
12-Aug-2014 |
Lajos Molnar <lajos@google.com> |
media: release allocated strings on error
Bug: 11990470
Change-Id: I74ffbfed8eb322d1b994fff99ed2470358bccf83
ndroid_media_MediaCodecList.cpp
|
| 5f9aa0bcea8be860fdf5a35476435616cb5f44f3 |
31-Jul-2014 |
Andy Hung <hunga@google.com> |
Update exception handling for MediaCodec
Throw MediaCodec.CodecException (versus IllegalStateException).
Print out status error codes as found (See MediaError.h for details).
Update error code mapping to CryptoException.
Bug: 12034929
Bug: 13976475
Change-Id: I23b951cb06807413f087c238a1d3526659f06e7b
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| cd5e3f95bfcc6039aa048b7f3141f265de02d114 |
06-Aug-2014 |
Lajos Molnar <lajos@google.com> |
media: update to reworked media codec list/info
Bug: 11990470
Change-Id: I884d656f6a325f7074a89d09601ad19363daa8a0
ndroid_media_MediaCodecList.cpp
|
| 6bf5b600d6d1e98f7eabbbc884dd286b335acd66 |
30-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Allow device to be unprovisioned
bug: 12247651
Change-Id: Ie2e77566d2c65925091296da5bcbec327985c946
ndroid_media_MediaDrm.cpp
|
| 05ad96e9a33e4e3d5568cfc3443fcb4dd7067433 |
29-Jul-2014 |
Robert Shih <robertshih@google.com> |
Merge "MediaPlayer: scanInternalSubtitleTracks in synchronous prepare" into lmp-dev
|
| c42a96dba4beaf87875e71b8d8b77ce7154c5cdb |
25-Jul-2014 |
Robert Shih <robertshih@google.com> |
MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
Bug: 16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
ndroid_media_MediaPlayer.cpp
|
| 4c4064fa66f551f49b7e1017b1ebe65a05f9df21 |
25-Jul-2014 |
Zhijun He <zhijunhe@google.com> |
ImageFormat: update raw10 spec to allow row padding
Change-Id: Id191b92037487f16538d111fc6171d3be9a02acf
ndroid_media_ImageReader.cpp
|
| 7de28d34f1ca3a727a8325cf3304f2fe03d2ac59 |
25-Jul-2014 |
Lajos Molnar <lajos@google.com> |
Implement MediaCodec.getImage methods
Bug: 10706245
Change-Id: Icbac5538a27ffdb53d974e2e1f8dc5afe02fb391
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| f7badff8bbcbd45939c2f60cfcc88c6d3b07c6b2 |
23-Jul-2014 |
Zhijun He <zhijunhe@google.com> |
CamcorderProfiles: add high speed profile constants
Change-Id: I8f783466f8c2560820db14488acc1a309d27ab0f
ndroid_media_MediaProfiles.cpp
|
| 55a30c41b6c47d3afe6b13c25c64e8eec9f45e7c |
21-Jul-2014 |
Jean-Michel Trivi <jmtrivi@google.com> |
AudioAttributes for SoundPool
Add support for building a SoundPool instance and specify
the AudioAttributes.
Remove SRC quality which was never implemented, while leaving
room for supporting it later through the Builder pattern.
Remove stream types.
Update AudioService's use of SoundPool to the new scheme.
Change-Id: Ie51e4008684e5ba25f9b7368098e4f20266a15c7
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| b58dc3132272a5ec1ad4792c3c9d48b4198bd57f |
18-Jul-2014 |
Lajos Molnar <lajos@google.com> |
Extend MediaCodecInfo to describe usable codec limits and features
Bug: 11990470
Bug: 12065651
Bug: 16131974
Change-Id: I841b8507e823f1ddf14754e34029a9bed4f402d8
ndroid_media_MediaCodecList.cpp
|
| 1e6e8018a4f914210b615bfca0f818fd13574228 |
16-Jul-2014 |
Lajos Molnar <lajos@google.com> |
MediaCodec: add reset() + documentation fixes
Bug: 12034929
Change-Id: I38f89a2e4c41e0ceb3fdae4522b9c04f6c43a4f1
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 7be24522ce2e1821ad45e7ada7c3f91e6814889a |
14-Jul-2014 |
Lajos Molnar <lajos@google.com> |
MediaExtractor: set buffer offset/limit in readSampleData
also fix setting offset/limit in MediaCodec's getBuffer.
Bug: 13008204
Change-Id: Iadf0f006cfccc2546971cc5384058e1a2721780b
ndroid_media_MediaCodec.cpp
ndroid_media_MediaExtractor.cpp
|
| 6a5b1db177b71970a2d00eb6d24b8317914eab29 |
14-Jul-2014 |
Eino-Ville Talvala <etalvala@google.com> |
MediaRecorder: Fix crash when given a released Camera object
Bug: 15617637
Change-Id: I420ecc3f7b946dcf705cf210a7d493290f838f09
ndroid_media_MediaRecorder.cpp
|
| 94686d13cacbec1ce7cf5fd0178fffb037d03cc1 |
12-Jul-2014 |
Chong Zhang <chz@google.com> |
MediaCodec: change onError cb to send CodecException
Bug: 11990118
Change-Id: I8b6112f126c2f473f64e2aad6ffcfbc3f1d6e64a
ndroid_media_MediaCodec.cpp
|
| d4023114e8cf7ec7db4d07958a303699b658f2c0 |
12-Jul-2014 |
Lajos Molnar <lajos@google.com> |
MediaCodec: add new buffer and format APIs
Bug: 14562236
Bug: 14297827
Bug: 13008204
Bug: 10706245
Bug: 10672559
Bug: 9175531
Change-Id: Ia94d34f625e532619a9ed344eb27e0d26647982f
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 8d5e556b2b76278000a506382fdf594c071e1fbd |
09-Jul-2014 |
Chong Zhang <chz@google.com> |
MediaCodec async callbacks
Bug: 11990118
Change-Id: I210d4302e1fd7e1a48d2228fd3f4f20c16b18a75
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| d1988a98ed69db8c33b77b5c085ab91d22ef3bbc |
01-Jul-2014 |
Zhijun He <zhijunhe@google.com> |
Add RAW10 image format
- Add RAW10 format in ImageFormat
- Add ImageReader support for this format
Bug: 15989722
Change-Id: Ic38ae596d5a472e990389d1fa221a82bea97b715
ndroid_media_ImageReader.cpp
|
| 8df982dfa5408afe67cd6a4b45bfbf26c94299d0 |
26-Jun-2014 |
Jean-Michel Trivi <jmtrivi@google.com> |
Java MediaPlayer: add support for setting audio attributes
Change-Id: Ia638107a5e67c20c46c2f5f1800db9da57d6f698
ndroid_media_MediaPlayer.cpp
|
| 5096defdaa4716ce81047a855d6e5ce3f8263600 |
24-Jun-2014 |
Igor Murashkin <iam@google.com> |
camera2: (legacy) Write the JPEG size as part of the blob transport
This fixes StillCaptureTest#testStillPreviewCombination
Change-Id: Ifbaae7828b2efcc1a768c77ce50718abd7f691d0
ndroid_media_ImageReader.cpp
|
| 5e6421bd8f0ac6efd617b1bcdb976b10f001654e |
21-Jun-2014 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "camera2: Switch to using YV12 for ImageReader."
|
| 91b9aabc9fa0c058ecc4a8b3f486540c28fe1cc0 |
20-Jun-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Switch to using YV12 for ImageReader.
Bug: 15116722
- Also fixes incorrect frame number for single captures.
Change-Id: I8552124d18ad176e6724f089a1e3a3f49a5eeec4
ndroid_media_ImageReader.cpp
|
| d712e1a387f06fedb33d083730d279b26ed5e399 |
19-Jun-2014 |
Jeff Tinker <jtinker@google.com> |
Add diagnostic error code to MediaDrm IllegalStateExceptions
bug: 13976775
Change-Id: I682dd66a79252a9ee030b3cab5deb350e653e933
ndroid_media_MediaDrm.cpp
|
| f4c6a154e9441bb7402e0b3d20b6ace16b9e76f1 |
12-Jun-2014 |
Elliott Hughes <enh@google.com> |
am b9525871: am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit 'b952587184572070805243e6f8380ceb769f441c':
Switch to a type-safe album art interface.
|
| b952587184572070805243e6f8380ceb769f441c |
12-Jun-2014 |
Elliott Hughes <enh@google.com> |
am 8525fe8d: am 1a3908e9: Merge "Switch to a type-safe album art interface."
* commit '8525fe8d0a5a886704307055ef211fc911997783':
Switch to a type-safe album art interface.
|
| 95d3f86fed2cab71a446f2b9ab38458ee91e3b65 |
11-Jun-2014 |
Elliott Hughes <enh@google.com> |
Switch to a type-safe album art interface.
(Requires a matching change in frameworks/av.)
Bug: 15514223
Change-Id: I4e494cc5d7a2eb82cd2b7ae3b829fc663136267a
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaScanner.cpp
|
| f928103269c948b78e93478284cc565c0ba2b040 |
09-Jun-2014 |
Elliott Hughes <enh@google.com> |
am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
* commit 'ef00c16d62cf2217c44658ad9894810322551d28':
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
|
| ef00c16d62cf2217c44658ad9894810322551d28 |
09-Jun-2014 |
Elliott Hughes <enh@google.com> |
am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
|
| e0f2fa33d79c7351d6dd1f0738d548b6f4a62f87 |
09-Jun-2014 |
Elliott Hughes <enh@google.com> |
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
ndroid_media_MediaScanner.cpp
|
| 2432912b356dfafd72f8be7b45286a9bc979029e |
05-Jun-2014 |
Elliott Hughes <enh@google.com> |
resolved conflicts for merge of f8272896 to master
Change-Id: I34a156bceb5dacd90c399c56c6f07d2a8e5c0c85
|
| f8272896686cbb3b88dbbd7338a418f72ed2347b |
05-Jun-2014 |
Elliott Hughes <enh@google.com> |
am bd1949a4: am b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."
* commit 'bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf':
[LP64] Fix access to MediaAlbumArt.
|
| 9fa803be109339e8ebfa7f338bf18858f49af709 |
05-Jun-2014 |
Elliott Hughes <enh@google.com> |
[LP64] Fix access to MediaAlbumArt.
The mSize field is a uint32_t, not a long.
Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
ndroid_media_MediaScanner.cpp
|
| 9dc96cf0fc6261606495e5e56c0be7bee77d8895 |
02-Jun-2014 |
Mike Lockwood <lockwood@google.com> |
am a0183b02: am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit 'a0183b02e4c6f53587519b445a546192b4a20146':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
|
| 307a37c2afc30190151285eb96ebd6a6940a96ec |
02-Jun-2014 |
Mike Lockwood <lockwood@google.com> |
am 1ac54ec6: am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '1ac54ec69bfcda2638b05c7daa4300ec5749e7b8':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
|
| a0183b02e4c6f53587519b445a546192b4a20146 |
02-Jun-2014 |
Mike Lockwood <lockwood@google.com> |
am 8868d129: am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '8868d1290afd96997fef671f4a7a4c7bbf94fa1a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
|
| 1ac54ec69bfcda2638b05c7daa4300ec5749e7b8 |
02-Jun-2014 |
Mike Lockwood <lockwood@google.com> |
am 750e78bb: am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
|
| 8868d1290afd96997fef671f4a7a4c7bbf94fa1a |
02-Jun-2014 |
Mike Lockwood <lockwood@google.com> |
am 1c725866: Merge "MtpDatabase JNI: Fixed incorrect method name in ALOGE."
* commit '1c725866da02c3e1f62fb416ea3450caed406f2a':
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
|
| 750e78bb7626e2e0d5c8feed4a6e4fbe7fe9b5da |
02-Jun-2014 |
Mike Lockwood <lockwood@google.com> |
am 27eb205e: Merge "MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue()."
* commit '27eb205e21e7715764084085f382d690e0406c63':
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
|
| 986b46d17974f37b82a106094aa258fd707a4596 |
31-May-2014 |
Martin Blumenstingl <martin.blumenstingl@googlemail.com> |
MtpDatabase JNI: Fixed incorrect method name in ALOGE.
Change-Id: I46688cf79f1e7554b28162df2347c4dcb571b8a9
ndroid_mtp_MtpDatabase.cpp
|
| 17a24c58bb2e86719f003c80f682beb66803f24d |
31-May-2014 |
Martin Blumenstingl <martin.blumenstingl@googlemail.com> |
MtpDatabase JNI: Fixed a memory-leak in getObjectPropertyValue().
The jstring "stringValue" was not never freed.
In the case where "str" was NULL the whole cleanup part (see "goto out")
was even skipped.
This patch makes getObjectPropertyValue() behave like
getObjectPropertyList().
Change-Id: I5a7ec3611036f5253a054b00064999bcd1d1c29e
ndroid_mtp_MtpDatabase.cpp
|
| a037bcebfa0afdf89e273b207f134e4c5d909a65 |
30-May-2014 |
Robert Shih <robertshih@google.com> |
am a034dac7: android_media_MediaMuxer_setLocation: amended signature.
* commit 'a034dac7be0658e59c73a880e958cab3c723323b':
android_media_MediaMuxer_setLocation: amended signature.
|
| a034dac7be0658e59c73a880e958cab3c723323b |
05-Feb-2014 |
Robert Shih <robertshih@google.com> |
android_media_MediaMuxer_setLocation: amended signature.
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.
Bug: 15337287
Bug: 12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)
ndroid_media_MediaMuxer.cpp
|
| b6079005ed0631c3972ff427f56e12523ec214a7 |
22-May-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
ndroid.mk
ndroid_media_DngCreator.cpp
ndroid_media_MediaPlayer.cpp
|
| feb50af361e4305a25758966b6b5df2738c00259 |
10-May-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Add HAL1 compatibility shim skeleton.
This adds basic support for running the Camera2 API on a device running
a camera HAL version lower than CAMERA_MODULE_API_VERSION_2_0.
This CL includes support for:
- N-way preview output streams
- N-way jpeg output streams
- CameraDevice emulation at the binder interface
- Basic camera metadata querying in the CameraManager
Bug: 15117269
Bug: 15116722
Change-Id: I8322955034c91f34bb348d4b28c2b774dbef38f6
ndroid_media_ImageReader.cpp
|
| b5eb843e4b7c56259e2609e2e668bf5a4cd51f42 |
20-May-2014 |
Andy Hung <hunga@google.com> |
Merge "Fix 64 bit long pointer size for media scanning"
|
| 989540264ab553109a272459339c03015fca9197 |
20-May-2014 |
Andy Hung <hunga@google.com> |
Fix 64 bit long pointer size for media scanning
Bug: 14993718
Change-Id: I98989caddcca67c2b3257cead948382fddb066da
ndroid_media_MediaScanner.cpp
|
| f967a5486a78db244624fde4c105aa5e6fa914b9 |
29-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Plumb DngCreator to native library.
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
ndroid.mk
ndroid_media_DngCreator.cpp
ndroid_media_MediaPlayer.cpp
|
| 7c513b6bef8ed4dfc28e0af6c8594563fdb9f436 |
09-May-2014 |
Lajos Molnar <lajos@google.com> |
Added MediaCodec.releaseOutputBuffer() method with render timestamp
Bug: 11784827
Change-Id: I67097c8e69b40ef3baa436f0e7731d28c696735c
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 29894c6176fdacdc933ffad742c0aeb350993787 |
08-May-2014 |
Ying Wang <wangying@google.com> |
am db55bb06: am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit 'db55bb0622e9fbe4b858d59409f516de01c1f1fd':
Remove unused LOCAL_LDLIBS.
|
| db55bb0622e9fbe4b858d59409f516de01c1f1fd |
08-May-2014 |
Ying Wang <wangying@google.com> |
am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
Remove unused LOCAL_LDLIBS.
|
| 4463cbc61d0947eccb67a52f60661a92d0cad508 |
08-May-2014 |
Ying Wang <wangying@google.com> |
am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS."
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
Remove unused LOCAL_LDLIBS.
|
| b38e3fdf5a2704913fe2c09e1778774760901a51 |
08-May-2014 |
Ying Wang <wangying@google.com> |
Remove unused LOCAL_LDLIBS.
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
ndroid.mk
|
| 5ba69bef8c36e78d1e08fae52fe276276668c20d |
08-May-2014 |
Selim Gurun <sgurun@google.com> |
Fix build
Fix the java reflection to have the devices boot again.
Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
ndroid_media_MediaPlayer.cpp
|
| ae84e20b2a0cb77223d40f55c71011d3ae8c71c7 |
01-May-2014 |
Marco Nelissen <marcone@google.com> |
am 4375e848: am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit '4375e84882a9a84b0012cf9504a30ede6ef72c1f':
MetadataRetriever: Check null pointer to avoid tombstone crash.
|
| 4375e84882a9a84b0012cf9504a30ede6ef72c1f |
01-May-2014 |
Marco Nelissen <marcone@google.com> |
am ab962b54: am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit 'ab962b54e3eac4ffadb5ea4e4948df10e6201468':
MetadataRetriever: Check null pointer to avoid tombstone crash.
|
| ab962b54e3eac4ffadb5ea4e4948df10e6201468 |
01-May-2014 |
Marco Nelissen <marcone@google.com> |
am ab3977d2: Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
* commit 'ab3977d21161815c130bdedf21e2571382d208da':
MetadataRetriever: Check null pointer to avoid tombstone crash.
|
| ab3977d21161815c130bdedf21e2571382d208da |
01-May-2014 |
Marco Nelissen <marcone@google.com> |
Merge "MetadataRetriever: Check null pointer to avoid tombstone crash."
|
| fad6fa7a04e9227f621dfea9e90f6b867c40af86 |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am 21ccb07f: am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '21ccb07fbe97097b6540097d89dd456447779178':
Cast CallVoidMethod's size_t parameters to jint
|
| 21ccb07fbe97097b6540097d89dd456447779178 |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am 414d9405: am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '414d94059f3559b67b4da25a34de6d5312abe06f':
Cast CallVoidMethod's size_t parameters to jint
|
| 414d94059f3559b67b4da25a34de6d5312abe06f |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
am 56cd8dbf: Merge "Cast CallVoidMethod\'s size_t parameters to jint"
* commit '56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07':
Cast CallVoidMethod's size_t parameters to jint
|
| 56cd8dbfbdeebc36ccbd5b2beedaaaa3f13c8b07 |
30-Apr-2014 |
Narayan Kamath <narayan@google.com> |
Merge "Cast CallVoidMethod's size_t parameters to jint"
|
| 293513a59d36cd96a3e474dde5981380d372d8c9 |
30-Apr-2014 |
Bill Yi <byi@google.com> |
Merge commit '0b62467b142b61ee1e449ba958ba37dfd961ef56' into HEAD
|
| 50ec7cbf9f77a46a4cafbfb3795d5b12c28785ff |
25-Apr-2014 |
Zhijun He <zhijunhe@google.com> |
Merge "ImageReader: remove RAW_SENSOR format translation"
|
| a5e1528f80f0472701dcbfc42d2f45ffc4a16466 |
24-Apr-2014 |
Zhijun He <zhijunhe@google.com> |
ImageReader: remove RAW_SENSOR format translation
Really not needed to have this, as both native and managed values are matched.
Change-Id: I175cbafbf88a80781a478c7aa87471fb977625b6
ndroid_media_ImageReader.cpp
|
| f74de0b6f34a1840b609f111202601e10b61400a |
22-Apr-2014 |
Lajos Molnar <lajos@google.com> |
Merge "Remove VideoEditor"
|
| e0e77cb5bb2885aea3da6823daebf40e06b073bd |
22-Apr-2014 |
Lajos Molnar <lajos@google.com> |
Remove VideoEditor
remove android.media.videoeditor.*
No longer supported and should not be used.
Bug: 13542518
Change-Id: I12de122443f0289ab1dfdd8b553e572a830cf412
ndroid_media_MediaProfiles.cpp
ediaeditor/Android.mk
ediaeditor/MODULE_LICENSE_APACHE2
ediaeditor/NOTICE
ediaeditor/VideoBrowserInternal.h
ediaeditor/VideoBrowserMain.c
ediaeditor/VideoBrowserMain.h
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorClasses.h
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorJava.h
ediaeditor/VideoEditorLogging.h
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorOsal.h
ediaeditor/VideoEditorPropertiesMain.cpp
ediaeditor/VideoEditorThumbnailMain.cpp
ediaeditor/VideoEditorThumbnailMain.h
|
| 2152a2c5f93872eac268306dc675558b2489d270 |
21-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am e618f184: am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
* commit 'e618f184733e745df4cf86019d23e085559e0f2c':
Allow DRM plugins to be destroyed when released
|
| e618f184733e745df4cf86019d23e085559e0f2c |
21-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 72eec7f6: Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
* commit '72eec7f6c9509fb86f46fbdb619523efacb8d02e':
Allow DRM plugins to be destroyed when released
|
| 72eec7f6c9509fb86f46fbdb619523efacb8d02e |
21-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Merge "Allow DRM plugins to be destroyed when released" into klp-modular-dev
|
| 3fafb4ebf2572578c6d7df742593ee5ed17748a8 |
21-Apr-2014 |
Mike Lockwood <lockwood@google.com> |
am f82c83a8: am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'f82c83a8debb468027921e4b479bf80fe7f04ee1':
MTP: Fix getThumbnail
|
| f82c83a8debb468027921e4b479bf80fe7f04ee1 |
21-Apr-2014 |
Mike Lockwood <lockwood@google.com> |
am eaabdce0: am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'eaabdce0ad556a91ccf731d042edfd9c5f249f5e':
MTP: Fix getThumbnail
|
| eaabdce0ad556a91ccf731d042edfd9c5f249f5e |
21-Apr-2014 |
Mike Lockwood <lockwood@google.com> |
am ca1f8f6d: am c4367721: MTP: Fix getThumbnail
* commit 'ca1f8f6d14a144dde64112cd471df5e9539ad521':
MTP: Fix getThumbnail
|
| c436772120ceea1d6e3f5b388ef068c99c8bb7d6 |
21-Apr-2014 |
Mike Lockwood <lockwood@google.com> |
MTP: Fix getThumbnail
The thumbnail size was not being passed to the MTP stack so getThumbnail
was returning zero length data.
Bug: 13747419
Change-Id: I309d35b5c46ab5f631c0dcb5981f7896bb5a2ed5
ndroid_mtp_MtpDatabase.cpp
|
| 2f894fec5b22948558b22753cc472d4559bea942 |
16-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
am 24dbfdaa: am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"
* commit '24dbfdaa701a729e3b231db63787e0d636b7cc3b':
frameworks: 64 bit compile issues
|
| 24dbfdaa701a729e3b231db63787e0d636b7cc3b |
16-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
am 936e87e1: am 5788722d: Merge "frameworks: 64 bit compile issues"
* commit '936e87e12dd1335c6f773705fd0a7edb32bc4385':
frameworks: 64 bit compile issues
|
| 853940331ff2be48ed3e63f459845e5e43d0a131 |
16-Apr-2014 |
Mark Salyzyn <salyzyn@google.com> |
frameworks: 64 bit compile issues
ToDo: core/jni/com_android_internal_net_NetworkStatsFactory.cpp (merge issues)
Change-Id: I5cf0bbb868e6c18e86c97c6491b6ee983a8ee1a2
ndroid_media_MediaRecorder.cpp
ediaeditor/VideoEditorMain.cpp
|
| d7cc9e3163ee19f9d6acf153209b52c47514c0ce |
16-Apr-2014 |
Dmitriy Ivanov <dimitry@google.com> |
am 5c04c4e7: am 6ced3b34: am 0d54e471: Merge "Remove code markers"
* commit '5c04c4e7b5f9dc76afe180c0b6a0901119834fcf':
Remove code markers
|
| 5c04c4e7b5f9dc76afe180c0b6a0901119834fcf |
15-Apr-2014 |
Dmitriy Ivanov <dimitry@google.com> |
am 6ced3b34: am 0d54e471: Merge "Remove code markers"
* commit '6ced3b34f02f353c0d3445775132aa9cbf40b160':
Remove code markers
|
| b8fdf8421edf689cd62c2d6a71bd4b5ad27f752e |
15-Apr-2014 |
Dmitriy Ivanov <dimitry@google.com> |
Remove code markers
Change-Id: I2defbdeddca39685194751022e6dcb5f1a48a0e9
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 600071ca78bb3fa52b4b3e04112ed6664ffe0e30 |
12-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Allow DRM plugins to be destroyed when released
bug: 13411994
Change-Id: I5b4ac137ebfbaa61bc37f8344ab6ff3a7f6c0099
ndroid_media_MediaDrm.cpp
ndroid_media_MediaDrm.h
|
| c847a4835b2233d28f6479deeed0592d267ee7bd |
30-Oct-2012 |
wang, biao <biao.wang@intel.com> |
MetadataRetriever: Check null pointer to avoid tombstone crash.
When the app's vm-heap is not enough, memory allocation for big
object like bitmap may failed.
This patch add protection for bitmap creating to avoid segment
fault error in the following GetIntField function.
Change-Id: I63977dc602f4ed395afd11004a0ed027173fb685
Signed-off-by: wang, biao <biao.wang@intel.com>
Signed-off-by: TingX Li <tingx.li@intel.com>
Signed-off-by: Wang LiangX <liangx.wang@intel.com>
ndroid_media_MediaMetadataRetriever.cpp
|
| 977ad8d26e701ed3902247852986d474e0e07f4d |
09-Apr-2014 |
Zhijun He <zhijunhe@google.com> |
ImageReader: Fix raw buffer size calculation issue
Stride should be used to calculate the size rather than width.
Change-Id: I01051fdf4dd2978d56b9998d8bcd542c50458f56
ndroid_media_ImageReader.cpp
|
| 9de8c1d82b6bf2b70e854a3349c9f1da60a23e83 |
03-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
resolved conflicts for merge of 4f342e87 to master
Change-Id: I2cdb238759beb49fede2de703df8defee92d316f
ndroid_media_MediaDrm.cpp
|
| 4f342e878d88b1f75a9b487e2aa0582b59e29083 |
03-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 4995d725: Merge "Add signature|system permission to MediaDrm signer APIs" into klp-modular-dev
* commit '4995d72520d16302fca13bc4614d1dd3c0d1c17c':
Add signature|system permission to MediaDrm signer APIs
|
| 65c94e695929ffa1aaa49d7b5938b34aaf078b6c |
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
Add signature|system permission to MediaDrm signer APIs
Also addresses style issues noted in post-submit review from
https://googleplex-android-review.git.corp.google.com/#/c/439054/
Change-Id: If177b11dbcc049bc271529c119bc5c36ae0107b5
related-to-bug: 12702350
ndroid_media_MediaDrm.cpp
|
| 53c90cf916ddd1151f042a61a569ea75a220b26e |
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 6dc8063d: am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
* commit '6dc8063d2a06017f249181b4b5b07c54ce645943':
Support CAST V2 Authentication in MediaDrm
|
| 6dc8063d2a06017f249181b4b5b07c54ce645943 |
02-Apr-2014 |
Jeff Tinker <jtinker@google.com> |
am 433a0633: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev
* commit '433a063309ba9ff9cdce4f9688e027c642a79505':
Support CAST V2 Authentication in MediaDrm
|
| e4095a80b674642e0e0e8f0883dee3b22f32f19a |
04-Mar-2014 |
Jeff Tinker <jtinker@google.com> |
Support CAST V2 Authentication in MediaDrm
Java API version
Update frameworks to enable support for CAST
V2 Authentication in the DRM Plugin.
Change-Id: I23cfbbbc89c1226b7a3968ce8bc1e2d4bd41014a
related-to-bug: 12702350
ndroid_media_MediaDrm.cpp
|
| 9c3b2583b5fd9a610456cd42710808c5624f205b |
01-Apr-2014 |
Lajos Molnar <lajos@google.com> |
Merge "MediaCodec: avoid silent array overflow in queueSecureInputBuffer()"
|
| 37109819d05495184bfcfaea91453d325828ab0b |
31-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 303d666f: am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '303d666f2e2b37120e0e9de206ce127e2a532026':
Cast CallMethod's size_t parameters to jint
|
| 303d666f2e2b37120e0e9de206ce127e2a532026 |
31-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 0e3f3c70: am 91bbb75c: Merge "Cast CallMethod\'s size_t parameters to jint"
* commit '0e3f3c70226640759d5d705233fbe59f525355bb':
Cast CallMethod's size_t parameters to jint
|
| 91bbb75c75568dee854fb10633f8ce3683265ffd |
31-Mar-2014 |
Narayan Kamath <narayan@google.com> |
Merge "Cast CallMethod's size_t parameters to jint"
|
| 0046b16ec7af940049344803afbb52953f100df3 |
26-Mar-2014 |
Mark Salyzyn <salyzyn@google.com> |
am 959bce3e: am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"
* commit '959bce3e69b4eb5dcba9ec48d92f21002f9c13b3':
jni: 64-bit compile issue
|
| 959bce3e69b4eb5dcba9ec48d92f21002f9c13b3 |
26-Mar-2014 |
Mark Salyzyn <salyzyn@google.com> |
am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue"
* commit '4e3abafc9400eed38a1e76897b79e923acfaf8ed':
jni: 64-bit compile issue
|
| aeb75fc5a3dc51bf9d5220647a68c48644c66ea8 |
20-Mar-2014 |
Mark Salyzyn <salyzyn@google.com> |
jni: 64-bit compile issue
- switch to PRId64
- some unused parameter warning suppression
Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
ndroid_mtp_MtpDatabase.cpp
|
| 7ac4f560dfe754eb4fe0d279fa03c1d9b3a7a5af |
24-Mar-2014 |
Lajos Molnar <lajos@google.com> |
MediaCodec: avoid silent array overflow in queueSecureInputBuffer()
Bug: 13006907
Change-Id: I7e1a1e37a677f8b2cf500e1cc52f4c2ff40fa470
ndroid_media_MediaCodec.cpp
|
| 136c08a7d3678e9fcf22667e75b0904a94add6bb |
05-Mar-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Cast CallMethod's size_t parameters to jint
This will avoid problems caused by automatic type
promotion of parameters when passed to a variadic function.
Change-Id: I9340cf4bc3afcb84ebb2843d2aaa1e832b0df7f4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_media_MediaExtractor.cpp
|
| 7acd69be86b77d27759fa312a78fd0be26ee1ab2 |
20-Mar-2014 |
Colin Cross <ccross@android.com> |
MediaHTTPConnection: fix JNI signature
mNativeContext was changed to a long, fix the GetFieldID signature
Change-Id: Ib19605d2c534a2aea7d75ab105349710905d716f
ndroid_media_MediaHTTPConnection.cpp
|
| 5e8ff02ec93aa0f933d0082d9a0e066b552c6a80 |
20-Mar-2014 |
Colin Cross <ccross@android.com> |
MediaHTTPConnection: use jlong to store native pointer
Change-Id: Ic4f391a8e658498e63c26ea2af4c7413ed387360
ndroid_media_MediaHTTPConnection.cpp
|
| 07cf4da1d004b145ba8b9055bbff314ef68528f3 |
19-Mar-2014 |
John Spurlock <jspurlock@google.com> |
Merge "Add stream-level suppression to vibrate/audio services."
|
| 29427a224e78068ade12bbabcf5613ce9cd48bfc |
19-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
am a0e300ef: am 458edc8d: am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit 'a0e300efae92d8155151e345034620054cff8955':
mediaeditor shouldn't depend on audioflinger.
|
| 458edc8de368607a1cf831f7e8bb70047c8bf905 |
19-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
mediaeditor shouldn't depend on audioflinger.
|
| da47d79d34bd7a3d202b29a1a5b3852d7551cf56 |
19-Mar-2014 |
Glenn Kasten <gkasten@android.com> |
am a3dc076d: am bfc44092: Merge "mediaeditor shouldn\'t depend on audioflinger."
* commit 'a3dc076d2dda77d8891fcd83f6f4056d15bbf2fc':
mediaeditor shouldn't depend on audioflinger.
|
| 1af30c7ac480e5d335f267a3ac3b2e6c748ce240 |
10-Mar-2014 |
John Spurlock <jspurlock@google.com> |
Add stream-level suppression to vibrate/audio services.
- Add new audio restriction layer to app-ops. Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled. Restrictions
also support a whitelisted set of exempt package names.
- Add new audio stream-level checks to app-ops.
- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.
- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.
- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.
- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.
Change-Id: Ifae8952647202f728cf1c73e881452660c704678
ndroid_media_MediaPlayer.cpp
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| 587a25b6cd168b78980e584772f8e7d91f778b5c |
19-Mar-2014 |
Narayan Kamath <narayan@google.com> |
mediaeditor shouldn't depend on audioflinger.
Change-Id: I7e1b999b03a3ee5eff2e10a460f64abeba16ba90
ediaeditor/Android.mk
|
| 8a358e44ccd00d72300f00031bf4f40921942e01 |
17-Mar-2014 |
Dan Stoza <stoza@google.com> |
Merge "Remove deprecated BufferQueue constructor"
|
| 92b53bc2dd42a3c1d2d7708145099da2a5fe541e |
13-Mar-2014 |
Mike Lockwood <lockwood@google.com> |
MTP: Add support for some audio specific object properties
This stops Windows 7 from putting up the
"Your device might not be able to play or view this file" dialog
when copying MP3 files to the device.
Bug: 3195286
Change-Id: Ic5b3fb75309893caae1a4f4b56068a543847f1f7
ndroid_mtp_MtpDatabase.cpp
|
| 5b3c7c1e575a7fe1bc765e5d14690e1bfd971ffb |
13-Mar-2014 |
Dan Stoza <stoza@google.com> |
Remove deprecated BufferQueue constructor
Bug: 13415624
Change-Id: Ic661d515a94fd5fad39f2d07f0cdf25337fae67c
ndroid_media_ImageReader.cpp
|
| 5b568aa04a91786962af1ab372b5a62481eea8cc |
12-Mar-2014 |
Mike Lockwood <lockwood@google.com> |
Merge "MTP: Add support for battery level device property"
|
| 56c85244b9be0fc6f6c2baf5f9a53f2364d5ec5e |
07-Mar-2014 |
Mike Lockwood <lockwood@google.com> |
MTP: Add support for battery level device property
Bug: 7342482
Change-Id: I810e55fe9695e2206816f57334ad14f65e9c641d
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpServer.cpp
|
| 762dda6d9e3aac02709a4c00f2bdf80f5de6f99a |
11-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
Don't assume that size_t is 32-bit
|
| 143528fc918d3865a6b14c98fff40cc861c29c82 |
11-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c':
Don't use size_t for variables that store uint32_t value
|
| efae1ff25d51d3c7ff2def472e8eb0c56b1be33f |
08-Mar-2014 |
Marco Nelissen <marcone@google.com> |
am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
Make MtpDatabase use libexif instead of libjhead
|
| 0bb17193cc764ea6c122a6a763cba7ece78ef8e7 |
14-Nov-2013 |
Elliott Hughes <enh@google.com> |
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
b/12603577
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
ndroid_media_MediaPlayer.cpp
|
| 8e701650179c8373a4fc5bf306befc3af2560e9d |
07-Mar-2014 |
Marco Nelissen <marcone@google.com> |
am 34425196: am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit '344251969929dcb37a33a3e3910121458f7dc38f':
Make MtpDatabase use libexif instead of libjhead
|
| 344251969929dcb37a33a3e3910121458f7dc38f |
07-Mar-2014 |
Marco Nelissen <marcone@google.com> |
am ac875878: am 9823a170: Merge "Make MtpDatabase use libexif instead of libjhead" into klp-dev
* commit 'ac87587875f1dfade5e06a82ccc009d0f0170569':
Make MtpDatabase use libexif instead of libjhead
|
| e78a747d35762c5468c7af4cd80ca60f1b0e0d2e |
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am f7a6fe95: am 0425a51b: am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit 'f7a6fe95b0b439d3c6288b0b9da152b4c70c2265':
Don't assume that size_t is 32-bit
|
| 6ae7cd063b244ed53ad7dfa5515d59a8af859361 |
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am f2c11c14: am 214c3d9b: am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit 'f2c11c142975f1571a0e8606a3b274afcb987b83':
Don't use size_t for variables that store uint32_t value
|
| 6087c51da80510e95549f5887d35bfbfa44af3c6 |
07-Mar-2014 |
Marco Nelissen <marcone@google.com> |
am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
libexif is now libjhead
|
| aefa427c27396bef64ee37d5c4d94e0a63cf7b05 |
10-Jan-2014 |
Marco Nelissen <marcone@google.com> |
Make MtpDatabase use libexif instead of libjhead
b/12203995
Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
ndroid.mk
ndroid_mtp_MtpDatabase.cpp
|
| 0425a51b0715e23de7c21feddf6cb055563c3a7a |
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 51ec4ec5: am 5de03b18: Merge "Don\'t assume that size_t is 32-bit"
* commit '51ec4ec51f88d854b182547405e37f3ae74c35bd':
Don't assume that size_t is 32-bit
|
| 214c3d9b064c35437cfbab1ea3b82a7fb343ca6b |
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
am 6ac6263d: am 28ccb4f7: Merge "Don\'t use size_t for variables that store uint32_t value"
* commit '6ac6263dcc55a4a93647cc1307c901a01c06d89c':
Don't use size_t for variables that store uint32_t value
|
| 5de03b18ea455c0250cbd01912282f28d8635910 |
07-Mar-2014 |
Narayan Kamath <narayan@google.com> |
Merge "Don't assume that size_t is 32-bit"
|
| faab8b23134ed12be16f58dd08c84175af27348b |
07-Mar-2014 |
Marco Nelissen <marcone@google.com> |
Fix build
Bad automerge
Change-Id: I000a9d3ac2915b3e39d2d34bd52062ac47e9f0fe
ndroid.mk
|
| da7ad468d9b86132f7546988324663c47cc0381c |
07-Mar-2014 |
Marco Nelissen <marcone@google.com> |
am 4bf85e84: am daefb17c: am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '4bf85e84e95cd39f5bded8abc8d1e0bf9c28e3ce':
libexif is now libjhead
|
| daefb17c2516eae398da989b6b2a368a0b843284 |
07-Mar-2014 |
Marco Nelissen <marcone@google.com> |
am e1af0bd8: am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit 'e1af0bd8588ca2de7084853017928729a793b769':
libexif is now libjhead
|
| e1af0bd8588ca2de7084853017928729a793b769 |
07-Mar-2014 |
Marco Nelissen <marcone@google.com> |
am 4f36104f: am e29c96e7: Merge "libexif is now libjhead" into klp-dev
* commit '4f36104f06755dc2c95b3d7c8bac5312d7572199':
libexif is now libjhead
|
| c0786cc258363c246d65a7172e6faf6dae9ef2d5 |
19-Dec-2013 |
Marco Nelissen <marcone@google.com> |
libexif is now libjhead
b/12203995
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
ndroid.mk
|
| fef85ef152ab176fd96dbe3047c8025136fa8560 |
05-Mar-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Cast CallVoidMethod's size_t parameters to jint
offset and size variables are passed to set method
of MediaCodec.BufferInfo java class. The corresponding
actual parameters of set method are of int type in java.
These variables are expected to fit in jint as they
indicate the offset and size of data in a media codec
buffer.
The variables are cast to jint, prior to passing to
java method, to avoid problems caused by automatic
type promotion of parameters when passed to a
variadic function, CallVoidMethod.
Change-Id: I39e202306f1b7122448c947f6d275f00251bb33a
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_media_MediaCodec.cpp
|
| e92416dfeb115939231819c5edb593b8bb81cc6d |
05-Mar-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Don't assume that size_t is 32-bit
Crypto data was being copied to java jint array in chunks of
size_t. This will not work on LP64 as size_t will be 64-bit.
This patch changes copy to use int32_t chunks instead of size_t.
Change-Id: I75d910a1182ad2f58f432cd172127f048b4c393b
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_media_MediaExtractor.cpp
|
| 58fad0bf141109f1aed820f4d57985c116e05b61 |
04-Mar-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Don't use size_t for variables that store uint32_t value
The local variables width, height, displayWidth and
displayHeight are set to the corresponding members
of VideoFrame class. As the members of VideoFrame are
uint32_t, the local variables have been changed to
uint32_t.
As these local variables are passed to a java method,
the change of size_t to uint32_t ensures that the size
of the actual parameter (i.e uint32_t) is now same as
the size of the formal parameter (i.e. jint) for all
platforms.
Change-Id: Icd14de0142bfd4e6ba52a3e6aff3d80b323a0de4
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_media_MediaMetadataRetriever.cpp
|
| 128b012cc8c2369136bb8450bc91c81aebe18506 |
02-Mar-2014 |
Chong Zhang <chz@google.com> |
fix MediaCodec release deadlock and resource leak
Bug: 12910147
Change-Id: I5f2c02b6ad5bfcd88797c6aa79dcaa23d030eacf
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| eece0dda56ae29fff6e9003df97594f6ac50b6e2 |
27-Feb-2014 |
Derek Sollenberger <djsollen@google.com> |
Fix includes so that they no longer rely on the global Skia includes directories.
bug:13225538
Change-Id: Ia5d816dc665f81c7985f21036af4fd0a63c560cf
ndroid.mk
ndroid_media_MediaMetadataRetriever.cpp
ediaeditor/Android.mk
|
| 9ae000ca8c05ad6f700ad7bf119bbc92fb964b57 |
13-Feb-2014 |
Andreas Huber <andih@google.com> |
Revert "Split AndroidRuntime into AndroidRuntimeBase base-class and the rest."
This reverts commit 7825334929b098b36e1144872200e75ba6d24b13.
Change-Id: I1702eb3ff9d7192d64039c8bf4bc3fc5d8e458c4
ndroid.mk
ediaeditor/Android.mk
|
| 7825334929b098b36e1144872200e75ba6d24b13 |
07-Feb-2014 |
Andreas Huber <andih@google.com> |
Split AndroidRuntime into AndroidRuntimeBase base-class and the rest.
AndroidRuntimeBase (exported by libandroid_runtime_base.so) is all you need
to link against to gain the ability to do AndroidRuntimeBase::getJNIEnv()
thus minimizing build dependencies.
Change-Id: Ia7f0c94c8c02b974c068e0db34774827f96aa95b
ndroid.mk
ediaeditor/Android.mk
|
| b1ed19a2ed1739c0d415cc81a3b7c458307694ab |
11-Feb-2014 |
Narayan Kamath <narayan@google.com> |
am 43c9516a: am 860bba68: am 7b7726b7: Merge "Fix in MediaMuxer\'s JNI code"
* commit '43c9516a29563131e04ee797562130e2c4f9d54e':
Fix in MediaMuxer's JNI code
|
| d2507a2f3cbe150fdf90d5a3a12b2711774ca3d4 |
07-Feb-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
Fix in MediaMuxer's JNI code
android_media_MediaMuxer_native_setup should return jlong. It was
incorrectly returning jint.
Change-Id: I31a475af0818f4d5dcbb39380b42612188cf3853
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_media_MediaMuxer.cpp
|
| b341a24b2adbb67cdc34ade0a19570ee37f0cb82 |
06-Feb-2014 |
Andreas Huber <andih@google.com> |
Merge "Remove no longer needed http proxy handling code, it's obsolete now"
|
| 7da27478ea09d7e6c8e6bb8c563ea6439c53e28f |
05-Feb-2014 |
Robert Shih <robertshih@google.com> |
Merge "android_media_MediaMuxer_setLocation: amended signature."
|
| f8a0c47e9091d7a14e05dedc65b49af09fdc8fb8 |
05-Feb-2014 |
Andreas Huber <andih@google.com> |
Remove no longer needed http proxy handling code, it's obsolete now
since we started to use java's HTTPConnection instead of the native
implementation.
Change-Id: I32b08480593a859e0368dbbcf8da8f25c9e08ca9
ndroid_media_MediaPlayer.cpp
|
| 3cb78498d3f664f541ba7d28f4543cf8c12733f1 |
05-Feb-2014 |
Robert Shih <robertshih@google.com> |
android_media_MediaMuxer_setLocation: amended signature.
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.
Bug: 12890910
Change-Id: I7feb7fa5c3eccc07f2d1bc733b7d4b3a3b52e292
ndroid_media_MediaMuxer.cpp
|
| d2506a506303ed94fd1991cf986b825b870a67c5 |
29-Jan-2014 |
Andreas Huber <andih@google.com> |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
Change-Id: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
ndroid.mk
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
ndroid_media_MediaHTTPConnection.cpp
ndroid_media_MediaHTTPConnection.h
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
|
| 10586ad2a6996b8f9f84ed47a65ccc2d883fc19f |
31-Jan-2014 |
Zhijun He <zhijunhe@google.com> |
am 4f840dd1: am 5901ddeb: am 0a1b64fe: Merge "Release locked buffer when it fails to acquire graphics buffer"
* commit '4f840dd16db41a2d4442667193d57260f84af04a':
Release locked buffer when it fails to acquire graphics buffer
|
| 0a1b64fe79f41eec5cebe8434ab30d93e2ea2724 |
31-Jan-2014 |
Zhijun He <zhijunhe@google.com> |
Merge "Release locked buffer when it fails to acquire graphics buffer"
|
| a0398430fcf365fba6e42ad0bdca2fbf45ed6fe0 |
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers as they can
be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Change-Id: I940433f601c6db998c1a8ffff338f5361200d5ed
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
ndroid_media_MediaMetadataRetriever.cpp
|
| 36bef0bf30d6bae48cf3837df351075ca4fce654 |
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:
ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com
Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.
Commit messages below:
================================================
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers as they can
be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
==================================================================
AArch64: Use long for pointers in graphics/Camera
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
===================================================================
Change-Id: Id5793fa0ebc17ee8b1eecf4b3f327977fdccff71
ndroid_media_MediaMetadataRetriever.cpp
|
| 334778981dc01b5f8f4e137eb3f78745e214cf4d |
27-Jan-2014 |
lina.x.pi <lina.x.pi@sonymobile.com> |
Release locked buffer when it fails to acquire graphics buffer
The JNI buffer in ImageReader_imageSetup is not released when
it fails to acquire graphics buffer. After all JNI buffers are
exhausted, ACQUIRE_MAX_IMAGES will be returned and leads to
error. The JNI buffer should be released when it fails to acquire
graphics buffer.
Change-Id: I3319a58ac44e36c8593b404672a685c4b589a735
ndroid_media_ImageReader.cpp
|
| aba671392d6606e35726c350a28d0c9b36ebfe16 |
22-Oct-2013 |
Andreas Huber <andih@google.com> |
API that allows usage of MediaCodec APIs without polling.
Change-Id: Iebccdd3aec74a2cfa9ad0bf16c0c6006a3b72999
related-to-bug: 11990118
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 7023df08f14ec5dee76ac54c03e870f84e297636 |
27-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Revert "AArch64: Make graphics classes 64-bit compatible"
This reverts commit 18b4cbeedef21c1fa666a110a157bab66edff976.
Change-Id: I0c52983a3ab1ace3ff743de546a43eca28e5cb0e
ndroid_media_MediaMetadataRetriever.cpp
|
| 18b4cbeedef21c1fa666a110a157bab66edff976 |
20-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Make graphics classes 64-bit compatible
This a merger of two commits submitted to AOSP by
the following authors:
ashok.bhat@arm.com, david.butcher@arm.coma
craig.barber@arm.com, kevin.petit@arm.com and
marcus.oakland@arm.com
Due to the very large number of internal conflicts, I
have chosen to cherry-pick this change instead
of letting it merge through AOSP because the merge
conflict resolution would be very hard to review.
Commit messages below:
================================================
AArch64: Make graphics classes 64-bit compatible
Changes in this patch include
[x] Long is used to store native pointers as they can
be 64-bit.
[x] Some minor changes have been done to conform with
standard JNI practice (e.g. use of jint instead of int
in JNI function prototypes)
[x] AssetAtlasManager is not completely 64-bit compatible
yet. Specifically mAtlasMap member has to be converted
to hold native pointer using long. Added a TODO to
AssetAtlasManager.java to indicate the change required.
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Craig Barber <craig.barber@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
==================================================================
AArch64: Use long for pointers in graphics/Camera
For storing pointers, long is used in
android/graphics/Camera class, as native
pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use of
jint instead of int in JNI function prototypes)
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
===================================================================
Change-Id: Ib3eab85ed97ea3e3c227617c20f8d213f17d4ba0
ndroid_media_MediaMetadataRetriever.cpp
|
| 0937eed32fbe780182cb0349ac29680add7e492c |
23-Jan-2014 |
Marco Nelissen <marcone@google.com> |
Check that the exif bits are actually there
b/12663599
Change-Id: If2af0ab20f29ab3264a8c6c8c4abf0ebeff6616c
ndroid_mtp_MtpDatabase.cpp
|
| 6bb5cb24b458a11bd02e9bff37c03f6381e06b7c |
16-Jan-2014 |
Narayan Kamath <narayan@google.com> |
Resolved conflicts for merge of 28c6ec02 to master
Change-Id: Idf1cabf2694dfa13d928df944d346f5e051b6948
|
| 075e9a19ce645752f8282bc19c91b25978a7dc52 |
06-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in media classes
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCrypto.cpp
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaProfiles.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| 633f8c227bfbc8962d516a7fae4a8bf306d0aa53 |
14-Jan-2014 |
Marco Nelissen <marcone@google.com> |
am 28f032e6: am e2c046fe: am 13249411: am a9045d24: am 337aa376: Merge "Add NULL check in updateProxyConfig"
* commit '28f032e6a66d74d570b36672939000707455acb1':
Add NULL check in updateProxyConfig
|
| 337aa376c09bb97a48afe075b4018f030445534f |
14-Jan-2014 |
Marco Nelissen <marcone@google.com> |
Merge "Add NULL check in updateProxyConfig"
|
| 92351c58866013db044b99cb79a6c0595499f22b |
13-Jan-2014 |
Marco Nelissen <marcone@google.com> |
libjhead_jni is still needed
protip: do not remove things from makefiles just because it builds without them
b/12528751
Change-Id: I3ef8dcdf638e8b59d309922bb972c893fc75a712
ndroid.mk
|
| 08af2ca38a45b2f92c0ae9360dd399de49d79b48 |
11-Jan-2014 |
Jason Sams <jsams@google.com> |
am bb0a4f20: am 1ae17633: am 411350dd: am 739ae9b3: am 868173a5: Merge "Fix a JNI local reference leak in MediaDrm"
* commit 'bb0a4f20502c27a920b7d874c9a17c178afee5f9':
Fix a JNI local reference leak in MediaDrm
|
| 868173a53f0d1059408b049f30af3402d5b0de64 |
11-Jan-2014 |
Jason Sams <jsams@google.com> |
Merge "Fix a JNI local reference leak in MediaDrm"
|
| 3cd393c5051ce26c8030736f5524962d98abe849 |
10-Jan-2014 |
Marco Nelissen <marcone@google.com> |
Make MtpDatabase use libexif instead of libjhead
b/12203995
Change-Id: I0e0e6209be7a9d3e493abdcee8619cae6d4b9501
ndroid.mk
ndroid_mtp_MtpDatabase.cpp
|
| c975437ef3338ba38b76b1a07594ccfd6e089709 |
07-Jan-2014 |
Narayan Kamath <narayan@google.com> |
am 1e3395c7: am 105b545e: am 0dce19ca: am 79ceb53a: am c58abeea: Merge "AArch64: Use long for pointers in MTP classes"
* commit '1e3395c7378a7dd293a2e8a8ac8fbf239adbad0c':
AArch64: Use long for pointers in MTP classes
|
| 819f2e12347e588c223923a3698daafb1c593ccf |
07-Jan-2014 |
Narayan Kamath <narayan@google.com> |
am 510616d2: am bec733af: am 23ebc24e: am 08467c57: am 9bc6acf2: Merge "AArch64: Use long for pointers in VideoEditor classes"
* commit '510616d215372e59e5e8c39b8de1125fc5b54c60':
AArch64: Use long for pointers in VideoEditor classes
|
| e434ddd042f7fe9ff905ab29bda14e113e3d1c55 |
07-Jan-2014 |
Narayan Kamath <narayan@google.com> |
am 113e83e6: am 58cb0f0c: am bfbe585e: am c0c92f20: am 357ea905: Merge "AArch64: Use long for pointers in audio effect classes"
* commit '113e83e6f538ea217c167c6d8e11b28042ff2c53':
AArch64: Use long for pointers in audio effect classes
|
| ac8bd534ddc474e5aadbe6a6edde200cff52d442 |
07-Jan-2014 |
Narayan Kamath <narayan@google.com> |
am 99aec6b5: am 40b0aaa9: am 568cde55: am 80cff944: am 74675f29: Merge "AArch64: Use long for pointers in AmrInputStream"
* commit '99aec6b5d1cb73a3f5b57badc53e6f56b2a53c4d':
AArch64: Use long for pointers in AmrInputStream
|
| e2e59326f13cf291bf5b37989390fd2a55a94f0c |
17-Dec-2013 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in MTP classes
For storing pointers, long is used in MTP classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: I67805547251722e7b77611d47d0bb632a64d3e6d
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
ndroid_mtp_MtpServer.cpp
|
| 44ba5c1b4ef33ff50dacb2eb5553d01405e77f4d |
17-Dec-2013 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in VideoEditor classes
For storing pointers, long is used in VideoEditor
classes, as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Ifff3a28f2ab6774ee89d31770ad63451c8726431
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorMain.cpp
|
| ea7861c918567d17d40a762b38f97c053d88b839 |
17-Dec-2013 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in audio effect classes
For storing pointers, long is used in AudioEffect
and Visualizer classes, as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Ief49bbe5baef663e268c7f6d70ac33a4df45621c
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| b348c3fd87bff8641bb0c2fc475742f1847a4784 |
17-Dec-2013 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in AmrInputStream
For storing pointers, long is used in AmrInputStream
class, as native pointers can be 64-bit.
Change-Id: I78fff3eb54fc7101746b0d693cbc4e923c2bad08
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
ndroid_media_AmrInputStream.cpp
|
| 83cc994ba40a7227c62a65ccb5addf3a23ff6350 |
02-Jan-2014 |
Chong Zhang <chz@google.com> |
MediaRecorder: add getSurface() api and SURFACE video source
Bug: 12305192
Change-Id: If833c5ac8a738ffa284307e0435b5cbd1b7379b1
ndroid_media_MediaRecorder.cpp
|
| e754e7880a76d23f06235e200e42704e1ace2977 |
20-Dec-2013 |
Marco Nelissen <marcone@google.com> |
Merge "libexif is now libjhead"
|
| 7f6abf84abd78a501a1be93b4b48d71c9063f024 |
19-Dec-2013 |
Marco Nelissen <marcone@google.com> |
libexif is now libjhead
Change-Id: I6b749e251a2e03738550ce911e59527f80d26212
ndroid.mk
|
| f3172c623e4bb77a047262c6e7eedc4a2c2ea95a |
19-Dec-2013 |
Narayan Kamath <narayan@google.com> |
Merge "MediaDrm#mNativeContext is a long, not int."
|
| 265551a164ac7757d1f2dacc0e2ab0afa0f850c7 |
10-Dec-2013 |
Patrik2 Carlsson <patrik2.carlsson@sonymobile.com> |
Fix a JNI local reference leak in MediaDrm
A reference leak was found in the subtitle usecase that also
applies to android_media_MediaDrm.cpp
(Code taken from the similar fix in android_media_MediaPlayer.cpp)
Change-Id: Icc4b25e4adc9a600ff4ac99a7a8478bb55a6e348
ndroid_media_MediaDrm.cpp
|
| e795ec73ebcdad306129ee55c21f8251b4603317 |
24-Sep-2013 |
Oscar Rydhé <oscar.rydhe@sonymobile.com> |
Add NULL check in updateProxyConfig
If the exclusionList was null in updateProxyConfig the VM would
crash when converting it to a UTF8 string. Avoid this by adding a
null check.
Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
ndroid_media_MediaPlayer.cpp
|
| 535daa191be782e147d0a115846135fe4229cf0b |
18-Dec-2013 |
Narayan Kamath <narayan@google.com> |
Remove unused field from MediaMuxer
Change-Id: If1ebb2302654b64924084a52425366f1b69c7c30
ndroid_media_MediaMuxer.cpp
|
| f11dd63e0c5c8cf02d382351004000b243013b5f |
18-Dec-2013 |
Narayan Kamath <narayan@google.com> |
MediaDrm#mNativeContext is a long, not int.
Therefore, we must use SetLongField and not SetIntField.
Change-Id: I2a805dd6b7c8e4905e742d8632d941f381a05930
ndroid_media_MediaDrm.cpp
|
| 656fd0402613cec0196d5e2ae0a460d044d2805b |
28-Nov-2013 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in MediaDrm and MediaMuxer
For storing pointers, long is used in MediaDrm and
MediaMuxer classes, as native pointers can be 64-bit.
Change-Id: I77f26cde627baf0dce70b6aa3a4dbd974051d9a6
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
ndroid_media_MediaDrm.cpp
ndroid_media_MediaMuxer.cpp
|
| dbccd44a638ae8705a5b14bff8b2dd74abc26045 |
22-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
|
| 99f752149b1a0df9ea0ba311d609d4d6e103787c |
14-Nov-2013 |
Elliott Hughes <enh@google.com> |
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
ndroid_media_MediaPlayer.cpp
|
| fd2e50086c4f4e2bb064c76a1de73e10c172f387 |
25-Sep-2013 |
Marco Nelissen <marcone@google.com> |
Fix hang
b/10855561
Change-Id: I29b046b835ce0ca3644e5c2e8f9bca5c0b380d4b
ndroid_media_MediaCodec.cpp
|
| badca26cb218852d32862dada36ee52fce865ad2 |
20-Sep-2013 |
Jean-Michel Trivi <jmtrivi@google.com> |
Add audio level monitoring capabilities in Visualizer effect
Extend the visualizer audio effect with the capability to query
peak and RMS values for the currently playing audio.
Values are expressed in mB and are retrieved as an array of
int values in the native layer, and written directly as
object fields for the JNI.
Bug 8413913
Change-Id: I808075a18e61f85c566544a2bdaae10e5c4a644b
udioeffect/android_media_Visualizer.cpp
|
| 4eda9f5359347c11914e47f477535c9533674d32 |
18-Sep-2013 |
Zhijun He <zhijunhe@google.com> |
ImageReader: disable NV21 support
Bug: 10787131
Change-Id: I5ff0a67144b5ec49eabde6129423a41c9597c2b8
ndroid_media_ImageReader.cpp
|
| 9e6d073a999d7934aa3f22a5877c6e8e2ce15766 |
17-Sep-2013 |
Zhijun He <zhijunhe@google.com> |
ImageReader: fix the 0 crop rect size issue
Rect isValid actually include the zero size case, which we don't want to include
in our case. This causes camera ImageReader test case fails at buffer size
sanity check.
Bug: 9802344
Change-Id: I561f5a049c6117c613df1e1b2789c43af9a19628
ndroid_media_ImageReader.cpp
|
| 5cf86aa7564eff8443158644e866a420d865b1bc |
16-Sep-2013 |
Igor Murashkin <iam@google.com> |
Merge "media: Update ImageReader to remove MaxImagesAcquiredException" into klp-dev
|
| 26cb5fd5fffb2204ec12994cacb3b32639eb4d59 |
16-Sep-2013 |
Igor Murashkin <iam@google.com> |
Merge "media: Update ImageReader APIs" into klp-dev
|
| cfa553369fd8ef68db751fe1052cd17fd5763965 |
16-Sep-2013 |
Zhijun He <zhijunhe@google.com> |
ImageReader: get correct crop size
Bug: 10752797
Change-Id: I2e56d69cde7f5ca669a366646b876861b277a239
ndroid_media_ImageReader.cpp
|
| e3351f1942bfe86682389b278e7ff128a72ea671 |
13-Sep-2013 |
Igor Murashkin <iam@google.com> |
media: Update ImageReader to remove MaxImagesAcquiredException
* acquiring images now throws IllegalStateException instead of
MaxImagesAcquiredException
Bug: 10691447
Change-Id: I7ce68f990fb96703705b9181012a28633fea0b7a
ndroid_media_ImageReader.cpp
|
| 5e712064dfe48992f8f732208fa4fc13f3455b30 |
30-Aug-2013 |
Igor Murashkin <iam@google.com> |
media: Update ImageReader APIs
Bug: 10461757
Change-Id: Ic04e4c41965e3d417b29004f3f08e0cd56b8f4cb
ndroid_media_ImageReader.cpp
|
| 91019c9ef34b2fb00a1c027a57d75ed9e0810df5 |
12-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Merge "Remove dependency on JNIHelp header side effects." into klp-dev
|
| 37682135da2fd90e7bc6a89a418862d1f4ca15fd |
11-Sep-2013 |
Zhijun He <zhijunhe@google.com> |
ImageReader: Skip size check for BLOB format
HAL_PIXEL_FORMAT_BLOB is for JPEG capture, the buffer width/height by definition
shouldn't be the same as the image width/height.
Bug: 10360518
Change-Id: I32146a0e8e15439bb8fe199403db4ff37d1ab1af
ndroid_media_ImageReader.cpp
|
| 87eac99a21772ae56018cb81db6966557b459554 |
10-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove dependency on JNIHelp header side effects.
Bug: 10680559
Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
ndroid_media_MediaDrm.cpp
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaScanner.cpp
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorLogging.h
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| cfd47481d1b375663d4e8e8d0c292d9001aa384b |
10-Sep-2013 |
Zhijun He <zhijunhe@google.com> |
MediaMuxer: Add setLocation API
This API could be used for camera recording when MediaMuxer is used to write
output media file.
Bug: 10594784
Change-Id: Ide2d6e1d87b246100a5def49bfb8646dc984a512
ndroid_media_MediaMuxer.cpp
|
| d901c033756b01f5bd3c697fb3802331e9b45ad0 |
28-Aug-2013 |
Igor Murashkin <iam@google.com> |
media: ImageReader throws OutOfResourcesException when out of buffers
Bug: 10507939
Change-Id: I34c66485695ad6141388be85903cbecb9ebaa5ab
ndroid_media_ImageReader.cpp
|
| af753a2dfc66c92bfcac64b77c7a4d89d9434ad8 |
23-Aug-2013 |
Zhijun He <zhijunhe@google.com> |
ImageReader: Fix API doc table misalignment issue
Also cleanup unused macro in ImageReader.
Bug: 10360518
Change-Id: I2332703c92df771a6339ff92069e92d50a6c5cd5
ndroid_media_ImageReader.cpp
|
| 76cf8fe75e7c1abce9383fb915842f62228a1d91 |
23-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "Add ability to test supported content types to MediaDrm" into klp-dev
|
| 7cda491321b9bd2e8faf956824312ea6a30e6457 |
21-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Add ability to test supported content types to MediaDrm
bug: 10244066
Change-Id: Ic96c2e23f36809faf1c88ede500f4bc2bad4142a
ndroid_media_MediaDrm.cpp
ndroid_media_MediaDrm.h
|
| df717aaa258e88c1af40b61e42aab86dabec8f61 |
17-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix JNI method called with exception pending" into klp-dev
|
| 8117d8f7023f8981bc4b2651efed5b28104d83d3 |
16-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Fix JNI method called with exception pending
bug: 10313912
Change-Id: I8390905334f2e37f210adced52c31e7a431d4f55
ndroid_media_MediaDrm.cpp
|
| dd0643202de80cc4ced37d1844e722c8a5e89154 |
15-Aug-2013 |
Igor Murashkin <iam@google.com> |
media: Fix ImageReader only using maxImages=1 no matter what
- No longer return null when some bad error happens
- Throws OutOfResourcesException when images need to be closed
- Throws IllegalStateException when an unknown internal error happens
Bug: 10333400
Change-Id: Ia53a5dd33f9ce53abd036e080e6fcc4ded9b251d
ndroid_media_ImageReader.cpp
|
| ca2fb9158e104ac88c8014e1273fd4554e1acd23 |
14-Aug-2013 |
Andreas Huber <andih@google.com> |
Merge "Expose MediaCodec.setParameters API to" into klp-dev
|
| 80c4437ebfe3e679267a64e4c9d7bdd585b7afce |
10-May-2013 |
Lajos Molnar <lajos@google.com> |
MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities
Added isFeatureSupported method to CodecCapabilities, so that applications
can query whether codecs support various features. For now
added one video-decoder feature:
FEATURE_AdaptivePlayback
Media playback applications can query it to see if the codec
supports seamless resolution changes during decoding.
Change-Id: I56b2cf1429f39f9b9e0243a990c95e7a64dd7ff7
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug: 7093648
ndroid_media_MediaCodecList.cpp
|
| 226065bbe60cf32b33a5f86d27e2db88138e4486 |
12-Aug-2013 |
Andreas Huber <andih@google.com> |
Expose MediaCodec.setParameters API to
- change video target bitrate on the fly
- request sync frames
- temporarily suspend feeding input buffers to the encoder
Change-Id: If5cf1162b2eeb28ac08288ecfa9f0e9823dd972e
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 8d5f3e31c914e29129f50fe9830d71adf52ab5cf |
12-Aug-2013 |
Andreas Huber <andih@google.com> |
Manage jclass objects (and most jobjects) in jni code using ScopedLocalRef
for safer refcounting. Previously jclass objects were not DeleteLocalRef'ed
at all, leading us to exhaust the local ref pool quickly in certain
circumstances.
This change also makes sure we properly serialize int64_t entries when
converting from AMessage to HashMap and boosts thread priority for
java-instantiated MediaCodecs slightly from NORMAL to FOREGROUND.
Change-Id: I4ebdd8a5ca6b3442698c9f86fcc31af8c199aaf5
ndroid_media_MediaCodec.cpp
ndroid_media_Utils.cpp
|
| f724c277d3362dbc8099fcbf8674609a424cd2ee |
07-Aug-2013 |
Jeff Brown <jeffbrown@google.com> |
Add more virtual display tests.
We can't test everything in CTS because some features require
system permissions. So this is another copy of the CTS test
with more stuff that we can build with the system cert.
Change-Id: Ied5a456a0810d38d307b6dfbad0f770cb480b4ee
ndroid_media_ImageReader.cpp
|
| 8f6c998cfb98ee6dbaac52bed5081be44df99d00 |
07-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "Define error codes for MediaCodec.CryptoException"
|
| 52a9a10b6b8c7b7a9f97777541841b94d4fd9754 |
02-Aug-2013 |
Mathias Agopian <mathias@google.com> |
Clearly separate consumer and producer interfaces
Bug: 9265647
Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf
ndroid_media_ImageReader.cpp
|
| 445b5f460fd083a0f267669db450d2e2fa049f08 |
06-Aug-2013 |
Jeff Brown <jeffbrown@google.com> |
Merge "Minor style cleanups."
|
| 708e3595031fa15f4ac26c5675a53c1ed495b895 |
05-Aug-2013 |
Zhijun He <zhijunhe@google.com> |
ImageReader: Add RGB format support.
Bug: 10155122
Change-Id: Id53d6ec815488e73bde6ca62b42c92d16bc813c9
ndroid_media_ImageReader.cpp
|
| ef961215599b1c154130d4e64e46a401d6bfef67 |
06-Aug-2013 |
Jeff Brown <jeffbrown@google.com> |
Minor style cleanups.
A few changes to demonstrate a slightly cleaner way to write
JNI code in the framework especially when multiple types are
involved. We use this pattern in many other places outside
of the media stack.
Added more detail to the UnsupportedOperationException that
occurs when buffer formats don't match.
Change-Id: Ic894dc1bd71b387f1be6ea1798fa59e533e9574f
ndroid_media_ImageReader.cpp
|
| 3ed38266c1647c6219ae5ad89cb3f867cf66caaa |
03-Aug-2013 |
Jeff Tinker <jtinker@google.com> |
Define error codes for MediaCodec.CryptoException
Define specific failure cases so apps have the information they
need to deal with these conditions.
Also adds a new ResourceBusyException to MediaDrm
Change-Id: Iaecf269d58108f28179974b05671bf29b9fe4b7d
related-to-bug: 10157154
related-to-bug: 9695816
ndroid_media_MediaCodec.cpp
ndroid_media_MediaDrm.cpp
|
| 7f4d3147d1851d2f0c544e45390c139bda9fd9aa |
23-Jul-2013 |
Zhijun He <zhijunhe@google.com> |
camera2: Implement CameraDevice#waitUntilIdle
Also cleanup some logging/comments.
Change-Id: Id1a4dd853519802a2b74b8d2172095ba388329e6
ndroid_media_ImageReader.cpp
|
| e32632682ca9207bd247ca27012cf670b5c23f54 |
17-Jul-2013 |
Mathias Agopian <mathias@google.com> |
update to new Consumer APIs
Change-Id: I8649f3add40e0aeeeb0396b98e2cb93312e8e990
ndroid_media_ImageReader.cpp
|
| b550929b7a4b0d5f9645a7a1ebf287d3f13cf1af |
13-Jul-2013 |
Mathias Agopian <mathias@google.com> |
always pass the BufferQueue explicitely to consumers
Change-Id: I32e380979a3f4c6b1dfb440cc5b5c3d30d7607db
ndroid_media_ImageReader.cpp
|
| 534046d2b12fd13776ad782b982649cb0bea9b79 |
01-Jul-2013 |
Zhijun He <zhijunhe@google.com> |
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
ndroid.mk
ndroid_media_ImageReader.cpp
|
| 212e78df9eb3bfff069de01aa7820cf4201c5f82 |
07-Jun-2013 |
Zhijun He <zhijunhe@google.com> |
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
ndroid.mk
ndroid_media_ImageReader.cpp
ndroid_media_MediaPlayer.cpp
|
| 3e72eb5245a439525976dbb9a67280b9b26b9f14 |
14-Jun-2013 |
Marco Nelissen <marcone@google.com> |
Remove unused MediaPlayer methods
Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
ndroid_media_MediaPlayer.cpp
|
| 4a02d4c60946c257ab48783493db67ca08e327bc |
03-Jun-2013 |
Andreas Huber <andih@google.com> |
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
|
| d5f9fa574da2ee210ac86154ab0aea9fee5e8278 |
28-May-2013 |
Andreas Huber <andih@google.com> |
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)
ndroid_media_MediaPlayer.cpp
|
| a70924bedd76a37de5cd5a0c86c5e9dd77614fcb |
22-May-2013 |
Jeff Tinker <jtinker@google.com> |
am eaa9ce70: am 606ab470: Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev
* commit 'eaa9ce7064ad4978d5acaafd4e797b5186ff03de':
Improve exception error messages to help diagnose app errors
|
| 63c7f94c48450283b6041f23b7a9d99214aa8eab |
22-May-2013 |
Jeff Tinker <jtinker@google.com> |
am 09d6ad37: am 2161b7cb: Merge "Fix invalid keyType translation in MediaDrm.getKeyRequest" into jb-mr2-dev
* commit '09d6ad37f790f1e135c4dbe71109b33ae29a94cc':
Fix invalid keyType translation in MediaDrm.getKeyRequest
|
| 606ab4706df372974cc86eb1bb1c50d79422d7cc |
22-May-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "Improve exception error messages to help diagnose app errors" into jb-mr2-dev
|
| 17b8922785987afa002fb5f081781f056e3ca1c7 |
21-May-2013 |
Jeff Tinker <jtinker@google.com> |
Fix invalid keyType translation in MediaDrm.getKeyRequest
bug: 9070897
Change-Id: Ib9b4174e08b1c828d0204e0ab65bc3d7c2efcedf
ndroid_media_MediaDrm.cpp
|
| eada5376d9c34f77bd3ba86a2ea674e3bde5e961 |
21-May-2013 |
Jeff Tinker <jtinker@google.com> |
Improve exception error messages to help diagnose app errors
bug: 9072051
Change-Id: I45057951d1a62b1b4a996e85f01601239e1b7161
ndroid_media_MediaDrm.cpp
|
| e0eb0e90630c19808429a9bcdc9ff8dff085d2e8 |
02-May-2013 |
Jeff Tinker <jtinker@google.com> |
am 9ba564c7: am 48f2b548: Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev
* commit '9ba564c7e205c4b278be61eec773a90a94451251':
MediaDrm API: Add two exceptions to handle error path scenarios
|
| 48f2b548edf8e276cc89d2c4c2d2936cde46fc95 |
02-May-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "MediaDrm API: Add two exceptions to handle error path scenarios" into jb-mr2-dev
|
| 1d507f7b9b163df6d19030f1cbf5d9191c6b7928 |
01-May-2013 |
Mike J. Chen <mjchen@google.com> |
am 94264d52: am 2f4cc8ea: Merge "Fix a crash case" into jb-mr2-dev
* commit '94264d522efcc21ac749a6444fbea90916f575c9':
Fix a crash case
|
| 1d7c218ba23185c58ae27f59e4ec6b8526b2d04a |
26-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API: Add two exceptions to handle error path scenarios
bug: 8725707
Change-Id: Ia00c495ac591cc2993f4d11ad3480b59833d009e
ndroid_media_MediaDrm.cpp
|
| 67a12184776605b6e6ddc01ca91b533a2e37a40b |
26-Apr-2013 |
Mike J. Chen <mjchen@google.com> |
Fix a crash case
There's a runtime check for a bad argument, but it is
after the usage of the bad argument. Move the usage
after the check.
Bug 8687716
Change-Id: Iddfa457951bac69b436a430cda21b5d7a563107b
Signed-off-by: Mike J. Chen <mjchen@google.com>
udioeffect/android_media_Visualizer.cpp
|
| 665bcd96b72566f8f2c8e56acfc9592fcf56dca9 |
19-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
am a393c2a2: am c884a08e: Merge "Improve error handling for DRM errors reported by plugins" into jb-mr2-dev
* commit 'a393c2a2f7a6a3153b82b1e43bfffa1a040d56b5':
Improve error handling for DRM errors reported by plugins
|
| d32885bb7fe17a331598908ab4e273cd5933a6c5 |
18-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
am 4efe71ae: am 45d59a99: Merge "Make MediaDrm APIs public" into jb-mr2-dev
* commit '4efe71ae55db09a4e3d727175df97d5bcda0449c':
Make MediaDrm APIs public
|
| f7568b5ee96b3d80721c76ab3d47f1368a99bf98 |
17-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Improve error handling for DRM errors reported by plugins
Change-Id: I25df78f16379b32c54189949daa3ab9c91187375
related-to-bug: 8621516
ndroid_media_MediaDrm.cpp
|
| e1c76bebef41d362369627ed0c06ea9a01c6bddb |
04-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Make MediaDrm APIs public
bug: 8603279
Change-Id: I9fab2673867ad413a084933cee7239d13e8b7893
ndroid_media_MediaDrm.cpp
|
| 28af35e8cdc601c7ab9c7287d9e72fdc331e8a9d |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
resolved conflicts for merge of a976bddd to master
Change-Id: I64e1cbfb0eee891ce4d1eee40eefdcedcc501f7f
|
| d685894212e6dbeac1fda4996903c1da115d49a6 |
10-Apr-2013 |
Ying Wang <wangying@google.com> |
Add liblog
Bug: 8580410
Change-Id: I746aa8258866508c3a725d0773faf4518096548f
ndroid.mk
udioeffect/Android.mk
ediaeditor/Android.mk
oundpool/Android.mk
|
| 574215e1f39dc0ef096d64e0fee3f9b0a1fe2d5d |
09-Apr-2013 |
Marco Nelissen <marcone@google.com> |
am d563cede: am c4ad3cb0: Merge "Add support for common encryption" into jb-mr2-dev
* commit 'd563cede5cf4ca2647dcf00775dd0ed1dd08e792':
Add support for common encryption
|
| c4ad3cb07ed76c5697c60285456d9c49675174d9 |
09-Apr-2013 |
Marco Nelissen <marcone@google.com> |
Merge "Add support for common encryption" into jb-mr2-dev
|
| e20a6d5c479909f37af748a81a6e5a5deb7b6e2c |
08-Apr-2013 |
Marco Nelissen <marcone@google.com> |
Add support for common encryption
Change-Id: I2d56a6a90dff3ce1c37296934fca01b8a2ca0f89
ndroid_media_MediaCodec.cpp
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
|
| 9e2e8e0b6d39e9f8b9078a6404931d4423205266 |
05-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
am 72e2307c: am 1e0f36cf: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
* commit '72e2307c6a84de5770dd1aa2943d3d609d29baf3':
Implement async event callout from drm plugin to Java app
|
| 1e0f36cffd8a4399fcd12e25bddde4544992bcb2 |
05-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
|
| e4d9a01bfc7451afff1ed399a5801c7aa2af2831 |
29-Mar-2013 |
Dan Morrill <morrildl@google.com> |
Phase 1 of refactoring SystemServer.
SystemServer is currently a monolithic class that brings up key system
services. This change is the first phase of refactoring it to be more
configurable. Specifically, it adds a set of on/off switches used to control
startup of individual services. Future plans include finer grained controls
and a more explicit and consistent startup sequence for these services.
Change-Id: I7299f5ce7d7b74a34eb56dffb788366fbc058532
oundpool/Android.mk
oundpool/android_media_SoundPool.cpp
oundpool/android_media_SoundPool_SoundPoolImpl.cpp
|
| 54cfbd6dc28334119c33b6a77779bfe244c71e69 |
02-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Implement async event callout from drm plugin to Java app
Change-Id: I451b7c6f766aafac39ce432a71ef5a03bffe29f1
ndroid_media_MediaDrm.cpp
ndroid_media_MediaDrm.h
|
| 5c0ce512c5782eb79c7b907e2dd20aa3896dd068 |
03-Apr-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "MediaDrm API update" into jb-mr2-dev
|
| 16b8cffb2893c10c35788191847500004da466d1 |
31-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
MediaDrm API update
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: Id3f8c706e9e3034b09af8e2a6a2f26bd74a49f93
ndroid_media_MediaDrm.cpp
|
| 1341f1eee3493fc5e263494acb8adebb6f0180b6 |
01-Apr-2013 |
Mike Lockwood <lockwood@google.com> |
MTP: Implement date created field in GetObjectInfo
Bug: 8293874
Change-Id: I3e50ea1049f63e2ed3a1f849fef74a2fbf206fe8
ndroid_mtp_MtpDatabase.cpp
|
| 90defba919e8e969a9963bf401a7b144d869accf |
22-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
Load crypto plugins from additional shared libraries
Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable. Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.
Multi-repository commit, goes with:
https://googleplex-android-review.googlesource.com/287838
Change-Id: I08577cda0cbcb22ebe3cb874f5fcafe411c36be3
ndroid_media_MediaCrypto.cpp
|
| 1e7298b250a3cddfcdcf54e413748e8eb71ca0c8 |
20-Mar-2013 |
ztenghui <ztenghui@google.com> |
Merge "Add the orientation hint to the MediaMuxer" into jb-mr2-dev
|
| d4a2118585d6227ccdccb946c946275b81d99ec9 |
20-Mar-2013 |
Jeff Tinker <jtinker@google.com> |
Merge "Implementing MediaDrm APIs" into jb-mr2-dev
|
| effc9b4839f3cc109fe3d8244022f3c898cd080b |
13-Mar-2013 |
ztenghui <ztenghui@google.com> |
Add the orientation hint to the MediaMuxer
bug:7991013
Change-Id: I7e3e513851589e4ba7983d2c416152b2b08cbcfb
ndroid_media_MediaMuxer.cpp
|
| 8a0c80fdcc46faa8cb8c9f4dda06f4b63ec2f906 |
08-Feb-2013 |
Jeff Tinker <jtinker@google.com> |
Implementing MediaDrm APIs
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
ndroid.mk
ndroid_media_MediaDrm.cpp
ndroid_media_MediaDrm.h
ndroid_media_MediaPlayer.cpp
|
| 4a05f436989a49e06ec762aac9507ad13fcc5e23 |
13-Mar-2013 |
Mathias Agopian <mathias@google.com> |
remove uses of Surface in favor of IGraphicBufferProducer
Change-Id: I2ec590eed03c76a084ee6b0af362a3ca6476bf9f
ndroid_media_MediaRecorder.cpp
|
| 68ccf103a10c674f1db649bb15bb3e790bc6dad3 |
13-Feb-2013 |
ztenghui <ztenghui@google.com> |
Java API for MediaMuxer
Implement the Java API for MediaMuxer.
bug:7991013
Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
ndroid.mk
ndroid_media_MediaMuxer.cpp
ndroid_media_MediaPlayer.cpp
|
| b1d90c8f60f71422196c337f1d078b68867f5710 |
07-Mar-2013 |
Mathias Agopian <mathias@google.com> |
fix JNI use of incStrong/decStrong
Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
ndroid_media_MediaPlayer.cpp
|
| 2621e40d0e0a496a96575768b7e2b70e3b3be640 |
19-Feb-2013 |
Andy McFadden <fadden@android.com> |
Implement Surface input to MediaCodec.
Adds two new public methods to MediaCodec, and one new public
constant to MediaCodecInfo (currently @hidden).
Bug 7991062
Change-Id: I830a9794e92334ad05c870cc5fc90be4652147a5
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 788717ca599c714d58b2cb5deea1d37b4a711c07 |
16-Feb-2013 |
Eino-Ville Talvala <etalvala@google.com> |
Camera and MediaRecorder: Support AppOps
- Allow media processes to update AppOps state
- Pass package name to media services
Bug: 8181262
Change-Id: I115d39f0b306cb9eb7cd3d3e663c680b7322fd3f
ndroid_media_MediaRecorder.cpp
|
| 52800617946c456e78ed010c82d0ec4358368164 |
15-Feb-2013 |
Mathias Agopian <mathias@google.com> |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaPlayer.cpp
|
| bfcae3595900b79401d635022bd6d30a5b5a6576 |
15-Feb-2013 |
Mathias Agopian <mathias@google.com> |
Surface doens't have an identity anymore
Change-Id: Ic62c0f6ba9aae9b67335a2029a5de1caa3fc5b94
ndroid_media_MediaRecorder.cpp
|
| 3866f0d581ceaa165710feeee9f37fe1b0d7067d |
12-Feb-2013 |
Mathias Agopian <mathias@google.com> |
split Surface in two classes: SurfaceControl and Surface
SurfaceControl is the window manager side; it can
control the attributes of a surface but cannot push buffers
to it. Surface on the other hand is the application (producer)
side and is used to push buffers to the surface.
Change-Id: Ib6754c968924e87e8dd02a2073c7a447f729f4dd
ndroid_media_MediaRecorder.cpp
ediaeditor/VideoEditorMain.cpp
|
| 145716e7c15867b13f518e49d3611a5f8030e7ee |
12-Feb-2013 |
Marco Nelissen <marcone@google.com> |
am 789e3fa0: am 9f03d4f9: Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
# Via Gerrit Code Review (2) and Android Git Automerger (1)
* commit '789e3fa052747feb72e8ffdc778d5bc19a718c06':
Revert "use utf8_length() instead of local function, isValidUtf8()"
|
| 9f03d4f921fab5757a791653891ce73c2d006e20 |
12-Feb-2013 |
Marco Nelissen <marcone@google.com> |
Merge "Revert "use utf8_length() instead of local function, isValidUtf8()""
|
| a0a73ed1e6ffeb97ee9c7f6d116f6f64b8adf61d |
12-Feb-2013 |
Marco Nelissen <marcone@google.com> |
Revert "use utf8_length() instead of local function, isValidUtf8()"
This reverts commit 1a8b6c29aaa5a1591097daca0876808cc029cbda
Reason for revert: utf8_length handles a slightly different range than the checkjni code, so it's possible for a given string to pass the utf8_length check, but then fail the jni check.
Change-Id: I81e15c95edd8f89782d8ad9025e68502b9340f22
ndroid_media_MediaScanner.cpp
|
| f3ec15425fcd828586d3bbcea7ceffd75012f7a4 |
28-Dec-2012 |
James Dong <jdong@google.com> |
am edde28fd: am 5d5526aa: Merge "Handle errors from AudioEffect::queryNumberEffects"
* commit 'edde28fd0956d941e4962e3228f3030e203da4aa':
Handle errors from AudioEffect::queryNumberEffects
|
| 5d5526aa86888cb0891f535823dc93e154f38b2e |
21-Dec-2012 |
James Dong <jdong@google.com> |
Merge "Handle errors from AudioEffect::queryNumberEffects"
|
| eca3eb5983fb8e8cea17175869f86cda7613dd60 |
20-Dec-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Don't create weird ByteBuffers"
|
| cbbea8e651feb580f439e28359d72589709fb120 |
19-Dec-2012 |
Marco Nelissen <marcone@google.com> |
Don't create weird ByteBuffers
Ensure that we don't create ByteBuffers with a NULL memory pointer
but nonzero size.
b/7892060
Change-Id: I2fc52e19fd05e698c38d94275e738e23a2999e1f
ndroid_media_MediaCodec.cpp
|
| d47f7d8b5fe3a3861d7cbdc5f912235407823c8e |
18-Dec-2012 |
Andy McFadden <fadden@android.com> |
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug 7736700
Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaPlayer.cpp
|
| d35d3687c741bb8d7cb025c7369755354ca0e53d |
17-Dec-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Turn off execute bit for ordinary media files"
|
| 1adc5975fa293afc484cc3095f74a7b4964f6306 |
30-Nov-2012 |
Andreas Huber <andih@google.com> |
am 800c8ab6: am 2644494a: Merge changes I8462f040,Ie471f40f
* commit '800c8ab68d695f1b6c5332c80a32316cdca69954':
MediaCodec: Allow getting the codec info directly
MediaCodec: Allow getting the chosen component name
|
| 4526f0de0a5698832719f16158bed57ad209d4f2 |
16-Nov-2012 |
Peter Karlsson <peter1.karlsson@sonyericsson.com> |
Handle errors from AudioEffect::queryNumberEffects
There may be cases where queryNumberEffects fails leading
to the usage of the uninitialized numEffects.
Change-Id: If6d46987021ff6f0c9a2123d8714ff5fdf9ced45
udioeffect/android_media_AudioEffect.cpp
|
| 37667556658da69fa5dbb0cb142c763ffe4a0098 |
26-Oct-2012 |
Glenn Kasten <gkasten@google.com> |
Turn off execute bit for ordinary media files
Change-Id: Idbb4f793307d4e1c4af289f855bd4a1a781722db
ediaeditor/VideoBrowserMain.c
|
| 93077a2902a74256b7eb4795e1ef92bbc5c50f10 |
25-Sep-2012 |
Martin Storsjo <martin@martin.st> |
MediaCodec: Allow getting the codec info directly
This saves the caller from manually iterating through the
MediaCodecList for finding the right codec.
This adds new public API.
Change-Id: I8462f040573427542d86d1b957a5aef53dd55e8e
ndroid_media_MediaCodecList.cpp
|
| 056ef2ed5ff92b742fe53f2498c596ec1f6bed3c |
25-Sep-2012 |
Martin Storsjo <martin@martin.st> |
MediaCodec: Allow getting the chosen component name
Currently, when the codec was opened by createDecoder/EncoderByType,
the caller does not know what codec actually was chosen, and
(for encoders) thus cannot know what color formats it supports.
This adds new public API.
Change-Id: Ie471f40f8104b37d27ced3dba5a54facc6504b1b
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 7b172a49a90ea6784dbfe0002474f9d4fd4ace1a |
07-Nov-2012 |
Kenny Root <kroot@google.com> |
am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
Correct executable bit for source files
|
| 58ed5d748c0b9b64845975ef5844ad313de7c3f6 |
07-Nov-2012 |
Kenny Root <kroot@google.com> |
am 768d9e1a: Merge "Correct executable bit for source files"
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
Correct executable bit for source files
|
| 3a084af2e90849aaa8beb3a610189e3399c63ea0 |
07-Nov-2012 |
Kenny Root <kroot@google.com> |
Correct executable bit for source files
Many media files and source code files were marked as executable in Git.
Remove those.
Also a shell script and python script were not marked as executable.
Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
ediaeditor/Android.mk
ediaeditor/VideoBrowserInternal.h
ediaeditor/VideoBrowserMain.h
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorClasses.h
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorJava.h
ediaeditor/VideoEditorLogging.h
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorOsal.h
ediaeditor/VideoEditorPropertiesMain.cpp
ediaeditor/VideoEditorThumbnailMain.cpp
ediaeditor/VideoEditorThumbnailMain.h
|
| b24a1b7f99c4ada2fe45a670962afdf1ddd7f67b |
30-Oct-2012 |
Glenn Kasten <gkasten@google.com> |
Remove obsolete references to libmedia_native
Bug: 6654403
Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
ndroid.mk
udioeffect/Android.mk
oundpool/Android.mk
|
| 097922b9c1e0821beb107024bcd0dc14144c0920 |
04-Oct-2012 |
James Dong <jdong@google.com> |
Throw an exception instead of crash when a surface does not have a binding surface texture
o related-to-bug: 7270329
Change-Id: I498d72187968e89d9498d01b10719569e12be2af
ndroid_media_MediaPlayer.cpp
|
| f6f16614574767263fcd0073f72c099edaca0607 |
13-Sep-2012 |
Mike Lockwood <lockwood@google.com> |
MtpDatabase: Use actual file size instead of media database size column
Fixes problems with file transfer from device to host that can occur
if the database size value is wrong.
Bug: 6954446
Change-Id: I03c3dd4b75267d1f4613f0b588c8899ded9a70be
Signed-off-by: Mike Lockwood <lockwood@google.com>
ndroid_mtp_MtpDatabase.cpp
|
| 64a55af0ac700baecb0877235eb42caac59a3560 |
26-Aug-2012 |
Jeff Brown <jeffbrown@google.com> |
Add plumbing for new surface flinger display API.
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.
Added JNI for all of the new surface flinger display API calls.
Enforced the requirement that all Surfaces created by
the window manager be named.
Updated the display manager service to use the new methods.
Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
ndroid_media_MediaCodec.cpp
ndroid_media_MediaPlayer.cpp
|
| c209a06cfdcf633f12a299245312e3ac32bff27c |
24-Aug-2012 |
Marco Nelissen <marcone@google.com> |
Let apps provide a custom data source for extractors
Adds android.media.DataSource, which is modeled after its native namesake,
and a new method on MediaExtractor that lets apps specify their implementation
of a DataSource as the source of data for the extractor.
Change-Id: If1b169bd18d2691ebc4f8996494dfc8ee0894b6c
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
|
| f96fcd5095e751fc9402d8bbecdf59f53e00d854 |
20-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes"
* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
To avoid the JNI memory leaks in video editor codes
|
| c96a7294a4ec7f807dbe0fd82a2ba2d58008304b |
25-Jun-2012 |
wfeng6 <wei.feng@intel.com> |
To avoid the JNI memory leaks in video editor codes
There is a protential memory leak in video editor JNI codes.
When importing so many video clips, the number of local reference
will exceed 512, which will cause the Dalvik virtual machine
crash. The patch will free each local reference when it's no
longer used to avoid memory leaks.
Change-Id: Iecd986c83f05a1103641746d6d43eef0a9c5ee40
Author: Wei Feng <wei.feng@intel.com>
Signed-off-by: Wei Feng <wei.feng@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 40786
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorMain.cpp
|
| 0bf666a875415bae7a1e575eea9b8e5e7762ff3d |
13-Aug-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 4da3769d: Merge "mediacodec: Don\'t crash if trying to open a codec that does not exist"
* commit '4da3769d30851f0b517a688a5c835715d7d0b0bf':
mediacodec: Don't crash if trying to open a codec that does not exist
|
| e68323325b398eee98d5c81a6024d377ebc48bc1 |
13-Jul-2012 |
Martin Storsjo <martin@martin.st> |
mediacodec: Don't crash if trying to open a codec that does not exist
Change-Id: If75e3156517993629f50622a84a9ac573fced815
ndroid_media_MediaCodec.cpp
|
| 333c09945e7399c6a2b1f4d9fdf981508e38db52 |
09-Jul-2012 |
Insun Kang <insun@google.com> |
Changed to obtain a parcel in each notify() call in jni.
Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85
related-to-bug: 6785452
ndroid_media_MediaPlayer.cpp
|
| c6693f6fee01f0694230c0078f5a2136f99c380e |
12-Jun-2012 |
James Dong <jdong@google.com> |
Add NOTICE and MODULE_LICENSE_APACH2 to libvideoeditor_jni.so
Change-Id: Ibe37c2e6ede6143dc4e27c6072867bc58aa1c08a
related-to-bug: 6647465
ediaeditor/MODULE_LICENSE_APACHE2
ediaeditor/NOTICE
|
| bb52c49c9aab2357100b18e72395c1dc3539dfa7 |
07-Jun-2012 |
Keun young Park <keunyoung@google.com> |
rename exif to exif_jni due to refactoring in external/jhead
- also pull libexif_jni from media_jni
Bug: 6623618
Change-Id: I4f06a4614c5fddcf98d95caff16a2c40f345dade
ndroid.mk
|
| 54c40e033e487b96ff3356d29ab02cc1304f4117 |
30-May-2012 |
James Dong <jdong@google.com> |
Fixed a buffer overflow issue
The allocated array has one byte less than the required length. Allocating the size one byte larger fixes the issue.
contribution was originally from teng.hong@nxp.com
Change-Id: I3aa2e6b995fd18e30649a34f201646082aab44ee
related-to-bug: 6347465
ediaeditor/VideoEditorMain.cpp
|
| 5ddb19e5305365d23ffd46751d8963d9b739b49d |
15-May-2012 |
James Dong <jdong@google.com> |
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6502980
Change-Id: I77aa67dac73ecb6200cfc885c426c23d70929e5d
ediaeditor/Android.mk
|
| f20e4f4b1a31c2103efdff01e2bf1a3b6f8d503e |
15-May-2012 |
James Dong <jdong@google.com> |
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"
This reverts commit cbaa821b7f286a54767cc8bc549504ea2ed86e4d.
ediaeditor/Android.mk
|
| cbaa821b7f286a54767cc8bc549504ea2ed86e4d |
15-May-2012 |
James Dong <jdong@google.com> |
Remove dependency of libvideoeditor_jni.so on static libs from video editor engine
related-to-bug: 6328360
Change-Id: Ifc9ffc671f454135db31590805c38f9635e5c815
ediaeditor/Android.mk
|
| 909c4b855a372dbc70ce6777df64d12ae93ad2d5 |
12-May-2012 |
James Dong <jdong@google.com> |
Merge "Improve notifying TimedText by reducing marshall/unmarshalling." into jb-dev
|
| b842599e51e2d3611503c3c7db1111358f99186d |
10-May-2012 |
Andreas Huber <andih@google.com> |
Make sure crop rect information is visible from java.
Change-Id: Ib914de3d42349efcd7af301d43bec82a21d24ce5
related-to-bug: 6471684
ndroid_media_Utils.cpp
|
| f86374adec8bd77af7b012f788ea59575296facb |
09-May-2012 |
Andreas Huber <andih@google.com> |
Remove SEEK_CLOSEST constant from MediaExtractor, its implementation makes no
sense for the java API.
Change-Id: I3f2eabb5ca5ffb6c1f03141bfd303310111e8774
related-to-bug: 6276111
ndroid_media_MediaExtractor.cpp
|
| 8902097bb686752ff207e3bda12713be1a8c74eb |
01-May-2012 |
Insun Kang <insun@google.com> |
Improve notifying TimedText by reducing marshall/unmarshalling.
o Removes mParcel from TimedText class.
o Converts native parcel into java parcel object directly without
copying to an intermediate byte array.
o JNIMediaPlayerListener::notify checks for Java exceptions, logs them,
and clears the exception state.
related-to-bug: 6405934
Change-Id: I8b82d3cd5b9b3ef8cad27e805202a0e445a88a45
ndroid_media_MediaPlayer.cpp
|
| 3dd7fd08a8a1d658b0aac8590f1fd922e056f689 |
08-May-2012 |
Andreas Huber <andih@google.com> |
Return codec buffers that are marked as having host endianness.
Change-Id: Iedfd829d108e65ee368909af14ace68b63e0e168
related-to-bug: 6364139
ndroid_media_MediaCodec.cpp
|
| 60d610bf103379277a4b29a7ead4f013f6128e4e |
03-May-2012 |
Andreas Huber <andih@google.com> |
Various changes to Media* APIs requested by the api council.
Change-Id: Iec2f50c99cf5f00a442737231361334e9ab46340
related-to-bug: 6432753
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodecList.cpp
ndroid_media_MediaCrypto.cpp
ndroid_media_MediaExtractor.cpp
|
| b12a5390694e8525ac61d7377e266e31d124c815 |
30-Apr-2012 |
Andreas Huber <andih@google.com> |
New API to set the video rendering mode on a MediaCodec instance.
Change-Id: I6d765bb4cab7bcf29f09364293c24e8a6930078b
related-to-bug: 6364139
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| f2855b3df5994e165b29025c4c49d8e7d634c034 |
26-Apr-2012 |
Andreas Huber <andih@google.com> |
The MediaExtractor can now unselect tracks and has more control over seeking.
Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417
related-to-bug: 6276111
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
|
| d6bdbb8da14f0162281ce18ce7573a6c5a15b04e |
24-Apr-2012 |
Dianne Hackborn <hackbod@android.com> |
am b4781b9b: am ea8ceca8: am 90577af7: Merge "use utf8_length() instead of local function, isValidUtf8()"
* commit 'b4781b9b489bc8b0049e1e92b7ab00e32b02b12c':
use utf8_length() instead of local function, isValidUtf8()
|
| 74a78b0f6e8c07cfc7da8f043987f6de0648bc05 |
20-Apr-2012 |
Andreas Huber <andih@google.com> |
Add the ability to query the amount of cached data to MediaExtractor.
Change-Id: I47ae60bc6fb8d88979c1f0d650b6ac528e811371
related-to-bug: 6364341
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
|
| bfc56f497de0d18125366a02a93e61cdc0891be4 |
19-Apr-2012 |
Andreas Huber <andih@google.com> |
DRM errors signaled by the CryptoPlugin are now visible to MediaCodec clients
through a custom exception "MediaCodec.CryptoException".
Change-Id: I30215e9e13bab68abad23e27dcead7c1accd07f1
related-to-bug: 6365261
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 5cef554cc857b2b542d2c62f8cd0c36d62e1bb9b |
19-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Merge "Add support for scaling mode parameter in Visualizer effect"
|
| ab57d03bdb3010d4957fb88c8acb30575ca02ec9 |
19-Apr-2012 |
Andreas Huber <andih@google.com> |
Fix a typo and choose a reasonable default for crypto-mode (0 would be unencrypted)
Change-Id: Ia46a7d7dd405bd569f319a64e43123d802c867d3
related-to-bug: 6275919
ndroid_media_MediaExtractor.cpp
|
| 91befdc0c4710234840cdfd853e7d30e8f9de62c |
18-Apr-2012 |
Andreas Huber <andih@google.com> |
Information required to decrypt buffers is now packaged into MediaCodec.CryptoInfo
New API on MediaExtractor to retrieve a CryptoInfo structure where applicable.
Change-Id: I18edfc9ac56a4544c8f17cba24401b96dacbff7d
related-to-bug: 6275919
ndroid_media_MediaCodec.cpp
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
|
| 2b9d6bd092ef1d0cc142bf16f671648d1c84c307 |
18-Apr-2012 |
Andreas Huber <andih@google.com> |
Make seekTo not throw exceptions.
Change-Id: I9d0469962364b86fbab920e9ac65f468fc630737
related-to-bug: 6276111
ndroid_media_MediaExtractor.cpp
|
| e1123e7f36723a8b888501c9a22a589297849ca2 |
16-Apr-2012 |
Jean-Michel Trivi <jmtrivi@google.com> |
Add support for scaling mode parameter in Visualizer effect
Add set/get methods to set how the Visualizer scales the captured
data.
Change-Id: Ia1da00fd5474dd3484b59caf7d1d0a812d0347de
udioeffect/android_media_Visualizer.cpp
|
| 2952c5d03c26aec8f2aa2d69f20b47a7cc8f39e1 |
17-Apr-2012 |
Andreas Huber <andih@google.com> |
MediaCrypto's constructor can throw RuntimeException.
Change-Id: I5718e9abab0d1465882580e826747d6a78bdefb5
related-to-bug: 6275919
ndroid_media_MediaCrypto.cpp
|
| 07ea426e3ae8915ca6bf67135f523f42cd920af0 |
11-Apr-2012 |
Andreas Huber <andih@google.com> |
Unhide new media related java APIs.
Change-Id: If0b8201eaca74f51f3499b6ecdfb73088586ee24
ndroid.mk
ndroid_media_Crypto.cpp
ndroid_media_Crypto.h
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodecList.cpp
ndroid_media_MediaCrypto.cpp
ndroid_media_MediaCrypto.h
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
ndroid_media_Utils.cpp
|
| 1a8b6c29aaa5a1591097daca0876808cc029cbda |
05-Apr-2012 |
Homin Lee <suapapa@insignal.co.kr> |
use utf8_length() instead of local function, isValidUtf8()
utf8_length() from libutils returns -1 when source not contains
valid sequence for UTF-8. Fixed to use it and removed the local
function isValidUtf8().
Change-Id: If2834ce1d1ae07fd8526ce8bc5df3fd3f44e85c8
Signed-off-by: Homin Lee <suapapa@insignal.co.kr>
ndroid_media_MediaScanner.cpp
|
| f3d9f5d097dffec33f416d0907d4a6e0dae43f69 |
12-Apr-2012 |
James Dong <jdong@google.com> |
Merge "Fix failure from setDataSource(String path) when path is a local file"
|
| e00b6f3a57d4b480ce674468de93555269bbd71a |
12-Apr-2012 |
James Dong <jdong@google.com> |
Fix failure from setDataSource(String path) when path is a local file
o the failure was because the mediaserver does not have read permission to sdcard
o related-to-bug: 6325960,6322913
Change-Id: I4feec01b8165c78563eee8aab69cb24df3244d03
ndroid_media_MediaPlayer.cpp
|
| 0041b5c561a48ed8f63c4fe8ae3bff5196f68d0f |
11-Apr-2012 |
James Dong <jdong@google.com> |
Fix thumbnail generation failure
o Change the impl of MediaMetadataRetriever.setDataSource(String).
It opens and passes an fd to the media framework
rather than pass the file path directly to the media server. The change is needed since media
server does not have read permission to sdcard
o Remove the unnecessary jni method
Change-Id: I5a2f47dde804523d264b588f855ba2575a99c179
ndroid_media_MediaMetadataRetriever.cpp
|
| 9e6bcce17d13bd4f7bba5f8fbcc2e6a0d695274b |
06-Apr-2012 |
Andreas Huber <andih@google.com> |
New JAVA API to support submitting encrypted buffers of input data.
Change-Id: Ib0df9a9427b4580946179860495b26f743558597
related-to-bug: 6275919
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
|
| 8240d9239d9aabed75c49f9d4d69fd8a5fe4c899 |
04-Apr-2012 |
Andreas Huber <andih@google.com> |
New Crypto JAVA class to facilitate decryption via MediaCodec.
Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug: 6275919
ndroid.mk
ndroid_media_Crypto.cpp
ndroid_media_Crypto.h
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaPlayer.cpp
|
| 0e97fc248eaea7b4c95053618ddedf0af638110e |
03-Apr-2012 |
Andreas Huber <andih@google.com> |
More DRM/crypto support.
related-to-bug: 6275919
Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
ndroid_media_MediaCodec.cpp
|
| 5a04bf395514a9342dd26af519b88f4b3e309eb9 |
30-Mar-2012 |
Andreas Huber <andih@google.com> |
New API to query available codecs and their capabilities.
Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
ndroid.mk
ndroid_media_MediaCodecList.cpp
ndroid_media_MediaPlayer.cpp
|
| ba4d0433319393d626d2169683209e4956a087e2 |
28-Mar-2012 |
James Dong <jdong@google.com> |
frameworks base Android.mk file changes
Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
ndroid.mk
oundpool/Android.mk
oundpool/android_media_SoundPool.cpp
|
| b3e2e24f789d41d6c38b8ad4c252cf9f6e2122d8 |
26-Mar-2012 |
Andreas Huber <andih@google.com> |
Merge "Provisional support for secure decryption of media streams."
|
| 9b8e496f4d143280deff137c5f30ca8907bc28db |
26-Mar-2012 |
Andreas Huber <andih@google.com> |
Provisional support for secure decryption of media streams.
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
ndroid_media_Utils.cpp
|
| 383c4b3e63b02dfb348db7504af0efefa7b6a682 |
26-Mar-2012 |
Eric Laurent <elaurent@google.com> |
Merge "reorganize SoundPool and JetPlayer code."
|
| f5e18125498b768d4528e4d1c19533c2b16f338b |
26-Mar-2012 |
Eric Laurent <elaurent@google.com> |
reorganize SoundPool and JetPlayer code.
Reorganize SoundPool and JetPlayer code to be ready for the
creation of libmedia_native.
Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation).
Remove dependencies on nativehelper/jni.h from JetPlayer.
Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
oundpool/Android.mk
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/SoundPoolThread.cpp
oundpool/SoundPoolThread.h
oundpool/android_media_SoundPool.cpp
|
| 6e3bceef9c0fcc82881fd88e98b299ce0371bbfa |
24-Mar-2012 |
James Dong <jdong@google.com> |
VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be deleted.
o this is to resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni
o related-to-bug: 6214141
Change-Id: I62d08a7789ecb34d35cd22d2e6f68c3510c9bd90
ediaeditor/VideoEditorMain.h
|
| 798cda73e173d69f7be51aa9123cd1917bfd5d59 |
23-Mar-2012 |
James Dong <jdong@google.com> |
Change Android.mk file to use the new location after /frameworks/media/libvideoeditor source files are moved
o related-to-bug: 6214141
Change-Id: Ic9f07a8558e944237ccaba4f756fcab59f84e78f
ediaeditor/Android.mk
|
| ae75f994cc50837afe79d3bfbc576811e3602fef |
16-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Add libmedia_native
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
ndroid.mk
udioeffect/Android.mk
oundpool/Android.mk
|
| 4e42c5f41fdb67ec62fbecc48038c8fe30b57bcd |
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Remove dependency on audio_* location
Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
udioeffect/Android.mk
|
| 1c1d1e7ed7ed2673b22642c6701659146ceaa602 |
13-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Gapless playback, step 1."
|
| 84b832054552e00257bb04997143ca33d6d100be |
29-Feb-2012 |
Marco Nelissen <marcone@google.com> |
Gapless playback, step 1.
Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.
Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
ndroid_media_MediaPlayer.cpp
|
| e1dea48f92fd087573ac76c6acd03f5a19181ece |
12-Mar-2012 |
James Dong <jdong@google.com> |
Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base
o related-to-bug: 6044887
Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
ndroid.mk
ediaeditor/Android.mk
|
| b9e8d86b74efe014945e8dd57d0d3fb52aa766f1 |
13-Mar-2012 |
James Dong <jdong@google.com> |
Merge "Removed the include header path since it is not needed."
|
| c52b980277f08aee7981b1fdbca7a89464cf66d9 |
12-Mar-2012 |
Andreas Huber <andih@google.com> |
Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.
and MediaExtractor.readSampleData now works with a non-direct byte buffer.
Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
ndroid_media_MediaCodec.cpp
ndroid_media_MediaExtractor.cpp
|
| 1b5fa0f811c939cf9db4318ca7de5cdece1398fd |
12-Mar-2012 |
James Dong <jdong@google.com> |
Removed the include header path since it is not needed.
o related-to-bug: 6044894
Change-Id: I15aec441dc0c75804aa33fc3e7ef977f7490922d
ediaeditor/Android.mk
|
| 28b269f3418c27275bbf635e524ed501bfac6518 |
07-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_policy_output_flags_t consistently
This affects:
- IAudioFlinger::openOutput
- AudioTrack::AudioTrack
- AudioTrack::set
- apps that call these
Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
oundpool/SoundPool.cpp
|
| d84e1ce0b535128f03416145554fb405f9fade3e |
07-Mar-2012 |
Jeff Sharkey <jsharkey@android.com> |
Split Parcel JNI details away from Binder.
This is purely a refactoring, with no change to the underlying
functionality.
Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
ndroid_media_MediaPlayer.cpp
|
| 720aa282791ef9405d39a15f419a41ab24f11e30 |
23-Feb-2012 |
John Grossman <johngro@google.com> |
Switch the way we configure for MediaPlayer retransmission.
This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
with merge conflicts addressed by hand and additional changes made in
response to code review feedback.
Move in the direction of a more publishable API for configuring a
media player for retransmission. It used to be that we used a custom
invoke and a modified URL (prefixed with aahTX://). There are many
issues with this technique and it was never meant to stand the test of
time.
This CL gets rid of all that. A new (but currently hidden) method was
introduced to the java level MediaPlayer API, called
setRetransmitTarget(InetSocketAddress), which allows an app writer to
set the retransmit target. For now, this method needs to be called
before a call to setDataSource (which is pretty unusual for the
MediaPlayer API) because this mid level code uses this as a cue to
instantiate an aahTX player instead of relying on the data source to
select a player. When retranmit functionality becomes part of the
existing android player implemenation, this
set-retrans-before-set-data-source behavior can go away, along with
the aahTX player itself.
Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98
Signed-off-by: John Grossman <johngro@google.com>
ndroid_media_MediaPlayer.cpp
|
| 4484bdd2f99a753b0801f0c13ca8a2b7bc38695a |
29-Feb-2012 |
Andreas Huber <andih@google.com> |
Separate the notion of "stop" from that of "release", i.e.
stop - means transition back to LOADED state and keeping the component
instance allocated.
release - means we get rid of the component completely.
Change-Id: I40ad01ce70821faaad43f57999249904f9144924
ndroid_media_MediaCodec.cpp
|
| 8335f1ccccedb6655d96d9d5b697a7f0938235dd |
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
ndroid_media_MediaCodec.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ediaeditor/VideoEditorMain.cpp
|
| 5c850396b39a57baabd37a9c0c8324f1bee408ca |
21-Feb-2012 |
Andreas Huber <andih@google.com> |
Add new APIs AMessage::(set|find)Buffer to make it safer to pass
ABuffer objects through messages.
Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
ndroid_media_Utils.cpp
|
| 88572f7a3e9d7ef85c26865a0150f3c2041561c2 |
21-Feb-2012 |
Andreas Huber <andih@google.com> |
Implementation of a java media codec interface and associated tools.
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
ndroid.mk
ndroid_media_MediaCodec.cpp
ndroid_media_MediaCodec.h
ndroid_media_MediaExtractor.cpp
ndroid_media_MediaExtractor.h
ndroid_media_MediaPlayer.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
|
| 3540a0197f56c4bcd7d7419f4502bfca34257de2 |
11-Jan-2012 |
John Grossman <johngro@google.com> |
Enhance Visualizer behavior in the case of mediaserver death.
Bring the Visualizer class into line with the SDK documentation by
returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when
the Visualizer loses its binder connection to the mediaserver because
of a mediaserver restart.
Also add a new callback interface to allow clients to be
asynchronously notified in the case of server death. Right now, the
interface definition and the registration method are flagged as hidden
pending API council review/approval.
See http://b/issue?id=5717519 for details.
Change-Id: Ic15856f27ed5a950a583ac11ca81f79bd7e9b1a0
Signed-off-by: John Grossman <johngro@google.com>
udioeffect/android_media_Visualizer.cpp
|
| 449725f9aa67136a38c7554ba76ac4e27e5e3bd3 |
10-Jan-2012 |
John Grossman <johngro@google.com> |
Reuse callback buffers in the Visualizer.
Don't re-allocate buffers used by Visualizer callbacks as this causes an
unacceptable amount of GC thrash. Instead, lazily allocate the buffers and only
reallocate them when the required size changes.
See http://b/issue?id=5717519 for details.
Change-Id: Ibd157ed51f30687ce7c4ef0b4003258a484e0f5d
Signed-off-by: John Grossman <johngro@google.com>
udioeffect/android_media_Visualizer.cpp
|
| b3db213eb55acb661e4b9ea40bcc00af4b76fab9 |
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Update comments
We no longer put the filename at start of file.
Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
oundpool/SoundPool.cpp
|
| 1137be1a686fdfc9f02c3aca7c33f28006df4742 |
09-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Follow raw pointer and sp<> conventions
Unconditional delete for raw pointers.
Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)".
Use "if (raw != NULL)" not "if (raw)".
Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| 459f40dfb3ee67ff0f0b75f5a2a7b195f62cd63c |
10-Feb-2012 |
James Dong <jdong@google.com> |
move away from MediaDebug and use ADebug instead for video editor engine
Change-Id: I2c0ad6c64f1bd03bd3dfe2c87792f8089dcbc101
ediaeditor/Android.mk
|
| 9dd295af25cb28d61ae8d7113b8342090be58362 |
31-Jan-2012 |
Andreas Huber <andih@google.com> |
The software AMR NB encoder is now an OMX component.
Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
ndroid.mk
|
| 05bd7b5dafd97bf1eb69a2b031eefa4d0ae2b2e5 |
20-Jan-2012 |
Jeff Brown <jeffbrown@google.com> |
Don't need to link to libsqlite from media JNI library.
Media JNI library doesn't actually use libsqlite.
Change-Id: If8017444d259779d459ef2da83119814e31454c2
ndroid.mk
|
| c6aacce37191e1cc79cfeba13b39899f59c68c3b |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
ndroid_media_Utils.cpp
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
ndroid_mtp_MtpServer.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
ediaeditor/VideoEditorMain.cpp
oundpool/SoundPool.cpp
oundpool/android_media_SoundPool.cpp
|
| a51f0e707f1f3142358aa919ea60ad2842803139 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
ndroid_media_MediaPlayer.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
oundpool/SoundPool.cpp
oundpool/SoundPoolThread.cpp
|
| 933e85615059b85a87747da57288384541cc56da |
04-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
ndroid_media_MediaRecorder.cpp
ediaeditor/VideoEditorLogging.h
|
| 1afd5bab4e0eaba8b5bc2ab5c7b556cd602cf2e7 |
20-Dec-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
ndroid_mtp_MtpDevice.cpp
|
| 06ade6ae1bd015e8b8ad0685847911213c93cc5b |
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaProfiles.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
ediaeditor/VideoEditorMain.cpp
oundpool/SoundPool.cpp
oundpool/SoundPoolThread.cpp
oundpool/android_media_SoundPool.cpp
|
| bc1d77b6cbce23fbe25f7231651037ae195bc90e |
13-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_stream_type_t consistently
At native level it was a mixture of audio_stream_type_t, int, uint32_t,
and uint8_t. Java is still int. Also fixed a couple of hard-coded -1
instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0
instead of AUDIO_STREAM_VOICE_CALL.
Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
ndroid_media_MediaPlayer.cpp
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/android_media_SoundPool.cpp
|
| 1c66547ba25be6a1893df0ae26857f649474843a |
12-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_format_t consistently"
|
| 3762c311729fe9f3af085c14c5c1fb471d994c03 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
ndroid_media_Utils.cpp
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
ndroid_mtp_MtpServer.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
ediaeditor/VideoEditorMain.cpp
oundpool/SoundPool.cpp
oundpool/android_media_SoundPool.cpp
|
| 8564c8da817a845353d213acd8636b76f567b234 |
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
ndroid_media_MediaPlayer.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
oundpool/SoundPool.cpp
oundpool/SoundPoolThread.cpp
|
| 1c5a89d4af193e3ce9be9992ffee0ab0a4d8da5a |
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_format_t consistently
Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield.
Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by
AUDIO_FORMAT_PCM_16_BIT.
Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| 6215d3ff4b5dfa52a5d8b9a42e343051f31066a5 |
04-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
ndroid_media_MediaRecorder.cpp
ediaeditor/VideoEditorLogging.h
|
| 5baa3a62a97544669fba6d65a11c07f252e654dd |
20-Dec-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
ndroid_mtp_MtpDevice.cpp
|
| 490909d2c057f348c0a6c69e5e6e9ab48fa8ea07 |
15-Dec-2011 |
Glenn Kasten <gkasten@google.com> |
Extract out audio DSP code to utility library
Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
ediaeditor/Android.mk
|
| 29f1c32eea12ab33547af73fb0e5dcf432e6979c |
02-Dec-2011 |
Hong Teng <hongteng@google.com> |
am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification,
* commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c':
Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
|
| 63149c81adf79f43c6508647614247277f8052e2 |
01-Dec-2011 |
Hong Teng <hongteng@google.com> |
Fixd for 5490443 Native crash while exporting a video
- Add new onError callback to PreviewProgressListener, which is
used to indicate video editor application for the error that has occurred during
priviewing.
With this modification, the application must implement the onError method,
and then VideoEditorPreviewTest.java is changed accordingly.
Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
ediaeditor/VideoEditorMain.cpp
|
| a4e702c2da02975276a46303ec78554e0d952905 |
03-Nov-2011 |
Marco Nelissen <marcone@google.com> |
am f51f1bd9: Verify we actually have valid utf8 metadata
* commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca':
Verify we actually have valid utf8 metadata
|
| f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca |
02-Nov-2011 |
Marco Nelissen <marcone@google.com> |
Verify we actually have valid utf8 metadata
Before calling NewStringUTF, check that the metadata value is actually
valid utf-8, and replace the offending characters with "?" if it is not.
b/5534491
Change-Id: I43de4307e739ae0b7d4177937ed33aa1dfb90d98
ndroid_media_MediaScanner.cpp
|
| 71f2cf116aab893e224056c38ab146bd1538dd3e |
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaProfiles.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
ediaeditor/VideoEditorMain.cpp
oundpool/SoundPool.cpp
oundpool/SoundPoolThread.cpp
oundpool/android_media_SoundPool.cpp
|
| f76afc80d229cf0c918e849acf5d8c4f5d4ffd07 |
15-Oct-2011 |
Jamie Gennis <jgennis@google.com> |
MediaPlayer: properly handle released surfaces
Bug: 5396571
Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
ndroid_media_MediaPlayer.cpp
|
| 8dc208476f1fbbf6cd0b8cc3d48487a62cb72883 |
28-Sep-2011 |
Marco Nelissen <marcone@google.com> |
Log a warning when a MediaPlayer is finalized without having being released.
b/5382634
Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
ndroid_media_MediaPlayer.cpp
|
| 07b9ae33127212fd9e15f96fa89b7d4cab81e55e |
20-Sep-2011 |
James Dong <jdong@google.com> |
Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug: 5145483
ndroid_media_MediaProfiles.cpp
|
| 81b37d8bde34ef3bb8eb8dfd7492761a39a8fd09 |
16-Sep-2011 |
Gloria Wang <gwang@google.com> |
If media player has died already, do not dec the old surface texture reference.
Otherwise segfault will occur.
For bug 5327664.
Do not merge.
Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
ndroid_media_MediaPlayer.cpp
|
| c286b2cc26d57efa5fef42c085bb2eb330021114 |
14-Sep-2011 |
Gloria Wang <gwang@google.com> |
Cherry-pick from master. Do not merge.
Do not need to reset surface as NULL in MediaPlayer's _release.
Related to bug 5252296.
Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
ndroid_media_MediaPlayer.cpp
|
| a18886ca08b32c5c949a285f27c8713e05e3dd11 |
09-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5278371: OOM in MediaItemThumbnailTest
Because we request 400x240 thumbnails. 100 thumbnails needs 38M,
which is too much. Change it to 70 now.
Also handle the case if the thumbnail callback throws exception.
Change-Id: Iac4ee72f308b7c7a6ae860983197601cf89bee8f
ediaeditor/VideoEditorMain.cpp
|
| 47a52158d2df0eb818bf7d589d8ff9fd5c0daaa3 |
07-Sep-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5156702: rotate thumbnails
Change-Id: I97b51dadf129172d5b154e9dfd66da254e4559d7
ediaeditor/VideoEditorMain.cpp
|
| fc301b0bb5c635c6bb51b48c504a8db5f9010e5c |
30-Aug-2011 |
Dave Burke <daveburke@google.com> |
Require INTERNET permission for network-based content.
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
ndroid_media_MediaPlayer.cpp
|
| c847b1a89df94dbff4c2f557f8c042ead5398c3f |
30-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5156702 Rotate video output for thumbnails and export
This is part of a multi project submit.
This is the Java and Jni changes.
Change-Id: I8851f5d865e657b7846bcded38e752f388f95895
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorClasses.h
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorMain.h
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 3ced044154945f9d60983032278e00fe28f4ab1b |
13-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 4142219 Don't hard code platform-specific limitations (Jni/ Java)
Also fixes 5118207 add other video codec support for video editor export.
Change-Id: If72427173bd8ff684af07ba00f4425c1deef29c6
ndroid_media_MediaProfiles.cpp
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorClasses.h
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 7f639d33151be143f062274b0da0729c29391bdb |
19-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Fix 5144356: Native crash while importing music"
|
| a91495d56dc10a57ed21490ffafae742b6411d6e |
18-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Merge "Fix for 5155561 During export, progress bar jumps from 0 to 50%"
|
| 176dde85a0ba838c1aed4148473743d964edbaec |
18-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Fix 5144356: Native crash while importing music
1. Use the correct Get*Field functions according to the field type.
2. When we have exceptions, return.
Change-Id: I1878d806e26798a0977ff71a781551088e45f6fb
ediaeditor/VideoEditorMain.cpp
|
| 6721d33feff547e938aeba20073c9c0cc6a3390b |
17-Aug-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 5155561 During export, progress bar jumps from 0 to 50%
Change-Id: I5f5814a1212cd242535ae7cadec8a76f099e78ce
ediaeditor/VideoEditorMain.cpp
|
| 1f5de3833daddfa1d0ebc7dee1f9e007d4ed36a0 |
15-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Display thumbnails one by one and cache them.
Change-Id: I10808f5bca475aea924817bf532dc5916438563a
ediaeditor/VideoBrowserInternal.h
ediaeditor/VideoBrowserMain.c
ediaeditor/VideoEditorMain.cpp
|
| cb04a1f3a31c252a0e3fda5e7eaa16f3257c9397 |
09-Aug-2011 |
Chih-Chung Chang <chihchung@google.com> |
Speed up thumbnail generation.
We don't need to have precise position for thumbnails, so we add
a tolerance parameter to the decoder. The decoder can return an
earlier frame within the tolerance time given.
Change-Id: I0a49ed6b03f8c3264606e4143dd5ecf48e9d0f62
ediaeditor/VideoBrowserMain.c
ediaeditor/VideoBrowserMain.h
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorThumbnailMain.cpp
ediaeditor/VideoEditorThumbnailMain.h
|
| 65de903a88d432044bfa78271dd3192856ff25b4 |
13-Aug-2011 |
James Dong <jdong@google.com> |
Merge "If release has been called before finalize, do not expect MediaPlayer still exists"
|
| 43ef913815ec84d04877a698614a31e129cd97e3 |
12-Aug-2011 |
James Dong <jdong@google.com> |
If release has been called before finalize, do not expect MediaPlayer still exists
o also, we should releae the surface object when release is called, not wait until finalize is called.
related-to-bug: 5157956
Change-Id: I0233ad61d8349c3e3800de68b752b9548ece1742
ndroid_media_MediaPlayer.cpp
|
| c498ad6eac80981946a7e96637fe2a9d0b161789 |
12-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 5144429: CTS test fails for AudioEffects"
|
| 1ee60119c4fa51ebfa781cf5fdc33f192e8551b8 |
26-Jul-2011 |
Ted Bonkenburg <tedbo@google.com> |
Remove ParcelSurfaceTexture and update MediaPlayer
This removes the ParcelSurfaceTexture class since that functionality has been
folded into Surface.java. The change also updates the MediaPlayer to get rid
of setParcelSurfaceTexture() and modifies setTexture() to use the new Surface
functionality in order to simplify the code.
Change-Id: Iafa75ea3188263928128325d8a726786971b4de4
ndroid_media_MediaPlayer.cpp
|
| 09f1735fadf985f321abef5fe696d0b80c6b46c7 |
12-Aug-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 5144429: CTS test fails for AudioEffects
android_media_AudioEffect_native_setup() was not initializing
properly the effect descriptor for audio pre processings.
AudioEffect tests should create per processing effects on a valid
AudioRecord session.
Change-Id: Ia1862ca91c98e272f9374b9225a7d4ce7ef132fc
udioeffect/android_media_AudioEffect.cpp
|
| 91784c996f95483e3041169215c0d6635e27ffcc |
10-Aug-2011 |
Gloria Wang <gwang@google.com> |
To support for switching from a non-null surface/ surface texture to
a null one, and vice versa.
Fix for bug 5137445.
Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
ndroid_media_MediaPlayer.cpp
|
| 17cfcbfa2920e2bd0576cce0b36fb72fbbd1e0e3 |
25-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Add dependencies for the YV12 color converter change.
Bug: 5061733
Change-Id: Id8227a4f634285323c37498604fe080d986bfb09
ediaeditor/Android.mk
|
| 85a315b54797b05b4232eda426fdd60e255aa97d |
27-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Merge "Fixing up Mediarecorder for MFF"
|
| b33d46cc77b0e96a4d0ff39b85158c5c4eca3855 |
26-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Merge "Add filename and line number in the debug messages."
|
| cac873bd4ad6ffc8587e3d77fece5abcf2804f4f |
26-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Fixing up Mediarecorder for MFF
For using the MediaRecorder in MFF (Mobile Filter Framework),
getMediaRecorder method in mediarecorder jni was earlier changed to
a non static method. Changed it back to a static method.
Also, added a new source type to MediaRecorder.VideoSource for recording
GRalloc buffers.
Change-Id: I031fad45c12b0ac9602d9e451d4767e95a86234d
ndroid_media_MediaRecorder.cpp
|
| 0f7f4ece1b6b73caf608d533d833a8cdc11c8131 |
24-Jul-2011 |
Eric Laurent <elaurent@google.com> |
Added APIs for audio preprocessing
Added APIs to control pre processes applied on captured audio.
Those APIs are still hidden until reviewed by API council.
Three types of standard pre processes are supported:
- Automatic Gain Control (AGC) by AutomaticGainControl class
- Acoustic Echo Cancellation (AEC) by AcousticEchoCanceler class
- Noise Suppression (NS) by NoiseSuppressor class
A method is added to AudioEffect class to query audio pre processings
applied by default by the platform on a given AudioRecord session ID.
Change-Id: I0b9fceeb8c704dd06319c3b52b85c96fe871d51d
udioeffect/android_media_AudioEffect.cpp
|
| aba28e7fecb06adab8de51619b2929b640369e83 |
23-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Deprecate two methods in MediaRecorder.java class"
|
| 897e27bc75886e44d2f9f09155127f401c4173ea |
02-Jul-2011 |
Pannag Sanketi <psanketi@google.com> |
Connect MediaRecorder Native to SurfaceMediaSource
Making a connection from MediaRecorder Native layer to the
SurfaceMediaSource for the purpose of encoding GL Frames. This will be
called from the java side inside the Mobile Filter Framework.
The mediarecorder native layer (client), when set the videosource to
option VIDEO_SOURCE_FRAMES, asks the StageFrightRecorder on the mediaserver
side to create a SurfaceMediaSource object and pass it back as a
sp<ISurfaceTexture> object. Using that, the client side will dequeue and
queue buffers. Connecting the GL Frames to the obtained
sp<ISurfaceTexture> is not part of this CL.
Related to bug id: 4529323
Change-Id: I651bec718dd5b935779e7d7a050b841c2d0b0fcd
ndroid_media_MediaRecorder.cpp
|
| 3ff98beeafd271a65c1f824699431366882b04f6 |
21-Jul-2011 |
James Dong <jdong@google.com> |
Deprecate two methods in MediaRecorder.java class
Change-Id: I98fbe628fe77867b97c04f44458948ede2f49d22
ndroid_media_MediaRecorder.cpp
|
| 25ba294d1f7f16d285a98d4a8ec2524ca2f860da |
21-Jul-2011 |
Chih-Chung Chang <chihchung@google.com> |
Add filename and line number in the debug messages.
Change-Id: I0e19215cd6f26ccd97bcbff765194adda5faf940
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorJava.h
|
| 432fb8ecbed402b06f7f92d829be544b317059be |
21-Jul-2011 |
Hong Teng <hongteng@google.com> |
Merge "fix for issue 4142219 Don't hard code platform-specific limitations-jni/java part"
|
| 2c70d4a372a8ce83163f19bbd6ae82483ffbe46b |
21-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Untangle MediaScanner error handling.
Bug: 5056917
Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
ndroid_media_MediaScanner.cpp
|
| 600acf14ff12eaf139f0ac644fb7e17849af65fa |
07-Jul-2011 |
Hong Teng <hongteng@google.com> |
fix for issue 4142219
Don't hard code platform-specific limitations-jni/java part
Change-Id: Icde261b1caf29a8cf552884c97f3c9d0b41741a3
ndroid_media_MediaProfiles.cpp
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| c1b9bbb21c8ad5109978a4e9e770cd18b0257434 |
13-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
Remove some #ifdef HAVE_ANDROID_OS that were needed for the simulator build
Change-Id: I13d9f251f86c05ae5405f37adbf6b8e9660935ba
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
|
| dcc31946f2b78be4bf95b1cace2e2c211f027e72 |
11-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Clean up MtpServer initialization and threading:
Move thread from native to Java code
Remove the stop() method (the thread will exit on its own)
Change-Id: Ib897c3630162f82669a4ee8c187e8172da50b29d
ndroid_mtp_MtpServer.cpp
|
| a59a1bad8586e79a863442fa5139658e50ce9dd7 |
11-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "Remove unnecessary locking from MediaScanner JNI code"
|
| af16d0b30e89f31b7617424c8706553ff571d08d |
10-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
Remove unnecessary locking from MediaScanner JNI code
There is nothing in this file that requires a global lock.
Furthermore, the lock can cause timeouts in native_finalize if one instance
is being garbage collected while another is busy in processDirectory
Bug: 5002520
Change-Id: I8717f8edeb932200d9f76b3d98915cfbe18b6ec6
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MediaScanner.cpp
|
| 7a59dd2ce33b46cbc73eef964ddb4272ea1da8d1 |
11-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Return error if user tries to copy a file >= 4GB to a FAT32 file system
Bug: 4561836
Change-Id: I2bffb93b032038f6c220c24c752ccd7ca66c23a0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| 5cc05263399fea948c3b80f83f07ff7476ef0505 |
24-Jun-2011 |
Eric Laurent <elaurent@google.com> |
Moved and renamed effect API header files
Moved specific effect header files to
system/media/audio_effects/include/audio_effects
and renamed to lower case (effect_xxx.h).
Change-Id: Icfc2264bfd013cab0395d7e310ada636b9fe3621
udioeffect/Android.mk
|
| ff90212a3c00e89b25399eb90cdce471cc8c8cc1 |
30-Jun-2011 |
Chih-Chung Chang <chihchung@google.com> |
Remove curtain effect (it's unused).
Change-Id: I2addf390aaa5aa514238b1f98eea67f27745cbf1
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorOsal.cpp
|
| 42419ce28a09eb63e29a8fef87e6f5534f41902f |
01-Jun-2011 |
Wu-cheng Li <wuchengli@google.com> |
Add framework support for camcorder zoom.
The purpose of ICameraRecordingProxy and ICameraRecordingProxyListener is to
allow applications using the camera during recording.
Camera service allows only one client at a time. Since camcorder application
needs to own the camera to do things like zoom, the media recorder cannot
access the camera directly during recording. So ICameraRecordingProxy is a proxy
of ICamera, which allows the media recorder to start/stop the recording and
release recording frames. ICameraRecordingProxyListener is an interface that
allows the recorder to receive video frames during recording.
ICameraRecordingProxy
startRecording()
stopRecording()
releaseRecordingFrame()
ICameraRecordingProxyListener
dataCallbackTimestamp()
The camcorder app opens the camera and starts the preview. The app passes
ICamera and ICameraRecordingProxy to the media recorder by
MediaRecorder::setCamera(). The recorder uses ICamera to setup the camera in
MediaRecorder::start(). After setup, the recorder disconnects from camera
service. The recorder calls ICameraRecordingProxy::startRecording() and
passes a ICameraRecordingProxyListener to the app. The app connects back to
camera service and starts the recording. The app owns the camera and can do
things like zoom. The media recorder receives the video frames from the
listener and releases them by ICameraRecordingProxy::releaseRecordingFrame.
The recorder calls ICameraRecordingProxy::stopRecording() to stop the
recording.
The call sequences are as follows:
1. The app: Camera.unlock().
2. The app: MediaRecorder.setCamera().
3. Start recording
(1) The app: MediaRecorder.start().
(2) The recorder: ICamera.unlock() and ICamera.disconnect().
(3) The recorder: ICameraRecordingProxy.startRecording().
(4) The app: ICamera.reconnect().
(5) The app: ICamera.startRecording().
4. During recording
(1) The recorder: receive frames from ICameraRecordingProxyListener.dataCallbackTimestamp()
(2) The recorder: release frames by ICameraRecordingProxy.releaseRecordingFrame().
5. Stop recording
(1) The app: MediaRecorder.stop()
(2) The recorder: ICameraRecordingProxy.stopRecording().
(3) The app: ICamera.stopRecording().
bug:2644213
Change-Id: I15269397defc25cbbcae16abc071c8349c123122
ndroid_media_MediaRecorder.cpp
|
| d7ed5992634596a53f32f66277de6d287ffb752f |
22-Jun-2011 |
Shailendra <shailendray@google.com> |
Fix for kenBurn Effect for PNG image is crashing (4861071 )
Change-Id: I4b9905ca862a1f0eac0bed4c7f021e93f79ea592
ediaeditor/VideoEditorClasses.cpp
|
| 7d40d42a364f520da853b41956b0a18ed172491b |
21-Jun-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for PTP variant of GetDeviceInfo result.
Change-Id: I09f86fda768b7697665e401adb9516588859bf59
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| 79cd8ba46b1ac15f75174beebc1411edea32c05b |
15-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Remove unneeded #include <sys/resource.h>
Suggested in code review for previous change.
Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
oundpool/SoundPool.cpp
|
| cc5278a3e258b30903102b718fb1cd832e79bb2b |
10-Jun-2011 |
tedbo <tedbo@google.com> |
Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.
This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.
Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
ndroid_media_MediaPlayer.cpp
|
| aa48835ce9a84d9d587d7a4b10ee6ea7c00e00ec |
08-Jun-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Remove obsolete setPtpMode support
PTP mode will be implemented as a separate USB function instead.
Change-Id: I9304c1936c70604ab2ed9704c6b95e11b61f5ba2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| e46a86fcb6a0849fc05c4cade6cb94aad0325295 |
02-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| 2225e4b7049fa3fb9d39a068b8268b63c952d7c1 |
05-May-2011 |
Glenn Kasten <gkasten@google.com> |
Use AudioTrack::event_type not int in callback
Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| e6f3f54e05ac773cacd146a9cc69d758d031271a |
16-May-2011 |
Mike Lockwood <lockwood@android.com> |
resolved conflicts for merge of b107f4de to master
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
|
| 51690544aaeee82b1c50232cd57d50038b77f0c4 |
10-May-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Have GetStorageInfo command return correct storage type for removable storage
Change-Id: I09b548483c12080e7d77970babcae2eef379f2f4
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| 34bb419e5946ab28112e9e27a4d1b3928d31e0e2 |
11-May-2011 |
Dima Zavin <dima@android.com> |
update for new audio.h header location
Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
ndroid_media_MediaRecorder.cpp
oundpool/SoundPool.cpp
|
| 79f407cc6c5ae34fc6f04d52fd034b49d1f002c4 |
05-May-2011 |
James Dong <jdong@google.com> |
Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI
Change-Id: Ib847213f566dee79126d7c14d00750a9a8dedeb9
ndroid.mk
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_Utils.cpp
ndroid_media_Utils.h
|
| 17524dc0d296146c8ffb3f692dc8ab05fee5b1e0 |
04-May-2011 |
James Dong <jdong@google.com> |
Clean up JNI code
o Move the Set/Map/Iterator calls from JNI to Java
o The JNI function receives arrays instead of Maps
o Removed Set/Iterator calls from the Java code as suggested
Change-Id: I34068bf24b61abaf2833dad1f65abc733ed760dd
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
|
| 710a2064450bee6da14a6bb94b964c2b1eee06d0 |
25-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
DO NOT MERGE MTP: Implement GetThumb command
This allows the PC to access thumbnails in JPEG files over MTP/PTP
Bug: 3219495
Change-Id: Id61f353ba70e896fae9a47338bf7871c0f185d3e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_mtp_MtpDatabase.cpp
|
| 371279f8026dc6cf41852cf09f4475d1caf6f589 |
22-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
DO NOT MERGE MTP: Add extended operations to support in-place editing of files
MTP does not support partial writes of files (the entire file must be transferred at once).
This makes it impossible to implement a FUSE file system for MTP
with acceptable performance.
To fix this problem, this change adds extended MTP operations to allow
partial writes to files:
SendPartialObject - allows writing a subset of a file, or appending to the end of a file
TruncateObject - allows changing the size of a file
BeginEditObject - must be called before using SendPartialObject and TruncateObject
EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject
We also add GetPartialObject64, which is the same as GetPartialObject
but has a 64 bit offset rather than 32.
Change-Id: Id5365e1c4dc55a2d819c16c9db0a3ac2260f9309
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpDatabase.cpp
|
| 9c112a86def2f5e21705b29f906aadcb7fafb067 |
24-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.
Bug: 3405327
Change-Id: Ibb37bb2856a0684ce9f685ed565ad35347622834
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MediaScanner.cpp
|
| 7ae938be1b4fb8938f0f438cfd611cd9ed0da513 |
05-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
DO NOT MERGE MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units
- Add storage_id column to media database for MTP storage ID
- Add framework resource for defining mount points and user visible descriptions
for multiple volumes
- Clean up locking in MtpServer JNI code
Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| d01ec6eab019e46398975202e9e4a198a603ad99 |
26-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add setParameter/getParameter to MediaPlayer API.
for bug 1982947
Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
ndroid_media_MediaPlayer.cpp
|
| 24fc2fb1c541e954b83fd31ea9f786a5e9b45501 |
20-Apr-2011 |
Dima Zavin <dima@android.com> |
audio/media: convert to using the audio HAL and new audio defs
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
ndroid_media_MediaRecorder.cpp
oundpool/SoundPool.cpp
|
| c89f22242b955ae748765b3465b819b40f70ee5f |
25-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Implement GetThumb command
This allows the PC to access thumbnails in JPEG files over MTP/PTP
Bug: 3219495
Change-Id: I4964f8b4826dffb7f0f77464ec91bd2e97a2f007
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_mtp_MtpDatabase.cpp
|
| 997354e4b4a9666cedd62282471e97822affced9 |
24-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.
Bug: 3405327
Change-Id: I2d7285bd32e06c1a5c4ef6a8a15f8f8b2c33b39b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MediaScanner.cpp
|
| 825e8716a6ddaf9c70767c5f7228d16da73f7573 |
23-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Add extended operations to support in-place editing of files"
|
| 2fb605a088d25037c66eae04f5d35ea1fe115390 |
22-Apr-2011 |
hongteng <hongteng@google.com> |
Fix for issue 3385135 "source code cleanup" engine part
- remove the unused header files
Change-Id: I78971f7a6ae9325ce96a474e448c6f3d586d7ba6
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 9df53fae3afd1c6b5278216be2fd33a255602aef |
22-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Add extended operations to support in-place editing of files
MTP does not support partial writes of files (the entire file must be transferred at once).
This makes it impossible to implement a FUSE file system for MTP
with acceptable performance.
To fix this problem, this change adds extended MTP operations to allow
partial writes to files:
SendPartialObject - allows writing a subset of a file, or appending to the end of a file
TruncateObject - allows changing the size of a file
BeginEditObject - must be called before using SendPartialObject and TruncateObject
EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject
We also add GetPartialObject64, which is the same as GetPartialObject
but has a 64 bit offset rather than 32.
Change-Id: I4b110748b97ae05cdc8aab02ecdbbbeb263f7840
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpDatabase.cpp
|
| c0125dd4f1f8bb03ad16138f86d55ed3305240c4 |
22-Apr-2011 |
Shyam Pallapothu <shyamp@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in JNI part
Change-Id: I4d38454cdf32cb87dadeedcecd19261dd0b0b927
ediaeditor/VideoBrowserInternal.h
ediaeditor/VideoBrowserMain.c
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorThumbnailMain.cpp
|
| 3feb41ff6f617768eb25c1b69c473d33f4f2f37b |
21-Apr-2011 |
Shyam Pallapothu <shyamp@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in JNI
Change-Id: I55f43989a8b89a3811468b30646fe1af0c87b386
ediaeditor/VideoBrowserMain.c
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorThumbnailMain.cpp
|
| 7743fa64b11e9747d3ba8065a08a33ee9d90938f |
12-Apr-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 4133431 "Remove OSAL layer" in JNI part"
Fix for issue 4133431
Change-Id: I5879b740e7104abca7f4e1e831629997a6eec781
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 966f9e558d714d9d41189e989b21e6d5fec35047 |
14-Apr-2011 |
Gloria Wang <gwang@google.com> |
Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939."
|
| 162ee49e1ce8800de80697fdd0e0e42ad7e9374e |
12-Apr-2011 |
Gloria Wang <gwang@google.com> |
- Add another parameter in notify() to be able to send timed text sample
through listener during video playback.
- Add OnTimedTextListener in the MediaPlayer
For feature request 800939.
Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
ndroid_media_MediaPlayer.cpp
|
| dd66bcbf9d6ef0c50a18d9c4b1b39ce7ef7afcc4 |
12-Apr-2011 |
Elliott Hughes <enh@google.com> |
More native code cleanup.
Don't keep unused global references to classes, don't throw exceptions
when an exception is already pending, and fix a (harmless) misunderstanding
about how GetStringChars works.
Change-Id: Ie445036f057daa8a1c76aceb7bad2a84fb81d820
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
|
| a3804cf77f0edd93f6247a055cdafb856b117eec |
12-Apr-2011 |
Elliott Hughes <enh@google.com> |
You don't need to poke around inside FileDescriptor manually.
We can help you with that.
Note also that getParcelFileDescriptorFD did no such thing. All its callers
were passing in a regular java.io.FileDescriptor and expecting the int. No
ParcelFileDescriptors involved.
Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
oundpool/android_media_SoundPool.cpp
|
| 15dd15fd572df6b6f785dff75f66e9b99f40322a |
09-Apr-2011 |
Elliott Hughes <enh@google.com> |
Tidy up exception throwing in the media native code.
(I'm going through all of frameworks/base in multiple passes. This pass is just
for exception throwing.)
Change-Id: Ia14a5c720edae86ac780023be88e676aa1b3315d
ndroid_media_AmrInputStream.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_ResampleInputStream.cpp
ndroid_mtp_MtpDatabase.cpp
|
| c371a02e7cf504e9a926ca29c33e63b658c2cef7 |
06-Apr-2011 |
James Dong <jdong@google.com> |
Media JNI code cleanup
o Don't throw exception again because an exception was already thrown
o Check on return values from FindClass() and GetMethodID
Change-Id: Id92bb8228f1f0d2798d1cdf7de73cbb43816060b
related-to-bug: 4139926
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaScanner.cpp
|
| 3977472d9f3380a8323156dbc7d0090cf2f2d310 |
06-Apr-2011 |
James Dong <jdong@google.com> |
Handle the failure from GetStringUTFChars()
Change-Id: I9eb0f9f0fd2fa5116e7be80b1fa2ed4a95521b9d
related-to-bug: 4139926
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpDevice.cpp
ndroid_mtp_MtpServer.cpp
|
| 46e18c11d46a2bc1a46174f963d0ed1224d94cd2 |
06-Apr-2011 |
Brian Carlstrom <bdc@google.com> |
Don't use local ref for cached jclass reference in JNI code
Change-Id: Id45b2acb358a819f2fd332e99f3a095f6fc7299b
related-to-bug: 4241138
ndroid_media_MediaMetadataRetriever.cpp
|
| b239b683765f63d79e74b8ba2a8cc2855f236536 |
05-Apr-2011 |
Mike Lockwood <lockwood@android.com> |
MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units
- Add storage_id column to media database for MTP storage ID
- Add framework resource for defining mount points and user visible descriptions
for multiple volumes
- Clean up locking in MtpServer JNI code
Change-Id: Iffb66ed156ef5bc80b14228af78fbacee7734360
ndroid_mtp_MtpServer.cpp
|
| a93f84e067f02c319c69a114e219006507d1b4f4 |
01-Apr-2011 |
James Dong <jdong@google.com> |
ISurfaceTexture does not have a method getIdentity()
Change-Id: I81e6b0335747bd5c2c4b15c9f8c99100842a06c1
ndroid_media_MediaPlayer.cpp
|
| 696257ccf315a1da042787c5b2d1f80c7146fc94 |
26-Mar-2011 |
Mathias Agopian <mathias@google.com> |
merge libsurfaceflinger_client into libgui
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.
NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.
Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
ndroid.mk
ediaeditor/Android.mk
|
| 602b3286ffe7da6e70bf2d9e4861a5d74ff7c473 |
18-Mar-2011 |
Eric Laurent <elaurent@google.com> |
Fix issue 3509396: AudioEffect.getParameter JAVA.
Removed dead/buggy code in AudioEffect.getParameter() and
AudioEffect.command() that was meant to return the actual length of
meaningful data in the returned parameter or command reply.
This is replaced by the method return status indicating this length when
positive (negative return codes still indicate the same errors as before).
Modified automated AudioEffect tests accordingly.
Change-Id: Ie89617f912766b8dee73b81f92af9c48027c982d
udioeffect/android_media_AudioEffect.cpp
|
| 5bb357f4ccdb573efbe1476a7f20e82f454b3a93 |
21-Mar-2011 |
Andreas Huber <andih@google.com> |
Fixing the build.
Change-Id: I89daa503029491e6f1a8321f7e45c9439315ad23
ndroid_media_MediaMetadataRetriever.cpp
|
| 14a80afa512c4d37b1e0dc4c4fe6281d74fc172e |
21-Mar-2011 |
Andreas Huber <andih@google.com> |
Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"
|
| 5b7ced6a4ebcec34a36d0779773bc9e671732dbf |
21-Mar-2011 |
Andreas Huber <andih@google.com> |
Support passing headers to MediaMetadataRetriever's setDataSource API
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
ndroid_media_MediaMetadataRetriever.cpp
|
| 9f2cde3cdb3e2de97f450d0f4e2b52aae86ce5a3 |
19-Mar-2011 |
James Dong <jdong@google.com> |
Scale the thumbnail if display dimension is different from the actual buffer size
bug - 3379293
Change-Id: I31c08010c97387716433da99d648bd364847b6aa
ndroid_media_MediaMetadataRetriever.cpp
|
| 0b8fe2012debcc3a274797ff4d405906fd30be8e |
17-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
am ce254e86: am 69d05490: am 0edefea8: Merge "Fix for 4087846 Crash reported by monkey report (Java/Jni)" into honeycomb-mr1
* commit 'ce254e8613ddc4d57a8a5a8a2763b22690f451a4':
Fix for 4087846 Crash reported by monkey report (Java/Jni)
|
| 8e7991a52edb3eb8bd1a44ceb7f6d97108748c8c |
16-Mar-2011 |
Rajneesh Chowdury <rajneeshc@google.com> |
Fix for 4087846 Crash reported by monkey report (Java/Jni)
Change-Id: I356f975743f5a24e72f33a20ee497a2b12791be6
ediaeditor/VideoEditorMain.cpp
|
| 0660c7d04892f3e84e5a3a3ec42cf4c704b9d689 |
15-Mar-2011 |
James Dong <jdong@google.com> |
Merge "Add a release() method to MediaScanner"
|
| 3070af08821ee86f06a9cc6b58dbb79c82946b94 |
14-Mar-2011 |
Iliyan Malchev <malchev@google.com> |
frameworks/base: remove LOCAL_PRELINK_MODULE
Change-Id: I54dd62ebef47e7690afa5a858f3cad941b135481
Signed-off-by: Iliyan Malchev <malchev@google.com>
ediaeditor/Android.mk
|
| 133cf8b92a07d5be8c64607b9644aa9cef169fb0 |
12-Mar-2011 |
James Dong <jdong@google.com> |
Add a release() method to MediaScanner
bug - 2586042
Change-Id: I08713ac75cbcaf01dff21a24cdefb6e2dacc92cb
ndroid_media_MediaScanner.cpp
|
| 86ad55028be46a4cfbe821f27729fcebf045ccc8 |
12-Mar-2011 |
Ying Wang <wangying@google.com> |
Merge "Remove unnecessary ld flags."
|
| eab30df28154ef6b671340726225ea60c8443595 |
12-Mar-2011 |
Ying Wang <wangying@google.com> |
Remove unnecessary ld flags.
This fixes the x86 buid, in which bfd linker is unavailabe.
Change-Id: Ibce1b5cbfb0435644b2d75056003578371510929
ediaeditor/Android.mk
|
| f39975285874ba80bca3e8d94323c6aad3bb83da |
11-Mar-2011 |
James Dong <jdong@google.com> |
A little cleanup in MediaScanner JNI code
o mainly use the defined class name rather than repeat the string each time
to reduce the typo chance.
o format the code also
Change-Id: I131c98f11335ff524d01a6791baa1b8c11013abc
ndroid_media_MediaScanner.cpp
|
| b966b9d9e882835691e5adda292d89dd704df71c |
09-Mar-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Convert date created and modified values from seconds to milliseconds
BUG: 4026365
Change-Id: Ifd78cca305299ed1cedd6595609d9bf8d520cd8e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpDevice.cpp
|
| 895a28e14e6c88b4ff3b1f1cdf02d22f7b3b52ca |
05-Mar-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3453519: (Java/JNI) do not allow editing of DRM protected contents
Change-Id: I376483c42b5bed8d2a1765804c2261c18d720a0c
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 4fad6762c6429379c4f7fe5d78e84d0718f52817 |
28-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
Fix for issue 3371667: fix source code compilation warnings (4)
Change-Id: I898f81fea6c061b9ca7cbd675218d9f4b8c0bc77
ediaeditor/VideoBrowserMain.c
ediaeditor/VideoEditorClasses.cpp
|
| 71771b3b1bbcafe84e7bd14941b98a1b1d6c8a60 |
01-Mar-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967: Memory leak from video editor engine
Change-Id: Ibaa66d7c95f2a60b59dc3102d3b5130ff1fbc62e
ediaeditor/VideoEditorMain.cpp
|
| 7c8f25f5b81ed2c6520174ead6d0fdf96a313945 |
28-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3431967: Memory leak from video editor engine
Change-Id: I610e82f5bdb8ac7b32541301a9fa41bbd8f1459d
ediaeditor/VideoEditorMain.cpp
|
| cc562a3576a6a8096626387472e05e8bee03352a |
09-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3438258 Add SurfaceTexture as MediaPlayer sink
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.
This includes:
- New Java and C++ interfaces
- C++ plumbing and implementation (JNI, Binder)
- Stagefright AwesomePlayer and NuPlayer use ANativeWindow
(either Surface or SurfaceTextureClient)
Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
ndroid_media_MediaPlayer.cpp
|
| 87e639bc151551c9618641a6765837b44eb90b9b |
23-Feb-2011 |
Gloria Wang <gwang@google.com> |
Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data"
|
| d211f41f764fe81fe00b10a99b4b44cb84479cbe |
20-Feb-2011 |
Gloria Wang <gwang@google.com> |
- Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data
Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
ndroid_media_MediaPlayer.cpp
|
| 66e57f6aa9d206552e9b154bf00a17d6efae7fb0 |
18-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Disable MTP when the keyguard is locked and secure
BUG: 3402847
Change-Id: I6c77efe18f525cd0af37911c8b6aac4f17352552
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| 467ca0de6d7fd55787a37de9dfd7e5325e1c3c6f |
18-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for dynamically adding and removing storage units
BUG: 3402847
Change-Id: I7da266061d949abcb6bb11c6faaa47b5e4a2a977
ndroid_mtp_MtpServer.cpp
|
| df4723ef3c43b3a0b2548908a4461db29b5649d2 |
17-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames
Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
ediaeditor/VideoEditorMain.cpp
|
| 9cfeb6ecfaaee07d17ce9313946518ca6006bc8e |
16-Feb-2011 |
Basavapatna Dattaguru <dattaguru@google.com> |
VideoEditor:Issue ID: 3431967
Fixes memory leak in getProperties
Updated with Review comments
Change-Id: Ie4e8edaee1c76f18d0526b5eae9f9a128e0a3c17
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 9ee9aad80981c661af3f4c16f5932aef1f98e7b0 |
11-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3444358 : Movie studio is broken in Master-TOT
Change-Id: Ie83703a5da6587a6b5668bc4777fdba71042b2bc
ediaeditor/VideoEditorMain.cpp
|
| 1d830165a0535010c176f08feba2973ad9003598 |
11-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "Fix for issue : 3439708 Last frame is missing effect"
|
| bc20c93863aefc6bf9a9338c4f1cb68e529826d3 |
11-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Fix JNI warnings in MtpDevice"
|
| 40304e227247c788d1c0e8d41c386cdb10cba91b |
11-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix JNI warnings in MtpDevice
Needed to add a global ref to the classse to avoid
"not a valid JNI reference" errors when calling the constructor.
Change-Id: Ieb7e69f5d19fd5a090c53d32f69a201040c49112
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpDevice.cpp
|
| fb4e92c4ed316295c7cde38e58cf0816c0e5f8ce |
11-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue : 3439708 Last frame is missing effect
Change-Id: Ibfc81c06ec525e95e5733bf03b7a2f3b58a5574c
ediaeditor/VideoEditorMain.cpp
|
| 91ba3a0033f1ed7f26fc9e8cd9088479c7de134a |
10-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for 3431967: Memory leak from video editor engine in JNI
Change-Id: If879bbcf68d01fea0995be0faf070b6dd7361218
ediaeditor/VideoEditorMain.cpp
|
| 5bdbb562ee8c995eed5c34f2b0249afd913f2b89 |
07-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
am 7d913d43: am 6ef407c0: Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
* commit '7d913d4350230afba8dea55718d887cf967d1ab2':
Fixed 3423072 Imported 1080x720 video clips present distorted view
|
| 0b180a7fae0619ab7a3f0082f535a622b8f59e7a |
07-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am d5924e9d: am 67ec9aa8: Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
* commit 'd5924e9d3a370c2816613d4420b622b857da4f00':
Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
|
| 4d3cd2c23e347e69534c626cad082ad1cc5fe36b |
07-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 6a9cb7dd: am e05c33fe: Merge "Modification for using Software decoder for thumbnail generation in JNI" into honeycomb
* commit '6a9cb7ddec346145b4563e06ff0940199758f888':
Modification for using Software decoder for thumbnail generation in JNI
|
| 6ef407c0e6e3c178b01e2837e59348f72c97cf8c |
05-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Merge "Fixed 3423072 Imported 1080x720 video clips present distorted view" into honeycomb
|
| 69e868dcabeb14c27251334fc33a5cad0982d379 |
04-Feb-2011 |
Danny Fernandes <dannyfernandes@google.com> |
Fixed 3423072 Imported 1080x720 video clips present distorted view
Change-Id: If4f4039c516eb77423dd590e8634a2d4a05d4622
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 67ec9aa87812a4d55a3c0ed5d0ab66cdb36342f0 |
04-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Hardware Video Decoder Flag Enabled for Thumbnail extraction and RenderFrame
Change-Id: Ie9cf769e42869b5cab57694e92884900d33f40d9
ediaeditor/Android.mk
|
| b62d78bd0d6a7738cc75df6f14f65abebb9b7b5f |
04-Feb-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Modification for using Software decoder for thumbnail generation in JNI
Change-Id: Ie3dd5a28311627fd0b559bc3d4e28d2f668ccc61
ediaeditor/Android.mk
ediaeditor/VideoBrowserMain.c
|
| 8930a1259dccd3d0639e74d7a9125f1f968dc65f |
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 2fa861cc: am 261ddb81: Merge "Fix issue 3408285 Crash while generating KenBurns" into honeycomb
* commit '2fa861cc6ef65696854dc4a85494bea6dd87fd8e':
Fix issue 3408285 Crash while generating KenBurns
|
| bf1e5cefe24f19d570426ef3ed1739902ea07631 |
02-Feb-2011 |
Nemmara Venkateswaran <vekateswar@google.com> |
am e00d44ce: am 47b8c96b: Merge "Fix for issue 3370023 : Wrong aspect ratio in overlay" into honeycomb
* commit 'e00d44ced228dc523f4492edd66d4eeb5dabd305':
Fix for issue 3370023 : Wrong aspect ratio in overlay
|
| beb9fc8ee8d3bd14d141104e91d41809dcfe0e1a |
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix issue 3408285 Crash while generating KenBurns
Change-Id: Iaa207229e2c699e1d374b424893bcf252c6614f3
ediaeditor/VideoEditorMain.cpp
|
| 63298a980930c81754ab4fb7849a4ff61088d864 |
01-Feb-2011 |
Santosh Madhava <smadhava@google.com> |
Fix for issue 3370023 : Wrong aspect ratio in overlay
Change-Id: I65bdfb2b5c9edc26de94052e21b8f55ec8671f6a
ediaeditor/VideoEditorMain.cpp
|
| 13c05526430488ceac6a9fe839cdc42da50e7c17 |
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am e9c5ade3: am c08f85a6: Fix issue 3414805 Crash during Overlay editing. JNI fixes.
* commit 'e9c5ade37168e43203c060635c66dbd4de2ae458':
Fix issue 3414805 Crash during Overlay editing. JNI fixes.
|
| c08f85a6484ee5da7062a5eac0f19912bd7e2513 |
02-Feb-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix issue 3414805 Crash during Overlay editing. JNI fixes.
Change-Id: I5e966c6987920318d3ce03f78552d0028ef55a26
ediaeditor/VideoEditorMain.cpp
|
| 3a70cf3aff5da2ed30923bf5fe70334ee54ede14 |
31-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 60a3ead5: am cd73d1ed: Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
* commit '60a3ead52ec6216b28d1d82ab3480a08bf919c17':
Fix for issue 3404671 Crash when exporting movie in JNI
|
| cd73d1ed6d1149a2ae642e87ffe8d89100fbafec |
31-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "Fix for issue 3404671 Crash when exporting movie in JNI" into honeycomb
|
| 8e6c69b092a4370c4ed10c3263f3580e8b960095 |
31-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 75aa290d: am ff843254: Merge "Merging the same files on top of tree." into honeycomb
* commit '75aa290d5d23a9bb862e409f9b5de23a0ffda579':
Merging the same files on top of tree.
|
| 4e7032052137345450bfd2b7a4a9a05ecde17076 |
30-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merging the same files on top of tree.
Add support for .m4v Issue 3395600
Change-Id: Idca673859afb3398d4b91aba9c20c37396c4f757
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorClasses.h
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorPropertiesMain.cpp
|
| 407a558af5556a9e198c6e0be255f6829c4e81ba |
31-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 471ebbca: am 45911e19: Merge "Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI" into honeycomb
* commit '471ebbca5f404062bed232aa27da9c1f1ebf0a1d':
Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
|
| 9803b8435e973d7e44360b91fa6935d0e3981a76 |
30-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 3400229 Pan and Zoom effect is not accurate in JAVA and JNI
Change-Id: I6216e7e66be4bf0d7cfc74ee3bda7e22969a229a
ediaeditor/VideoEditorClasses.cpp
|
| 5618e037af1a9d4323990a580d4181b9bc8e3091 |
30-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Fix for issue 3404671 Crash when exporting movie in JNI
Change-Id: Id2883d7be314ebd2138297b936bcbe6b55361ac5
ediaeditor/VideoEditorMain.cpp
|
| 5af2ce4c5fd45250943fa62ad5dc194ca5e3de51 |
26-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
am 81bebad0: am ecebf173: Merge "Fix for Issue 3370836 : JNI files for Overlay optmization." into honeycomb
* commit '81bebad0f1fa0bda5a74e4e78b43bd94bd94bf40':
Fix for Issue 3370836 : JNI files for Overlay optmization.
|
| c16ccc1c5a6293136ae9bd4756dc2f57914a2020 |
22-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix for Issue 3370836 : JNI files for Overlay optmization.
Change-Id: I3d7a0248bfd75bbd7c23321e22c3c331eb33ddd2
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorMain.h
|
| 53df92d84e7380d85a99efe9d9b538627310c015 |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am d28bb6e2: am 2aaa7764: Merge "VideoEditor:Fix for 3369908" into honeycomb
* commit 'd28bb6e279c17224e843101199d228fe5aad459d':
VideoEditor:Fix for 3369908
|
| 2aaa776429f58069e25c8160a9e5b9a969f6e993 |
26-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "VideoEditor:Fix for 3369908" into honeycomb
|
| 501e52f09d555cc27c637846a897b4903a116678 |
26-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
am 7fadb5e7: am 2b3da7ab: Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
* commit '7fadb5e77fd079c3a6c5eeae1ae81a487864b129':
MTP: Fix race conditions in MtpServer JNI code
|
| 2b3da7ab61ac920881f35bbf66234c073d79ba24 |
26-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb
|
| 071b2b6739c83d3de806cda5d7be2aba33fde1af |
25-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix race conditions in MtpServer JNI code
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.
BUG: 3317803
Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| 454693d3f6f9e2db5079138f2f7b744bc0a58fb3 |
25-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 4ba9e68f: am b8942108: Merge "Video Editor:Fix for 3375632" into honeycomb
* commit '4ba9e68fa95c59e4f2c7c6b17a663b10a5405f45':
Video Editor:Fix for 3375632
|
| b8942108826893657ca0b8b6d5d6d153739a76f6 |
25-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Merge "Video Editor:Fix for 3375632" into honeycomb
|
| 244d6d3c8b260da0434befce40a85bb35baf9743 |
25-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
am 08902803: am a2edecfe: Merge "Issue no : 3370622" into honeycomb
* commit '08902803458faa74fd9aeaec2d9de35046912ed0':
Issue no : 3370622
|
| 1ac760afabeb19ced48a788c7b675baba47d4db3 |
24-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Issue no : 3370622
VideoEditor: Fix for Clear Surface API
Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
ediaeditor/VideoEditorMain.cpp
|
| dc5b1762da470d6b1f26a28fb8abe0b7ee27df45 |
24-Jan-2011 |
Gil Dobjanschi <virgild@google.com> |
am 6c170ecc: am 9c265fcc: Merge "VideoEditor:Clear Surface API addition" into honeycomb
* commit '6c170eccf2864e526a145c91102b204cb787c860':
VideoEditor:Clear Surface API addition
|
| 05d9f81bd638a749669192b50e680b166529d5f3 |
24-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideoEditor:Clear Surface API addition
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
ediaeditor/VideoEditorMain.cpp
|
| 474cb4d2d563d130b61a2832811b3aea26028307 |
23-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
VideoEditor:Fix for 3369908
Change-Id: Ic28d1c96a681dcc56d4432e10dffc273029e1c85
ediaeditor/Android.mk
|
| b21827d1bc543e6c3fe31f0b0bc02e8ce306f43f |
23-Jan-2011 |
Dheeraj Sharma <dheerajs@google.com> |
Video Editor:Fix for 3375632
Change-Id: I354b8b653ea0ccddda49a6e530ad63b5bd44a5b2
ediaeditor/VideoBrowserMain.c
|
| 47063a859ada034d9181b58ffb9875902a4e2531 |
23-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "New APIs for MTP and PTP host support"
|
| 8182e72479a8b0d832df9c392890b25bfa6f97b5 |
30-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
New APIs for MTP and PTP host support
This replaces the previous ContentProvider based interface
Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_mtp_MtpDevice.cpp
|
| 2d044d1ff9d5d51eba9669857b7d5ea4e9c2ac52 |
22-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Merge "Remove MTP related log spam" into honeycomb
|
| f26a586c86b097f975e26fe526ead564ad011bd0 |
22-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Remove MTP related log spam
Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpServer.cpp
|
| 8f995b5f6de6690ecf80d40cde70e2e6f6e3f232 |
21-Jan-2011 |
Carl Shapiro <cshapiro@google.com> |
Remove dead code referencing an obsolete interface.
Bug: 3378919
Change-Id: I780d98492ea7996187e3d97fcae7748f7ee68e91
ndroid_media_MediaMetadataRetriever.cpp
|
| ae12a50a35c0d8425430d0e934c022ecb9cd4936 |
21-Jan-2011 |
Carl Shapiro <cshapiro@google.com> |
Perform orthogonal rotations without using a Skia canvas.
Bug: 3371653
Change-Id: I315f671c0016f61417ff7c2a98d2c96f6b243bdf
ndroid_media_MediaMetadataRetriever.cpp
|
| fe93351cf1e16dcb32c3c824cf4f1201991b2130 |
19-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Merge "remove eng developement local tags in make file" into honeycomb
|
| 6dbd3ee67b4e4d3bae9508c640e14e39cc953903 |
19-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
remove eng developement local tags in make file
Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
ediaeditor/Android.mk
|
| 581cad2221cb367e9e3ef6991c565cd37ced994f |
19-Jan-2011 |
James Dong <jdong@google.com> |
Turn error/exception logging on at the native layer
o also fixed some compilation warnings
Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
ediaeditor/VideoEditorLogging.h
ediaeditor/VideoEditorMain.cpp
|
| 897f894e88a3a1c9010309f04c6bf466125ff818 |
19-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Close and reopen driver file after an error.
BUG: 3368665
Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| a1c9180461a819f0515ec92a72d8ebfe462d977f |
19-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix problem with MTP starting up on the first try.
BUG: 3361230
Change-Id: Ibc2e8adf24a14ea18385b306e786a77983ff8f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpServer.cpp
|
| 0a3dbf6f69a72d557afca69f006a407fbfc2482d |
18-Jan-2011 |
James Dong <jdong@google.com> |
Merge "Fix the build break in git_master-without-vendor" into honeycomb
|
| a1a55bbe9480231095c0da28ae34804b663bc11f |
18-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
Fix the build break in git_master-without-vendor
Change-Id: I8fff5ee69958212a80711e0d86fb86514c8797f4
ediaeditor/Android.mk
|
| 7a0bd17bceaf3efc3732e30c538fae420d3b742c |
18-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix problems with modification dates for folders and non-media files
Also removed an unnecessary parameter to MtpDatabase.endSendobject()
BUG: 3352142
Change-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_mtp_MtpDatabase.cpp
|
| cd196d3727db641e581d4223815367a5ca5d5637 |
17-Jan-2011 |
Dharmaray Kundargi <dharmaray@google.com> |
videoeditor JNI files on honeycomb
Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
ediaeditor/Android.mk
ediaeditor/VideoBrowserInternal.h
ediaeditor/VideoBrowserMain.c
ediaeditor/VideoBrowserMain.h
ediaeditor/VideoEditorClasses.cpp
ediaeditor/VideoEditorClasses.h
ediaeditor/VideoEditorJava.cpp
ediaeditor/VideoEditorJava.h
ediaeditor/VideoEditorLogging.h
ediaeditor/VideoEditorMain.cpp
ediaeditor/VideoEditorMain.h
ediaeditor/VideoEditorOsal.cpp
ediaeditor/VideoEditorOsal.h
ediaeditor/VideoEditorPropertiesMain.cpp
ediaeditor/VideoEditorThumbnailMain.cpp
ediaeditor/VideoEditorThumbnailMain.h
|
| 4507cef05e492f65755aa321007d6592d111d01f |
13-Jan-2011 |
James Dong <jdong@google.com> |
Remove legacy code that should not be used
Change-Id: I9209e3a32b64a30627848d2a425f32ed6b73e8a2
ndroid_media_MediaMetadataRetriever.cpp
|
| 11eab056dd0133a390169d3581edf3eef26d6a54 |
06-Jan-2011 |
James Dong <jdong@google.com> |
Publish MediaMetadataRetriever.java as public API
o Removed setMode() methods and related mode constants
o Removed some of the unused the metadata keys
o Updated the javadoc
o part of a multi-project change.
bug - 2433195
Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
ndroid_media_MediaMetadataRetriever.cpp
|
| a60e212d0dda7d2a748180ce77405f2463c9cf53 |
29-Dec-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3261656.
The problem can occur if a sample is started at the same time as the last AudioTrack callback
for a playing sample is called. At this time, allocateChannel() can be called concurrently with moveToFront()
which can cause an entry in mChannels being used by moveToFront() to be erased temporarily by allocateChannel().
The fix consists in making sure that the SoundPool mutex is held whenever play(), stop() or done() are called.
In addition, other potential weaknesses have been removed by making sure that the channel mutex is held while
starting, stopping and processing the AudioTrack call back.
To that purpose, a mechanism similar to the channel restart method is implemented to avoid stopping channels
from the AudioTrack call back but do it from the restart thread instead.
The sound effects SounPool management in AudioService has also been improved to make sure that the samples have
been loaded when a playback request is received and also to immediately release the SoundPool when the effects are
unloaded without waiting for the GC to occur.
The SoundPool.java class was modified to allow the use of a looper attached to the thread in which the sample
loaded listener is running and not to the thread in which the SoundPool is created.
The maximum number of samples that can be loaded in a SoundPool lifetime as been increased from 255 to 65535.
Change-Id: I368a3bdfda4239f807f857c3e97b70f6b31b0af3
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/SoundPoolThread.h
|
| 27480cd49470af667dc8985f45b5ba43ab9ed4cd |
06-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Remove support for obsolete PTP content provider
This will be replaced by a new PTP host API in an upcoming commit.
Change-Id: Ib914194e332b5c090cb8e34ed35bd691bc9f85d1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_mtp_PtpClient.cpp
ndroid_mtp_PtpCursor.cpp
|
| df9b349b960fff95dff4fcf8b2661899e33059da |
05-Jan-2011 |
James Dong <jdong@google.com> |
Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java
Change-Id: I34dfc1daa3bed1f334f3f266cbe70d1e3d7924f6
ndroid_media_MediaMetadataRetriever.cpp
|
| 0cd0136d440cf6ad9d5fab430269116786e671ec |
30-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Move MTP Java classes to android.mtp.* package.
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MtpDatabase.cpp
ndroid_media_MtpServer.cpp
ndroid_media_PtpClient.cpp
ndroid_media_PtpCursor.cpp
ndroid_mtp_MtpDatabase.cpp
ndroid_mtp_MtpServer.cpp
ndroid_mtp_PtpClient.cpp
ndroid_mtp_PtpCursor.cpp
|
| da03aaad78c124be8903c2c4029ecd329b250f4c |
29-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Change libusbhost and libmtp from static to shared libraries
Change-Id: Iccc67db32400cdeb88aa33261c9e0cf73db992ca
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
|
| 0e4b535b439f2c8bd4f7ba820f81bf74336bae76 |
19-Dec-2010 |
James Dong <jdong@google.com> |
Avoid using private Bitmap constructor to generate bitmaps
bug - 2433195
Change-Id: Ic74225286c9884055ae751cf76a1d65e8e70b3ae
ndroid_media_MediaMetadataRetriever.cpp
|
| 076e05b488e40fdd946f0d35137fe66a576efe09 |
16-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MediaScanner: Add support for scanning empty directories
Currently the media scanner does not create database entries for directories
unless they contain a file that is scanned.
Fixing this so we provide a consistent view of the world to MTP.
Change-Id: Ia776acfeae23192183e7192d63cdc34d830ea889
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MediaScanner.cpp
|
| 88b77412286115b158d906369b62515d773f21bc |
15-Dec-2010 |
James Dong <jdong@google.com> |
Fix media metadata retriever JNI due to a change to the private native Bitmap constructor signature
Change-Id: I48c94b7a77a717c15fac548c7068a8a3e62c79fb
ndroid_media_MediaMetadataRetriever.cpp
|
| 1b198ea6856cb5db989a7f161b7516eeecf5ebc8 |
14-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Create files/folders with group media_rw instead of sdcard_rw
Otherwise the sdcard daemon that implements the Fuse file system at
/mnt/sdcard won't have write access to the files.
BUG: 3254123
Change-Id: Ib0c306bbc31ec936fd6164f17e7cd1b5dfff21b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| 7f36b19b6b78c83f1c52edd153d64295ee3840ce |
12-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for reserve storage setting to avoid low storage situations.
Set resource config_mtpReserveSpaceMegabytes to number of megabytes to reserve.
If MTP has dedicated storage this value should be zero, but if MTP is
sharing storage with the rest of the system, set this to a positive value
to ensure that MTP activity does not result in the storage being
too close to full.
BUG: 3250924
Change-Id: I881c87240da268bad1ea1b99ad03673ab85ffdbf
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| 2711e494caf9ec665c46258feb36c9654290f6e0 |
11-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Check for null string before calling GetStringUTFChars() in MtpDatabase JNI
BUG: 3274649
Change-Id: I5a3c8fcebf71ed453a121ca5a1345e39895d3bf3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 365e03e4943b2d2f4d1e602409ab0e770ea77d1d |
09-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Improve argument checking in SendObjectInfo
In particular, make sure the parent is a folder and make sure file
does not already exist.
Change-Id: Ifa870faba3285f03a92025d9e82f93fed78a761c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 9b5e9c407d35eab4f37c208d81bdf0b8bcdbdf93 |
08-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: pass format back as default value in GetObjectPropDesc for format property
Change-Id: Icc4071af16763a613c9fb31e87dc716f1516c7d8
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| ea93fa16b166ff477e9cf6bd3ac67c8fb259fb57 |
07-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Implement MTP_DEVICE_PROPERTY_IMAGE_SIZE device property.
Return screen size as preferred maximum image size.
Change-Id: I8dc4afb0e49fe45f6925a35aa443d3fc30211453
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| faf09ba9405ff019b5ca7e2317debe4ff269d4f8 |
03-Dec-2010 |
James Dong <jdong@google.com> |
Prepare for publishing MediaMetadataRetriever as public API
step one:
o replaced captureFrame with getFrameAtTime
o removed getMode
bug - 2433195
Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
ndroid_media_MediaMetadataRetriever.cpp
|
| 7d7fb63071ca370f77ed69055ac30341b8388d15 |
02-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for multiple properties in GetObjectPropList command
Change-Id: Ib469a6c8141937aaa3e811345056195117abb4b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 5b19af05f2c6ad71171f95bdad2484a38b61121f |
24-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Use DateTime form in GetObjectPropDesc for date/time properties.
Change-Id: I5a3c0b07a9f2958b86947256606e6a824dbe93a6
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 5a2755d0c9220b6bc52cb1262927e27dc3dce6c1 |
22-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Rename MtpCursor to PtpCursor
Change-Id: I8ce257641388b195f3e17995d323355b19355dc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_PtpCursor.cpp
|
| c0b8b321d5428e4fc425713e3889ef745af3af2d |
20-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Rename MtpClient and MtpCursor to PtpClient and PtpCursor
Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MtpClient.cpp
ndroid_media_MtpCursor.cpp
ndroid_media_PtpClient.cpp
ndroid_media_PtpCursor.cpp
|
| d48124e0fe511265024a61abee67d8ed6ac61592 |
20-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Fix issue 3157123."
|
| f3d6dd0782e3135885efdc26cb86cf0bf811749f |
18-Nov-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3157123.
Use a Mutex wherever atomic operations were used in AudioTrack,
AudioRecord, AudioFlinger and AudioEffect classes.
Change-Id: I6f55b2cabdcd93d64ef19446735b8f33720f8dbc
oundpool/SoundPool.h
|
| 929b3da2fcf061219a82dcced85ffa186c742cc4 |
19-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
PTP: Fix permissions problems with files imported via PTP
Change-Id: I630a89c67e5b3d6d0c29e6c257f84e1909fa4de2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpClient.cpp
|
| 954c267725d64a37655d6f3a00de6a5aa00ddaf8 |
19-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
PTP: Improve performance and reliability of file importing
Now the file copy is done completely within the media process
rather than pushing data to the client via ContProvider.openFile().
File system writes are now interleaved with USB reads, which allows us
to copy the data faster and prevents the camera from timing out during transfer.
File is automatically inserted in the media provider after a successful import
and a Uri is returned to the client.
BUG: 2994234
Change-Id: Ie75c63da76f623343d3d966c6a707aa1ae871972
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpClient.cpp
|
| 413577d8600413bb1dca3730d4ccf20892b929b4 |
16-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fixes to allow file transfers > 4 gigabytes
BUG: 3198248
Change-Id: I6f11c79a19d7bdd63718a7370939124b1262d221
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 3159991e586f9e243f60d65a9554828328b00521 |
15-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix time values returned via GetObjectPropValue and GetObjectPropList
Change-Id: If9bb8b4b19ed6c8d57736e5d1af948fcc946af0e
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| e2ad6ec1718ef0c0e8230f8f62e7cfefcf598b6a |
15-Oct-2010 |
Mike Lockwood <lockwood@google.com> |
MTP: Partial implementation of the GetObjectPropList command
In this initial implementation we only support fetching one property at a time.
Support depth = 0 (single object) or depth = 1 (all objects in a directory)
Reimplemented GetObjectPropValue on top of GetObjectPropList, since the former
is a special case of the latter.
Change-Id: Ia76ee61741d6ee3902b5c5d9fc094cf86dfaf650
Signed-off-by: Mike Lockwood <lockwood@google.com>
ndroid_media_MtpDatabase.cpp
|
| d1959717c28766d4a7fecedd703a79e17c532da8 |
09-Nov-2010 |
James Dong <jdong@google.com> |
am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" into gingerbread
* commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84':
Support extracting thumbnail from rotated video tracks
|
| 53ebc72fd83f83bb5536d5917390aae03b7f5cad |
09-Nov-2010 |
James Dong <jdong@google.com> |
Support extracting thumbnail from rotated video tracks
Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
ndroid_media_MediaMetadataRetriever.cpp
|
| 69b8d69aadbf0e795f1a1e1adc82c78cf0b9959f |
29-Oct-2010 |
Andreas Huber <andih@google.com> |
Squashed commit of the following:
commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:59:23 2010 -0700
suspend() and resume() methods on VideoView are back but don't do anything.
They need to be back because they were public before.
Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425
commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:47:05 2010 -0700
Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."
This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.
Conflicts:
api/current.xml
Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5
commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:16 2010 -0700
Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."
This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.
commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:08 2010 -0700
Revert "Release MediaPlayer if suspend() returns false."
This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.
commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:40:46 2010 -0700
manually.
Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87
Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
ndroid_media_MediaPlayer.cpp
|
| 4de82c7885bd41f9fa5ca3938d617cae5edacbdf |
23-Oct-2010 |
Eric Laurent <elaurent@google.com> |
am 5a9d2737: am b6a2256e: Merge "Fix issue 3126094." into gingerbread
Merge commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860'
* commit '5a9d2737181768a1da54d4e7fb00a6b1b86b3860':
Fix issue 3126094.
|
| cc02ac54ac0758e6f44b2d8e5134ff1b2fa96409 |
23-Oct-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3126094.
android_media_Visualizer.cpp:
Delete local reference to jArray in captureCallback() in
the case of waveform capture.
Change-Id: Ia822ab6d9945fff93605f7732e56120c19fd42a5
udioeffect/android_media_Visualizer.cpp
|
| 6a6a3aff17e057eeb1457ac4d04ab4b5e8f53abe |
12-Oct-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: allow renaming directories
Change-Id: I90849e7924f33a2f39dae400968f2eda64710beb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 5ebac83e20dadf10bd4a0cee4ddf69d0ec049f98 |
12-Oct-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for renaming files
Change-Id: I679d674eb4dae88f60165ab2850cc20eec7ceee3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 3e13c1b705af78f4fa20a38cb144d2a747894e88 |
11-Oct-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Remove some excessive logging
Change-Id: I4b082d8a2ea7ec4ee80e557ad50ed10b03fe4c52
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| 329430a54e152ad1f5e0003194728988661788bb |
11-Oct-2010 |
Eric Laurent <elaurent@google.com> |
am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c'
* commit '4f21e517d09b9d793d20d64547df330fba705b3c':
Added getter for session Id to AudioSink
|
| b3bdf3f0086f1d921720f6dc92cabc7b6f2ab63e |
08-Oct-2010 |
Eric Laurent <elaurent@google.com> |
Added getter for session Id to AudioSink
Added a method to expose the audio session id at AudioSink interface
so that the AudioPlayer in stagefright can retrieve it.
Also:
- Fixed audio effect send level not being initialized in mediaplayer.
- Fixed compilation error when LOGV is enabled in mediaplayer JNI
Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
ndroid_media_MediaPlayer.cpp
|
| 8839471f4d83238f9c017142dcbe3f915f3213fb |
27-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix local reference leaks.
We cannot rely on the VM automatically freeing local references for us
in a timely manner in JNI code that is not called directly from Java.
Change-Id: I6ee8a9a97cb557b9d3b2ace4e4d20467b436fb9c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| ae078f7dacdc719d045c2d19bbce019599fec64e |
26-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Implement extra object properties for audio, video and image files
Read-only support at this point.
BUG: 2869730
Change-Id: I424ba760c8f5f4af394bd65276f19438fa6da6cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| cc64c5dbfbf11f513f60a82ee590f62dfb9a1565 |
26-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Merge changes I1302cacd,I05125c79,I8d9653ce
* changes:
MTP: Fix some warnings
MTP: Include current property value in GetDevicePropDesc
MTP: Fix reading and writing device property descriptors
|
| ac745c1c6b625ab4254086bf7e763575e3482e6d |
26-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix some warnings
Change-Id: I1302cacd1df885c770332cecaaea9f7c8ab97b88
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpCursor.cpp
|
| a2a2128423309641a6b508a15404f3a7e8f3077b |
26-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Include current property value in GetDevicePropDesc
Change-Id: I05125c79ad58b6f75734fcedcc8af9b689fa9ff3
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| a7936a5d6d3c989055fffa74f6c5a4b4a8c83114 |
25-Sep-2010 |
Eric Laurent <elaurent@google.com> |
am f3ae63ee: am 52f58e96: Merge "fix problem in AudioEffect JNI setup." into gingerbread
Merge commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7'
* commit 'f3ae63eef2d7f55c793b2e76d1371f82cea0aab7':
fix problem in AudioEffect JNI setup.
|
| 2fb43ef8c0b922c1bd0d7cb6867e30d702d4bdb8 |
24-Sep-2010 |
Eric Laurent <elaurent@google.com> |
fix problem in AudioEffect JNI setup.
There is a problem in AudioEffect and Visualizer native_setup() methods
that causes a crash in the application after the mediaserver process
has crashed and restarted.
The problem is that the native AudioEffect/Visualizer constructor is
called while the JNI is in critical state after calling
GetPrimitiveArrayCritical(). As the mediaserver process just restarted, the
first call to AudioSystem will cause the binder IAudioflinger interface to
be reteived and a callback send to AudioSystem JNI to clear the mediaserver
error state. This will call env->FindClass() and crash due to the JNI being
in critical state.
Also fixed a similar problem in AudioTrack JNI
Change-Id: I4a9026a3e26c7f78d9b4b4bec1aac90fbee2ab62
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| dbaa3c8f68a51aaac2a2a93f7f3e5b6bd9b3b134 |
24-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Merge changes Ie8bd9107,I1065179a
* changes:
MTP: Reenable GetObjectPropValue and SetObjectPropValue
MTP: Minor debug output cleanup
|
| d3bfecb0c9bdf3651a06e86c7c8607768a29a9ae |
24-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Reenable GetObjectPropValue and SetObjectPropValue
Windows no longer chokes now that we implement the minimum set of properties
BUG: 2869730
Change-Id: Ie8bd9107610b9b38f060ad8a2f05334a3b4aff9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| bb7684bafad2d60f064ace2403b24c19040ea95c |
23-Sep-2010 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of ac4a284a to master
Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
|
| 1a5149e5d7f2dddc8b324f7695e69fd89af73c52 |
22-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3022800.
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class
Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| f1f5361e328c13be80e3760d8cc2170d70c9d0ba |
21-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP host: Use Java longs for storage and object IDs
This avoids problems with unsigned 32 bit numbers with cameras that use
storage and object IDs > 0x7FFFFFFF
Change-Id: I615f2d468851e9d6ff8882d22966d3687697d8eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpClient.cpp
ndroid_media_MtpCursor.cpp
|
| c37255d5d0fd9e0ec02b0d7cb5c4b235e200d367 |
10-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Media scanner support for tracking files of arbitrary type.
The native media scanner no longer filters files based on file extension.
Audio, video, image and playlist files are handled as before, but non-media
files are now inserted into the "files" table, which was originally added
to support MTP.
Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MediaScanner.cpp
|
| 55d39f20660d3c619f8342bbee4bbd11a30de8ba |
11-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Adding hasProfile."
|
| 35c8b532e576abc50fe7cdb42db0e22ccb1c7390 |
10-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Merge "Added specific resolution and time lapse profiles."
|
| 9d619542bea7d4c376a5a8b4a55c795a796adef3 |
10-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Adding hasProfile.
- Added hasProfile to CamcorderProfile and JNI.
- Added hasCamcorderProfile to MediaProfiles.
- using android.hardware.Camera.CAMERA_ID_DEFAULT for default camera
in get().
Change-Id: Ib57bb49ae79492d7cbc0ec6c7b6efcbf74f80013
ndroid_media_MediaProfiles.cpp
|
| 4af0dfd6cbc13fa6a89ec1430cbe6f619cd64d8a |
07-Sep-2010 |
Nipun Kwatra <nkwatra@google.com> |
Added specific resolution and time lapse profiles.
- Added enums QUALITY_{QCIF,480P,720P,1080P}
QUALITY_TIME_LAPSE_{LOW,HIGH,QCIF,480P,720P,1080P} in CamcorderProfile
and corresponding ones in MediaProfiles.
- Added functions createDefaultCamcorderTimeLapseLowProfile,
createDefaultCamcorderTimeLapseHighProfile to set default values.
- Moved javadoc for constants to the get() function.
Change-Id: Ib8b3f8d29395dff77a397d1e6b44cfaf8c481d4d
ndroid_media_MediaProfiles.cpp
|
| c18c02d78c0d9ec422f35aac2680022096c8c7cf |
10-Sep-2010 |
James Dong <jdong@google.com> |
am 2432248b: am 4709c7fa: Merge "Fixed a copy and paste error" into gingerbread
Merge commit '2432248b03c675812dbb2154e2535bf3ada54b0a'
* commit '2432248b03c675812dbb2154e2535bf3ada54b0a':
Fixed a copy and paste error
|
| 8d3b9100a660591cca01f1df801aaf9830b9e3ba |
10-Sep-2010 |
James Dong <jdong@google.com> |
Fixed a copy and paste error
Change java/lang/IOException to java/lang/RuntimeException
since there is no java/lang/IOException while keeping
the signature of the MediaRecorder class
constructor unchanged.
Change-Id: Id9b9aa55db42bef528069ef1e2102038391bc15f
ndroid_media_MediaRecorder.cpp
|
| db16e5a673738fbac6ef195659015479f1534fc4 |
02-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Implement support for getting/setting device properties"
|
| 59e3f0db0855567a95f783f6d1ec36a7cfc4ea83 |
02-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Implement support for getting/setting device properties
Added support for the "device friendly name" and "synchonization partner"
properties, which are required by Microsoft.
Change-Id: Ic0443333d75f7d98a2d902a790b9d505a56d4eef
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 602bebd3fc814e8576941f05df11b0507c60fe9a |
02-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: try to fix sim build
Change-Id: I25b7bbecf61043e326105c74b2244036beda7c43
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| ee9c3dbdd04a73d867a1358a8e50848c40d0153f |
02-Sep-2010 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 71c908c4 to master
Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047
|
| 8d7d413959b1835a5c96da4a49bfda93f09d208c |
01-Sep-2010 |
Andreas Huber <andih@google.com> |
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
ndroid.mk
ndroid_media_MediaPlayer.cpp
|
| f06a44995142696e5867c50c39be64c03157f5d3 |
31-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "MTP: Send an Intent after an MTP session that resulted in media database modifications"
|
| d20e80251258c88450ad3b5bd650f1cb6d01bc15 |
31-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
Merge "Add settings option for running MTP server in PTP mode."
|
| 2837eefc5459427138c080d445bb491c75630163 |
31-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Send an Intent after an MTP session that resulted in media database modifications
Change-Id: Ib2796e9155350c67769502935a73cf98d6ae9c08
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| eabe8bfaf8c45289a4cfd880f4107d1a9b17e38b |
31-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
Add settings option for running MTP server in PTP mode.
This can be used as a compatibility workaround for host operating systems
without MTP support.
Change-Id: If4f1856206056ca8e40c3ffbfa382f185c413598
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| b33a5aea130b025f30966828562fcba56f25b265 |
27-Aug-2010 |
Nipun Kwatra <nkwatra@google.com> |
Added setAuxiliaryOutputFile to MediaRecorder and JNI
added setAuxiliaryOutputFile to allow setting of an auxiliary output file.
Also added the JNI support.
Change-Id: I8c3335192bd6f7fcbfdfc8552cfd0848f2ad2a5d
ndroid_media_MediaRecorder.cpp
|
| 828d19dd96b05fa99abdc517701e5366543c324f |
10-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: work in progress on expanded property support
GetObjectPropValue and SetObjectPropValue are disabled until I figure out
why Windows doesn't like what I have done.
Change-Id: I74e945ef3ea031f6d46f4ebaa8df815da0a5c3ed
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 0a7fa0a868ccce920827e141cbbe237594e53364 |
24-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Check and clear exceptions after calling into Java in MtpDatabase
Change-Id: I805858c66fe57208c06aa624d16b72966555e005
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 2b2bff5d98ea5038c04ba65ac2bbf77692517ea8 |
18-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Remove retry loop from MTP server code
This should eliminate the spammy logging that my coworkers have noticed.
Change-Id: Ic0e611f5277dd13651490cbe5f7ded5f6e17db4f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| 465206940acade296a1064ac5a1fbcd0419d9eb6 |
12-Aug-2010 |
James Dong <jdong@google.com> |
am b408f549: am d790c648: Add lost preview surface detection in the JNI layer Throws an IOException if this happens rather than crashes
Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf'
* commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf':
Add lost preview surface detection in the JNI layer
|
| d790c6485a388a3e8045dbd18b903b20a7dcf0d9 |
12-Aug-2010 |
James Dong <jdong@google.com> |
Add lost preview surface detection in the JNI layer
Throws an IOException if this happens rather than crashes
Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
ndroid_media_MediaRecorder.cpp
|
| 4b322ce4fb86b5a7a6e50633a3a9f498ca8d4706 |
10-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Push queries for supported formats and properties up to Java.
Change-Id: I4f117090340e3916afda3d194521a6092a672ddc
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| c642e8a44c3dece488f488481fb69eeebd2f3554 |
09-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix some typos
Change-Id: Ib31708c3a925e3c0ab8eea6922ab09e02b740936
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 9a2046fb5ceeee4d5334274cbff15f1058bb3244 |
03-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for syncing MTP playlists
MTP playlists now correspond to playlists in the media provider
(like those created by the Music app).
Change-Id: I085cb3cff003037ad62f0e297fb0cfd3047cb3a2
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 23ee42f904ad6ba4e3d3d569ffd49f4f7d174e1e |
03-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix some thread safety issues in MTP server start/stop sequence.
Change-Id: Ied1cddc6220fa7394e8de99df9bc37a1208b04ff
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| 7a047c89862febf63ce1bb5873179c7a2ff8d9d3 |
02-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Implement GetNumObjects
Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 59c777a24a2c639dfd84b7bf17e430e6d3424866 |
02-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
Clean up MtpDatabase API.
Return MTP response codes instead of booleans for success or failure.
Remove some unused code.
Change-Id: I82ce80a4d7779233264e3caf139ebd0cece12f5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| ba2709583d9b759ca7b2aad05dcbeeb2a6c4083e |
28-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter types." into gingerbread
Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf'
* commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf':
Audio effects: modified command() parameter types.
|
| a4c72acfbc6c06588dd26cf41e67a834fc0a54f9 |
28-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Audio effects: modified command() parameter types.
The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command()
function have been modified from int to uint32_t. This is more consistent with their role.
Change-Id: I84d289fc262d6753747910f06f485597dfee6591
udioeffect/android_media_AudioEffect.cpp
|
| b008e9b1281da871e970e5b4817f78afb4f12d4a |
27-Jul-2010 |
Eric Laurent <elaurent@google.com> |
resolved conflicts for merge of d306cc81 to master
Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
|
| ca57d1cc89d65dfbd59c749c5736574cd08c7bd3 |
23-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Audio Effects: added methods to effects java classes to store and load current effect settings in
a single call.
Addional changes:
- Fixed simulator build
- Use effect interface UUIDs from OpenSL ES includes when available
- Added cleanspec rules to remove now obsolete test effect libraries
- Fixed bug in AudioEffect JNI setParameter function.
Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
udioeffect/android_media_AudioEffect.cpp
|
| bc4cb0bc79c0d366d6866fe4054a71e00d169ff9 |
27-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP host: Add support for reading files from an MTP device via ParcelFileDescriptor
Also added some support for sending files to the device that hasn't been debugged yet.
Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously.
Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpClient.cpp
|
| 0119ba5bd3335fe026927eeb65de535a7bd8c838 |
21-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Merge commit '34161132030254bac7dd64c9713832e2f961a061'
* commit '34161132030254bac7dd64c9713832e2f961a061':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
|
| 7070b36549d511d6627538c73dfbab23fbae5b43 |
16-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Added methods to AudioTrack and MediaPlayer java classes to enable use of
auxiliary audio effects. The effect can be attached and detached by specifying its
ID and the send level controlled.
Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
ndroid_media_MediaPlayer.cpp
|
| ff164a7d6f839c194a52572136cfa320609598e0 |
15-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Exclude MTP implementation from simulator build
Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_media_MtpClient.cpp
ndroid_media_MtpCursor.cpp
ndroid_media_MtpDatabase.cpp
ndroid_media_MtpServer.cpp
|
| be125a50b41f15810145671e0fcbdaf13b363e03 |
13-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Add support for sending events to the host when objects are added and removed
Change-Id: Ia1d5232b919c644c670ff9ca651eca92b3f9ad42
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| d815f79766984fce499e147ecbacc01914683f74 |
12-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Integrate host to device file transfer with the media provider.
MTP file transfers happen in two stages. The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.
To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file. After the file transfer has completed, then
MtpDatabase.endSendObject is called. In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.
To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.
Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
|
| 90787e053aa71694dbe61f4c64b2632446fd4c5d |
09-Jul-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio effect API." into gingerbread
Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f'
* commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f':
Fix swap of sessionId and output in audio effect API.
|
| 4cb15cf15dfc9d9c6c8dc34911a4ed6bf53e8e4c |
09-Jul-2010 |
Jean-Michel Trivi <jmtrivi@google.com> |
Fix swap of sessionId and output in audio effect API.
Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
udioeffect/android_media_AudioEffect.cpp
|
| c5c7853b633144ae6344f989ea14eee8b2d0938b |
09-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Remove some scafolding and test code that is no longer worth maintaining.
Change-Id: I9ee62d2463d8df1246a84774e8ac7e674778279a
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpDatabase.cpp
ndroid_media_MtpServer.cpp
|
| d21eac9c70940f2c73da5faaf401dbbc44b70a15 |
03-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.
The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.
Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MtpDatabase.cpp
ndroid_media_MtpServer.cpp
|
| 98449546fa33f420e2aef7d0d1c1afb538af4069 |
08-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'
* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
Added Visualizer effect.
|
| dacabf97c609a040ada857a7da6c560097448ae3 |
08-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Added Visualizer effect." into gingerbread
|
| df9b81ced437b11f8a3fcf4ba3ea6af703d121e2 |
02-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Added Visualizer effect.
The visualizer enables application to retrieve part of the currently playing audio for visualization purpose.
It is not an audio recording interface and only returns partial and low quality audio content as a waveform or
a frequency representation (FFT).
Removed temporary hack made in MediaPlayer for animated wall papers based on audio visualization (snoop() method.
This commit also includes a change in AudioEffect class:
- the enable()/disable() methods have been replaced bya more standard setEnabled() method.
- some fixes in javadoc
Change-Id: Id092a1340e9e38dae68646ade7be054e3a36980e
ndroid_media_MediaPlayer.cpp
udioeffect/Android.mk
udioeffect/android_media_AudioEffect.cpp
udioeffect/android_media_Visualizer.cpp
|
| dad69277b7fdcc2759bec5a35ac45dae8f61ec9b |
02-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Fix ownership and file permissions for transferred files and folders
All new files and folders are created with group sdcard_rw
Permissions for new files are 0664 and directories 0775
Change-Id: I6d508231150f687e2e529112fd47f10e30fa594f
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpServer.cpp
|
| 4024ddcf66912128e1f2b6b17e63f6f9f1e3a00a |
01-Jul-2010 |
Chih-Chung Chang <chihchung@google.com> |
am bda93c4c: am 09b90057: Add multiple camera support for in MediaProfiles.
Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef'
* commit 'bda93c4cb94b47c86251d22df16e46a514c191ef':
Add multiple camera support for in MediaProfiles.
|
| d0e1a9f40e4d9b41d83be3b3c62d6849cb37d6a6 |
01-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Remove an unnecessary thread from the MtpClient class.
Now a single thread is used for passing USB host events up to MtpClient.
Change-Id: I0e3a277956cb3d1036da122ea10acb03a27844d6
Signed-off-by: Mike Lockwood <lockwood@android.com>
ndroid_media_MtpClient.cpp
|
| 09b9005769f2b717f637131578ce6cfa6bd62bd9 |
22-Jun-2010 |
Chih-Chung Chang <chihchung@google.com> |
Add multiple camera support for in MediaProfiles.
Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
ndroid_media_MediaProfiles.cpp
|
| 81ea83d10883886013bc95eac2fe032acf1e7aa9 |
30-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Move MTP JNI code from libandroid_runtime to libmedia_jni
Signed-off-by: Mike Lockwood <lockwood@android.com>
Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MtpClient.cpp
ndroid_media_MtpCursor.cpp
ndroid_media_MtpServer.cpp
|
| 8e103da1f1b0656e3427b34b75f02d7ddf6073d5 |
25-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Various fixes and improvements in audio effects implementation" into gingerbread
|
| 53334cdb81bab4a4dfd0a41d2ef50709015a36c8 |
24-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Various fixes and improvements in audio effects implementation
Effect API:
- Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi:
Removed media/AudioCommon.h file created for initial version of EffectApi
- Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize
the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware.
- Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode:
now an index is passed for the queried effect instead of implicitly querying the next one.
- Added CPU load and memory usage indication in effects descriptor
- Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine
- Added flag to indicate hardware accelerated effect implementation.
- Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h
Effect libraries:
- Reflected changes in Effect API
- Several fixes in reverb implementation
- Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library.
- Replaced pointer by integer identifier for library handle returned by effects factory
Audio effect framework:
- Added support for audio session -1 in preparation of output stage effects configuration.
- Reflected changes in Effect API
- Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines.
- Added some overflow verification on indexes used for deferred parameter updates via shared memory
- Added hardcoded CPU and memory limit check when creating a new effect instance
Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
udioeffect/android_media_AudioEffect.cpp
|
| 8d65dd26530c7559082bd738cf930e2806158ab2 |
24-Jun-2010 |
Andreas Huber <andih@google.com> |
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce
related-to-bug: 2370115
ndroid.mk
ndroid_media_MediaScanner.cpp
|
| 619346f902241736d933657a4fe10f10c50a1ba8 |
21-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Added support for audio sessions in MediaPlayer and AudioTrack.
Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks.
Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
ndroid_media_MediaPlayer.cpp
|
| 49b6fbaebd5413b92c6dcff423da95d5525455ee |
18-Jun-2010 |
James Dong <jdong@google.com> |
AmrInputStream refresh: eliminate the dependency upon OpenCore's code
Change-Id: I0e66bc0a16fcdcf70136012ae1cd4138506cc94b
ndroid.mk
ndroid_media_AmrInputStream.cpp
|
| 01f7ac64488027492b2909b99d70491e7a391015 |
14-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI." into kraken
|
| 948235c06ed0d49190b2f49d9299b473c4dd61a9 |
09-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.
Added AudioEffect C++ class. AudioEffect is the base class for effect specific implementations,
OpenSL ES effect interfaces and audio effect JNI.
Added the AudioEffect JNI and AudioEffect JAVA class. AudioEffect is the base class
to implement more specific JAVA classes to control audio effects from JAVA applications.
Change-Id: If300a1b708f2e6605891261e67bfb4f8330a4624
ndroid.mk
udioeffect/Android.mk
udioeffect/android_media_AudioEffect.cpp
|
| 457d5ae3c9e40c8336b65ea954d1bd5ae1622917 |
09-Jun-2010 |
James Dong <jdong@google.com> |
Fix a potential(observed sometimes) media server crash
The problem is that we are referring an temp object returned from a function call.
When the function call returned, the temp object is gone; and thus the reference
may be invalidated.
-- rebased
bug - 2734946
Change-Id: I1993c4462df95610ca478f816adc30058af5850e
ndroid_media_MediaRecorder.cpp
|
| 5e14010b1fc066dfcbc0a577d59492687c99667d |
09-Jun-2010 |
Mathias Agopian <mathias@google.com> |
allow re-targetting of surfaces
Surfaces can now be parcelized and sent to remote
processes. When a surface crosses a process
boundary, it looses its connection with the
current process and gets attached to the new one.
Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
ndroid_media_MediaRecorder.cpp
|
| 8b138323d54e36fd66b22a634494648e20c53373 |
13-Apr-2010 |
Mathias Agopian <mathias@google.com> |
don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.
Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
|
| db6cc0ba71a873ad0258e850cb939639b7857c26 |
02-Apr-2010 |
Dave Sparks <davidsparks@android.com> |
Use local lock for most MediaMetadataRetriever methods. Bug 2560834.
MediaMetadataRetriever uses a single static lock for all operations.
This effectively serializes all metadata retrieval operations in a
single process. This patch uses the object level lock for all normal
operations and only uses the static lock to serialize calls to
release.
Change-Id: I81c9f234c2f0007a26d18e1398c709b41a4dbbd7
ndroid_media_MediaMetadataRetriever.cpp
|
| 09468dbbe9d91214a171a2b2f43bd37795f0b8c1 |
11-Mar-2010 |
Steve Howard <showard@google.com> |
Add a name to the previously-unnamed thread created by SoundPoolThread.
SoundPool itself also creates a thread, which was called "SoundPoolThread", unrelated to the SoundPoolThread class. The SoundPoolThread class then created an unnamed thread, which showed up as "android:unnamed_thread". That's confusing, so this change renames the SoundPool thread to "SoundPool" and then names the SoundPoolThread thread as "SoundPoolThread". Say that ten times fast :)
Change-Id: I67b7e644a30c94b6eda44bf970764a52a1c2958b
oundpool/SoundPool.cpp
oundpool/SoundPoolThread.cpp
|
| 0fc6bc4cac6391f048f0f2748b3e979effe0924b |
27-Feb-2010 |
James Dong <jdong@google.com> |
Clean up MediaRecorder for public Java SDK
- update comments and fix a check in setAudioChannels()
bug - 2362412
ndroid_media_MediaRecorder.cpp
|
| b93003649d0d58e6824b54d6e9e1386912c34448 |
26-Feb-2010 |
James Dong <jdong@google.com> |
Merge "Image encoding settings java API through xml configuration file"
|
| 9b433f0b654d32530b0b48a7a653216ae0bb94d8 |
24-Feb-2010 |
James Dong <jdong@google.com> |
Image encoding settings java API through xml configuration file
- I decided to completely remove jpeg decoding related stuff from this change
I think that setting is better off if it is specified by the system properties.
We don't have to include MediaProfiles.h header in skia files
ndroid_media_MediaProfiles.cpp
|
| 196863d27407e23c69debdd061df58ce8fe76c20 |
23-Feb-2010 |
Gloria Wang <gwang@google.com> |
Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE,
but when it calls GetByteArrayRegion, it multiplies it by 2 which
defeats the "// safety first" check at the beginning.
ndroid_media_ResampleInputStream.cpp
|
| 7bef5a58f1166c0e2509e27ace07c7af7c5d1d20 |
17-Feb-2010 |
Dave Sparks <davidsparks@android.com> |
Fix logging in SoundPool.
oundpool/SoundPool.cpp
|
| 675ee6ac3641e75a1496b06bdbc89fb4f5476647 |
17-Feb-2010 |
Dave Sparks <davidsparks@android.com> |
Merge "Add SoundPool API to pause and resume all active streams. Bug 2426531."
|
| f992cbb9aae593c7787ac9c5f6b475e7bb0a92c5 |
09-Feb-2010 |
Dave Sparks <davidsparks@android.com> |
Add SoundPool API to pause and resume all active streams. Bug 2426531.
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/android_media_SoundPool.cpp
|
| 62ed7a6d4a20d1efb151315b104805ce445e7346 |
16-Feb-2010 |
James Dong <jdong@google.com> |
Merge "Support decoder queries from media profiles xml configuration file"
|
| d32fba411f2710ad66681466674c8243f2ca3454 |
11-Feb-2010 |
James Dong <jdong@google.com> |
Support decoder queries from media profiles xml configuration file
ndroid_media_MediaProfiles.cpp
|
| fbb3885024ac9c90f322b6259d7e519c8927e6ff |
12-Feb-2010 |
Andreas Huber <andih@google.com> |
New API on java's MediaPlayer to suspend/resume a session.
related-to-bug: 2231576
ndroid_media_MediaPlayer.cpp
|
| 000479f9e325b4e426a67033abd92d47da412725 |
10-Feb-2010 |
Mathias Agopian <mathias@google.com> |
split libsurfaceflinger_client and libcamera_client out of libui
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
|
| e7038ace44ed6e6cd27be35b003e6dd0412e936f |
04-Feb-2010 |
James Dong <jdong@google.com> |
Camcorder profile Java API support
- Use Enum for Quality instead of int
- Use static values() method from Enum, rather than if-else
bug - 2417312
ndroid_media_MediaProfiles.cpp
|
| c371194e4e0651c328f1870a90bbfd4e217c747b |
20-Jan-2010 |
James Dong <jdong@google.com> |
Initial check-in for xml-based encoder capabilities retrieval
- Changed the Java API as suggested
- Treat /etc/media_profiles.xml as the default xml configurtion file
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaProfiles.cpp
|
| 256430093679e1d62b54fb0c852126e54d162f6f |
28-Jan-2010 |
Andreas Huber <andih@google.com> |
API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.
related-to-bug: 2393577
Original change by Andrei Popescu <andreip@google.com>
ndroid_media_MediaPlayer.cpp
|
| 55e99c61005b6c9b463f8069a71a7d8540fb8895 |
27-Jan-2010 |
Andreas Huber <andih@google.com> |
Attempt to fix the build ... again.
ndroid.mk
|
| 37105cc7710f988984e92b65989b78ed59693b8b |
27-Jan-2010 |
Andreas Huber <andih@google.com> |
Fixing the build. Why is this suddenly necessary and didn't break the build before???
ndroid.mk
|
| e4a838051de5e56f44c71117073a035b804b5d04 |
08-Jan-2010 |
Andreas Huber <andih@google.com> |
Reorganize some of the stagefright implementation related to metadata.
ndroid.mk
ndroid_media_MediaScanner.cpp
|
| 3c56221af7160355f5265bc2dc14322636d945fc |
24-Dec-2009 |
Dave Sparks <davidsparks@android.com> |
Fix SoundPool restart problem CheckJNI issue.
oundpool/android_media_SoundPool.cpp
|
| f6e43bf29084760b39257b2273e0f04c2815fdc5 |
08-Dec-2009 |
Dave Sparks <davidsparks@android.com> |
Add OnLoadCompleteListener to SoundPool.
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/SoundPoolThread.cpp
oundpool/SoundPoolThread.h
oundpool/android_media_SoundPool.cpp
|
| c333133107fb492de481a96ed1277e71daf2dd8c |
16-Dec-2009 |
Dave Sparks <davidsparks@android.com> |
am b5fc8ffc: am 91487425: Merge change I0448ef20 into eclair
Merge commit 'b5fc8ffcff6b8e1747af5c6ba1176a81986b55a8'
* commit 'b5fc8ffcff6b8e1747af5c6ba1176a81986b55a8':
Fix SoundPool buffer size rounding error. Bug 2327620.
|
| 66d28cedd92dcc1669ace23231da1b8c1374ff2f |
15-Dec-2009 |
Dave Sparks <davidsparks@android.com> |
Fix SoundPool buffer size rounding error. Bug 2327620.
AudioTrack was modified earlier to calculate minimum buffer size
based on the hardware reported latency. Previously, it was a
hard-coded value. As a result of this change, the minimum buffer
size is now variable based on hardware latency. On Passion, this
brought out a subtle rounding error in the buffer size calculation
in SoundPool. This can cause AudioTrack creation to fail based on
the requested sample rate. This fix calculates the total buffer
size first, and then does rounding before dividing by the number
of buffers.
oundpool/SoundPool.cpp
|
| 3c256cf321f820f9d87399b9e254e4400c354c31 |
07-Dec-2009 |
Dave Sparks <davidsparks@android.com> |
More SoundPool cleanup. Remove mSoundPoolRef and unused notify callback.
oundpool/SoundPool.h
|
| c0e3ddf8f2f30dc9593f0a1bfd46335823e25d65 |
07-Dec-2009 |
Dave Sparks <davidsparks@android.com> |
Remove unused Java object reference in native SoundPool code.
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/android_media_SoundPool.cpp
|
| bfb9fb143b67c2d0307af2bce9af3c08f362b29a |
03-Dec-2009 |
Andreas Huber <andih@google.com> |
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
ndroid.mk
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaScanner.cpp
|
| c39d2e3c012fb96999991e30659a474f9f30f789 |
20-Sep-2009 |
Marco Nelissen <marcone@google.com> |
Music visualizer support hack.
This currently assumes 44k stereo (won't crash on other formats, but won't give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
ndroid_media_MediaPlayer.cpp
|
| a52b4d764ebd79b29eac296a5c3a629cff1990c4 |
24-Sep-2009 |
Dianne Hackborn <hackbod@google.com> |
Fix broken build.
I -did- run it... why did this later break on me?!?
Change-Id: I70db0279f9a1b499496f9808525d2b112495d6c7
ndroid_media_MediaMetadataRetriever.cpp
|
| 8b0466170082fdf12f78d7b70358002520e99e9b |
03-Sep-2009 |
Marco Nelissen <marcone@google.com> |
When encountering a .nomedia file, notify the MediaScannerClient,
so that it can erase the data column for entries that are in the
folder containing the .nomedia file. This prevents us from
deleting (via a delete trigger) files when somebody adds a
.nomedia file after the fact.
ndroid_media_MediaScanner.cpp
|
| 831fbc1c2050ea844a825be3be897347f95bcbad |
03-Aug-2009 |
Marco Nelissen <marcone@google.com> |
We don't need libopencore_author and libcutils in libmedia_jni
ndroid.mk
|
| 4935d05eaa306cef88cf0ab13eca386f270409ec |
03-Aug-2009 |
Marco Nelissen <marcone@google.com> |
Untangle MediaPlayer, MediaRecorder, MediaScanner and MediaMetadataRetriever JNI
code, so that creating one of those doesn't initialize all the others. Shaves
a hundred milliseconds or so off music app startup time.
ndroid_media_AmrInputStream.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
ndroid_media_ResampleInputStream.cpp
|
| 1b0efec3473134fb7de226f3e1fdade5b3529ad9 |
31-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 17c195c8: Merge change 9340 into donut
Merge commit '17c195c8da3470b2e69880e206342f0c2d85f938'
* commit '17c195c8da3470b2e69880e206342f0c2d85f938':
Fix issue 2025872: Deadlock in SoundPool.stop
|
| fd8c0e1ff8ef781ba169c0164458ec1ce95ee35c |
31-Jul-2009 |
Eric Laurent <elaurent@google.com> |
Fix issue 2025872: Deadlock in SoundPool.stop
There were 2 problems in SoundPool:
1 If not using the shared memory buffer mode, there was a problem when a sound channel was stolen. The new channel could sometimes not be added to the restart
list if the AudioTrack callback thread was stopped before the underrun callback was called.
The SoundChannel::play() method is modified so that SoundPool::done() is called immediately after stopping the channel. There is a possibility that done() is called a second time by the callback; in this case it will be added 2 times to the restart list but the second start request will be ignored as the first one will have reset the next chennel ID when processed.
2 There was a deadlock on SoundPool::mLock if SoundPool::stop() was called while a channel restart was pending:
SoundPool::stop() lock mLock -> SoundChannel::stop() -> SoundPool::done() -> SoundPool::addToRestartList() -> try to lock mLock == deadlock
A second mutex mRestartLock is added to protect the restart list mRestart. mLock is still used to protect mChannels list but mRestart is now used to
protect access to mRestart by restart thread and client thread.
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| cbe7c5441c9af004dae93cff09787e21771beda8 |
30-Jul-2009 |
James Dong <jdong@google.com> |
Remove hardcoded maximum frame rate limit from the framework
bug 1993400
ndroid_media_MediaRecorder.cpp
|
| a553c25b33c99b345cf1c8688f8df0ed8df14e5a |
17-Jul-2009 |
Eric Laurent <elaurent@google.com> |
Fix issue 1795088 Improve audio routing code
Initial commit for review.
Integrated comments after patch set 1 review.
Fixed lockup in AudioFlinger::ThreadBase::exit()
Fixed lockup when playing tone with AudioPlocyService startTone()
oundpool/SoundPool.cpp
|
| c7bebd15378d98104e6cd32666665fd60eaa8043 |
22-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 5f2b05ea: Merge change 8220 into donut
Merge commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09'
* commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09':
Fix issue 1996218: Disable use of shared memory buffer by SoundPool.
|
| 45fce58ca1f8d967bdca574e79837ae2fcfed741 |
22-Jul-2009 |
Eric Laurent <elaurent@google.com> |
Fix issue 1996218: Disable use of shared memory buffer by SoundPool.
Disabled USE_SHARED_MEM_BUFFER compilation switch in SoundPool.cpp.
oundpool/SoundPool.cpp
|
| 0fc736f321b01995d9f5913d2490cbb479554266 |
10-Jul-2009 |
Marco Nelissen <marcone@google.com> |
Don't pass references to temporary objects, and handle the case where we dont have a Surface.
ndroid_media_MediaPlayer.cpp
|
| b88993f073a353fba6a2d6e4510fad5a2a5b170d |
10-Jul-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 6797
* changes:
rename libsgl/libcorecg to libskia
|
| b5af325fb1d21a9295bf3009cc95e5ead4999247 |
10-Jul-2009 |
Mike Reed <reed@google.com> |
rename libsgl/libcorecg to libskia
ndroid.mk
|
| 5d55c7119820ee9bb06fc072e416fe98ba77cd28 |
09-Jul-2009 |
Nicolas Catania <niko@google.com> |
Basic plumbing to retrieve metadata from the native player.
IMediaPlayer.h
Added a getMetadata method that mirrors the on in MediaPlayer.java.
MediaPlayer.java
Added a native method to get the metadata from the native player.
Parse the parcel into a Metadata object.
Metadata.java
Added a stub to parse the Parcel returned by the native player into
a set of metadata.
android_media_MediaPlayer.cpp
JNI call to forward the getMetadata call.
MediaPlayerService.cpp
MediaPlayerService::Client implements the new getMetadata method added in IMediaPlayer.h
ndroid_media_MediaPlayer.cpp
|
| b2c693919be966f179080a9ec70a7a82dbf57627 |
08-Jul-2009 |
Nicolas Catania <niko@google.com> |
Implemented the metadata changed notification filters.
IMediaPlayer:
new setMetadataFilter method so set a filter (2 lists of allowed and blocked metadata type)
serialized in a Parcel.
MediaPlayer.java/android_media_MediaPlayer.cpp/mediaplayer.cpp
new setMetadataFilter that passes the filter down to the MediaPlayerService's binder interface.
MediaPlayerService.cpp
The Client inner class holds the allowed and blocked metadata types.
These are in 2 vectors that get populated in the setMetadataFilter.
A new shourldDropMetadata method returns true if a type of metadata should be dropped according
to the filters.
The notify method in run the metadata update notifications thru the filter and possibly drop them.
ndroid_media_MediaPlayer.cpp
|
| 2387208c9ecb5dba01bd933312c80c5133bd3c41 |
24-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 3d7b8d1a: Merge change 5158 into donut
Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282'
* commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282':
Use a ref-counted callback interface for Camera.
|
| 20cb94eeb5b9672573fc86bf51e09bd66a774581 |
13-May-2009 |
Nicolas Catania <niko@google.com> |
Direct api to the native media player.
MediaPlayer.java has 3 new methods:
* newRequest creates a Parcel that can be used to send data to the
native player using invoke.
* invoke issues synchronous calls to the native player using opaque
parcels for the request and reply.
IMediaPlayer.h has 1 new abstract method:
* invoke
The Midi and Vorbis players have a stub for these. So far only PV
makes use of that new feature.
To avoid any copy overhead, the JNI interface uses Parcel as a java
object (no serialization/copy happens at the JNI layer).
The remote interface token is inserted when the Parcel is constructed
in java. That way the parcel is already routable when it reaches
IMediaPlayer.cpp (proxy). No extra copy is needed there.
ndroid.mk
ndroid_media_MediaPlayer.cpp
|
| 5e27115995c4506dddf4f1271effd4fb4c935ad3 |
24-Jun-2009 |
Dave Sparks <davidsparks@android.com> |
Use a ref-counted callback interface for Camera.
This allows the camera service to hang onto the callback interface
until all callbacks have been processed. This prevents problems
where pending callbacks in binder worker threads are processed
after the Java camera object and its associated native resources
have been released.
Bug 1884362
ndroid_media_MediaRecorder.cpp
|
| 5f80742306d6d66b1641f96b57ad819c3667b18e |
12-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'
* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
Removed trailing whitespaces.
|
| 32f82774884bdd709789ab9f3ccdf5b972ff7681 |
12-Jun-2009 |
Nicolas Catania <niko@google.com> |
Removed trailing whitespaces.
ndroid_media_MediaPlayer.cpp
|
| f5b746e15708bea6a8ef5bb7f7cfea03d7415a7f |
09-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am b2df1699: Merge change 1548 into donut
Merge commit 'b2df1699c996e62baa78877978cd2c5607ea4194'
* commit 'b2df1699c996e62baa78877978cd2c5607ea4194':
NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
|
| 2bcda90c0234f67f210a96f195b355493ca7d1ff |
08-Jun-2009 |
Jianhong Jiang <jianhong@google.com> |
NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
ndroid_media_MediaRecorder.cpp
|
| 4599184a1c1c3f54b396c49b5728e4031e559e18 |
01-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 450ad31b: Merge change 2774 into donut
Merge commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e'
* commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e':
Limit check on maxChannels for SoundPool.
|
| 450ad31b62af468aa0fb308a5c983b8f8334ae4e |
01-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
Merge change 2774 into donut
* changes:
Limit check on maxChannels for SoundPool. Bug 1838724
|
| 3c8704b171c812dde6f48e5416ba0b336470dd4a |
30-May-2009 |
Dave Sparks <davidsparks@android.com> |
Limit check on maxChannels for SoundPool.
Bug 1838724
oundpool/SoundPool.cpp
|
| 27b3eaf4de9e093bef27803dcfc6d572be5b08ca |
29-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am 0f5179c7: Merge change 2716 into donut
Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db'
* commit '0f5179c7d333ddab729b5943766637c21d1b74db':
Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
|
| 8b0b174198793cabb2b3fcc015f9bfdc9d5082b5 |
29-May-2009 |
Dave Sparks <davidsparks@android.com> |
Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
passing a null surface. The API is now enabled to change the surface while
the video is playing. This could allow orientation changes during playback
or to allow the audio track from a video to play in the background.
NOTE: There are still changes required to pmem driver to allow remapping
shared physical memory into a process in order for this to work. This
change only enables the API to send the appropriate calls when the lower
level code supports it.
ndroid_media_MediaPlayer.cpp
|
| c5d0343b677d5ddc2d69fd15b81b084a40ab12ac |
26-May-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am de8268d6: Merge change 2331 into donut
Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c'
* commit 'de8268d6d1cd168510c490b17e93154d2eab767c':
Fix issue 1846343 - part 1
|
| 4bc035a65cac177be9294e69f110497e3b6e34e6 |
22-May-2009 |
Eric Laurent <elaurent@google.com> |
Fix issue 1846343 - part 1
This change is the first part of a fix for issue 1846343, :
- Added new enum values for input sources in AudioRecord and MediaRecorder for voice uplink, downlink and uplink+downlink sources.
- renamed streamType to inputSource in all native functions handling audio record.
A second change is required in opencore author driver and android audio input to completely fix the issue.
ndroid_media_MediaRecorder.cpp
|
| 25ba5b6564224dceefa086b5c439ef28dad530ca |
19-May-2009 |
Mathias Agopian <mathias@google.com> |
checkpoint: split libutils into libutils + libbinder
ndroid.mk
oundpool/Android.mk
|
| 429a3b5f1d94327e5cbb2dc80667af4574bba388 |
11-May-2009 |
James Dong <jdong@google.com> |
Fix a JNI layer crash due to null camera object passed to get_native_camera()
The fix will check on the camera object and if it is a null object, we
throw a NullPointerException; application layer should also avoid passing a null
java object to MediaRecorder.setCamera().
ndroid_media_MediaRecorder.cpp
|
| 9648e4b6774910afde095be94b8359ae80cd3dcb |
07-May-2009 |
Eric Laurent <elaurent@google.com> |
fix issue 1641535: SoundPool should use AudioTrack with shared memory buffer
Enabled USE_SHARED_MEM_BUFFER switch in SoundPool.cpp
oundpool/SoundPool.cpp
|
| c02cac481c5e14792bf12f75392ccecdf4a59391 |
01-May-2009 |
James Dong <jdong@google.com> |
Change 79 in git master branch
ndroid.mk
ndroid_media_AmrInputStream.cpp
|
| 08905cc3362d8737290ceba96077aa2d234ab378 |
25-Mar-2009 |
Dianne Hackborn <> |
Automated import from //branches/donutburger/...@140818,140818
oundpool/NOTICE
|
| 105925376f8d0f6b318c9938c7b83ef7fef094da |
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
ndroid_media_MediaRecorder.cpp
|
| ba87e3e6c985e7175152993b5efcc7dd2f0e1c93 |
13-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@138607
ndroid_media_MediaRecorder.cpp
|
| 4df2423a947bcd3f024cc3d3a1a315a8dc428598 |
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ndroid.mk
ODULE_LICENSE_APACHE2
OTICE
ndroid_media_AmrInputStream.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
ndroid_media_ResampleInputStream.cpp
oundpool/Android.mk
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/SoundPoolThread.cpp
oundpool/SoundPoolThread.h
oundpool/android_media_SoundPool.cpp
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
ndroid.mk
ODULE_LICENSE_APACHE2
OTICE
ndroid_media_AmrInputStream.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
ndroid_media_ResampleInputStream.cpp
oundpool/Android.mk
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/SoundPoolThread.cpp
oundpool/SoundPoolThread.h
oundpool/android_media_SoundPool.cpp
|
| 076357b8567458d4b6dfdcf839ef751634cd2bfb |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@132589
ndroid_media_MediaRecorder.cpp
|
| 3dec7d563a2f3e1eb967ce2054a00b6620e3558c |
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@137055
ndroid_media_MediaRecorder.cpp
|
| da996f390e17e16f2dfa60e972e7ebc4f868f37e |
13-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@131421
ndroid_media_MediaRecorder.cpp
oundpool/SoundPool.cpp
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
ndroid_media_MediaRecorder.cpp
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| b798689749c64baba81f02e10cf2157c747d6b46 |
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
ndroid.mk
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_ResampleInputStream.cpp
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
ndroid.mk
ndroid_media_AmrInputStream.cpp
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
oundpool/SoundPool.cpp
oundpool/SoundPool.h
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
ndroid.mk
ODULE_LICENSE_APACHE2
OTICE
ndroid_media_MediaMetadataRetriever.cpp
ndroid_media_MediaPlayer.cpp
ndroid_media_MediaRecorder.cpp
ndroid_media_MediaScanner.cpp
oundpool/Android.mk
oundpool/SoundPool.cpp
oundpool/SoundPool.h
oundpool/SoundPoolThread.cpp
oundpool/SoundPoolThread.h
oundpool/android_media_SoundPool.cpp
|