summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am f5e63398: am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero ↵Marco Nelissen2015-04-091-0/+10
|\ | | | | | | | | | | | | error in corrupted media file" * commit 'f5e633989263f03c469d676246fbf003f3bb1acc': Fix div zero error in corrupted media file
| * am 65b351c9: am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in ↵Marco Nelissen2015-04-091-0/+10
| |\ | | | | | | | | | | | | | | | | | | corrupted media file" * commit '65b351c9e6b2de28d9517d90c42965d0fb3c5cd6': Fix div zero error in corrupted media file
| | * am 5a5e2f41: am 1c4eddb1: Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
| | |\ | | | | | | | | | | | | | | | | * commit '5a5e2f411caee5017ef6f2b54c031621a8269c27': Fix div zero error in corrupted media file
| | | * am 1c4eddb1: Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
| | | |\ | | | | | | | | | | | | | | | | | | | | * commit '1c4eddb16146855723d5854078ad0f6884f3f3f2': Fix div zero error in corrupted media file
| | | | * Merge "Fix div zero error in corrupted media file"Marco Nelissen2015-04-091-0/+10
| | | | |\
| | | | | * Fix div zero error in corrupted media fileDan Liang2015-04-081-0/+10
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some corrupted media file has timescale value as zero and shouldn't be used. Change-Id: I8f6a347f8651cdc7e8c370ab1881e1a5fcb30839 Signed-off-by: Dan Liang <dan.liang@intel.com>
* | | | | Merge "Fix AudioPolicyManager dynamic policy initialization"Jean-Michel Trivi2015-04-093-31/+31
|\ \ \ \ \
| * | | | | Fix AudioPolicyManager dynamic policy initializationJean-Michel Trivi2015-04-083-31/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioPolicyManager::getInputForAttr() is initializing the AudioMix for the new AudioInputDescriptor. The audio policy manager refactoring introduced a regression where the association of an existing AudioMix (registered when the associated AudioPolicy was registered) with the input descriptor copied a value of local scope, instead of referencing the AudioMix in the list of mixes. Bug 20081375 Change-Id: Iddd57fed8525880afd1d4a5493f97130aabe4816
* | | | | | Merge "audio policy: volume in dBs"Eric Laurent2015-04-0910-40/+77
|\ \ \ \ \ \
| * | | | | | audio policy: volume in dBsEric Laurent2015-04-0810-40/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volumes are now stored and exchanged in dBs to be consistent with the volume tables. They are converted if needed when applied to the target gain controller. Change-Id: I916cbb0bbe65c916444b8c65a2bdca9645c58399
* | | | | | | Merge "audio policy: volume control reorganization"Eric Laurent2015-04-099-376/+571
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | audio policy: volume control reorganizationEric Laurent2015-04-089-376/+571
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Output volume and routing control by AudioOutputDescriptor is reorganized to prepare hardware source volume and routing control. AudioOutputDescriptor contains all volume, device and activity state common to software (audio flinger mixers) and hardware sources (tuners, A2DP, HDMI). A new class SwAudioOutputDescriptor is derived from AudioOutputDescriptor and is specific to software sources. Low level routing and volume control methods receive an AudioOutputDescriptor parameter instead of an IO handle. mPrimaryOutput is now an AudioOutputDescriptor. Change-Id: Ie90943ee3102cdb8adf89fdd2addd2c279b1e5bf
* | | | | | | Merge "Enable 8 bit and float pcm record formats for AudioFlinger"Andy Hung2015-04-094-21/+77
|\ \ \ \ \ \ \
| * | | | | | | Enable 8 bit and float pcm record formats for AudioFlingerAndy Hung2015-04-084-21/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update sampling rate handling as well. Bug: 19570772 Change-Id: I872248e64c0578b2e48869a68fee0d51bd0640c3
* | | | | | | | Merge "Improve ResamplerBufferProvider"Andy Hung2015-04-084-40/+88
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Improve ResamplerBufferProviderAndy Hung2015-04-084-40/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3cc3af221ad5797ff219d75227350733afa180db
* | | | | | | | Merge "Add RecordBufferConverter for RecordThread data processing"Andy Hung2015-04-084-136/+305
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Add RecordBufferConverter for RecordThread data processingAndy Hung2015-04-084-136/+305
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia3aab8590cd41e8a7cba0a7345d70d2866d92045
* | | | | | | | Merge "Return number of frames output from resample method"Andy Hung2015-04-089-41/+59
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | Return number of frames output from resample methodAndy Hung2015-04-089-41/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic297e2ed59839f1788c83e099ef1a9e4af29591f
* | | | | | | Merge "audio flinger: improve device to device audio patches"Eric Laurent2015-04-084-24/+29
|\ \ \ \ \ \ \
| * | | | | | | audio flinger: improve device to device audio patchesEric Laurent2015-04-084-24/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow creation of audio patches between input and output devices managed by the same audio HW module. Change-Id: I4b83268a4d5c41f3d5905d7581202cf5193efd32
* | | | | | | | Merge "audio policy: fix unique audio port ID."Eric Laurent2015-04-0816-79/+180
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | audio policy: fix unique audio port ID.Eric Laurent2015-04-0816-79/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mId member from AudioPort as it was shadowed by mId in DeviceDescriptor. Add getters for Id, and HW module name and version to device, output and input descriptors. Fix DeviceDescriptor name initialization. Change-Id: I4a69f385e40330954d9dad5f2926c521f60b2ec1
* | | | | | | HLS: traces in LiveSession and PlaylistFetcher for easier debuggingChong Zhang2015-04-085-58/+172
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug: 19567254 Change-Id: I4305d37cb74279ccd435f99483231cd1dcf42fc9
* | | | | | Merge "Adding explicit routing API to AudioTrack"Paul McLean2015-04-0818-28/+251
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Adding explicit routing API to AudioTrackPaul McLean2015-04-0818-28/+251
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* | | | | | am e5eda367: (-s ours) am afc7b857: am e849af87: Cherry-pick two BufferItem ↵Dan Stoza2015-04-070-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | changes * commit 'e5eda367571db5894024d0d71e3831484ef53141': Cherry-pick two BufferItem changes
| * | | | | am afc7b857: am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'afc7b857308aae3e33290f6af82ad8699cafde36': Cherry-pick two BufferItem changes
| | * | | | am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'e849af8737d9302a7b24fa2f0083cde01c9cd4fc': Cherry-pick two BufferItem changes
| | | * | | Cherry-pick two BufferItem changesDan Stoza2015-04-0712-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcameraservice: Stop using IGBC::BufferItem (cherry picked from commit 027c772ed30ddd32808df669e37a53e9b97b1f99) libstagefright: Stop using IGBC::BufferItem (cherry picked from commit 983e2be81f9ea767ae4d8b19669c1c080ecf58d4)
* | | | | | Merge "Camera2Client: support HAL version 3.3"Zhijun He2015-04-071-1/+2
|\ \ \ \ \ \
| * | | | | | Camera2Client: support HAL version 3.3Zhijun He2015-04-071-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id018e3ce21b4344d09a877395eb355adba9e8fa2
* | | | | | | Merge "stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED."Ronghua Wu2015-04-071-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | stagefright: add new MediaCodec callback CB_RESOURCE_RECLAIMED.Ronghua Wu2015-03-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19620911 Change-Id: I8db19cdbb1b93a7a6401e158f91285e7c395b719
* | | | | | | am 514c8ffc: (-s ours) am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ↵Lajos Molnar2015-04-070-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source" * commit '514c8ffc36b3e93d9ffa61328149ae47ef749a5b': DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source
| * | | | | | am 0ffe8f97: am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT ↵Lajos Molnar2015-04-070-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE: mediaplayer: ensure secure decoders are instantiated before starting source" * commit '0ffe8f9705a3fe4a71d4a03c24a9d77ff43f069b': DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source
| | * | | | | am 39a8a377: (-s ours) am ddd1c72b: (-s ours) Merge "DO NOT MERGE: ↵Lajos Molnar2015-04-060-0/+0
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mediaplayer: ensure secure decoders are instantiated before starting source" * commit '39a8a37759b6964b29b721b83079642c38ec417e': DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source
| | | * | | | am ddd1c72b: (-s ours) Merge "DO NOT MERGE: mediaplayer: ensure secure ↵Lajos Molnar2015-04-060-0/+0
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoders are instantiated before starting source" * commit 'ddd1c72b7d4e407fed59a4f0f45408f1fe9a0cd8': DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before starting source
| | | | * | | Merge "DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated ↵Lajos Molnar2015-04-065-14/+111
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | before starting source"
| | | | | * | | DO NOT MERGE: mediaplayer: ensure secure decoders are instantiated before ↵Lajos Molnar2015-04-035-14/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | starting source Bug: 19984798 Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
* | | | | | | | audiopolicy: add support for parsing AUDIO_FORMAT_DTSPhil Burk2015-04-061-0/+2
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18292317 Change-Id: Ic9a15fc09ce32021d12072fb71252d207deac30a Signed-off-by: Phil Burk <philburk@google.com>
* | | | | | | am 3248cb7d: (-s ours) am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ↵Chong Zhang2015-04-030-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ours) Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE" * commit '3248cb7dd030d9b45362c1c0364763419be9064c': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| * | | | | | am af69e818: am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: ↵Chong Zhang2015-04-030-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not use cached source for wvm content -- DO NOT MERGE" * commit 'af69e81834d09a02a6bfe1b685e66cd007243373': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| | * | | | | am 4ea8ecf7: (-s ours) am f7f62b7e: (-s ours) Merge "nuplayer: do not use ↵Chong Zhang2015-04-030-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cached source for wvm content -- DO NOT MERGE" * commit '4ea8ecf7bfa54ea6440f833cc9f9c475779860e4': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| | | * | | | am f7f62b7e: (-s ours) Merge "nuplayer: do not use cached source for wvm ↵Chong Zhang2015-04-030-0/+0
| | | |\ \ \ \ | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | content -- DO NOT MERGE" * commit 'f7f62b7ec23cc265c72b49f7f67886253b27c48f': nuplayer: do not use cached source for wvm content -- DO NOT MERGE
| | | | * | | Merge "nuplayer: do not use cached source for wvm content -- DO NOT MERGE"Chong Zhang2015-04-031-23/+32
| | | | |\ \ \ | | | | | |/ / | | | | |/| |
| | | | | * | nuplayer: do not use cached source for wvm content -- DO NOT MERGEChong Zhang2015-04-031-23/+32
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | bug: 18730095 Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
* | | | | | Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in ↵Robert Shih2015-04-031-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO"
| * | | | | | ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO sync words can be either 0x000001 (3 bytes) or 0x00000001 (4 bytes); simply searching for 0x000001 in appendData suffices because: 1. 0x000001 is a suffix of 0x00000001, as such we would continue to identify all sync words that we used to identify originally. 2. the parsing logic downstream of appendData in dequeueAccessUnitMPEGVideo and dequeueAccessUnitH264 can both handle 0x000001. Bug: 19900317 Change-Id: Iac42aad74563d056a443b4396eacbae0f7a4738b
generated by cgit v1.1 at 2024-06-26 09:12:44 +0000