summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rotate fallback sizeAndy McFadden2013-09-191-5/+9
| | | | | | | | | | If configuring the encoder for display-size recording fails, we drop back to 720p. This was done a bit too literally, and didn't look good in portrait mode. Rotate the fallback size as needed. Bug 10826876 Change-Id: Id3130471fc1467afa8bf91d75c9d4a49245253c3
* LoudnessEnhancer audio effect implementationJean-Michel Trivi2013-09-1719-0/+1872
| | | | | | | | | | | | Implementation based on DRC effect, controlled by a target gain. The target gain is used to amplify the signal at the input of the DRC, and to compute the knee of the DRC. Bug 8413913 Change-Id: I386d64793a9fa3f7218e053d6f0a99f6836c02bd
* Merge "Fix underruns when fast track denied due to SRC" into klp-devGlenn Kasten2013-09-173-39/+37
|\
| * Fix underruns when fast track denied due to SRCGlenn Kasten2013-09-173-39/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSL ES requests a fast track. If sample rate conversion is needed, the request is denied by server, and a larger client buffer is used to handle the higher latency of a normal track. However the client notification period was calculated based on buffer being divided into 2 sub-buffers. That resulted in the notification period being too long. The server pulls chunks that are smaller than half the total buffer. So now the client uses 3 sub-buffers when there is SRC. Also removed the 'defer wake' optimization because it was incorrect. This optimization attempted to reduce the number of wakeups of client, when server releaseBuffer knows that another releaseBuffer will be following. But there is no way for the first releaseBuffer to predict how soon the second releaseBuffer will occur. In some cases it was a long time, and the client underran. So now the client is woken up immediately if the total number of available frames to client is >= the minimum number the client wants to see (the notification period). Also fix bug where minimum frame count was not being used in the calculation of notification period. Bug: 10342804 Change-Id: I3c246f4e7bc3684a344f2cf08268dc082e338e2a
* | Merge "Fix hang" into klp-devMarco Nelissen2013-09-161-1/+1
|\ \
| * | Fix hangMarco Nelissen2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | Specify that the surface is controlled by the app, to avoid a hang. b/10531761 Change-Id: Idccc2c73aa3d368d8e7fbdc071ce36e2382efea4
* | | Merge "Camera3: Always set a trigger ID for an active trigger" into klp-devEino-Ville Talvala2013-09-162-0/+51
|\ \ \
| * | | Camera3: Always set a trigger ID for an active triggerEino-Ville Talvala2013-09-162-0/+51
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to work around HAL implementations that expect to see an ID for every trigger. Use a dummy trigger ID of 1, since 0 has special meaning for older HALs. Bug: 10720617 Change-Id: I9cb1b8dbcb113cb9e737e5adb04032fd61a54c12
* | | Merge "Camera: setCallBackWindow only if callback surface is used" into klp-devZhijun He2013-09-161-1/+1
|\ \ \
| * | | Camera: setCallBackWindow only if callback surface is usedZhijun He2013-09-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling setCallBackWindow without checking the previewCallbackSurface could make the stream to be deleted during callback stream operation, which is bad because the preview is still active and the delete fails. Bug: 10730496 Change-Id: I8addac25e5aa7901bf200d730c749bee2c088090
* | | | Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into ↵Chong Zhang2013-09-162-5/+9
|\ \ \ \ | |/ / / |/| | | | | | | klp-dev
| * | | Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flagsChong Zhang2013-09-112-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also update seek flag in NuPlayerDriver, otherwise MediaPlayer will get wrong flags. Bug: 10676387 Change-Id: Ice30f27a9a04e37b4718d26228a407fea8d9e4fc
* | | | Camera: Don't overwrite the error statusZhijun He2013-09-151-1/+1
| |/ / |/| | | | | | | | | | | Bug: 10749544 Change-Id: I6096effde03e18ee1b8c63cf3b36dce0344054c5
* | | Merge "Fix SoundPool.play() looping" into klp-devGlenn Kasten2013-09-141-2/+2
|\ \ \
| * | | Fix SoundPool.play() loopingGlenn Kasten2013-09-111-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by configuring SoundPool for shared memory and fast track. Previously SoundPool used a streaming track, and looping in streaming mode relied on the ability to loop the most recently enqueued data. That 'feature' was lost in the new implementation of streaming, so we're now switching from streaming mode to shared memory mode. Shared memory mode had always been desired, but was blocked by bug 2801375 which is fixed now. Bug: 10171337 Change-Id: I2a938e3ffafa2a74d5210b4198b50db20ad5da0e
* | | Merge "audioflinger: fix ro.audio.silent in offload mode" into klp-devEric Laurent2013-09-141-2/+4
|\ \ \
| * | | audioflinger: fix ro.audio.silent in offload modeEric Laurent2013-09-131-2/+4
| | |/ | |/| | | | | | | Change-Id: I5a1a79000d53146689b0a198cc5419c36509703f
* | | Merge "Camera: Limit supported preview sizes" into klp-devZhijun He2013-09-132-20/+61
|\ \ \
| * | | Camera: Limit supported preview sizesZhijun He2013-09-132-20/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES can provide sizes as large as jpeg sizes, which could cause potential issues when trying to do full size still capture and full size preview. This is not supported by many devices due to hardware limitation. This change limits the preview (as well video) size to no more than 1080p. Bug: 10625115 Change-Id: I9467ab843553ec06e8249b4a17c0ecf4c6d6f04e
* | | | audioflinger: longer offload thread standby delayEric Laurent2013-09-132-9/+24
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Increase offloaded output thread standby delay to 1 second to allow transition between tracks with going to stanby if reusing the same audio track (gapless) - Make sure pause/flush/resume sequence is sent to the HAL in the right order - Fix format display in track dump Bug: 8174034. Change-Id: I43ef6f8fdbf7427e4eff6cc2d0665d7d1463ea8a
* | | Merge "Fix MediaDrm cts tests" into klp-devJeff Tinker2013-09-123-0/+899
|\ \ \
| * | | Fix MediaDrm cts testsJeff Tinker2013-09-113-0/+899
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving the build of the mock MediaDrm plugin back to frameworks/av since it can't be installed by cts. b/10668350 Change-Id: Id662bdb0775389b458f86a299392217f2d959422
* | | | Merge "ACodec: fix flush/resume for decoder-output-meta-data mode" into klp-devLajos Molnar2013-09-121-2/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | ACodec: fix flush/resume for decoder-output-meta-data modeLajos Molnar2013-09-121-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When in decoder-output-meta-data mode, ACodec does not hold onto buffers, but they are either with the native window, or with the component/client. However, for flushing we did not release the discarded buffers back to native window (this makes sense because they will be resubmitted shortly.) This logic can be handled by the normal resubmission. Change-Id: Ic472b386422251515ef12f426e187f208f14decc Signed-off-by: Lajos Molnar <lajos@google.com> Bug: 10621959 Bug: 10192533
* | | | Merge "Fix AudioTrack shared memory leak" into klp-devGlenn Kasten2013-09-122-1/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Fix AudioTrack shared memory leakGlenn Kasten2013-09-112-1/+14
| | | | | | | | | | | | | | | | | | | | Bug: 2801375 Change-Id: I50e15164fe310f69ea019dca5b49171a02bc6992
* | | | Merge "audioflinger: add HOTWORD audio source." into klp-devEric Laurent2013-09-126-2/+33
|\ \ \ \
| * | | | audioflinger: add HOTWORD audio source.Eric Laurent2013-09-106-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HOTWORD is a special capture audio source that uses the same audio tuning as VOICE_RECOGNITION but allows an active capture to be preempted. Bug: 10640877. Change-Id: Iea09a11cbcdbacc8d434e5230e7559dcd1b44ac0
* | | | | Pass subtitle track properties to getTrackInfoChong Zhang2013-09-111-0/+7
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | Bug: 10326117 Change-Id: I15fcc49ad02e26d7cc92e82ee670bafca62a09a7
* | | | Merge "Make sure the encoder instance is safely release()'d before its" into ↵Andreas Huber2013-09-101-2/+22
|\ \ \ \ | | | | | | | | | | | | | | | klp-dev
| * | | | Make sure the encoder instance is safely release()'d before itsAndreas Huber2013-09-061-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reference count drops to 0. Change-Id: I6601226e2754f17e964125cacf02dc02cfbf6231 related-to-bug: 10150263
* | | | | MediaMuxer: Hook up setLocation methodZhijun He2013-09-092-0/+20
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | This method is needed when mediamuxer is used for camera video recording. Bug: 10594784 Change-Id: I9bd006a07e5e2ac7019849e3f4f7cf7b8356d669
* | | | Merge "camera3: Dump latest request sent with dumpsys" into klp-devIgor Murashkin2013-09-092-1/+78
|\ \ \ \
| * | | | camera3: Dump latest request sent with dumpsysIgor Murashkin2013-09-062-1/+78
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10606535 Change-Id: I0dd5ca3e09f45701659ab9ebd3b51939a2f6e6ba
* | | | | Merge "audioflinger: no effects on offloaded tracks" into klp-devEric Laurent2013-09-095-13/+83
|\ \ \ \ \
| * | | | | audioflinger: no effects on offloaded tracksEric Laurent2013-09-095-13/+83
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Invalidate offloaded tracks when an effect is enabled so that the track is recreated in PCM mode and the effect can be applied. This is temporary until effect offloading is implemented. Bug: 8174034. Change-Id: I77b8b54a10db6cb8334be76d863ea7e720eaad09
* | | | | Camera: Correct stream id typesZhijun He2013-09-089-35/+33
|/ / / / | | | | | | | | | | | | | | | | Bug: 10604704 Change-Id: I223ac5d200eb6439c08955fb7ad586592099fbae
* | | | Camera: Send VIDEO_SNAPSHOT intent for video snapshot caseZhijun He2013-09-061-0/+6
|/ / / | | | | | | | | | | | | Bug: 9924539 Change-Id: Ief39eff79c31f2c2aa5df2fe1a0f04c4afc74690
* | | audioflinger: remove async write race conditionsEric Laurent2013-09-062-53/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | Remove possible race conditions between async callback thread and offload thread when clearing and setting the draining and write blocked flags. Bug: 8174034. Change-Id: I7af10491f39dc0e7d7414862a9d8e763daa2e2b7
* | | Effect Offload Proxy for effects offloadjpadmana2013-09-064-1/+408
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effect Proxy abstracts the sub effects to the upper layers. It has the following functionalities: - creation and release of sub effects - routing the effect commands and process to the appropriate sub effect Bug: 8174034. Change-Id: I22d8136636048e7fe8f8807cbc6e348ffa200a22 Signed-off-by: jpadmana <rpadmanaban.jayashree@gmail.com>
* | | Merge "Effects Factory changes for effects offload" into klp-devEric Laurent2013-09-064-2/+298
|\ \ \
| * | | Effects Factory changes for effects offloadjpadmana2013-09-064-2/+298
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio_effects.conf - commented changes to illustrate the addition of Proxy and sub effects to the conf file Added an effectFactoryApi - EffectGetSubEffects for querying the sub effect descriptors from the factory. This api is used by the Proxy to get the sub effects Added functions and data structures in factory code for loading the sub effects gSubEffectList - has the Proxies and their corresponding sub effects - addSubEffect() - reads a sub effect node and adds to the gSubEffectList - findSubEffect() - searches through the gSubEffectList to find a SubEffect Bug: 8174034. Change-Id: I25b0c62b2ad523a52337128b51469e628209ea3e Signed-off-by: jpadmana <rpadmanaban.jayashree@gmail.com>
* | | | Merge "Better workaround for slow decoders." into klp-devMarco Nelissen2013-09-061-4/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Better workaround for slow decoders.Marco Nelissen2013-09-041-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is more in the spirit of the original code. Now it checks whether a codec instantiated by name is a video codec, and enables the extra looper if so. b/10528409 Change-Id: Ia253c04c1283d4ecf66f213ef4bf523279ad7cca
* | | | Merge "camera: Fix race condition between setParameters() and ↵Ruben Brunk2013-09-061-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | stopPreview()." into klp-dev
| * | | | camera: Fix race condition between setParameters() and stopPreview().Ruben Brunk2013-09-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10414772 Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9
* | | | | Merge "Start 'am' with exec()" into klp-devAndy McFadden2013-09-051-15/+55
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Start 'am' with exec()Andy McFadden2013-09-041-15/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were using system() to run 'am broadcast'. Switch to fork()+exec(). Bug 10606037 Change-Id: Ifae1a2b4f1914f015d09f2cac8cd0b1896d87a84
* | | | | Merge "wifi-display: do not use HDCP's encryptNative method if its ↵Chong Zhang2013-09-045-1/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | unsupported" into klp-dev
| * | | | | wifi-display: do not use HDCP's encryptNative method if its unsupportedChong Zhang2013-09-035-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10609422 Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402