summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* AudioPolicyManager: notification of dynamic policy mix activityJean-Michel Trivi2015-04-143-1/+26
| | | | | | | | | | Implement non-stream type specific ref counting in output descriptors to keep track of mix activity. Notify audio policy client of mix activity changes. Bug 20226914 Change-Id: Iec939cb640c58056f88947b611d23b4bb6d8a11b
* Merge "stagefright: LiveSession: delay consuming reply ID for seek"Lajos Molnar2015-04-092-17/+10
|\
| * stagefright: LiveSession: delay consuming reply ID for seekLajos Molnar2015-04-082-17/+10
| | | | | | | | | | | | | | Only consume reply ID when actually handling the seek. Bug: 20123914 Change-Id: I2112ee1b89f8193b487ea2b0b3b7050ba3413864
* | am 3f14f569: am de2faabb: am d661654a: am 0958e926: Merge "Log cause of ↵Marco Nelissen2015-04-091-1/+1
|\ \ | | | | | | | | | | | | | | | | | | failure to dlopen" * commit '3f14f5692ab396bfd0193a280311a600abeabeaa': Log cause of failure to dlopen
| * \ am d661654a: am 0958e926: Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| |\ \ | | | | | | | | | | | | | | | | * commit 'd661654a637438fb7a03270e289de3f1fd5e4956': Log cause of failure to dlopen
| | * \ am 0958e926: Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * commit '0958e926fef85d7e1e0eb08f330ff46218b72822': Log cause of failure to dlopen
| | | * \ Merge "Log cause of failure to dlopen"Marco Nelissen2015-04-091-1/+1
| | | |\ \
| | | | * | Log cause of failure to dlopenMarco Nelissen2015-04-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19782799 Change-Id: Idba3d802debb12bb4986c525bb9bb5e3cec09f7d
* | | | | | am fdbafc07: am da589e3d: am fc33bb3f: am e686cc09: Merge "Don\'t fail read ↵Marco Nelissen2015-04-091-6/+11
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when "seeking" to current position" * commit 'fdbafc0728380645ee2194e2ccfe72b12c65fccf': Don't fail read when "seeking" to current position
| * | | | | am fc33bb3f: am e686cc09: Merge "Don\'t fail read when "seeking" to current ↵Marco Nelissen2015-04-091-6/+11
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | position" * commit 'fc33bb3f7474c45eca4de112ccf048150a9112f6': Don't fail read when "seeking" to current position
| | * | | | am e686cc09: Merge "Don\'t fail read when "seeking" to current position"Marco Nelissen2015-04-091-6/+11
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | * commit 'e686cc0952176964684ce2487c5170e41d03c057': Don't fail read when "seeking" to current position
| | | * | | Merge "Don't fail read when "seeking" to current position"Marco Nelissen2015-04-091-6/+11
| | | |\ \ \
| | | | * | | Don't fail read when "seeking" to current positionMarco Nelissen2015-04-031-6/+11
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes thumbnails for MPEG2TS files. Bug: 19583374 Change-Id: I66e5ca014e2f32ba2566c6f511b6e8859d5a97dc
| * | | | | am 8c6f1d97: am 38c9d6cf: Merge "ESQueue:use 0x000001 instead of 0x00000001 ↵Marco Nelissen2015-04-091-2/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as sync word in H264/MPEG_VIDEO" * commit '8c6f1d972aa71806d67a220081d0031b91c09a8c': ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO
| | * | | | am 38c9d6cf: Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word ↵Marco Nelissen2015-04-091-2/+2
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in H264/MPEG_VIDEO" * commit '38c9d6cfd2db353ebebf291589fcceceebb9f2b8': ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEO
| | | * | | Merge "ESQueue:use 0x000001 instead of 0x00000001 as sync word in ↵Marco Nelissen2015-04-091-2/+2
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | H264/MPEG_VIDEO"
| | | | * | | ESQueue:use 0x000001 instead of 0x00000001 as sync word in H264/MPEG_VIDEORobert Shih2015-04-031-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
* | | | | | Merge "Pass crypto source data using a shared buffer"Jeff Tinker2015-04-094-13/+38
|\ \ \ \ \ \
| * | | | | | Pass crypto source data using a shared bufferJeff Tinker2015-04-084-13/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaCodec was using a binder transaction buffer to pass encryption source data for protected content. On some 4K content, the max binder transaction buffer size was being exceeded. This change uses a shared buffer for the encryption source data instead of a binder transaction buffer, which avoids the problem and may be more efficient. bug: 20027687 Change-Id: I36a24ebf600d7e1064b78e48b167fdc29b2c65e9
* | | | | | | 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 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
| | | * | | | 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 "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
| | | * | | | nuplayer: do not use cached source for wvm content -- DO NOT MERGEChong Zhang2015-04-031-23/+32
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | bug: 18730095 Change-Id: Ibd4f54907949daae1d095fa0922050310d16698f
| | | * | | DO NOT MERGE libstagefright: Stop using IGBC::BufferItemDan Stoza2015-04-013-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switches all uses of IGraphicBufferConsumer::BufferItem (and BufferQueue::BufferItem) to the BufferItem in libgui. Similar to I0ddd38df37500cfd6b21d1e768ed14e39c5cd9fc, but not a cherry-pick. Change-Id: I9b16c81bd3bdacdba86eb8fb9b216b295a44b1cb
| * | | | | am e849af87: Cherry-pick two BufferItem changesDan Stoza2015-04-073-11/+13
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'e849af8737d9302a7b24fa2f0083cde01c9cd4fc': Cherry-pick two BufferItem changes
| | * | | | Cherry-pick two BufferItem changesDan Stoza2015-04-073-11/+13
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libcameraservice: Stop using IGBC::BufferItem (cherry picked from commit 027c772ed30ddd32808df669e37a53e9b97b1f99) libstagefright: Stop using IGBC::BufferItem (cherry picked from commit 983e2be81f9ea767ae4d8b19669c1c080ecf58d4)
* | | | | Enable 8 bit and float pcm record formats for AudioFlingerAndy Hung2015-04-081-7/+3
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Update sampling rate handling as well. Bug: 19570772 Change-Id: I872248e64c0578b2e48869a68fee0d51bd0640c3
* | | | HLS: traces in LiveSession and PlaylistFetcher for easier debuggingChong Zhang2015-04-085-58/+172
| | | | | | | | | | | | | | | | | | | | bug: 19567254 Change-Id: I4305d37cb74279ccd435f99483231cd1dcf42fc9
* | | | Adding explicit routing API to AudioTrackPaul McLean2015-04-083-9/+32
| |_|/ |/| | | | | | | | Change-Id: I40c048c7644c46f4e4f7103875206c0785c4b1dc
* | | 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
* | | | Merge "HLS: misc bug fixes"Chong Zhang2015-04-0311-282/+293
|\ \ \ \
| * | | | HLS: misc bug fixesChong Zhang2015-04-0211-282/+293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - fix no target-duration case - fix for audio-only <=> audio/video switching - disable audio-only variants if there is at least one variant with video - fix mpeg2ts PTS wraparound when bandwidth adapting - tweak up/down switch marks bug: 19567254 Change-Id: Ib46144203c56dfc96eccd6ddaa3867e8a4f2c6a9
* | | | | Merge "nuplayer: Has video hint for offload"Ronghua Wu2015-04-032-1/+6
|\ \ \ \ \
| * | | | | nuplayer: Has video hint for offloadHaynes Mathew George2015-04-022-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send a hint indicating whether the clip being played has a video stream from NuPlayer to NuPlayerDecoderPassThrough. This hint is used to open the audio sink with the correct offload config. Currently, NuPlayerDecoderPassthrough always calls openAudioSink with hasVideo set to false causing an unnecessary recreation of AudioTrack. Change-Id: I7bc6c73818b65f9237a6e606721b7d48e1d807b9 CRs-Fixed: 811510
* | | | | | IAudioFlinger: add checks on binder callsEric Laurent2015-04-021-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit number of ports and patches listed by LIST_AUDIO_PATCHES and LIST_AUDIO_PORTS. Also fix typo causing wrong pointer to be used when writing to Parcel. Bug: 19573085. Change-Id: I41a9c710e45738a4f11990160587856c429a4646
* | | | | | audio port: support multiple clientsEric Laurent2015-04-011-23/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for more than one audio port callback client per process. Change-Id: I657c4fc28d5d2d993307551e3e69567dc60196cb
* | | | | | Merge "Split ManagerDefault into manager and engine"Jean-Michel Trivi2015-04-011-0/+2
|\ \ \ \ \ \
| * | | | | | Split ManagerDefault into manager and engineFrançois Gaffie2015-04-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch defines an interface for a new component: policy engine. The APIs found under this interface are the one we may want to customize and to configure easily. This patch also split the current manager code into manager and engine to provide a default version of the policy engine. Change-Id: I97cf59760b53d248fe9efe466ae5e73bd7e5cc06 Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | Merge "Split ManagerDefault into Manager and ManagerDefinitions"Jean-Michel Trivi2015-04-011-1/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Split ManagerDefault into Manager and ManagerDefinitionsFrançois Gaffie2015-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits the managerdefault into a manager and a manager defintion library that contains all pillar elements of a policy manager. It renames the file with the name of the main class they contains. It splits the AudioPort into AudioPort and AudioPatch. Change-Id: I992cf0b8aed895805cc003ba0980d2c9e92c985b Signed-off-by: François Gaffie <francois.gaffie@intel.com>
* | | | | | | Merge "mediaplayer: ensure secure decoders are instantiated before starting ↵Chong Zhang2015-04-015-14/+111
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | source"
| * | | | | | mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-04-015-14/+111
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 19984798 Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
* | | | | | Revert "mediaplayer: ensure secure decoders are instantiated before starting ↵Bart Sears2015-04-015-111/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | source" Reverting a CL that auto-merged from lmp-mr1-dev This reverts commit 68fca636ac961c181ee71a49f151c71b564258d0. Change-Id: I797955c4745710452516b0d487529c95e2d1893e
* | | | | | am 8f46a007: am 6bedacad: am d513b7da: am 31878abb: am 68fca636: ↵Lajos Molnar2015-04-015-14/+111
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | mediaplayer: ensure secure decoders are instantiated before starting source * commit '8f46a007b2f2f70e48df32d5633912481441220b': mediaplayer: ensure secure decoders are instantiated before starting source
| * | | | | am d513b7da: am 31878abb: am 68fca636: mediaplayer: ensure secure decoders ↵Lajos Molnar2015-04-015-14/+111
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are instantiated before starting source * commit 'd513b7da73be6013daa321e1f8c2e488dec65dcd': mediaplayer: ensure secure decoders are instantiated before starting source
| | * | | | | mediaplayer: ensure secure decoders are instantiated before starting sourceLajos Molnar2015-03-315-14/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19984798 Change-Id: Iff13cf03c4ce3141380f4d7ab4a2b1045c5ce747
generated by cgit v1.1 at 2024-05-27 23:05:32 +0000