| d7db05b2fea5125d7833fa87a445ec819c54e10d |
03-May-2017 |
Pawin Vongmasa <pawin@google.com> |
Add search paths for xml files for MediaProfiles
This CL also adds versions to xml files. The default name for
the xml file is changed from media_profiles.xml to
media_profiles_V1_0.xml.
Test: Small CtsMediaTestCases
Test: Manual use of video recording and playback in Camera app
Bug: 36430270
Merged-In: Idd0cd07f358fb4eda8ce5b31adf62a7313eccbbf
Change-Id: Idd0cd07f358fb4eda8ce5b31adf62a7313eccbbf
edia/MediaProfiles.h
|
| 322db26b76f7511c6d73f34a92a4e54840fcb876 |
28-Apr-2017 |
Wei Jia <wjia@google.com> |
IMediaExtractor: ensure users to check returned value by getTrack.
Test: fix the crash from the stream in the bug.
Bug: 37777357
Change-Id: Ia99907c396a2074a9419db9b8103a9325b290169
edia/IMediaExtractor.h
|
| 8253f44c3d0d8a7003dd2e6f728f9e3d63927727 |
18-Apr-2017 |
Steven Moreland <smoreland@google.com> |
Fix libmedia includes.
Test: works with BOARD_VNDK_VERSION := current
Bug: 33241851
Change-Id: Idb6319563dfe83807d32ee54eb2fe66346c9f54a
VSyncSettings.h
ufferProviders.h
ufferingSettings.h
haracterEncodingDetector.h
rypto.h
ryptoHal.h
rm.h
rmHal.h
rmPluginPath.h
rmSessionClientInterface.h
rmSessionManager.h
xtendedAudioBufferProvider.h
Crypto.h
DataSource.h
Drm.h
DrmClient.h
HDCP.h
MediaCodecList.h
MediaCodecService.h
MediaDeathNotifier.h
MediaDrmService.h
MediaExtractor.h
MediaExtractorService.h
MediaHTTPConnection.h
MediaHTTPService.h
MediaLogService.h
MediaMetadataRetriever.h
MediaPlayer.h
MediaPlayerClient.h
MediaPlayerService.h
MediaRecorder.h
MediaRecorderClient.h
MediaSource.h
OMX.h
RemoteDisplay.h
RemoteDisplayClient.h
ResourceManagerClient.h
ResourceManagerService.h
StreamSource.h
etPlayer.h
inearMap.h
ediaCodecBuffer.h
ediaCodecInfo.h
ediaDefs.h
ediaMetadataRetrieverInterface.h
ediaProfiles.h
ediaRecorderBase.h
ediaResource.h
ediaResourcePolicy.h
emoryLeakTrackUtil.h
etadata.h
idiDeviceInfo.h
idiIoWrapper.h
odulo.h
MXBuffer.h
MXFenceParcelable.h
luginLoader.h
ecordBufferConverter.h
ingBuffer.h
haredLibrary.h
ingleStateQueue.h
tringArray.h
ypeConverter.h
isualizer.h
onvert.h
edia/AVSyncSettings.h
edia/BufferProviders.h
edia/BufferingSettings.h
edia/CharacterEncodingDetector.h
edia/Crypto.h
edia/CryptoHal.h
edia/Drm.h
edia/DrmHal.h
edia/DrmPluginPath.h
edia/DrmSessionClientInterface.h
edia/DrmSessionManager.h
edia/ExtendedAudioBufferProvider.h
edia/ICrypto.h
edia/IDataSource.h
edia/IDrm.h
edia/IDrmClient.h
edia/IHDCP.h
edia/IMediaCodecList.h
edia/IMediaCodecService.h
edia/IMediaDeathNotifier.h
edia/IMediaDrmService.h
edia/IMediaExtractor.h
edia/IMediaExtractorService.h
edia/IMediaHTTPConnection.h
edia/IMediaHTTPService.h
edia/IMediaLogService.h
edia/IMediaMetadataRetriever.h
edia/IMediaPlayer.h
edia/IMediaPlayerClient.h
edia/IMediaPlayerService.h
edia/IMediaRecorder.h
edia/IMediaRecorderClient.h
edia/IMediaSource.h
edia/IOMX.h
edia/IRemoteDisplay.h
edia/IRemoteDisplayClient.h
edia/IResourceManagerClient.h
edia/IResourceManagerService.h
edia/IStreamSource.h
edia/JetPlayer.h
edia/LinearMap.h
edia/MediaCodecBuffer.h
edia/MediaCodecInfo.h
edia/MediaDefs.h
edia/MediaMetadataRetrieverInterface.h
edia/MediaProfiles.h
edia/MediaRecorderBase.h
edia/MediaResource.h
edia/MediaResourcePolicy.h
edia/MemoryLeakTrackUtil.h
edia/Metadata.h
edia/MidiDeviceInfo.h
edia/MidiIoWrapper.h
edia/Modulo.h
edia/OMXBuffer.h
edia/OMXFenceParcelable.h
edia/PluginLoader.h
edia/RecordBufferConverter.h
edia/RingBuffer.h
edia/SharedLibrary.h
edia/SingleStateQueue.h
edia/StringArray.h
edia/TypeConverter.h
edia/Visualizer.h
edia/convert.h
edia/mediametadataretriever.h
edia/mediaplayer.h
edia/mediarecorder.h
edia/mediascanner.h
ediametadataretriever.h
ediaplayer.h
ediarecorder.h
ediascanner.h
|
| 0de04e850beced076e4b1fcf0e513255f62a7d85 |
12-Apr-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Remove setQuirks() from IOMXNode and IOmxNode." into oc-dev
|
| 1b8ecbb25f142904e6da47171738b55b6be69e78 |
08-Apr-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "NuPlayer: notify client of playback error of individual track." into oc-dev
|
| 6ed07dc02d4240f94e7fb0786fb263bdc7a610ba |
05-Apr-2017 |
Pawin Vongmasa <pawin@google.com> |
Remove setQuirks() from IOMXNode and IOmxNode.
Test: Media post-submit tests on Pixel phone.
Test: Manual use of Camera, Photos, Play Movies and YouTube apps.
Bug: 36952714
Change-Id: I230df51c2d658e29cffec369ba622e336c3402d2
OMX.h
|
| 0f0c9b5007ff694d05a91c28359db0553e4dd061 |
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.
Change-Id: I81768eecca88d5e59e6e6e547f29308a94e30c7b
MediaAnalyticsService.h
ediaAnalyticsItem.h
|
| 686e8e57299151127c4ae30daf84a21cd947bf65 |
03-Apr-2017 |
Wei Jia <wjia@google.com> |
NuPlayer: notify client of playback error of individual track.
Test: mediaplayer doesn't send error notify to client when only one
track has error.
Bug: 24761723
Change-Id: Ie956f2c29483ac722a75bea86d649ce6d934a43d
ediaplayer.h
|
| 2fdf283c82b24caf4150b32b5e893322a3e3524b |
02-Apr-2017 |
TreeHugger Robot <treehugger-gerrit@google.com> |
Merge "Add Flag for Enabling 64-bit Media DRM Server" into oc-dev
|
| e9fec5451704893412c8e707940483a6bdb5f238 |
14-Mar-2017 |
John W. Bruce <juce@google.com> |
Add Flag for Enabling 64-bit Media DRM Server
We are ready for devices to begin migrating to a 64-bit Media DRM
Server. However, not all devices are ready to make this jump yet. A
device needs to have all of its DRM Plugins ready to run as 64-bit
before it can do this. This includes having 64-bit hardware
integrations.
So that devices can turn on 64-bit support as they get ready, I am
adding flags that can be set in a device's device.mk file. There are two
parts:
* ENABLE_MEDIADRM_64 enables building the mediadrmserver as 64-bit.
* Setting drm.64bit.enabled=true in PRODUCT_PROPERTY_OVERRIDES switches
mediadrmserver to searching for DRM Plugins in the 64-bit directory.
Test: Validated that turning on these flags enables a 64-bit
mediadrmserver that loads 64-bit DRM Plugins from the lib64
directory (after setting DISABLE_TREBLE_DRM to true to load this
code as opposed to the Legacy DRM Plugin HAL)
Bug: 36076017
Change-Id: I141cfd57ff75b40c8b0cb40a5bf1439a1ab5b766
rmPluginPath.h
|
| d49dbd6b625cddb82f3f7bbeac62d48ef338ef0f |
07-Jul-2016 |
Andy Hung <hunga@google.com> |
Allow MediaExtractor to create FileSource
Remove binder call to MediaServer for reading files.
Test: Photos, Play Music, Play Movies, Youtube
Bug: 29125703
Change-Id: Id6abf592bf6d70b81158f6038b1982f0a537b9b9
MediaExtractorService.h
|
| 6dcab2bafd847be84c2c2230bbd04af9c45c491e |
28-Mar-2017 |
Chong Zhang <chz@google.com> |
DRM: more fixes for heap base mapping -- DO NOT MERGE
Heap base for the same heap could be mapped to different values
after they go across binder to CryptoHal. So we can't use heapbase
to index the heaps.
Since each ACodec instance allocates all its shared memory buffers
from the same memory dealer, we let CryptoHal assign a sequence
number to the ACodec when it calls setHeap. In subsequent calls
to CryptoHal::decrypt, reference the heap by the seq num, and ignore
the heap base address.
Bug: 36479980
Bug: 36209723
Bug: 36660223
Test: the above bugs don't repro
Change-Id: I2f519a689a5891447385d1bf9d6e668bb3b4dbe2
(cherry-picked from bf628da1e231e2e4d6bf61f9884e120bae3f9156)
ryptoHal.h
Crypto.h
|
| d07c92742fc5801cab8e99801f591365986acbe9 |
28-Mar-2017 |
Chong Zhang <chz@google.com> |
Revert "Revert "Fix decoder instantiation during playback"" -- DO NOT MERGE
This reverts commit de7268d8e20b883ec88a7ff19ad560a665373484.
Bug: 36479980
Bug: 36209723
Bug: 36660223
Change-Id: I8d83305a28dc35cee16f8f1068c90fdd0b9effff
(cherry picked from commit 6aa5c0662c86c7f7b2890577a207086eeecbd177)
rypto.h
ryptoHal.h
Crypto.h
|
| 93e29c0846e0f7583ae96edafbf5e8a3169711ee |
22-Mar-2017 |
Jeff Tinker <jtinker@google.com> |
Merge "Revert "Fix decoder instantiation during playback""
|
| de7268d8e20b883ec88a7ff19ad560a665373484 |
22-Mar-2017 |
Jeff Tinker <jtinker@google.com> |
Revert "Fix decoder instantiation during playback"
This reverts commit 33327c7f0f04bcce3f8e8ee23953f87efc423037.
Bug: 36479980
Bug: 36209723
Change-Id: I8ff9422086f5ba9ba5df60135d20b9d8bfc0be52
rypto.h
ryptoHal.h
Crypto.h
|
| 7ec2a45e48f6c24a5e8fa96416d8793329b79d2f |
17-Mar-2017 |
Jeff Tinker <jtinker@google.com> |
Merge "Fix decoder instantiation during playback"
|
| 33327c7f0f04bcce3f8e8ee23953f87efc423037 |
16-Mar-2017 |
Jeff Tinker <jtinker@google.com> |
Fix decoder instantiation during playback
When a decoder is created while another decoder
is in use and the two decoders share a common
crypto instance, decryption results would become
indeterminate, which could cause the decoder to
hang. This change adds a notification to the
crypto instance so it can update state when its
ownership changes.
bug: 36209723
Test: playbacktests-debug-androidTest.apk as
described in the bug.
Change-Id: I453c260eace5543dd79a3569bf6a9592394c4113
rypto.h
ryptoHal.h
Crypto.h
|
| 04563aafa0debc95d50951ca944abf37ef2777ce |
09-Mar-2017 |
Pawin Vongmasa <pawin@google.com> |
Move hybrid interface from libbinder to libhidl/transport.
Also, merge android.hardware.media.omx@1.0-impl into libstagefright_omx.
Test: With CtsMediaTestCases.apk installed,
adb shell am instrument -e size small -w
'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Manual use of Camera, Photos, Play Movies and YouTube apps.
Test: Manual use of screen mirroring.
Bug: 33854657
Change-Id: Ie927bcafd86dc7e9509bb8b76bb3b51f9a423cc7
OMX.h
|
| de2c37e75c6e58fd9da2e87f11e72927620c3265 |
03-Mar-2017 |
Jeff Tinker <jtinker@google.com> |
Merge "Load vendor-provided drm hidl hal modules"
|
| ac7d4125516299b8a3e6f2b25822a692bdd96311 |
01-Mar-2017 |
Pawin Vongmasa <pawin@google.com> |
Use tokens for IOmxNode.
Test: Mirroring, Camera, Photos, YouTube and Play Movies apps.
Bug: 35442034
Change-Id: I0e43ec57d0f37c71d41652fd9883b72650433e20
MediaCodecService.h
OMX.h
|
| abeb36a8c2f044772297536e70340c3b245863e4 |
17-Feb-2017 |
Jeff Tinker <jtinker@google.com> |
Load vendor-provided drm hidl hal modules
Prior to this change, the default legacy hal
module was explicitly referenced. This change
uses the service manager to iterate through
any hal instances so vendor-provided hals
can be loaded.
bug:34507158
Change-Id: I23bc4fdb2dc7d5254833c9a977241f1fede726a9
ryptoHal.h
rmHal.h
|
| e2b43843fd12783188edd2c54188ea8d26864788 |
02-Feb-2017 |
Vijay Venkatraman <vijaykv@google.com> |
Moved headers from include/ to appropriate libs
include/camera -> camera/include/camera
include/media/audiohal -> media/libaudiohal/include
include/media/AudioResampler*.h -> media/libaudioprocessing/include
include/media/Audio*.h,IAudio*.h,IEffect*.h,ToneGenerator.h -> media/libaudioclient/include
include/media/EffectsFactoryApi.h -> media/libeffects/include
include/media/stagefright -> media/libstagefright/include
include/media/nbaio -> media/libnbaio/include
include/media/<rest of files> -> media/libmedia/include
include/cpustats -> media/libcpustats/include/cpustats
Added symlinks from old location to new ones
Bug: 33241851
Test: VNDK linked modules will need to add explicit lib dep.
All other modules should compile the same
Change-Id: I0ecf754a2132640ae781a3cc31428fb8c0bd1669
VSyncSettings.h
ufferProviders.h
ufferingSettings.h
haracterEncodingDetector.h
rypto.h
ryptoHal.h
rm.h
rmHal.h
rmSessionClientInterface.h
rmSessionManager.h
xtendedAudioBufferProvider.h
Crypto.h
DataSource.h
Drm.h
DrmClient.h
HDCP.h
MediaAnalyticsService.h
MediaCodecList.h
MediaCodecService.h
MediaDeathNotifier.h
MediaDrmService.h
MediaExtractor.h
MediaExtractorService.h
MediaHTTPConnection.h
MediaHTTPService.h
MediaLogService.h
MediaMetadataRetriever.h
MediaPlayer.h
MediaPlayerClient.h
MediaPlayerService.h
MediaRecorder.h
MediaRecorderClient.h
MediaSource.h
OMX.h
RemoteDisplay.h
RemoteDisplayClient.h
ResourceManagerClient.h
ResourceManagerService.h
StreamSource.h
etPlayer.h
inearMap.h
ediaAnalyticsItem.h
ediaCodecBuffer.h
ediaCodecInfo.h
ediaDefs.h
ediaMetadataRetrieverInterface.h
ediaProfiles.h
ediaRecorderBase.h
ediaResource.h
ediaResourcePolicy.h
emoryLeakTrackUtil.h
etadata.h
idiDeviceInfo.h
idiIoWrapper.h
odulo.h
MXBuffer.h
MXFenceParcelable.h
luginLoader.h
ecordBufferConverter.h
ingBuffer.h
haredLibrary.h
ingleStateQueue.h
tringArray.h
ypeConverter.h
isualizer.h
onvert.h
ediametadataretriever.h
ediaplayer.h
ediarecorder.h
ediascanner.h
|