summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove default parameters for AudioTrack"Glenn Kasten2013-08-051-11/+11
|\
| * Remove default parameters for AudioTrackGlenn Kasten2013-08-021-11/+11
| | | | | | | | | | | | The defaults aren't needed; all users must know these values. Change-Id: I0c1c97cb80bfea8e69a7cfa53ec85a91a8d48bb5
* | Merge "AudioRecord has no default sample rate"Glenn Kasten2013-08-052-3/+2
|\ \
| * | AudioRecord has no default sample rateGlenn Kasten2013-08-022-3/+2
| |/ | | | | | | Change-Id: I72feefdd6f3a623fd3669b80d4b264518fdc0929
* | Merge "Recording of non-linear formats is not supported"Glenn Kasten2013-08-051-9/+5
|\ \
| * | Recording of non-linear formats is not supportedGlenn Kasten2013-08-021-9/+5
| |/ | | | | | | | | | | Such formats are already rejected in AudioRecord::set() Change-Id: I5ba1fd9e4cd659e5226c75aa4f63e52f655e0521
* | Merge "Use screen dimensions as default video size"Andy McFadden2013-08-021-12/+49
|\ \
| * | Use screen dimensions as default video sizeAndy McFadden2013-08-021-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of 720p, use the screen dimensions as the default video size. For example, a phone with a 768x1280 display would be recorded as a 768x1280 video when in portrait, or a 1280x768 video when in landscape. If the device is not able to record at that resolution, we fall back to 720p. Also, fixed a problem introduced by a buffer timestamp change. Change-Id: I7230ddb323c669ab07327f26df8d103c192c21d3
* | | Merge "fix fallout from binderizing BufferQueues consumer side"Mathias Agopian2013-08-022-9/+4
|\ \ \ | |_|/ |/| |
| * | fix fallout from binderizing BufferQueues consumer sideMathias Agopian2013-08-012-9/+4
| | | | | | | | | | | | Change-Id: I626bac6df4fc3d8478046193f06ecc7ea60dd3a8
* | | Merge "Report underruns for fast tracks also"Glenn Kasten2013-08-025-16/+36
|\ \ \ | |/ / |/| |
| * | Report underruns for fast tracks alsoGlenn Kasten2013-07-315-16/+36
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression that was introduced earlier by commit 9f80dd223d83d9bb9077fb6baee056cee4eaf7e5 called "New control block for AudioTrack and AudioRecord". That commit broke underrun reporting for fast tracks. Also remove Track::mUnderrunCount, which counted the number of underrun events, and was only used by dumpsys media.audio_flinger. Now dumpsys media.audio_flinger reports the number of underrun frames, Isolated underrun-related control block accesses via the proxy, so that the server is not directly poking around in the control block. The new proxy APIs are AudioTrackServerProxy::getUnderrunFrames() and AudioTrackServerProxy::tallyUnderrunFrames(). getUnderrunFrames() returns a rolling counter for streaming tracks, or zero for static buffer tracks which never underrun, but do a kind of 'pause' at end of buffer. tallyUnderrunFrames() increments the counter by a specified number of frames. Change-Id: Ib31fd73eb17cbb23888ce3af8ff29f471f5bd5a2
* | am 6d4d8790: am b687ff9f: Merge "Fix mismatched delete/new couple"Glenn Kasten2013-08-011-2/+2
|\ \ | | | | | | | | | | | | * commit '6d4d879037a495f9a4276a6996d1845594ce9090': Fix mismatched delete/new couple
| * \ am b687ff9f: Merge "Fix mismatched delete/new couple"Glenn Kasten2013-08-011-2/+2
| |\ \ | | | | | | | | | | | | | | | | * commit 'b687ff9f2e02790e8a8e3964cb73e87546cd72dd': Fix mismatched delete/new couple
| | * \ Merge "Fix mismatched delete/new couple"Glenn Kasten2013-08-011-2/+2
| | |\ \
| | | * | Fix mismatched delete/new coupleAndrei V. FOMITCHEV2013-07-301-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In RecordThread::readInputParameters(), mRsmpInBuffer is allocated with new[] and should be freed with delete[] instead of delete. This error has been found by valgrind. Change-Id: I2f947abb658a21a7d1e61eebb99270cb37d2d147 Signed-off-by: Andrei V. FOMITCHEV <andreix.fomitchev@intel.com> Signed-off-by: David Wagner <david.wagner@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
* | | | | Merge "Camera: fix the metadate parcel write issue"Zhijun He2013-07-312-9/+14
|\ \ \ \ \
| * | | | | Camera: fix the metadate parcel write issueZhijun He2013-07-312-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also rename the frameId to requestId to make it less confusing. Change-Id: I14a20b6fcabb86294afb31fc0c56397e185c1373
* | | | | | Unregister any handlers still registered on now "dead" ALoopersAndreas Huber2013-07-313-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | upon the death of an ALooper. Change-Id: I64c0835b8db04486204f3d0fa7173ee53708a116 related-to-bug: 10106648
* | | | | | am b57fb786: am d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"Andreas Huber2013-07-311-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | | * commit 'b57fb786a32d4ea78cd8bbf24a65593353d87a88': rtsp handle response line ended with '\n'
| * | | | am d0ef1ccd: Merge "rtsp handle response line ended with \'\n\'"Andreas Huber2013-07-311-0/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'd0ef1ccd987e650e025b840e72f91770d03a5110': rtsp handle response line ended with '\n'
| | * | | Merge "rtsp handle response line ended with '\n'"Andreas Huber2013-07-311-0/+3
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | rtsp handle response line ended with '\n'Yajun Zeng2013-07-311-0/+3
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I5bfafd3fa2c95083e833da2846556282eada2b02 Signed-off-by: Yajun Zeng <beanz@marvell.com>
* | | | Merge "Add resampler comments and fix a typo"Glenn Kasten2013-07-304-4/+16
|\ \ \ \
| * | | | Add resampler comments and fix a typoGlenn Kasten2013-07-304-4/+16
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie071673875f663de4212eed4a4dff89d51a5a915
* | | | | Remove default channel mask in AudioRecord constructor and set()Glenn Kasten2013-07-301-8/+8
| |_|_|/ |/| | | | | | | | | | | Change-Id: I22ad4ba8777842bf6705e79c6ad796fdb9a4104c
* | | | Camera: Rename new API to camera2, rearrange camera serviceEino-Ville Talvala2013-07-3067-178/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Support API rename from photography to camera2 - Reorganize camera service files - API support files to api1/, api2/, api_pro/ - HAL device support files into device{1,2,3}/ - Common files into common/ - Camera service remains at top-level Change-Id: Ie474c12536f543832fba0a2dc936ac4fd39fe6a9
* | | | Move control block mName to createTrack() outputGlenn Kasten2013-07-3010-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of a series of CLs to clean up the shared memory control block, by removing any fields that don't have to be there. Change-Id: I6e51003a1293b6800258c31b22cff2eba42162e7
* | | | Rename control block flags to mFlagsGlenn Kasten2013-07-306-32/+33
| | | | | | | | | | | | | | | | Change-Id: I7b6d31e24531954ab1ecdf3ed56c19433700bd89
* | | | Merge "AudioRecord and HAL input stream must be 16-bit PCM only"Glenn Kasten2013-07-303-7/+22
|\ \ \ \
| * | | | AudioRecord and HAL input stream must be 16-bit PCM onlyGlenn Kasten2013-07-243-7/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there are 16-bit PCM assumptions in several places for capture: - resampler API - mRsmpInBuffer and mRsmpOutBuffer - RecordThread::threadLoop upmix, downmix, and resampling - possibly other places Until those assumptions are removed, this CL enforces 16-bit PCM in both client and server at all places where a format is checked. Change-Id: I08b0570bff626ad0d341804825a72c14e61b4233
* | | | Rename control block server to mServer and add commentsGlenn Kasten2013-07-304-15/+19
| | | | | | | | | | | | | | | | Change-Id: Ieabd91acee92d0e84e66fbd358df5282b856306e
* | | | Use correct type for OutputDescriptor::formatGlenn Kasten2013-07-302-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ide608ef452d57da29b708180d90470361c123d1d
* | | | Merge "Fix theoretical race using TrackBase::sampleRate()"Glenn Kasten2013-07-302-5/+8
|\ \ \ \
| * | | | Fix theoretical race using TrackBase::sampleRate()Glenn Kasten2013-06-262-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In two places we assumed that TrackBase::sampleRate() would return the same value when it is called twice in the same function. This is not guaranteed; sampleRate() reads from the control block so the return value could change. To fix this, only call sampleRate() once and cache the return value to get a consistent value. This was only a theoretical race. In MixerThread::prepareTracks_l() it would have no bad effect. In TimedTrack::getNextBuffer() it could cause a real problem, but we don't currently support dynamic sample rate ratios for timed tracks. Change-Id: I8e5c33f0121fc058d1e70c2ab5e9135397d3e0b7
* | | | | Remove CC_LIKELY and CC_UNLIKELY where not neededGlenn Kasten2013-07-293-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only keep them in performance-sensitive code Change-Id: Ib257ddd7bc39ce9896997ffae008c524ac743d01
* | | | | Rename RecordThread::mInputBytes to the more generic mBufferSizeGlenn Kasten2013-07-292-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares for using it in PlaybackThreads later Change-Id: Id90a92aa6372e4b69914b0008cef07296ca5d6a3
* | | | | Move members from ThreadBase to PlaybackThreadGlenn Kasten2013-07-292-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move mNormalFrameCount and frameCountHAL(), since they're not used by record threads. Also comment which fields are updated by readParameters(). Change-Id: I5fc0a8a89cc637976f22d49271a5a3e136dab4e1
* | | | | Merge "Fix typo in AwesomePlayer"Andreas Huber2013-07-291-1/+1
|\ \ \ \ \
| * | | | | Fix typo in AwesomePlayerSungsoo Lim2013-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I32113e382a3033c9a1b038dc06e4ccddc2a97d7f
* | | | | | Merge "Use standard name and type for channel mask"Glenn Kasten2013-07-294-11/+11
|\ \ \ \ \ \
| * | | | | | Use standard name and type for channel maskGlenn Kasten2013-07-244-11/+11
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Former name 'channels' was ambiguous with respect to channel count. Change-Id: I716f792d95a7e0c787d27514ad6e93dbcef8a415
* | | | | | Merge "camera2 api: Override default RGBx formats to IMPLEMENTATION_DEFINED"Igor Murashkin2013-07-291-2/+2
|\ \ \ \ \ \
| * | | | | | camera2 api: Override default RGBx formats to IMPLEMENTATION_DEFINEDIgor Murashkin2013-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9487482 Change-Id: I09d3b4e41454d350c4bc7b1f8e893c3dad655e73
* | | | | | | Merge "Simplify getParameters()"Glenn Kasten2013-07-291-12/+6
|\ \ \ \ \ \ \
| * | | | | | | Simplify getParameters()Glenn Kasten2013-07-251-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iedfeca3cd477d023c350d6d4e6eed874ee467a32
* | | | | | | | Merge "Treat mChannelCount as uint32_t consistently"Glenn Kasten2013-07-293-6/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Treat mChannelCount as uint32_t consistentlyGlenn Kasten2013-07-293-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mChannelCount was 8-, 16-, or 32-bits Change-Id: I2cc2fedf3e33144e5c8bbd9894763282d9217f63
* | | | | | | | | Merge "Fail more gracefully on version mismatch"Marco Nelissen2013-07-291-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fail more gracefully on version mismatchMarco Nelissen2013-07-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b/9900647 Change-Id: I9ea508a2685ff8adc780edd5ecec30dd1a9b0997