summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
* | | | | | Merge "Fix CameraService error flag when running HAL1 with API2." into klp-devRuben Brunk2013-09-041-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix CameraService error flag when running HAL1 with API2.Ruben Brunk2013-09-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10620944 Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d
* | | | | | Merge " Fixed timestamp handling in ESQueue Access Unit parser. This ↵Rachad2013-09-041-6/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | fixes bug b/10294801" into klp-dev
| * | | | | Fixed timestamp handling in ESQueue Access Unit parser.Rachad2013-08-301-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes bug b/10294801 Change-Id: Ie96d36e2ff6fdee0c949a85da3602ab04b34bf6e
* | | | | | Merge "Work around decoder slowness" into klp-devMarco Nelissen2013-09-041-0/+2
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | Work around decoder slownessMarco Nelissen2013-09-031-0/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | b/10528409 Change-Id: Ifcaf0488d63e87676b1e9382437943138deb76a6
* | | | Fix miscellanous AudioTrack::getTimestamp() bugsGlenn Kasten2013-09-033-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that get_presentation_position is non-NULL before calling. AudioTrack::getTimestamp not implemented for fast tracks. Fix typo in Track::getTimestamp(). Fix bugs in AudioTrack::getTimestamp after stop: - getTimestamp while stopped is not allowed. - stop, start, getTimestamp now returns the correct value. Change-Id: Ie8d9dc1f28d8927634e04175a68b147ffc2ea8eb
* | | | Implement MonoPipe::getTimestampGlenn Kasten2013-09-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | using SingleStateQueue observer Change-Id: I7b1928b087f1e676c7b291df6cefa7707301662c
* | | | FastMixer computes presentation timestamps for fast tracksGlenn Kasten2013-09-031-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | and forwards them to each track's ExtendedAudioBufferProvider::onTimestamp(). Change-Id: I06fb9586bb7e20d5c0289abdc8cac6cd3fd2f6e8
* | | | Add ExtendedAudioBufferProvider::framesReleased and onTimestampGlenn Kasten2013-09-035-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | and implement them in SourceAudioBufferProvider using the associated NBAIO_Source, and in Track using the associated AudioTrackServerProxy. Change-Id: I60dc4adba63fc1dc452ff16caf347e4a7c8242c2
* | | | Add NBAIO_Source::onTimestamp()Glenn Kasten2013-09-033-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with dummy default implementation, and implement in MonoPipeReader. onTimestamp is meant to be called by the corresponding sink when it has a new timestamp available. Change-Id: I8a90d24d1061e4a592ce5bd8ee1c9fce6bdd8a84
* | | | Instantiate SingleStateQueue<AudioTimestamp>Glenn Kasten2013-09-035-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | as typedef AudioTimestampSingleStateQueue and use it in MonoPipe. Change-Id: Idaebb362bd9d0a81a7ed83792ab9369dc37c0e74
* | | | Merge "Add NBAIO_Sink::getTimestamp()" into klp-devGlenn Kasten2013-09-036-1/+31
|\ \ \ \
| * | | | Add NBAIO_Sink::getTimestamp()Glenn Kasten2013-09-036-1/+31
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with a real implementation in AudioStreamOutSink for dummy implementation initially in MonoPipe. Use in AudioFlinger::PlaybackThread::threadLoop_write() to keep the input to the timestamp latch up-to-date. Change-Id: I10ef277991b63bb43d55d6f3df75116ef32246cd
* | | | Merge "AAC encoder: handle missing object types" into klp-devJean-Michel Trivi2013-09-031-0/+4
|\ \ \ \
| * | | | AAC encoder: handle missing object typesJean-Michel Trivi2013-08-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio object type for parametric stereo and lowdelay was not passed to the FDK AAC encoder. Bug 9428126 Change-Id: Ic32822afff8b1da6a2d80c1b65d514f24059fb29
* | | | | Camera2/3: Increase precapture start timeoutEino-Ville Talvala2013-09-031-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we only wait 200 ms for the HAL to switch to the precapture state. This is insufficient at low preview frame rates (dark conditions, ~10 fps), where a 3-request-deep HAL pipeline will take 300 ms to produce a precapture trigger output. In those cases, we would prematurely skip the precapture sequence, causing bad quality pictures. Since this is a fallback timeout to prevent deadlock in case of a bad HAL or framework implementation, increase the timeout to 1 second. Has no impact on correctly-working implementations Bug: 10430191 Change-Id: I08e99f8e7f3beb8f15dcee32632cdebfe3dca8b3
* | | | Revert "Enhancement for OnInfo callback on DRM Framework"Jeff Tinker2013-09-033-237/+4
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5ff7836da0220b3097f36c8a5e82111816ebca62. Fixes Fatal signal 6 (SIGABRT)" when playing or downloading a video bug: 10542864 Change-Id: I7f81a41c3acdbeb571a514b3f65e7ba37d403cca
* | | Merge "Revert "Fix decoder EOS handling"" into klp-devEric Laurent2013-08-316-208/+202
|\ \ \
| * | | Revert "Fix decoder EOS handling"Eric Laurent2013-08-306-208/+202
| | |/ | |/| | | | | | | | | | | | | | | | This reverts commit 9da36a6c8df70a5c8179ac78fab33cfbb5078cb2. Bug: 10571297. Change-Id: I76f20fe34872ea54fce626077462fb86c8c3f02e
* | | audioflinger: offloaded tracks flush/pause orderEric Laurent2013-08-301-4/+6
|/ / | | | | | | | | | | | | Make sure that a flush received after a pause is forwarded to the HAL after the pause. Change-Id: Ib3221f70c59f8b3dbbac20b23104f6b779b75be0
* | Merge "camera: Fix deadlock when sending callbacks during disconnect" into ↵Igor Murashkin2013-08-301-6/+4
|\ \ | | | | | | | | | klp-dev