summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Prevent reading past the end of the buffer in 3GPPJoshua J. Drake2015-05-071-2/+3
| | | | | | | | | | Metadata processed within the parse3GPPMetaData function may not be NUL terminated and thus calling setCString may read out of bounds. Ensure proper NUL termination, but take care not to interfere with other special cases (ie, albm). Bug: 20923261 Change-Id: Ie93b3038b534b4c4460571a68f4d734cff7ad324
* am 959d3179: am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am ↵Marco Nelissen2015-05-071-1/+1
|\ | | | | | | | | | | | | 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrun * commit '959d31794fca9091ff066d6e90457e66d1e5d4a6': Fix potential buffer overrun
| * am 07d4f27b: am f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am ↵Marco Nelissen2015-05-071-1/+1
| |\ | | | | | | | | | | | | | | | | | | 5a75b421: am 30d77e2c: Fix potential buffer overrun * commit '07d4f27b150bdba4107d54d71a70e94a3900e95c': Fix potential buffer overrun
| | * am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | |\ | | | | | | | | | | | | | | | | * commit 'd638e73568fa43eb964a305ed438603ae5900264': Fix potential buffer overrun
| | | * am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '0d9eb04fa1d7d2b524587fa3372381a30067fc15': Fix potential buffer overrun
| | | | * am 5a75b421: am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a75b4215821d633af18dd8dae2495299c070bf0': Fix potential buffer overrun
| | | | | * am 30d77e2c: Fix potential buffer overrunMarco Nelissen2015-05-071-1/+1
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '30d77e2c75c1973f9fb363717af92cf640685da3': Fix potential buffer overrun
| | | | | | * Fix potential buffer overrunMarco Nelissen2015-05-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "samples" parameter indicates the max number of sample tuples, not the max number of samples. Bug: 16183063 Change-Id: I5347497bbbe65910b8489d354e985ebc90d65516
* | | | | | | am d7446564: am 1e5670ab: am 296dc670: am d8e41553: am bd28ac74: am ↵Marco Nelissen2015-05-071-3/+11
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59cea261: Add some sanity checks * commit 'd7446564c3e469aea1bba5460ff1fb9441f9fc09': Add some sanity checks
| * | | | | | am 1e5670ab: am 296dc670: am d8e41553: am bd28ac74: am 59cea261: Add some ↵Marco Nelissen2015-05-071-3/+11
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sanity checks * commit '1e5670abf9c1b714819ab6ec529a6bc19cbdacf4': Add some sanity checks
| | * | | | | am bd28ac74: am 59cea261: Add some sanity checksMarco Nelissen2015-05-061-3/+11
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | * commit 'bd28ac7471e2c7cab0ce9df4c2d5a295adc163a1': Add some sanity checks
| | | * | | | am 59cea261: Add some sanity checksMarco Nelissen2015-05-061-3/+11
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | * commit '59cea2616269f34b1f3d046995efd8da42cd5549': Add some sanity checks
| | | | * | | Add some sanity checksMarco Nelissen2015-04-221-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19400722 Change-Id: Ib3afdf73fd4647eeea5721c61c8b72dbba0647f6
* | | | | | | Merge "NuPlayer: parcel placeholder mime in track info if not provided by ↵Robert Shih2015-05-061-1/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | source" into mnc-dev
| * | | | | | | NuPlayer: parcel placeholder mime in track info if not provided by sourceRobert Shih2015-05-061-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20853994 Change-Id: Iaf30e84ec78297099e6888070e7e779237b2d69f
* | | | | | | | stagefright: fix pushBlankBuffersToNW for non-meta decodersLajos Molnar2015-05-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20709429 Change-Id: Ifaee74083dedecb755e5c8ba3369cf90dfd74035
* | | | | | | | Merge "Implement audio device callback" into mnc-devEric Laurent2015-05-064-63/+320
|\ \ \ \ \ \ \ \
| * | | | | | | | Implement audio device callbackEric Laurent2015-05-064-63/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add class AudioSystem::AudioDeviceCallback notifying AudioSystem clients upon device selection change on a given input or output thread. Maintain a list of installed callback per I/O handle in AudioSystem and call registered callbacks when an OPEN of CONFIG_CHANGED event is received on IAudioFlingerClient::ioConfigChanged(). Add methods to AudioTrack and AudioRecord to add and remove device change callbacks. Add methods to AudioTrack and AudioRecord to query currently selected device. ioConfigChanged() events now convey the audio patch describing the input or output thread routing. Fix AudioRecord failure to start when invalidation is handled by start(). Change-Id: I9e938adf025fa712337c63b1e02a8c18f2a20d39
* | | | | | | | | Merge "Pass all DRM errors through ICrypto" into mnc-devJeff Tinker2015-05-061-3/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Pass all DRM errors through ICryptoJeff Tinker2015-05-051-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only the detailed messages for vendor-defined DRM errors were being passed. This change allows detailed messages to be passed for any DRM error, including the ones defined in the framework. bug: 20857014 Change-Id: I72aa85b31ac852fb1fb6ad0a93f3309100b52c9d
* | | | | | | | | Merge "OggExtractor::verifyHeader: return errors instead of asserting" into ↵Marco Nelissen2015-05-051-2/+6
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | OggExtractor::verifyHeader: return errors instead of assertingMarco Nelissen2015-05-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16631522 Change-Id: I619455af64cad04a0f4fd35e52e3f3709efad8b4
* | | | | | | | | | stagefright: Validate track formats passed to MPEG4WriterPraveen Chavan2015-05-051-20/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Validate the mime type for tracks to start with; and throw an error for unsupported types rather than let apps re-mux/encode the whole clip and assert towards the end while writing the header. The writer asserts if provided with an unsupported mime when authoring the fourcc, which is done at the end of muxing. Bug: 17007397 Change-Id: Ie80372940a46038db73107101a2ae6fdecf72eaa
* | | | | | | | | | Merge "Stagefright: propagate InsufficientResources error" into mnc-devRonghua Wu2015-05-053-3/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Stagefright: propagate InsufficientResources errorPraveen Chavan2015-05-053-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate OMX_ErrorInsufficientResources when handling node-allocation failure any other error from the component. bug: 20132289 Change-Id: I1ed9626dab947227e3d5e983bbbeee89ad7b2d2a
* | | | | | | | | | | Merge "SoftVPXEncoder: don't skip the last input buffer with eos flag." into ↵Ronghua Wu2015-05-051-1/+5
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | SoftVPXEncoder: don't skip the last input buffer with eos flag.Ronghua Wu2015-05-041-1/+5
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20507129 Change-Id: I4016727cbae54e2d29c3c6ab5cd8c47826070bf4
* | | | | | | | | | | SoftAVCEnc: Removed alignment requirement on input widthHarish Mahendrakar2015-05-051-1/+1
| |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6e1abf588420beec6f1af4394b69b2e53487299
* | | | | | | | | | Merge "AudioRecord keeps track of UID" into mnc-devJean-Michel Trivi2015-05-052-4/+26
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | AudioRecord keeps track of UIDJean-Michel Trivi2015-05-052-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 20832981 Change-Id: If5f3c61fae02d86b9d6fdf411711f854fd56c77d
* | | | | | | | | | | nuplayer: get playback frame rate from video track meta instead of file meta.Ronghua Wu2015-05-042-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20481562 Change-Id: Ifb4b89cce5bc810f3f411c27ba61c996a488a1c0
* | | | | | | | | | | MediaSync: clean up configureAudioTrack and configureSurface.Wei Jia2015-05-041-8/+8
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I579956aad4a6d591b5338d518e610b8532a72402
* | | | | | | | | | Merge "stagefright: propagate consumer usage flags in MediaSync" into mnc-devLajos Molnar2015-05-021-0/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stagefright: propagate consumer usage flags in MediaSyncLajos Molnar2015-05-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I20533904d1591f2abeb1db5497fc5c143ed5b2e2
* | | | | | | | | | | Merge "stagefright: add support for dynamically setting MediaCodec output ↵Lajos Molnar2015-05-022-120/+321
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | surface" into mnc-dev
| * | | | | | | | | | stagefright: add support for dynamically setting MediaCodec output surfaceLajos Molnar2015-05-012-120/+321
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11990461 Change-Id: I2aee89ef504234dc66eb5fcf6e62e1706088f758
* | | | | | | | | | | MediaRecorder: implement persistent input surface APIsChong Zhang2015-05-017-6/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19127604 Bug: 19489395 Change-Id: I7dd8015a8fe029f9867fcdb52322629c77eff50b
* | | | | | | | | | | MediaCodec: implement persistent input surface APIsChong Zhang2015-05-0111-61/+426
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19127604 Bug: 19489395 Change-Id: Idaf1cc9008016f66903e93907a676f54e342e1a3
* | | | | | | | | | Merge "stagefright: MediaCodec: rename mNativeWindow to mSurface" into mnc-devLajos Molnar2015-05-021-21/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | stagefright: MediaCodec: rename mNativeWindow to mSurfaceLajos Molnar2015-05-011-21/+15
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because mNativeWindow is of type sp<Surface> Bug: 19489395 Change-Id: I5ddc78b04e387915a2293b71195d7a6494986356
* | | | | | | | | | Merge "mediaplayer: flush audio sink when renderer is flushed." into mnc-devWei Jia2015-05-021-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mediaplayer: flush audio sink when renderer is flushed.Wei Jia2015-05-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17488729 Change-Id: Ie56018367cb6aec1749ca148e94173e6c5864b27
* | | | | | | | | | | Merge "AudioTrack: reduce retrograde motion spew" into mnc-devPhil Burk2015-05-011-5/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | AudioTrack: reduce retrograde motion spewPhil Burk2015-05-011-5/+12
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I96aced52b136ceea924aa3d9ef56374dd4c49784 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | Merge "AudioSystem: refactor audio config cache and callbacks" into mnc-devEric Laurent2015-05-012-141/+118
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | AudioSystem: refactor audio config cache and callbacksEric Laurent2015-05-012-141/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up implementation of audio configuration cache and callback events from AudioFlinger: - Define class AudioIoDescriptor for audio input and output configurations outside of AudioSystem class. - Do not use void * but an AudioIoDescriptor as argument to audio config callbacks from AudioFlinger. - Remove unused configuration events. - Move AudioSystem audio input and output cache from static singletons to members of AudioFlingerClient subclass. Change-Id: I67c196c32c09ce2756af0755ee1fe631040c3270
* | | | | | | | | | | stagefright: remove NativeWindowWrapperLajos Molnar2015-04-306-66/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Surface and SurfaceTextureClient are the same and Surface, it does not add value. Bug: 19489395 Change-Id: I016ecd1cf5cc51ce6244b6fa34ecd75f84e3db01
* | | | | | | | | | | Merge "GenericSource: reply mime information for *all* track types" into mnc-devRobert Shih2015-05-012-6/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | GenericSource: reply mime information for *all* track typesRobert Shih2015-04-302-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20729923 Change-Id: I65a8aedf089cfa4756fc9de433949c1b4bd416ce
* | | | | | | | | | | | stagefright: support setting/getting playback/sync config in MediaSyncLajos Molnar2015-04-3018-104/+907
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18249558 Bug: 19666434 Bug: 20057497 Change-Id: I5868b17423d7c20cfaf4a399f3eb67bfba440605
generated by cgit v1.1 at 2025-03-21 17:05:08 +0000