summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am 7ebc1670: am 8975220e: Merge "Fix for Bundled Effects level compensation" ↵Ricardo Garcia2014-12-162-104/+144
|\ | | | | | | | | | | | | into lmp-mr1-dev * commit '7ebc167072be27f42b7c58bd7f9378c8311533ab': Fix for Bundled Effects level compensation
| * Merge "Fix for Bundled Effects level compensation" into lmp-mr1-devRicardo Garcia2014-12-162-104/+144
| |\
| | * Fix for Bundled Effects level compensationRicardo Garcia2014-12-092-104/+144
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | From the bundled effects, only the EQ had some sort of level compensation based on the settings of the effect. This patch takes into account all the status and levels of EQ, BassBoost and Virtualizer bundled effects and makes an informed decision on the overall level compensation. bug: 18213779 Change-Id: I23c7b94fe7da5482f0bbef0cbe715ea464631420
* | | am 42818cca: am 9f932418: Merge "Fix for apps that forget to use widevine:// ↵Jeff Tinker2014-12-151-0/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | urls" into lmp-mr1-dev * commit '42818cca55fa4e4faca5b5686c7930070c2bf434': Fix for apps that forget to use widevine:// urls
| * | Merge "Fix for apps that forget to use widevine:// urls" into lmp-mr1-devJeff Tinker2014-12-151-0/+8
| |\ \
| | * | Fix for apps that forget to use widevine:// urlsJeff Tinker2014-12-151-0/+8
| | | | | | | | | | | | | | | | | | | | bug: 18554455 Change-Id: I8ff08e7270c65c375205169eb068f361f2a4a727
* | | | am 06f99521: am 2aa82e78: Merge "MediaCodecList: handle binder death" into ↵Lajos Molnar2014-12-151-1/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev * commit '06f9952190357426445344090b4e20b8758a118a': MediaCodecList: handle binder death
| * | | Merge "MediaCodecList: handle binder death" into lmp-mr1-devLajos Molnar2014-12-151-1/+12
| |\ \ \
| | * | | MediaCodecList: handle binder deathLajos Molnar2014-12-121-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18691591 Change-Id: Icc402d6ea9b0de4ac642c3b403fb64e865481b2e
* | | | | am a0b3a0a4: am 6e430fbd: Merge "NuPlayer: send NOT_SEEKABLE media info to ↵Wei Jia2014-12-152-2/+6
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | client when the source is not seekable." into lmp-mr1-dev * commit 'a0b3a0a46dc42eafe620ffd053604515bbd9ca9a': NuPlayer: send NOT_SEEKABLE media info to client when the source is not seekable.
| * | | | Merge "NuPlayer: send NOT_SEEKABLE media info to client when the source is ↵Wei Jia2014-12-152-2/+6
| |\ \ \ \ | | |/ / / | |/| | | | | | | | not seekable." into lmp-mr1-dev
| | * | | NuPlayer: send NOT_SEEKABLE media info to client when the source is not ↵Wei Jia2014-12-122-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | seekable. LiveSession: return -1 for duration when it's not available. Bug: 18599325 Change-Id: Iecd040f48750806f98d1799e2aaab2f90c6f3887
* | | | | am aff13ad4: am 8ddb0223: Merge "Tunneled video Playback/Max resolution: ↵Rachad2014-12-131-1/+15
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev * commit 'aff13ad4e639316bca12827d68a4f0a6ac54cd02': Tunneled video Playback/Max resolution: Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component.
| * | | | Merge "Tunneled video Playback/Max resolution: Call ↵Rachad2014-12-131-1/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component." into lmp-mr1-dev
| | * | | | Tunneled video Playback/Max resolution:Rachad2014-12-121-1/+15
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call mOmx->prepareForAdaptivePlayback() to provide max resolution information to tunneled OMX component. bug: 17883772 Change-Id: I8f634824103e66483527828993bb24f65e68e419
* | | | | am d4c0fef8: am 554016a3: Merge "stagefright: advertise 8kHz AAC decoder ↵Lajos Molnar2014-12-131-1/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | support" into lmp-mr1-dev * commit 'd4c0fef88384128acc4c986fe7d3026996d4a96b': stagefright: advertise 8kHz AAC decoder support
| * | | | stagefright: advertise 8kHz AAC decoder supportLajos Molnar2014-12-131-1/+2
| |/ / / | | | | | | | | | | | | Bug: 18738266 Change-Id: I1e5a1dc04b4deabfac069e70e4f730be6023a8ef
* | | | am 6b3e1a6d: am ac90a24d: Merge "Remove obsolete TARGET_SIMULATOR checks"Elliott Hughes2014-12-121-24/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * commit '6b3e1a6d59b304a2dde7f03ba184feac0dec4ee7': Remove obsolete TARGET_SIMULATOR checks
| * | | | Remove obsolete TARGET_SIMULATOR checksTrevor Drake2014-12-111-24/+11
| | | | | | | | | | | | | | | | | | | | Change-Id: I9d499190e49fed16aac686ae5da79ab870605ff4
| * | | | Fix AAC recording issueMarco Nelissen2014-12-101-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uninitialized variable that caused ADTS recording to incorrectly specify LTP object in the header. Bug: 17895547 Change-Id: I75650f4963f4f371cd191bc635e32c9ab17fa8c9
* | | | | resolved conflicts for merge of 6571ed31 to lmp-mr1-dev-plus-aospLajos Molnar2014-12-1118-997/+595
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Change-Id: Ibaea3a0766f75a61964615482a9ef28651a42b37
| * | | | stagefright: misc fixes to software video encoders (and decoders)Lajos Molnar2014-12-1018-997/+594
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - move logic to set encoder parameters to common encoder class (similarly to what was done for decoders) - set compressed buffer size based on frame size and compression ratio, and codec-specific minimum size - set raw buffer size based on frame size and metadata mode - do not set stride and slice height on compressed ports - advertise only QCIF support for google H263 encoder - set large-enough input size for video decoders to support adaptive playback - do not change input buffer size on output port reconfiguration, as no input buffer reallocation takes place - do not return empty buffers with EOS after EOS has been signaled Bug: 18513091 Bug: 18639027 Change-Id: Ib13492ef66adf331aa4572c67d2b283ea020cb41
* | | | | am 2253b3c5: am f484952e: mediaplayer: allow setVideoSurface before ↵Lajos Molnar2014-12-111-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | setDataSource * commit '2253b3c50ee4b89349553f42edf676ce8579e680': mediaplayer: allow setVideoSurface before setDataSource
| * | | | mediaplayer: allow setVideoSurface before setDataSourceLajos Molnar2014-12-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18709604 Change-Id: I41e4734faed48b5583feb29896cd5783b8cd7e33
| * | | | Fix overload of SoftVideoDecoderOMXComponent::updatePortDefinitionsBernhard Rosenkränzer2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An overloaded function should take the same parameters as the function it is overloading. Bug: 18639027 Change-Id: I8327fe1b363917515cf76c8f76bdbc05b2c0fbf0 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | Merge commit 'f5a968a0' into mmGlenn Kasten2014-12-102-1/+59
|\ \ \ \ \ | |/ / / / | | | | | | | | | | Change-Id: Ifd30546c11def40ad483f27c9d7baa4008fcbac3
| * | | | Merge "audio policy: binder calls for dynamic audio policy mixes" into ↵Eric Laurent2014-12-102-1/+59
| |\ \ \ \ | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| | * | | | audio policy: binder calls for dynamic audio policy mixesEric Laurent2014-12-092-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add binder calls to register and unregister dynamic mixes to AudioPolicyManager. Bug: 16009464. Change-Id: I4ef38166d0cfc88c984970969380d0cd6eb083ac
* | | | | | am c49d9cda: am 2dda40d6: Merge "audio policy: add support for custom mixes" ↵Eric Laurent2014-12-103-1/+125
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into lmp-mr1-dev * commit 'c49d9cda49dab8b7dd0376cf56476b3e1895d5c6': audio policy: add support for custom mixes
| * | | | | Merge "audio policy: add support for custom mixes" into lmp-mr1-devEric Laurent2014-12-103-1/+125
| |\ \ \ \ \ | | |/ / / /
| | * | | | audio policy: add support for custom mixesEric Laurent2014-12-093-1/+125
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for custom mixes in AudioPolicyManager. Two methods are added to register or unregister a list of custom mixes with their attributes and format. getOutputForAttr() and getInputForAttr() first look for a match in registered mixes before defaulting to normal output/input selection Remote submix device connection disconnection now takes address into account to identify the correspnoding custom mix. Bug: 16009464. Change-Id: I3f1c2a485a0fb71b1f984ed0adc9b68aa971e408
* | | | | am 2a0f484e: am a04c05ab: Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit '2a0f484e7d95490274e77cd4adc01592cfdf6e3a': Truncate file before recording into it.
| * | | | Merge "Truncate file before recording into it."Marco Nelissen2014-12-101-0/+3
| |\ \ \ \
| | * | | | Truncate file before recording into it.Marco Nelissen2014-12-101-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recording into an existing file of non-zero length could leave old data in the file after the recording ends. Best case that wastes space, worst case it results in a file that's considered corrupt on playback. Change-Id: I2c77a107603b2b36790958360ff0856c2b28d677
* | | | | | am c15a72f6: am 1914e7ed: Merge "Fix print format mismatches."Chih-Hung Hsieh2014-12-102-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c15a72f66add3c1f1b5b6a53488628c3843472bf': Fix print format mismatches.
| * | | | | Fix print format mismatches.Chih-Hung Hsieh2014-12-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang complains about mismatch of argument type and print format. Change-Id: Ib07da09d8b1b62b3018033f9eaf7aa01bf7f7f9c
* | | | | | am 6eb3b520: am f6a364ed: Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | * commit '6eb3b5205354ee41ae79abb692abb1490a8c3019': Fix AAC recording issue
| * | | | | Merge "Fix AAC recording issue" into lmp-mr1-devMarco Nelissen2014-12-091-1/+2
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Fix AAC recording issueMarco Nelissen2014-12-091-1/+2
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix uninitialized variable that caused ADTS recording to incorrectly specify LTP object in the header. Bug: 17895547 Change-Id: I75650f4963f4f371cd191bc635e32c9ab17fa8c9
* | | | | am f143b608: am d1aeff55: Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | * commit 'f143b60856d275a9dcda1f3084c768655b242022': Fix build with clang in C++11 mode
| * | | | Merge "Fix build with clang in C++11 mode"Lajos Molnar2014-12-0937-98/+98
| |\ \ \ \
| | * | | | Fix build with clang in C++11 modeBernhard Rosenkränzer2014-11-2737-98/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the deprecated register keyword in many places, fixes one instance of passing '\0' where a char* is expected, and 2 switch type narrowing issues. Change-Id: Ie265ac26ff6a61267ad6406dfe237226d97ca9ac Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | am f3c25346: am 66172f5c: Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f3c253464e0047a28960b27bbee7366d5bd63327': Cast int64_t values to long long before print.
| * | | | | Merge "Cast int64_t values to long long before print."Lajos Molnar2014-12-091-2/+2
| |\ \ \ \ \
| | * | | | | Cast int64_t values to long long before print.Bernhard Rosenkränzer2014-12-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So the "%lld" format will not have Clang warnings in 32-bit and 64-bit builds. Alternative is to use PRId64. Change-Id: I5fafc506fae012748a04ec261af62d9d13475cde Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | | | | | | am 5abc1201: am 3cc93734: Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '5abc1201bbdb27b855c85bd4f8e63748a941835b': Fix build with clang
| * | | | | | Merge "Fix build with clang"Lajos Molnar2014-12-091-2/+1
| |\ \ \ \ \ \
| | * | | | | | Fix build with clangBernhard Rosenkränzer2014-12-081-2/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the -DNDEBUG case, nextOffset is unused, causing clang to spew a warning in code build with -Werror. Change-Id: If0101dcdf735672050f985a1de25a983edb02a52 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
| * | | | | | Merge "Prevent ANR when AudioTrack is paused or re-routed"Glenn Kasten2014-12-091-0/+2
| |\ \ \ \ \ \
| | * | | | | | Prevent ANR when AudioTrack is paused or re-routedzunkyu.lee2014-12-081-0/+2
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If ClientProxy was interrupted by AudioTrack::pause() just before futex syscall() in obtainBuffer() was called, It will not call releaseBuffer to wake up AudioTrackThread. It puts the AudioTrackThread to sleep and then a deadlock occurs. In this case, CBLK_INTERRUPT flags can't prevent a deadlock, so this patch set mFutex to FUTEX_WAKE during interrupt() to avoid deadlock. A similar problem could occur due to re-route or recovery after mediaserver death. Bug: 18641665 Change-Id: I66fcae43af9a91eb55f6cdb52c644ee6c0999772
generated by cgit v1.1 at 2024-05-14 16:48:19 +0000