summaryrefslogtreecommitdiffstats
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 f14555b0: am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am ↵Marco Nelissen2015-05-071-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | 30d77e2c: Fix potential buffer overrun * commit 'f14555b0c847a6b158035ae90f1238c20b8493d2': Fix potential buffer overrun
| | | * am 3fdb2cbb: am d638e735: am 0d9eb04f: am 5a75b421: am 30d77e2c: Fix ↵Marco Nelissen2015-05-071-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | potential buffer overrun * commit '3fdb2cbb16e7c347d8013cb85b5d29f106c50cf9': 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
* | | | | | | | | Merge "audio policy: clarify use of mName field for audio devices" into mnc-devEric Laurent2015-05-075-37/+33
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | audio policy: clarify use of mName field for audio devicesEric Laurent2015-05-065-37/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio port field mName was used for two different purposes which caused a problem when exposing this information at the SDK API. Create a new "mTag" field storing the audio_policy.conf device tag if needed. Field "mName" is now used to store any additional name associated to a given device when available (e.g Manufacturer and model name for a USB device). Change-Id: I17fa872e4a3a2e1b7cbb807c6f72e095a8a2c9c5
* | | | | | | | | | 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 296dc670: am d8e41553: am bd28ac74: am 59cea261: Add some sanity checksMarco Nelissen2015-05-071-3/+11
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * commit '296dc6708cbcdc183025500f104defe17380be37': Add some sanity checks
| | | * | | | | | | am d8e41553: am bd28ac74: am 59cea261: Add some sanity checksMarco Nelissen2015-05-071-3/+11
| | | |\ \ \ \ \ \ \ | | | | | |/ / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd8e41553b96432c4d4dae80fcc042b95fd9d27d9': 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
* | | | | | | | | | Make header functions "inline" to avoid warning when unused.Chih-Hung Hsieh2015-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iefac44f3c0e1c3fd4b19833d9692744100f92e00 (cherry picked from commit 5e9febef197a9852c833a0aedc6bfee179c4ae9e)
* | | | | | | | | | 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-0610-71/+454
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Implement audio device callbackEric Laurent2015-05-0610-71/+454
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | muxer: skip tracks unsupported by MediaMuxer instead of abortingRobert Shih2015-05-051-2/+12
| |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17007397 Change-Id: Id3f3d54a58c76554227e3c103fdbb39422a54496
* | | | | | | | | | | 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 "CameraService: update android.control.availableModes" into mnc-devZhijun He2015-05-051-2/+37
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | CameraService: update android.control.availableModesZhijun He2015-05-051-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only advertise CONTROL_MODE_OFF when manual 3A controls are supported. Also fixed some bug regarding static metadata update. Bug: 20734940 Change-Id: I5061f3c49ec20dc8cf5d849771c000fb82543e8f
* | | | | | | | | | | | | Merge "AudioRecord keeps track of UID" into mnc-devJean-Michel Trivi2015-05-056-6/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | AudioRecord keeps track of UIDJean-Michel Trivi2015-05-056-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "MediaSync: clean up configureAudioTrack and configureSurface." into ↵Wei Jia2015-05-042-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | MediaSync: clean up configureAudioTrack and configureSurface.Wei Jia2015-05-042-10/+10
| | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I579956aad4a6d591b5338d518e610b8532a72402
* | | | | | | | | | | | | Check memory allocation in ISoundTriggerHwServiceEric Laurent2015-05-041-0/+10
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add memory allocation check in ISoundTriggerHwService::listModules(). Bug: 19385640. Change-Id: Iaf74b6f154c3437e1bfc9da78b773d64b16a7604
* | | | | | | | | | | | Add camera app op - cameraSvet Ganov2015-05-028-79/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26570cc0a23fdea740b416a26838d40cac296c85
* | | | | | | | | | | | 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 "AudioTrack: fix direct tracks not pausing" into mnc-devPhil Burk2015-05-022-10/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | AudioTrack: fix direct tracks not pausingPhil Burk2015-05-012-10/+12
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a Direct Track is paused and the HAL does not support pause() and resume() then the HW never gets paused. The app can just keep writing data, which gets played. Bug: 18899620 Change-Id: Ice0f360956ff7ca425f6f24a0a2a8640d8b43fa8 Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | | | | | | | Merge "stagefright: add support for dynamically setting MediaCodec output ↵Lajos Molnar2015-05-025-122/+338
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | surface" into mnc-dev