summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use new channel count functions for audio masksAndy Hung2014-05-1611-22/+31
| | | | | Change-Id: Ia658ab4b6320d19fdb50f123c930918724ff0ef3 Signed-off-by: Andy Hung <hunga@google.com>
* Fix build.Marco Nelissen2014-05-152-4/+4
| | | | Change-Id: I2b0a3049c81b99ba233d5945e16dcddd975aa4f9
* Merge "Unify error/status codes"Marco Nelissen2014-05-1512-218/+233
|\
| * Unify error/status codesMarco Nelissen2014-05-1512-218/+233
| | | | | | | | Change-Id: Ib90cc2f2adc07ff146256931c92c0ec4becb86f5
* | Merge "Hook up event handling in NDK MediaDrm API"Jeff Tinker2014-05-152-6/+69
|\ \
| * | Hook up event handling in NDK MediaDrm APIJeff Tinker2014-05-152-6/+69
| |/ | | | | | | Change-Id: I48ac1d3ca5405c5909454c7a553917b31b9a50e5
* | ACodec: remove PTS log spamLajos Molnar2014-05-152-4/+2
| | | | | | | | | | | | Bug: 14976517 Bug: 11784827 Change-Id: Ibc1bbd80e7aac30b0f8f1e9ca2be1bb3e5e2ebbb
* | Merge "Send 64 bit OMX codec handling to 32 bit MediaServer"Andy Hung2014-05-153-0/+22
|\ \
| * | Send 64 bit OMX codec handling to 32 bit MediaServerAndy Hung2014-05-143-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a temporary fix for 64 bit OMX handling until 64 bit codecs are more robust. Bug: 13938273 Change-Id: Ifc79e360f9606f6c909b859d322b7dd5d416b26b Signed-off-by: Andy Hung <hunga@google.com>
* | | Merge "Update OMX messages for 64 bit"Andy Hung2014-05-1511-152/+238
|\ \ \ | |/ /
| * | Update OMX messages for 64 bitAndy Hung2014-05-1411-152/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | Change node_id and buffer_id to uint32_t. Ensure IOMX messages are fixed size. Remove 64 bit compile warnings in associated files. Change-Id: Icdbef00aca575e5dc502ebb52e3ce7d0d7883203 Signed-off-by: Andy Hung <hunga@google.com>
* | | am 4b7c5444: am e32106fd: screenrecord: Add raw frames output formatBenoit Goby2014-05-143-17/+24
|\ \ \ | |_|/ |/| | | | | | | | * commit '4b7c5444f8af79f1f3e04e09bd03b84dec26facf': screenrecord: Add raw frames output format
| * | am e32106fd: screenrecord: Add raw frames output formatBenoit Goby2014-05-143-17/+24
| |\ \ | | | | | | | | | | | | | | | | * commit 'e32106fd5175afdf939ae397aece9caf378a4912': screenrecord: Add raw frames output format
| | * | screenrecord: Add raw frames output formatBenoit Goby2014-05-133-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works like the frames output format but without a header so that the output can be piped directly to mplayer: adb shell screenrecord --output-format=raw-frames - | mplayer -demuxer rawvideo -rawvideo w=320:h=240:format=rgb24 - Change-Id: Ib5ed508fdca3a5d63e973c5189b3677c2d92b43f
* | | | Only export necessary symbolsMarco Nelissen2014-05-147-25/+114
| | | | | | | | | | | | | | | | Change-Id: I869d7124c8cc555f4b09801a898f4dd3ecb072ec
* | | | Merge "Fix typos and pointer math."Marco Nelissen2014-05-144-10/+8
|\ \ \ \
| * | | | Fix typos and pointer math.Marco Nelissen2014-05-144-10/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I07f33a57454d013844b56bc3e57fe0a271e8b38c
* | | | | Merge "WIP: MediaDrm NDK APIs"Jeff Tinker2014-05-143-0/+1077
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | WIP: MediaDrm NDK APIsJeff Tinker2014-05-133-0/+1077
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3ac08a3b027135c3fd2a9e95c5e8b3fd722df019 TODO: hooking up event handler, testing
* | | | | Merge "Pull up mFlags and isFastTrack from Track to TrackBase"Glenn Kasten2014-05-145-10/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Pull up mFlags and isFastTrack from Track to TrackBaseGlenn Kasten2014-05-135-10/+12
| | | | | | | | | | | | | | | | | | | | Change-Id: I6bd48292310be4e05758a11f617f50585904422d
* | | | | Merge "Explicitly include Configuration.h"Glenn Kasten2014-05-132-0/+3
|\ \ \ \ \ | |/ / / /
| * | | | Explicitly include Configuration.hGlenn Kasten2014-05-132-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Must include Configuration.h in any source file with #ifdef or #if that depends on Configuration.h. This avoid inconsistencies that could result in subtle bugs. Change-Id: I99fdf19d56e7c73de4e7d672b937336b932a2a00
* | | | | Merge "Fix memory corruption if increaseSamplingN is not called"Glenn Kasten2014-05-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Fix memory corruption if increaseSamplingN is not calledGlenn Kasten2014-05-131-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Icbf9aaf68c25ba3330ceb79167bd776cf0342d0d
* | | | | Some crypto stuff, error codesMarco Nelissen2014-05-139-12/+612
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add crypto/drm related functions, define some media errors instead of using magic numbers in the code. Change-Id: I5924cba0bfcdb3623073c9182a646b70f4ead5a5
* | | | AudioFlinger: add specific mutex for client listsEric Laurent2014-05-136-92/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a specific mutex to protect access to mClients and mNotificationClients lists. This avoids locking the main AudioFlinger mutex from inside thread loops and allows not to worry about cross deadlocks when sending a config event with status reply while keeping the ThreadBase or AudioFlinger mutex locked. As a way of consequence, remove notification client list passed to processConfigEvents_l() and audioConfigChanged() as the list can now be accessed by locking client mutex only. Change-Id: I228022204b6709a8bb60cc96d9514a6ffe59b62e
* | | | Merge "Add AMediaCodec callback"Marco Nelissen2014-05-132-14/+117
|\ \ \ \
| * | | | Add AMediaCodec callbackMarco Nelissen2014-05-092-14/+117
| | | | | | | | | | | | | | | | | | | | Change-Id: I33b7ff3bcdcff6d3a5e1db385b900ae18b7e0f03
* | | | | am 4ae3cfd8: (-s ours) am 21bde57f: Add frame dump outputAndy McFadden2014-05-130-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '4ae3cfd801f0e62c2863d20a8ecc21369351c205': Add frame dump output
| * | | | am 21bde57f: Add frame dump outputAndy McFadden2014-05-128-87/+512
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | * commit '21bde57f0099fed5cca78d9357571dc015a63227': Add frame dump output
| | * | | Add frame dump outputAndy McFadden2014-05-128-87/+512
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the ability to dump frames as RGB data with a minimal frame header. Only recommended for devices with small displays. Enable with "--output-format=frames". The "--raw" option is now selected with "--output-format=h264". Change-Id: I18d3d4a87cd056d7acf0658985a90dc5895dbfb6
* | | | | am c1b0056e: (-s ours) am 2d11a203: Provide raw H.264 output from screenrecordAndy McFadden2014-05-130-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'c1b0056ea57978a77a6fac0ea80861b39140696f': Provide raw H.264 output from screenrecord
| * | | | am 2d11a203: Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2d11a2031b99db9b503a7ad7efd1f18606af4012': Provide raw H.264 output from screenrecord
| | * | | Provide raw H.264 output from screenrecordAndy McFadden2014-05-122-39/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds an experimental (undocumented) "--raw" flag. If set, we output an H.264 byte stream rather than a .mp4 file. If the filename is "-", we send the output to stdout. If stdout is a tty, we reconfigure it to avoid CRLF line termination over adb. Change-Id: I5193f6193c9c1a59f92eefad0ed399f24afbf6de
* | | | | Merge "Camera: Don't enable log spew by default for eng build"Zhijun He2014-05-122-8/+4
|\ \ \ \ \
| * | | | | Camera: Don't enable log spew by default for eng buildZhijun He2014-05-122-8/+4
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Also replace assert with LOG_ALWAYS_FATAL_IF. Change-Id: I528b97d9bc7a93dc3575ded28f6bf7e294d0a1e6
* | | | | Merge "audiopolicy: refactor audio command threads"Eric Laurent2014-05-122-118/+83
|\ \ \ \ \
| * | | | | audiopolicy: refactor audio command threadsEric Laurent2014-05-122-118/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use strong pointers for command data to avoid transfering ownership of the object to receiver thread. This avoids waiting for the command acknowlegement to proceed with next command on server side. - Use a separate mutex for each command condition. - Factor in duplicated code to send commands. Change-Id: Ib0526e7c4fa64a71ad4015f477c6361727c6f40a
* | | | | | am 7fd1af85: am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry ↵Eino-Ville Talvala2014-05-121-0/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | | | | | | | | | | count before reading it" * commit '7fd1af85f8fb40f7cb4fcdba98418aeea61fb4f0': camera: check Intent entry count before reading it
| * | | | am c36fbcdf: am f02f06c4: Merge "camera: check Intent entry count before ↵Eino-Ville Talvala2014-05-121-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reading it" * commit 'c36fbcdf37ec02314e7b8134bb0de5f624fa70fd': camera: check Intent entry count before reading it
| | * \ \ \ am f02f06c4: Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f02f06c422a58ddaca49d14f21a196eaa435d07b': camera: check Intent entry count before reading it
| | | * \ \ \ Merge "camera: check Intent entry count before reading it"Eino-Ville Talvala2014-05-121-0/+3
| | | |\ \ \ \
| | | | * | | | camera: check Intent entry count before reading itYuvraj Pasi2014-05-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case when find() returns empty entry, blindly reading the entry will cause segfault Change-Id: Ib5be7fd855c409ba3b45f0d43e15237367172817
* | | | | | | | Fix bit rot in AudioStreamInSourceGlenn Kasten2014-05-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It obviously had not been compiled in a while. Change-Id: If514f474808e557a67a671c3b833572ad4a88338
* | | | | | | | Allow placement of Pipe buffer to be specifiedGlenn Kasten2014-05-092-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2f6b68089ecfe85cd975d29ad0d0afd13c487002
* | | | | | | | Explicitly ignore return value of __futex_syscall3Glenn Kasten2014-05-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic65f257bfc4a0eff7bdd3c44fab68a3f17e2bd08
* | | | | | | | Cache mCblk in local variable cblkGlenn Kasten2014-05-091-5/+7
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the style used throughout the rest of AudioTrackShared. Change-Id: I959a6be3064e087bb19eba41173fd130dfcb4a9a
* | | | | | | Merge "Remove obsolete IAudioRecord::getCblk()"Glenn Kasten2014-05-094-29/+1
|\ \ \ \ \ \ \
| * | | | | | | Remove obsolete IAudioRecord::getCblk()Glenn Kasten2014-05-094-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id20b5efd765b9796b0e391610e06dc928a829ebf
generated by cgit v1.1 at 2024-04-27 14:34:16 +0000