summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Simplify track 'needs' bitsGlenn Kasten2013-11-062-26/+20
| | | | | | | Use more standard coding convention for bit masks, and add a FIXME about max channel count. Change-Id: I856784016703417ee480b92ae73757c472f9cf95
* Remove redundant this->Glenn Kasten2013-11-061-2/+2
| | | | Change-Id: Id783201e802b6ce294fa92f4bbe492adfb446686
* Remove dead codeGlenn Kasten2013-11-061-2/+0
| | | | Change-Id: Ide9196aa348cd3846b5c71d51fe6538f38ea8dc2
* Merge "Fix race condition in initializing downmix"Glenn Kasten2013-11-062-27/+28
|\
| * Fix race condition in initializing downmixGlenn Kasten2013-11-062-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code that initializes downmix GUID searches for an effect of the right type. If two or more AudioMixers are created, there is a possibility that the GUID will temporarily have the wrong value. Now the initialization is only done once, regardless of how many AudioMixers there are. Other minor changes: - use naming convention of leading 's' for static member variables - log message for no downmix effect is now a warning instead of an error, since it is not an error until there is actual content to downmix without a downmix effect Change-Id: I33ab0e51cf9d24ecaf8ae868883736b0772178c4
* | Merge "Support TS + AC3 for ATSC standard"Changwan Ryu2013-11-066-0/+255
|\ \
| * | Support TS + AC3 for ATSC standardChangwan Ryu2013-11-066-0/+255
| | | | | | | | | | | | Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
* | | Merge "Support AC3 in stagefright"Changwan Ryu2013-11-064-1/+74
|\ \ \ | |/ /
| * | Support AC3 in stagefrightChangwan Ryu2013-11-064-1/+74
| | | | | | | | | | | | Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
* | | Merge "Move local declarations to point of first use"Glenn Kasten2013-11-061-2/+1
|\ \ \
| * | | Move local declarations to point of first useGlenn Kasten2013-11-041-2/+1
| | |/ | |/| | | | | | | Change-Id: I8a078386e371caab5174fc07b47f48fb9f21609a
* | | am 44dc9155: am 48b6cd98: Merge "audioflinger: fix direct output underrun" ↵Eric Laurent2013-11-061-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '44dc91554521eaab478674a7f812cb8a4fa4f809': audioflinger: fix direct output underrun
| * \ \ am 48b6cd98: Merge "audioflinger: fix direct output underrun" into klp-devEric Laurent2013-11-061-0/+6
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '48b6cd98b23b2cf9dee88f075f7575ecb5aaf545': audioflinger: fix direct output underrun
| | * \ \ Merge "audioflinger: fix direct output underrun" into klp-devEric Laurent2013-11-061-0/+6
| | |\ \ \
| | | * | | audioflinger: fix direct output underrunEric Laurent2013-11-051-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Underruns on tracks handled by a direct or offloaded threads were not properly reported to the applications causing a failure to automatically recover. Bug: 11535001. Change-Id: I7a8696b4d646f78b16710addfe7c108d0dd0038d
* | | | | | Merge "Rename TrackPaused to trackPaused"Glenn Kasten2013-11-061-3/+3
|\ \ \ \ \ \
| * | | | | | Rename TrackPaused to trackPausedGlenn Kasten2013-11-041-3/+3
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: I3b38e0c9a6bbb6e18cb5b1f72670139a3071cb8f
* | | | | | Merge "Use const more places"Glenn Kasten2013-11-062-3/+3
|\ \ \ \ \ \
| * | | | | | Use const more placesGlenn Kasten2013-11-042-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: Ibc068d319d6fff26f2d11248e17481d8f7f027e0
* | | | | | Merge "Clean up channel mask handling"Glenn Kasten2013-11-061-4/+3
|\ \ \ \ \ \
| * | | | | | Clean up channel mask handlingGlenn Kasten2013-10-301-4/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use type audio_channel_mask_t instead of uint32_t. Use function audio_channel_out_mask_from_count() to convert from channel count to channel mask instead of hard-coded assumption. Rename 'channels' to 'channelMask' to avoid confusion with channel count. Change-Id: I21a85e668458b773d108f95c2381eef9c4816251
* | | | | | am 92168885: am f8a1169d: Merge "Notify current video size if available" ↵Marco Nelissen2013-11-041-1/+10
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '921688852b72bfa921913b8afe18c0d749c6797d': Notify current video size if available
| * | | | | am f8a1169d: Merge "Notify current video size if available" into klp-devMarco Nelissen2013-11-041-1/+10
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'f8a1169d98a09d1473f289c363353d08301576f6': Notify current video size if available
| | * | | | Merge "Notify current video size if available" into klp-devMarco Nelissen2013-11-041-1/+10
| | |\ \ \ \
| | | * | | | Notify current video size if availableMarco Nelissen2013-11-011-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/11248101 Change-Id: I0fa3b5592efcf400c86692002267da6825e331ad
* | | | | | | am 2922d230: am 065789f2: Merge "Restore NuPlayer error and EOS handling" ↵Lajos Molnar2013-11-042-4/+10
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '2922d230155cb1be7acc0c11bef6f0ca0345bdb7': Restore NuPlayer error and EOS handling
| * | | | | | am 065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-devLajos Molnar2013-11-042-4/+10
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '065789f24890b0a9f3614dc175e6f7664af1f2ce': Restore NuPlayer error and EOS handling
| | * | | | | Merge "Restore NuPlayer error and EOS handling" into klp-devLajos Molnar2013-11-012-4/+10
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Restore NuPlayer error and EOS handlingLajos Molnar2013-10-302-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was erroneously removed by commit a73c954 Change-Id: I4742339139e770f0181c99d427875897fd60b68e Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11413439
* | | | | | | am 4cf799fb: am 5c7ffaed: Merge "AudioFlinger: fix duplicating thread ↵Eric Laurent2013-10-311-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | standby." into klp-dev * commit '4cf799fbbb74de102d34ccb014ba7fbd9bfa5e14': AudioFlinger: fix duplicating thread standby.
| * | | | | am 5c7ffaed: Merge "AudioFlinger: fix duplicating thread standby." into klp-devEric Laurent2013-10-311-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5c7ffaed6f04b844c2e4e2024bfb0203ac2233dd': AudioFlinger: fix duplicating thread standby.
| | * | | | Merge "AudioFlinger: fix duplicating thread standby." into klp-devEric Laurent2013-10-311-0/+1
| | |\ \ \ \
| | | * | | | AudioFlinger: fix duplicating thread standby.Eric Laurent2013-10-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fd47797 fixing issue 11247103 introduced a regression where the duplicating thread does not exit standby state as expected. This in turn prevents the tracks sending audio to other threads to complete their activity cycle normally. The fix conists in clearing mStandby state also in the specialized threadLoop_write() method of DuplicatingThread subclass. Bug: 11451415. Change-Id: Ie8a92c819a56a2834ea25fa70a8b7b2125721775
* | | | | | | Support for MPEG2 videoChangwan Ryu2013-10-312-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597
* | | | | | | am 34790c86: am 3ff5792a: Merge "camera: Collect stack traces when bad ↵Igor Murashkin2013-10-305-0/+171
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | things happen, print with dumpsys" into klp-dev * commit '34790c866cdc309e3779b811db43f63aa7eae7ef': camera: Collect stack traces when bad things happen, print with dumpsys
| * | | | | | am 3ff5792a: Merge "camera: Collect stack traces when bad things happen, ↵Igor Murashkin2013-10-305-0/+171
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | print with dumpsys" into klp-dev * commit '3ff5792adfdbf67662a5f8064315a55690d53944': camera: Collect stack traces when bad things happen, print with dumpsys
| | * | | | | Merge "camera: Collect stack traces when bad things happen, print with ↵Igor Murashkin2013-10-305-0/+171
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | dumpsys" into klp-dev
| | | * | | | camera: Collect stack traces when bad things happen, print with dumpsysIgor Murashkin2013-10-295-0/+171
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 11324229 Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
* | | | | | | am 8578eb36: am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works ↵Lajos Molnar2013-10-301-0/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after reset" into klp-dev * commit '8578eb364799f83c6f237d286e1447c02db6afbc': AwesomePlayer: ensure STARTED message works after reset
| * | | | | | am c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" ↵Lajos Molnar2013-10-301-0/+5
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'c76b9f52cf4e39f6943c53f5b3657dfee65857ac': AwesomePlayer: ensure STARTED message works after reset
| | * | | | | Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-devLajos Molnar2013-10-301-0/+5
| | |\ \ \ \ \
| | | * | | | | AwesomePlayer: ensure STARTED message works after resetLajos Molnar2013-10-281-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I06217c07c0b68476cb296fd6151f6a0d8d4e02d0 Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 11412881
* | | | | | | | am b6b97f60: am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to ↵Lajos Molnar2013-10-291-0/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | output buffers" * commit 'b6b97f6071a3948494b5e9cb1a9c175157bdaf07': avcenc: Prepend startcodes to output buffers
| * | | | | | | am eb76f318: am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'eb76f318e9daf91dbf195bcb74852b3bd736a32a': avcenc: Prepend startcodes to output buffers
| | * \ \ \ \ \ \ am 96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '96aed4fb18e5303b039cc7e5dc252e0827491d09': avcenc: Prepend startcodes to output buffers
| | | * \ \ \ \ \ \ Merge "avcenc: Prepend startcodes to output buffers"Lajos Molnar2013-10-291-0/+6
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | avcenc: Prepend startcodes to output buffersMartin Storsjo2013-09-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the encoder output data that is similar to what actual HW encoders output. This form is also what is expected by virtually every other component - the only exception seems to be stagefright's MPEG4Writer which happens to work with this format. This also makes the encoder's output work in other decoders when passing through directly. If feeding the encoded data straight through to a decoder (such as in the EncodeDecodeTest CTS test), the output from OMX.google.h264.encoder cannot be decoded by e.g. OMX.Nvidia.h264.decode on a Nexus 7 or OMX.SEC.avc.dec on a Galaxy S3. Change-Id: I6e16433a4a66936e3080723c8233681f53bd55e5
* | | | | | | | | | | am ce275b7d: am 1c594b63: Merge "audioflinger: enable effects after ↵Eric Laurent2013-10-292-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | / | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | registration if needed" into klp-dev * commit 'ce275b7dd20e3d4781a46126c753e6eb998e6c0f': audioflinger: enable effects after registration if needed
| * | | | | | | | | am 1c594b63: Merge "audioflinger: enable effects after registration if ↵Eric Laurent2013-10-292-0/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed" into klp-dev * commit '1c594b637df26499ce1dae2db34f2b3290efd838': audioflinger: enable effects after registration if needed
| | * | | | | | | | Merge "audioflinger: enable effects after registration if needed" into klp-devEric Laurent2013-10-302-0/+3
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
generated by cgit v1.1 at 2025-01-10 08:47:13 +0000