OSDN Git Service
James Dong [Wed, 21 Mar 2012 01:53:29 +0000 (18:53 -0700)]
Merge "Handling end times of subtitles."
Insun Kang [Tue, 13 Mar 2012 23:16:35 +0000 (08:16 +0900)]
Handling end times of subtitles.
Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
Eric Laurent [Wed, 21 Mar 2012 01:20:33 +0000 (18:20 -0700)]
am
eb99cacc: am
b388138f: resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
* commit '
eb99caccd7165385fc83b0175c6d176c990f179b':
Eric Laurent [Wed, 21 Mar 2012 01:20:31 +0000 (18:20 -0700)]
am
04353390: resolved conflicts for merge of
393dd03e to ics-scoop-plus-aosp
* commit '
04353390722b9195434cc86af4414004eff058e8':
AudioTrack: relax check on minimum buffer size
Glenn Kasten [Tue, 20 Mar 2012 21:01:39 +0000 (14:01 -0700)]
Merge "Add libmedia_native"
Marco Nelissen [Tue, 20 Mar 2012 17:08:52 +0000 (10:08 -0700)]
Merge "Move COM tag parsing to constructor"
Marco Nelissen [Tue, 20 Mar 2012 16:48:02 +0000 (09:48 -0700)]
Move COM tag parsing to constructor
Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
Marco Nelissen [Tue, 20 Mar 2012 16:15:05 +0000 (09:15 -0700)]
Merge "Parse mp3 encoder padding/delay"
Marco Nelissen [Mon, 19 Mar 2012 20:49:43 +0000 (13:49 -0700)]
Parse mp3 encoder padding/delay
Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag.
Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
Wu-cheng Li [Tue, 20 Mar 2012 02:25:56 +0000 (19:25 -0700)]
Merge "Do not set camera preview display if the surface is null."
Glenn Kasten [Tue, 20 Mar 2012 00:36:25 +0000 (17:36 -0700)]
Add libmedia_native
Change-Id: I3ac357c78fb89f108d15c6e5b9fa317de0e9fb9a
Glenn Kasten [Mon, 19 Mar 2012 23:21:04 +0000 (16:21 -0700)]
Merge "Add libmedia_native"
Glenn Kasten [Mon, 19 Mar 2012 14:31:58 +0000 (07:31 -0700)]
Merge "audio_channel_in/out_mask_from_count"
Wu-cheng Li [Wed, 14 Mar 2012 09:25:57 +0000 (17:25 +0800)]
Do not set camera preview display if the surface is null.
MediaRecorder.setPreviewDisplay() is not required if applications
use MediaRecorder.setCamera(). Besides, this causes a problem when
apps use Camera.setPreviewTexture. Camera service thinks the
surface texture from Camera.setPreviewTexture and the surface from
MediaRecorder.setPreviewDisplay are different.
bug:
5988937
Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
Eric Laurent [Sat, 17 Mar 2012 00:26:15 +0000 (17:26 -0700)]
am
b388138f: resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
* commit '
b388138ff2986d6883fa9331fa91ae5e18ae81a0':
Eric Laurent [Sat, 17 Mar 2012 00:22:34 +0000 (17:22 -0700)]
resolved conflicts for merge of
393dd03e to ics-scoop-plus-aosp
Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
Eric Laurent [Sat, 17 Mar 2012 00:19:25 +0000 (17:19 -0700)]
resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
Andreas Huber [Fri, 16 Mar 2012 22:19:30 +0000 (15:19 -0700)]
Merge "Report an error instead of waiting for EOS indefinitely in sf2."
Eric Laurent [Fri, 16 Mar 2012 22:01:01 +0000 (15:01 -0700)]
am
3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1
* commit '
3fe7ee651db0aae9485ead227c89db1e24b9e245':
AudioTrack: relax check on minimum buffer size
Andreas Huber [Fri, 16 Mar 2012 20:19:20 +0000 (13:19 -0700)]
Report an error instead of waiting for EOS indefinitely in sf2.
Change-Id: Id7bcfb90a3b6a61f0df8bd8f39ea4ffa3c433d87
Andreas Huber [Fri, 16 Mar 2012 20:15:53 +0000 (13:15 -0700)]
Merge "ACodec is a little more aggressive in its error checking now."
Eric Laurent [Tue, 6 Mar 2012 01:06:40 +0000 (17:06 -0800)]
AudioTrack: relax check on minimum buffer size
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.
Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.
Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f
Conflicts:
media/libmedia/AudioTrack.cpp
Andreas Huber [Fri, 16 Mar 2012 19:00:18 +0000 (12:00 -0700)]
ACodec is a little more aggressive in its error checking now.
Update components to do the right thing.
Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
Glenn Kasten [Fri, 16 Mar 2012 18:42:24 +0000 (11:42 -0700)]
Add libmedia_native
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
Andreas Huber [Fri, 16 Mar 2012 18:38:38 +0000 (11:38 -0700)]
Merge "Remove obsolete software codec header files and amr encoders."
Andreas Huber [Fri, 16 Mar 2012 17:53:50 +0000 (10:53 -0700)]
Remove obsolete software codec header files and amr encoders.
Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
Marco Nelissen [Fri, 16 Mar 2012 17:11:13 +0000 (10:11 -0700)]
Merge "Skip XING/VBRI frame when decoding"
Glenn Kasten [Fri, 16 Mar 2012 17:06:49 +0000 (10:06 -0700)]
am
97824b70: am
aa1bd6de: am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
97824b706d8865b50faf2f09d0cf969bec0874e3':
Add empty libmedia_native in old location
Glenn Kasten [Fri, 16 Mar 2012 17:03:54 +0000 (10:03 -0700)]
am
aa1bd6de: am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
aa1bd6dec676ab81e14ca428427d2b8c627c83fa':
Add empty libmedia_native in old location
Glenn Kasten [Fri, 16 Mar 2012 17:01:28 +0000 (10:01 -0700)]
am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
d8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
Add empty libmedia_native in old location
Andreas Huber [Fri, 16 Mar 2012 16:57:23 +0000 (09:57 -0700)]
Merge "Remove obsolete OMXComponentBase class"
Andreas Huber [Fri, 16 Mar 2012 15:23:32 +0000 (08:23 -0700)]
Remove obsolete OMXComponentBase class
Change-Id: I701ff5a57b0ab49cc772c4f82d03b5005e54ec6f
Marco Nelissen [Fri, 16 Mar 2012 14:56:42 +0000 (07:56 -0700)]
Skip XING/VBRI frame when decoding
Don't send the XING/VBRI frame to the decoder, as it will result in
extra data being output. Also clean up the XING seeker code a bit.
Change-Id: I714a94180edae9bedc1bc0c96bf382fe6f928ac6
Insun Kang [Thu, 15 Mar 2012 14:04:43 +0000 (23:04 +0900)]
Fix a bug in MediaPlayer's addExternalSource().
Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
Glenn Kasten [Fri, 16 Mar 2012 05:09:38 +0000 (22:09 -0700)]
am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
Add empty libmedia_native in old location
Wu-cheng Li [Fri, 16 Mar 2012 04:23:24 +0000 (21:23 -0700)]
Merge "Add a new camera open API that allows taking the ownership."
Glenn Kasten [Thu, 15 Mar 2012 19:53:43 +0000 (12:53 -0700)]
Add empty libmedia_native in old location
Submitting this first, in the old location, will allow early testing of
the build for all the dependent projects. Then those projects will not
need to be updated atomically when libmedia_native is moved.
Change-Id: I31ab315e53970986d18a4e3b1673e31460f6a3f1
Glenn Kasten [Wed, 14 Mar 2012 19:56:06 +0000 (12:56 -0700)]
audio_channel_in/out_mask_from_count
and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count
Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
Eino-Ville Talvala [Thu, 15 Mar 2012 17:34:00 +0000 (10:34 -0700)]
Merge "Move CameraParameters.h to frameworks/native."
Glenn Kasten [Thu, 15 Mar 2012 14:53:54 +0000 (07:53 -0700)]
Merge "Remove dependency on audio_* location"
Wu-cheng Li [Fri, 24 Feb 2012 03:01:00 +0000 (19:01 -0800)]
Add a new camera open API that allows taking the ownership.
The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.
bug:
5584464
Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
James Dong [Thu, 15 Mar 2012 00:45:18 +0000 (17:45 -0700)]
Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks."
Eino-Ville Talvala [Thu, 15 Mar 2012 00:14:19 +0000 (17:14 -0700)]
Move CameraParameters.h to frameworks/native.
CameraParameters.h is indirectly required to implement the Camera
HAL. Move it to frameworks/native.
Bug:
6171735
Change-Id: I1bf4db228333be16fc7caa3c51280a9495293011
Marco Nelissen [Wed, 14 Mar 2012 23:58:13 +0000 (16:58 -0700)]
Merge "Fix Xing seeking when TOC[0] == 0"
Glenn Kasten [Tue, 13 Mar 2012 22:59:35 +0000 (15:59 -0700)]
Remove dependency on audio_* location
Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
Marco Nelissen [Wed, 14 Mar 2012 23:40:11 +0000 (16:40 -0700)]
Fix Xing seeking when TOC[0] == 0
A file purchased from the Amazon mp3 store had two 0 entries at the
start of the TOC (presumably because there was a lot of silence at
the beginning, which compresses well), which made TOC based seeking
think the TOC was not valid.
b/
6170518
Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347
Insun Kang [Thu, 16 Feb 2012 11:28:27 +0000 (20:28 +0900)]
Defines MediaPlayer APIs to support multiple audio/video/timedtext
tracks.
o Newly introduced APIs are (MediaPlayer):
getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().
o Timed text tracks are supported only, for now.
o TODOs:
- Define the audio/video behavior for enableTrack and disableTrack.
- Refactoring AwesomePlayer / TimedTextDriver so that all types of
track index can be managed in the correct order and be ready for
supporting audio/video tracks.
(MediaExtractor and MediaSource for text file might be necessary.)
Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
Glenn Kasten [Wed, 14 Mar 2012 23:28:38 +0000 (16:28 -0700)]
Merge "AudioFlinger playback thread CPU measurement in Hz"
Glenn Kasten [Tue, 6 Mar 2012 19:27:10 +0000 (11:27 -0800)]
AudioFlinger playback thread CPU measurement in Hz
Log statistics on CPU usage in Hz in addition to wall clock time
Use CPU statistics for all playback threads, not just MIXER
(but they are disabled by default by a compile-time debug macro).
ThreadCpuUsage library:
- Move statistics out of the library and leave that up to the caller
- Add API to determine a CPU's frequency
Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
Eric Laurent [Wed, 14 Mar 2012 22:30:05 +0000 (15:30 -0700)]
Merge "audioflinger: more info in dumpsys"
Eric Laurent [Wed, 14 Mar 2012 22:03:26 +0000 (15:03 -0700)]
audioflinger: more info in dumpsys
Added TID and io handle to AudioFlinger threads dump.
Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
Glenn Kasten [Wed, 14 Mar 2012 20:57:03 +0000 (13:57 -0700)]
Merge "Break circular dependency on media player service"
Glenn Kasten [Wed, 14 Mar 2012 20:56:25 +0000 (13:56 -0700)]
Merge "Prepare frameworks/native/services/audioflinger"
Glenn Kasten [Wed, 14 Mar 2012 20:54:21 +0000 (13:54 -0700)]
Merge "Use correct syntax for #include <> """
James Dong [Wed, 14 Mar 2012 17:43:22 +0000 (10:43 -0700)]
Merge "make sure that lower-case mime and file suffix is used to check against the supported ones"
James Dong [Wed, 14 Mar 2012 17:43:18 +0000 (10:43 -0700)]
Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"
James Dong [Wed, 14 Mar 2012 17:43:12 +0000 (10:43 -0700)]
Merge "Turned off log spamming from DrmPassthruPlugin"
James Dong [Wed, 14 Mar 2012 02:20:55 +0000 (19:20 -0700)]
Fixed a buffer overflow bug in DrmPassthruPlugin
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
James Dong [Wed, 14 Mar 2012 01:54:16 +0000 (18:54 -0700)]
Turned off log spamming from DrmPassthruPlugin
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
Glenn Kasten [Wed, 14 Mar 2012 00:55:35 +0000 (17:55 -0700)]
Break circular dependency on media player service
Bug:
6165157
Change-Id: I3c85bbcaf31f3cb9a009e273f7b6284015eb3bd8
Glenn Kasten [Tue, 13 Mar 2012 21:46:23 +0000 (14:46 -0700)]
Use correct syntax for #include <> ""
Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
Glenn Kasten [Tue, 13 Mar 2012 23:09:39 +0000 (16:09 -0700)]
Prepare frameworks/native/services/audioflinger
Part of this change will be reverted after the move is complete.
Change-Id: Ie7f6355368258f2b1344f4ef754da9151a06e41d
James Dong [Tue, 13 Mar 2012 06:20:29 +0000 (23:20 -0700)]
make sure that lower-case mime and file suffix is used to check against the supported ones
Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
Daniel Lam [Thu, 23 Feb 2012 22:35:13 +0000 (14:35 -0800)]
SurfaceTexture: Fully refactored from BufferQueue
Cleaning up camera and media interactions as part of SurfaceTexture refactoring
Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
Marco Nelissen [Tue, 13 Mar 2012 20:23:07 +0000 (13:23 -0700)]
Merge "Gapless playback, step 1."
Marco Nelissen [Wed, 29 Feb 2012 00:07:44 +0000 (16:07 -0800)]
Gapless playback, step 1.
Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.
Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
James Dong [Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)]
Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base"
Glenn Kasten [Mon, 12 Mar 2012 23:29:55 +0000 (16:29 -0700)]
Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.
Use git diff -b or -w to verify.
Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
James Dong [Tue, 13 Mar 2012 16:21:37 +0000 (09:21 -0700)]
Merge "Fixing coding style : Indentation"
Glenn Kasten [Tue, 13 Mar 2012 14:16:44 +0000 (07:16 -0700)]
Merge "Clean up assertion checks"
Insun Kang [Tue, 13 Mar 2012 08:17:41 +0000 (17:17 +0900)]
Fixing coding style : Indentation
Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
James Dong [Mon, 12 Mar 2012 21:37:53 +0000 (14:37 -0700)]
Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base
o related-to-bug:
6044887
Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
Glenn Kasten [Tue, 13 Mar 2012 01:13:59 +0000 (18:13 -0700)]
Fix bug where mMixerStatus was set to IDLE
Change-Id: I55df1738fb7ba17ba6caeea6a17557526eac17a7
Glenn Kasten [Thu, 8 Mar 2012 20:18:35 +0000 (12:18 -0800)]
Clean up assertion checks
Use ALOG_ASSERT instead of assert.
Use compile-time asserts where appropriate.
Fix typo in an ALOGV.
Change-Id: I58f1c1ffc14319a022c88b5a88b8d0368660da8b
Glenn Kasten [Fri, 9 Mar 2012 20:08:48 +0000 (12:08 -0800)]
Inline applyVolume() into threadLoop_mix()
Also the declaration of applyVolume in PlaybackThread was dead.
Change-Id: I4b1a9848d07d3d7f340baea05b17f667c78df868
Glenn Kasten [Mon, 12 Mar 2012 22:05:51 +0000 (15:05 -0700)]
Merge "Remove unnecessary friend declarations"
Glenn Kasten [Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)]
Merge "Remove virtual from methods that don't need it"
Glenn Kasten [Mon, 12 Mar 2012 18:26:39 +0000 (11:26 -0700)]
Merge "Merge dup code at thread entry and param change"
Jean-Michel Trivi [Mon, 12 Mar 2012 18:21:35 +0000 (11:21 -0700)]
Merge "Extend WAV extractor for multichannel"
James Dong [Mon, 12 Mar 2012 17:33:38 +0000 (10:33 -0700)]
Merge "Avoid checking supported mime types or file suffixes in multiple places"
Glenn Kasten [Fri, 24 Feb 2012 22:59:21 +0000 (14:59 -0800)]
Merge dup code at thread entry and param change
This CL is mostly just cleanup, but there are a couple of fixes marked
"FIX" below.
Merge the duplicate code that was at the beginning of threadLoop() and
after a parameter change. cacheParameters_l() is now called at entry to
threadLoop() and after any parameter change. It re-calculates all values
that are derived from parameters, and caches them in instance variables.
updateWaitTime_l():
- FIX activeSleepTime depends on mWaitTimeMs, which was initially set
to infinity. updateWaitTime_l() was not called at entry to
threadLoop(), so activeSleepTime was not set correctly before the
first parameter change.
- FIX reversed the order of calls after parameter change
for the same reason so that updateWaitTime_l() is called before
calculating values that are derived from wait time.
- marked it private since now it's only called from DuplicatingThread
Change-Id: If2607d2ed66c6893d910433e48208a93c41fb7e9
James Dong [Sat, 10 Mar 2012 01:33:42 +0000 (17:33 -0800)]
Avoid checking supported mime types or file suffixes in multiple places
Change-Id: I47d24070c7bda385cd1d7fa1f6a75dbb1f82b476
Jean-Michel Trivi [Fri, 9 Mar 2012 18:23:23 +0000 (10:23 -0800)]
Extend WAV extractor for multichannel
Support multichannel (more than 2) audio in WAV.
Support WAV_EXT format.
Change-Id: If0e6cf28cb3096f4f148ff6583f7e01db8f8a901
James Dong [Sat, 10 Mar 2012 00:11:18 +0000 (16:11 -0800)]
Merge "Added an failure log message when the fwdlock engine fails to open a given file."
Glenn Kasten [Wed, 7 Mar 2012 17:15:37 +0000 (09:15 -0800)]
Use audio_policy_output_flags_t consistently
This affects:
- IAudioFlinger::openOutput
- AudioTrack::AudioTrack
- AudioTrack::set
- apps that call these
Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
Glenn Kasten [Fri, 9 Mar 2012 23:23:45 +0000 (15:23 -0800)]
Merge "Use AudioRecord::record_flags consistently"
Conley Owens [Fri, 9 Mar 2012 23:15:35 +0000 (15:15 -0800)]
am
ea374096: am
c24f5ba4: am
9a3f3b9d: am
67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '
ea374096511f92206c264f3f1eb0551a05a34cd5':
stagefright amrwbenc: Simplify the definition of static_vo
Conley Owens [Fri, 9 Mar 2012 23:15:32 +0000 (15:15 -0800)]
am
3557654c: am
66da3fdc: am
972efafb: am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
3557654c95bae7754dcd1951ec10742b895817e2':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 23:13:14 +0000 (15:13 -0800)]
am
c24f5ba4: am
9a3f3b9d: am
67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '
c24f5ba4ee2873d6fd980229f0d24c80104d3558':
stagefright amrwbenc: Simplify the definition of static_vo
Conley Owens [Fri, 9 Mar 2012 23:13:11 +0000 (15:13 -0800)]
am
66da3fdc: am
972efafb: am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
66da3fdce4dc61f7d1c125eda9b2e065658cc0e5':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 23:10:08 +0000 (15:10 -0800)]
am
9a3f3b9d: am
67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '
9a3f3b9db63e7e109a417c0959b8bc589ab70e04':
stagefright amrwbenc: Simplify the definition of static_vo
Conley Owens [Fri, 9 Mar 2012 23:09:58 +0000 (15:09 -0800)]
am
972efafb: am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
972efafb90b543eea51aa5b23104d469a1bcc1fb':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 23:06:53 +0000 (15:06 -0800)]
am
67cf093d: Merge "stagefright amrwbenc: Simplify the definition of static_vo"
* commit '
67cf093d86539d4f3db7e2a2b168c9a250c0a5b8':
stagefright amrwbenc: Simplify the definition of static_vo
Conley Owens [Fri, 9 Mar 2012 23:06:48 +0000 (15:06 -0800)]
am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
6db6ea02b999e86dfbddd08780eeab0034389f93':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Andreas Huber [Fri, 9 Mar 2012 22:44:13 +0000 (14:44 -0800)]
Merge "Fix memory leak when carrying ABuffer* in AMessages."
Andreas Huber [Fri, 9 Mar 2012 22:33:01 +0000 (14:33 -0800)]
Fix memory leak when carrying ABuffer* in AMessages.
Change-Id: Icb4770ca238d316e6dd2d89159357a8fdb504ea9
Glenn Kasten [Fri, 9 Mar 2012 21:44:14 +0000 (13:44 -0800)]
Merge "Replace hard-coded 3 by FCC_2 to simplify searches"
James Dong [Fri, 9 Mar 2012 21:05:17 +0000 (13:05 -0800)]
Added an failure log message when the fwdlock engine fails to open a given file.
Change-Id: I0e7f60b61f03fde046fc1ad668b28cdee635898b
Glenn Kasten [Fri, 9 Mar 2012 18:30:26 +0000 (10:30 -0800)]
Remove virtual from methods that don't need it
Change-Id: I30e17e61aae25b036436c0e270313c80c43e5f06
Marco Nelissen [Fri, 9 Mar 2012 20:36:17 +0000 (12:36 -0800)]
Merge "Improve AudioPlayer position reporting"