summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* stagefright: add support for fences in OMXLajos Molnar2015-06-022-4/+29
| | | | | | | Pass Fence between Surface and ACodec, and between ACodec and IOMX. Bug: 12386081 Change-Id: Ifdc566979dec0d91ed8b07c3b69d2cf092accc73
* Merge "Store server latency, sample rate, framecount information in ↵Andy Hung2015-06-021-0/+7
|\ | | | | | | AudioTrack" into mnc-dev
| * Store server latency, sample rate, framecount information in AudioTrackAndy Hung2015-06-011-0/+7
| | | | | | | | | | Bug: 21198655 Change-Id: I24590196642a97ea5d61bc6356f0aff782bd37d3
* | stagefright: rework metadata buffer supportLajos Molnar2015-06-013-10/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add fence to new metadata buffer mode structure, but don't use it yet, so that we don't have to add another mode soon. - Change GraphicBuffers to ANativeWindowBuffer in new metadata mode. This removes internal depencency from vendor codecs. - Extend new metadata mode from SW encoders to all codecs. - Fallback from new metadata mode to old mode (so Camera can always use the new mode even with legacy codecs) Related-bug: 19614055 Bug: 13222807 Change-Id: I405a21dd6ce8e99808f633bfeab8f14278eb7079
* | Merge "Track camera and flashlight usage in battery stats." into mnc-devRuben Brunk2015-06-021-2/+0
|\ \
| * | Track camera and flashlight usage in battery stats.Ruben Brunk2015-06-011-2/+0
| | | | | | | | | | | | | | | | | | Bug: 15986092 Change-Id: I9dc6828332e4091fd93bf2d82839e8e3862a2fc2
* | | stagefright: allow to overallocate OMX codec buffersLajos Molnar2015-06-011-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Specify allottedSize for useBuffer and allocateBufferWithBackup, where OMX will see only the allottedSize, even though framework may allocate and use a bigger buffer. Bug: 13222807 Change-Id: Ibfa93f6c7b7c8ca0853ef17d4a0758e496eaf921
* | | Remove EVENT_NEW_TIMESTAMP symbol until fully implementedGlenn Kasten2015-06-011-0/+2
| | | | | | | | | | | | Change-Id: I8e5dda004580ee97258d8d82721edee24ec2b929
* | | remove video editor from MediaProfileChong Zhang2015-05-281-78/+1
| |/ |/| | | | | | | bug: 17112465 Change-Id: Id59ba13e9c796298ad7dbaf03a595cc1fa62c169
* | media: rename doNotResuscitate to doNotReconnect to align with the ↵Ronghua Wu2015-05-221-1/+1
| | | | | | | | | | | | | | implementation. Bug: 21370108 Change-Id: I4c202d81507b29afb5e7f72231c4c7847d0b29bf
* | Merge "libmediaplayerservice: try to open audio sink in offload mode in ↵Ronghua Wu2015-05-222-4/+14
|\ \ | | | | | | | | | error." into mnc-dev
| * | libmediaplayerservice: try to open audio sink in offload mode in error.Ronghua Wu2015-05-222-4/+14
| |/ | | | | | | | | | | Bug: 19061432 Bug: 21370108 Change-Id: Iaa757555ef37fd1ac87b6e2d5a9969bb58cc5ebc
* | Merge "stagefright: measure max encoder buffer count for persistent surface" ↵Chong Zhang2015-05-221-0/+2
|\ \ | | | | | | | | | into mnc-dev
| * | stagefright: measure max encoder buffer count for persistent surfaceChong Zhang2015-05-211-0/+2
| | | | | | | | | | | | | | | | | | bug: 19127604 Change-Id: I9a9b29b527d20f43a5a0188380baf2242bd31507
* | | Merge "audio flinger: do not call JAVA services until system is ready" into ↵Eric Laurent2015-05-212-0/+6
|\ \ \ | |/ / |/| | | | | mnc-dev
| * | audio flinger: do not call JAVA services until system is readyEric Laurent2015-05-202-0/+6
| |/ | | | | | | | | | | | | | | Wait for system ready indication form AudioService before enabling calls to scheduling service or power manager. Bug: 11520969. Change-Id: I221927394f4a08fd86c9d457e55dd0e07949f0cf
* | Merge "camera: Add AIDL interface for CameraServiceProxy." into mnc-devRuben Brunk2015-05-201-0/+52
|\ \ | |/ |/|
| * camera: Add AIDL interface for CameraServiceProxy.Ruben Brunk2015-05-201-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | - Adds an AIDL interface to allow the proxy camera service running in system server to accept RPCs from the camera service running in mediaserver. - Request an update to the valid user set from the proxy camera service when mediaserver restarts to initialize properly + avoid DOS after a crash. Bug: 21267484 Change-Id: Ib821582794ddd1e3574b5dc6c79f7cb197b57f10
* | Merge "Change mime for HLS timed ID3 stream to application/x-id3v4" into mnc-devRobert Shih2015-05-151-1/+1
|\ \ | |/ |/|
| * Change mime for HLS timed ID3 stream to application/x-id3v4Robert Shih2015-05-141-1/+1
| | | | | | | | | | Bug: 21151892 Change-Id: I6a243b0edbbb445df0caf65f395f81926fd515f0
* | camera2: Fix work-profile eviction handling.Ruben Brunk2015-05-141-1/+1
| | | | | | | | | | Bug: 20124384 Change-Id: I6fb82dbfd5f98746ed4befed81a583e3709bfee8
* | Merge "stagefright: prevent more crashes in ACodec" into mnc-devLajos Molnar2015-05-141-0/+8
|\ \
| * | stagefright: prevent more crashes in ACodecLajos Molnar2015-05-131-0/+8
| | | | | | | | | | | | | | | | | | | | | Signal errors if OMX or native window reports an error Bug: 20439174 Change-Id: Iebeb16f5a29c6819d39568a184b921799a234686
* | | Merge "stagefright: rename usePersistentInputSurface to setInputSurface" ↵Chong Zhang2015-05-138-12/+10
|\ \ \ | |/ / |/| | | | | into mnc-dev
| * | stagefright: rename usePersistentInputSurface to setInputSurfaceChong Zhang2015-05-138-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | and clear persistent surface pointer when MediaRecorder is reset bug: 21045118 bug: 21045402 Change-Id: Ifd0d6deeb969f2252123929541b30b518cecbf9a
* | | am 0eb7c793: am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am ↵Lajos Molnar2015-05-131-0/+22
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 438217a0: Merge "Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev * commit '0eb7c79398ef04e457c76f117feef6d7bcbbc684': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| * \ \ am b5fbb811: am c8c86c1d: am bcf2becf: am c531d995: am 438217a0: Merge "Add ↵Lajos Molnar2015-05-121-0/+22
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes" into lmp-dev * commit 'b5fbb81157eaab594bb37275176a0a178098dc46': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | * \ \ am c531d995: am 438217a0: Merge "Add AUtils::isInRange, and use it to detect ↵Lajos Molnar2015-05-121-0/+22
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | malformed MPEG4 nal sizes" into lmp-dev * commit 'c531d9956513b9b82dad84aeb507b866e6b3951a': Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizes
| | | * | | Add AUtils::isInRange, and use it to detect malformed MPEG4 nal sizesLajos Molnar2015-04-241-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19641538 Change-Id: I5aae3f100846c125decc61eec7cd6563e3f33777
| | | * | | am 99370d2d: am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: ↵Eric Laurent2014-11-101-2/+7
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bound array size in queryDefaultPreProcessing * commit '99370d2da54d7537ffda7fef1f6ef36f8b690321': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | * \ \ am ae6965ae: am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size ↵Eric Laurent2014-11-101-2/+7
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in queryDefaultPreProcessing * commit 'ae6965ae7664aaea489a8d58358035610075c9af': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | * \ \ am 3aef3560: am e360f0f6: IAudioPolicyService: bound array size in ↵Eric Laurent2014-11-101-2/+7
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | queryDefaultPreProcessing * commit '3aef35600523eb6b4ccc8086a8913e80701a031a': IAudioPolicyService: bound array size in queryDefaultPreProcessing
| | | | | | * | | IAudioPolicyService: bound array size in queryDefaultPreProcessingEric Laurent2014-11-101-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18226810. Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124 (cherry picked from commit 74adca9ad30b7f8a70d40c5237bade0d16c4ea58)
* | | | | | | | | Merge "MediaSync: support changing surface on the fly." into mnc-devWei Jia2015-05-121-2/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MediaSync: support changing surface on the fly.Wei Jia2015-05-111-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I5809df2d3bb0dd6b4a982f11d62c4b7a452ed6fb
* | | | | | | | | | Merge "Update sampling rate to 192kHz for devices" into mnc-devAndy Hung2015-05-121-0/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update sampling rate to 192kHz for devicesAndy Hung2015-05-121-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0a83206be51d7ae18ccf85b94b2127356307be69
* | | | | | | | | | | Merge "mediaresourcemanager: change resource manager service log to use ring ↵Ronghua Wu2015-05-121-0/+361
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffer." into mnc-dev
| * | | | | | | | | | | mediaresourcemanager: change resource manager service log to use ring buffer.Ronghua Wu2015-05-111-0/+361
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move the ring buffer implementation from libcameraservice to media include. also add line prefix support to the service log. Bug: 20637674 Change-Id: Ib6b32f31abe92c42644ef7012f1e3d46220ccfbd
* | | | | | | | | | | Merge "Revert "Add camera app op - camera"" into mnc-devSvetoslav Ganov2015-05-122-5/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
| * | | | | | | | | | Revert "Add camera app op - camera"Svetoslav Ganov2015-05-122-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not needed duplication of work This reverts commit 32fa6d0e65dbf956e253a1006e9419dce2fe75c9. Change-Id: I2c81b0dacb2ed99c408c79c1f9e22a4baa564494
* | | | | | | | | | | Merge "libstagefright: report special error when codec is released by ↵Ronghua Wu2015-05-081-1/+7
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resource manager." into mnc-dev
| * | | | | | | | | | | libstagefright: report special error when codec is released by resource manager.Ronghua Wu2015-05-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I3403da361adbf2ea6979fcadb0d5ad0889d3513e
* | | | | | | | | | | | Merge changes from topic 'codec-surface' into mnc-devLajos Molnar2015-05-082-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright: enable experiments stagefright: allow connecting to surfaces that attach buffers
| * | | | | | | | | | | stagefright: enable experimentsLajos Molnar2015-05-072-0/+21
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20894716 Change-Id: I8c05b99dca8b3099a3a1b2b465f0f58bef786572
* | | | | | | | | | | libstagefright: config resource manager with secure codec co-existing policy.Ronghua Wu2015-05-081-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I0d729782c1622f23e9c37b7a9231e58e3f807470
* | | | | | | | | | | Merge "libstagefright: export profiling results directly to xml." into mnc-devRonghua Wu2015-05-081-2/+1
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | libstagefright: export profiling results directly to xml.Ronghua Wu2015-05-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: Icdeb1c30816d6de120ea0acd0880b3a9614bea8f
* | | | | | | | | | | stagefright: support push-blank-buffers-on-shutdown for SW rendererLajos Molnar2015-05-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20885565 Change-Id: I2a361b8dd6d39d2cf994f6748ed562be4c642b77
* | | | | | | | | | | stagefright: move native window helpers into SurfaceUtilsLajos Molnar2015-05-073-7/+34
| |_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20885565 Change-Id: I2ed14be8a7cb08b1ed4ea65cb9286dc1384fe64a