summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "audio policy: use audio_devices_t when appropriate"Eric Laurent2012-03-082-4/+4
|\
| * audio policy: use audio_devices_t when appropriateEric Laurent2012-03-082-4/+4
| | | | | | | | Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
* | Merge "Fix videos app bandwidth accounting for 4G streaming"Jeff Tinker2012-03-083-0/+11
|\ \
| * | Fix videos app bandwidth accounting for 4G streamingJeff Tinker2012-02-143-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Register the app uid with the WV extractor so it can attribute bandwidth usage to the proper process. Multi-repository commit, also changes in vendor/widevine Change-Id: I42395fd08bf0bfc7e224745f820a714400066456 related-to-bug: 5434244
* | | resolved conflicts for merge of 532679a5 to masterDirk Dougherty2012-03-071-1/+1
|\ \ \ | | | | | | | | | | | | Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
| * \ \ am 4d7bc655: Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219': Doc change: String changes for Android Market
| | * | | Doc change: String changes for Android MarketDirk Dougherty2012-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
* | | | | Merge "IAudioFlingerClient::ioConfigChanged param2 const"Glenn Kasten2012-03-072-9/+9
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | IAudioFlingerClient::ioConfigChanged param2 constGlenn Kasten2012-03-062-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged is used as an input. So changed it from void * to const void *. It is then cast to const OutputDescriptor * or const audio_stream_type_t * depending on the event. Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
* | | | | Merge "Effect for multichannel PCM downmix to stereo"Jean-Michel Trivi2012-03-073-0/+1013
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Effect for multichannel PCM downmix to stereoJean-Michel Trivi2012-03-073-0/+1013
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First pass at implementing an audio effect whose role is to downmix multichannel PCM buffers to stereo. The effect is not handling volume changes. The effect code here handles quad, 4.0, 5.1 and 7.1 input configurations, to optimize the most commom configurations, and does not yet handle generic multichanel configurations. Change-Id: I74d04bd961348f3f0e4ae7714b70e620808a0829
* | | | | Merge "MediaPlayerService: fix AudioSink latency"Eric Laurent2012-03-063-5/+9
|\ \ \ \ \
| * | | | | MediaPlayerService: fix AudioSink latencyEric Laurent2012-03-053-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The AudioSink latency is currently cached when the associated AudioTrack is created. However, the AudioTrack latency can change if the AudioTrack is moved from one output stream to another. The AudioPlayer must also periodically update its view of the latency as it is needed to compensate the real audio time used for A/V sync. This fixes an A/V sync problem seen when switching A2DP on and off while playing a video. Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4
* | | | | | Merge "AudioTrack: relax check on minimum buffer size"Eric Laurent2012-03-061-6/+3
|\ \ \ \ \ \ | |/ / / / /
| * | | | | AudioTrack: relax check on minimum buffer sizeEric Laurent2012-03-051-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Remove unused code - MediaSourceSplitter"James Dong2012-03-062-235/+0
|\ \ \ \ \ \
| * | | | | | Remove unused code - MediaSourceSplitterJames Dong2012-03-052-235/+0
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
* | | | | | Merge "Remove references to sched_policy.h"Glenn Kasten2012-03-061-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Remove references to sched_policy.hGlenn Kasten2012-03-051-2/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of scheduling policy cleanup, remove obsolete references to sched_policy.h and its APIs. Change-Id: Id957d11dd645cdf9d53dd6c02e568369aef23243
* | | | | Add channel mask in AudioSinkJean-Michel Trivi2012-03-025-16/+38
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for specifying a channel mask when opening an AudioSink. This parameter does not replace the channel count parameter in order to not have to duplicate the logic to derive a mask from the channel count everywhere an AudioSink is used without a known mask. A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will be automatically derived from the number of channels. Update existing AudioSink implementations to use the channel mask, and users of AudioSink to specify the mask if available, and CHANNEL_MASK_USE_CHANNEL_ORDER otherwise. Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
* | | | Correct GUID errors in audio effect configurationJean-Michel Trivi2012-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Correct erroneous spaces that were present in some audio effect GUIDs. Change-Id: Ide3a1552b2f8976f96ee980f1341f935555656d9
* | | | Merge "Remove hacks that worked around issues in OMX components several ↵Andreas Huber2012-03-011-66/+0
|\ \ \ \ | | | | | | | | | | | | | | | releases back."
| * | | | Remove hacks that worked around issues in OMX components several releases back.Andreas Huber2012-03-011-66/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
* | | | | am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes ↵Jean-Baptiste Queru2012-03-013-14/+43
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I46c81dba,If1f40e9c,I652eaaa5 * commit '9de7793b425be89889412f3a86466d7b19055c3c': stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| * | | | am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5Jean-Baptiste Queru2012-02-293-14/+43
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '704131cb7e4f9cc682ea57ed569375f9f289368e': stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| | * \ \ \ Merge changes I46c81dba,If1f40e9c,I652eaaa5Jean-Baptiste Queru2012-02-293-14/+43
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: stagefright aacenc: Use QDADD/QDSUB instructions stagefright aacenc: Remove useless inline asm for simple right shift stagefright aacenc: Use ARMv6 SSAT instruction
| | | * | | | stagefright aacenc: Use QDADD/QDSUB instructionsMans Rullgard2012-01-131-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I46c81dba0486d515f1f2b89a13fae27f6ab1e122
| | | * | | | stagefright aacenc: Remove useless inline asm for simple right shiftMans Rullgard2012-01-131-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1f40e9c16952182e974af1c86a14995259c2ade
| | | * | | | stagefright aacenc: Use ARMv6 SSAT instructionMans Rullgard2012-01-133-3/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I652eaaa54e7766d9dca80fd8cc156ca481359471
* | | | | | | am 715c78b9: am 225eec8d: am f9d4ba77: am 69aae36e: Merge "stagefright ↵Jean-Baptiste Queru2012-03-011-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aacenc: Safeguard against overwriting bits" * commit '715c78b933f8dec04882ebb73acd61fdd42c6c64': stagefright aacenc: Safeguard against overwriting bits
| * | | | | | am 69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"Jean-Baptiste Queru2012-02-291-0/+1
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '69aae36e900cf7114c5895618747906951a11730': stagefright aacenc: Safeguard against overwriting bits
| | * | | | | Merge "stagefright aacenc: Safeguard against overwriting bits"Jean-Baptiste Queru2012-02-291-0/+1
| | |\ \ \ \ \
| | | * | | | | stagefright aacenc: Safeguard against overwriting bitsMartin Storsjo2012-01-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if bits above the lowest noBitsToWrite were set, they would be ORed into the previous cache word, setting unrelated bits erroneously. This doesn't noticeably affect the performance of the codec as a whole. Change-Id: Ie9935533c4299b8f07cb14485f039a9be9c84016
* | | | | | | | Switch the way we configure for MediaPlayer retransmission.John Grossman2012-03-017-130/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd with merge conflicts addressed by hand and additional changes made in response to code review feedback. Move in the direction of a more publishable API for configuring a media player for retransmission. It used to be that we used a custom invoke and a modified URL (prefixed with aahTX://). There are many issues with this technique and it was never meant to stand the test of time. This CL gets rid of all that. A new (but currently hidden) method was introduced to the java level MediaPlayer API, called setRetransmitTarget(InetSocketAddress), which allows an app writer to set the retransmit target. For now, this method needs to be called before a call to setDataSource (which is pretty unusual for the MediaPlayer API) because this mid level code uses this as a cue to instantiate an aahTX player instead of relying on the data source to select a player. When retranmit functionality becomes part of the existing android player implemenation, this set-retrans-before-set-data-source behavior can go away, along with the aahTX player itself. Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98 Signed-off-by: John Grossman <johngro@google.com>
* | | | | | | | LibAAH_RTP: Add support for AAC in MP4.John Grossman2012-03-0110-132/+446
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry picked from Ie8298eb9d253fc6ede448da87660a60d23170987 and conflicts fixed by hand. Change-Id: I6f0a59357ba1a3d57caf67d2eb0ade7486723e7b Signed-off-by: John Grossman <johngro@google.com>
* | | | | | | Instead of hardcoding OMX component names in our code, supportAndreas Huber2012-03-014-227/+580
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a config file instead. Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
* | | | | | | Merge "Shorten thread names"Glenn Kasten2012-02-292-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Shorten thread namesGlenn Kasten2012-02-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prctl(PR_SET_NAME) limits to 15 characters. Before we had names like "Binder Thread #" and the counter was cut off :-( Also remove redundant "thread" at end of name; it's always a thread. Change-Id: I1f99c2730ba0787ed9b59c15914356cddf698e2f
* | | | | | | | Merge "AudioRecord const methods"Glenn Kasten2012-02-291-7/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | AudioRecord const methodsGlenn Kasten2012-02-281-7/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
* | | | | | | | Merge "Separate the notion of "stop" from that of "release", i.e."Andreas Huber2012-02-292-54/+186
|\ \ \ \ \ \ \ \
| * | | | | | | | Separate the notion of "stop" from that of "release", i.e.Andreas Huber2012-02-282-54/+186
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stop - means transition back to LOADED state and keeping the component instance allocated. release - means we get rid of the component completely. Change-Id: I40ad01ce70821faaad43f57999249904f9144924
* | | | | | | | Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."James Dong2012-02-286-86/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Moves TimedTextDriver.h into include/media/stagefright/timedtext.Insun Kang2012-02-276-86/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that other players can include TimedTextDriver.h properly. Change-Id: I15e72bf655de8555eef6244a6c853c27a0828a1d
* | | | | | | | am 254cf597: am 7b6b81f8: am f016dc1b: am f881fa51: Merge "stagefright amr: ↵Jean-Baptiste Queru2012-02-283-4/+6
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid C++/C99 for loops with variable declaration" * commit '254cf5973ebe5ebdce9ef261d826e88ed2f67f58': stagefright amr: Avoid C++/C99 for loops with variable declaration
| * | | | | | | am f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable ↵Jean-Baptiste Queru2012-02-273-4/+6
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | declaration" * commit 'f881fa517978adc7ea610a1982e0d071f1fd3425': stagefright amr: Avoid C++/C99 for loops with variable declaration
| | * | | | | | Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"Jean-Baptiste Queru2012-02-273-4/+6
| | |\ \ \ \ \ \
| | | * | | | | | stagefright amr: Avoid C++/C99 for loops with variable declarationMartin Storsjo2012-02-273-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the code compileable in C89 mode, too. Change-Id: I9b76f8bfca148d1aec6081b8db139f351d64cfed
* | | | | | | | | remove dependency on unneeded headersMathias Agopian2012-02-271-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I890f40c430beca055bedd95c878eb68b42f232c2
* | | | | | | | | Merge "audio preprocessing: fix multiple enable problem"Eric Laurent2012-02-271-1/+14
|\ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-05-28 23:05:18 +0000