OSDN Git Service
Glenn Kasten [Tue, 17 Sep 2013 21:50:42 +0000 (14:50 -0700)]
am
fc270954: am
e56f3c96: Merge "strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe."
* commit '
fc270954192ef7e15ac2c88daadd8890d22096e3':
strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe.
Glenn Kasten [Tue, 17 Sep 2013 21:47:57 +0000 (14:47 -0700)]
am
e56f3c96: Merge "strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe."
* commit '
e56f3c96fa6e7550b67e8b049f999aaa2ada1192':
strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe.
Glenn Kasten [Tue, 17 Sep 2013 21:46:05 +0000 (21:46 +0000)]
Merge "strtok stores its values in thread local storage. So it can not guarantee works well when multithread environment. AudioFlinger has multithread. so strtok_r is more safe."
seunghak.han [Sat, 7 Sep 2013 05:59:43 +0000 (14:59 +0900)]
strtok stores its values in thread local storage.
So it can not guarantee works well when multithread environment.
AudioFlinger has multithread.
so strtok_r is more safe.
Change-Id: I6d77ef9cc49a4478dd856dcdca14e4920ce955c6
Marco Nelissen [Mon, 16 Sep 2013 23:01:23 +0000 (16:01 -0700)]
am
bc910e5c: Merge "Fix hang" into klp-dev
* commit '
bc910e5c8d05f24531bd6b11379cf41cc73415ed':
Fix hang
Marco Nelissen [Mon, 16 Sep 2013 22:57:17 +0000 (22:57 +0000)]
Merge "Fix hang" into klp-dev
Eino-Ville Talvala [Mon, 16 Sep 2013 22:47:56 +0000 (15:47 -0700)]
am
a099d1f6: Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev
* commit '
a099d1f6be3fbbb1af4c12b2ab627397f0826982':
Camera3: Always set a trigger ID for an active trigger
Eino-Ville Talvala [Mon, 16 Sep 2013 22:45:56 +0000 (22:45 +0000)]
Merge "Camera3: Always set a trigger ID for an active trigger" into klp-dev
Marco Nelissen [Mon, 16 Sep 2013 20:30:01 +0000 (13:30 -0700)]
Fix hang
Specify that the surface is controlled by the app, to avoid a hang.
b/
10531761
Change-Id: Idccc2c73aa3d368d8e7fbdc071ce36e2382efea4
Zhijun He [Mon, 16 Sep 2013 18:28:02 +0000 (11:28 -0700)]
am
72a2f171: Merge "Camera: setCallBackWindow only if callback surface is used" into klp-dev
* commit '
72a2f171ddf5c1eab7d6ccd47ac2b7ac4fc9c087':
Camera: setCallBackWindow only if callback surface is used
Zhijun He [Mon, 16 Sep 2013 18:23:35 +0000 (18:23 +0000)]
Merge "Camera: setCallBackWindow only if callback surface is used" into klp-dev
Chong Zhang [Mon, 16 Sep 2013 18:17:37 +0000 (11:17 -0700)]
am
a5652e9c: Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into klp-dev
* commit '
a5652e9cdaf6624e03a7e84c40590a42e44c5217':
Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags
Chong Zhang [Mon, 16 Sep 2013 18:14:01 +0000 (18:14 +0000)]
Merge "Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags" into klp-dev
Zhijun He [Mon, 16 Sep 2013 17:51:50 +0000 (10:51 -0700)]
am
66281c3a: Camera: Don\'t overwrite the error status
* commit '
66281c3a5d7eea486ddc6ad30088ba92956fd4fd':
Camera: Don't overwrite the error status
Eino-Ville Talvala [Fri, 13 Sep 2013 18:39:24 +0000 (11:39 -0700)]
Camera3: Always set a trigger ID for an active trigger
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
Zhijun He [Mon, 16 Sep 2013 04:06:10 +0000 (21:06 -0700)]
Camera: setCallBackWindow only if callback surface is used
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
Zhijun He [Sat, 14 Sep 2013 00:59:59 +0000 (17:59 -0700)]
Camera: Don't overwrite the error status
Bug:
10749544
Change-Id: I6096effde03e18ee1b8c63cf3b36dce0344054c5
Glenn Kasten [Sat, 14 Sep 2013 00:16:15 +0000 (17:16 -0700)]
am
d176ec1e: Merge "Fix SoundPool.play() looping" into klp-dev
* commit '
d176ec1e371a686c58385692a28da677e398c302':
Fix SoundPool.play() looping
Eric Laurent [Sat, 14 Sep 2013 00:16:14 +0000 (17:16 -0700)]
am
7f91e5e0: Merge "audioflinger: fix ro.audio.silent in offload mode" into klp-dev
* commit '
7f91e5e09cf3bd8068894b2e54cbdaac70bf53a0':
audioflinger: fix ro.audio.silent in offload mode
Zhijun He [Sat, 14 Sep 2013 00:15:18 +0000 (17:15 -0700)]
am
d4dadf23: Merge "Camera: Limit supported preview sizes" into klp-dev
* commit '
d4dadf23dd2dd8acd514d60d84475954070340b8':
Camera: Limit supported preview sizes
Eric Laurent [Sat, 14 Sep 2013 00:15:06 +0000 (17:15 -0700)]
am
972a173d: audioflinger: longer offload thread standby delay
* commit '
972a173d7d1de1a3b5a617aae3e2abb6e05ae02d':
audioflinger: longer offload thread standby delay
Glenn Kasten [Sat, 14 Sep 2013 00:08:55 +0000 (00:08 +0000)]
Merge "Fix SoundPool.play() looping" into klp-dev
Eric Laurent [Sat, 14 Sep 2013 00:07:28 +0000 (00:07 +0000)]
Merge "audioflinger: fix ro.audio.silent in offload mode" into klp-dev
Eric Laurent [Sat, 14 Sep 2013 00:00:08 +0000 (17:00 -0700)]
audioflinger: fix ro.audio.silent in offload mode
Change-Id: I5a1a79000d53146689b0a198cc5419c36509703f
Zhijun He [Fri, 13 Sep 2013 23:04:17 +0000 (23:04 +0000)]
Merge "Camera: Limit supported preview sizes" into klp-dev
Zhijun He [Thu, 12 Sep 2013 05:58:17 +0000 (22:58 -0700)]
Camera: Limit supported preview sizes
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
Eric Laurent [Wed, 4 Sep 2013 16:42:59 +0000 (09:42 -0700)]
audioflinger: longer offload thread standby delay
- 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
Jeff Tinker [Thu, 12 Sep 2013 22:02:52 +0000 (15:02 -0700)]
am
99bf6267: Merge "Fix MediaDrm cts tests" into klp-dev
* commit '
99bf6267f0a4e2c3153be49ced59ae164d55ea6d':
Fix MediaDrm cts tests
Jeff Tinker [Thu, 12 Sep 2013 21:58:15 +0000 (21:58 +0000)]
Merge "Fix MediaDrm cts tests" into klp-dev
Lajos Molnar [Thu, 12 Sep 2013 21:19:50 +0000 (14:19 -0700)]
am
877c673c: Merge "ACodec: fix flush/resume for decoder-output-meta-data mode" into klp-dev
* commit '
877c673c3d3794e89e4677d448f38f77bdee7fdb':
ACodec: fix flush/resume for decoder-output-meta-data mode
Lajos Molnar [Thu, 12 Sep 2013 21:16:57 +0000 (21:16 +0000)]
Merge "ACodec: fix flush/resume for decoder-output-meta-data mode" into klp-dev
Lajos Molnar [Thu, 12 Sep 2013 16:12:54 +0000 (09:12 -0700)]
ACodec: fix flush/resume for decoder-output-meta-data mode
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
Glenn Kasten [Thu, 12 Sep 2013 16:08:49 +0000 (09:08 -0700)]
am
dc33c542: Merge "Fix AudioTrack shared memory leak" into klp-dev
* commit '
dc33c542351449ceee95cc50a9009f495e7c72ba':
Fix AudioTrack shared memory leak
Glenn Kasten [Thu, 12 Sep 2013 15:13:44 +0000 (15:13 +0000)]
Merge "Fix AudioTrack shared memory leak" into klp-dev
Jeff Tinker [Thu, 12 Sep 2013 01:40:44 +0000 (18:40 -0700)]
Fix MediaDrm cts tests
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
Chong Zhang [Wed, 11 Sep 2013 19:52:43 +0000 (12:52 -0700)]
Add FLAG_CAN_SEEK_BACKWARD and FLAG_CAN_SEEK_FORWARD see flags
Also update seek flag in NuPlayerDriver, otherwise MediaPlayer will
get wrong flags.
Bug:
10676387
Change-Id: Ice30f27a9a04e37b4718d26228a407fea8d9e4fc
Eric Laurent [Thu, 12 Sep 2013 00:17:47 +0000 (17:17 -0700)]
am
efc4d489: Merge "audioflinger: add HOTWORD audio source." into klp-dev
* commit '
efc4d4899e03fb8464017dd48539106cec2163de':
audioflinger: add HOTWORD audio source.
Eric Laurent [Thu, 12 Sep 2013 00:15:15 +0000 (00:15 +0000)]
Merge "audioflinger: add HOTWORD audio source." into klp-dev
Chong Zhang [Wed, 11 Sep 2013 23:58:36 +0000 (16:58 -0700)]
am
a911f51c: Pass subtitle track properties to getTrackInfo
* commit '
a911f51c21430ac92f1d796b2338878fd98382e9':
Pass subtitle track properties to getTrackInfo
Chong Zhang [Fri, 6 Sep 2013 22:34:50 +0000 (15:34 -0700)]
Pass subtitle track properties to getTrackInfo
Bug:
10326117
Change-Id: I15fcc49ad02e26d7cc92e82ee670bafca62a09a7
Glenn Kasten [Wed, 11 Sep 2013 21:35:16 +0000 (14:35 -0700)]
Fix SoundPool.play() looping
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
Glenn Kasten [Wed, 11 Sep 2013 16:14:16 +0000 (09:14 -0700)]
Fix AudioTrack shared memory leak
Bug:
2801375
Change-Id: I50e15164fe310f69ea019dca5b49171a02bc6992
Eric Laurent [Mon, 9 Sep 2013 16:08:44 +0000 (09:08 -0700)]
audioflinger: add HOTWORD audio source.
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
Andreas Huber [Tue, 10 Sep 2013 19:13:42 +0000 (12:13 -0700)]
am
c728c580: Merge "Make sure the encoder instance is safely release()\'d before its" into klp-dev
* commit '
c728c580fc512b50604f33f1c4581c500062b245':
Make sure the encoder instance is safely release()'d before its
Andreas Huber [Tue, 10 Sep 2013 19:10:50 +0000 (19:10 +0000)]
Merge "Make sure the encoder instance is safely release()'d before its" into klp-dev
Zhijun He [Tue, 10 Sep 2013 19:02:54 +0000 (12:02 -0700)]
am
7f9551f7: MediaMuxer: Hook up setLocation method
* commit '
7f9551f75eedb3e4e1fe8feaaba48d8080635fc4':
MediaMuxer: Hook up setLocation method
Glenn Kasten [Tue, 10 Sep 2013 17:15:33 +0000 (10:15 -0700)]
am
3c939600: am
d6ca2e8b: Merge "Uninitialized pointer can cause crash."
* commit '
3c9396002f51da24f9ba8b8dc96ae06bf667ba2c':
Uninitialized pointer can cause crash.
Glenn Kasten [Tue, 10 Sep 2013 17:13:13 +0000 (10:13 -0700)]
am
d6ca2e8b: Merge "Uninitialized pointer can cause crash."
* commit '
d6ca2e8bc17db104f0421ae1e7e0799488b96d70':
Uninitialized pointer can cause crash.
Glenn Kasten [Tue, 10 Sep 2013 17:11:52 +0000 (17:11 +0000)]
Merge "Uninitialized pointer can cause crash."
Zhijun He [Mon, 9 Sep 2013 22:48:58 +0000 (15:48 -0700)]
MediaMuxer: Hook up setLocation method
This method is needed when mediamuxer is used for camera video recording.
Bug:
10594784
Change-Id: I9bd006a07e5e2ac7019849e3f4f7cf7b8356d669
Igor Murashkin [Mon, 9 Sep 2013 23:09:55 +0000 (16:09 -0700)]
am
6220f993: Merge "camera3: Dump latest request sent with dumpsys" into klp-dev
* commit '
6220f993541b0317e6ace3c410dd35a8d76e30bc':
camera3: Dump latest request sent with dumpsys
Igor Murashkin [Mon, 9 Sep 2013 23:07:23 +0000 (23:07 +0000)]
Merge "camera3: Dump latest request sent with dumpsys" into klp-dev
Eric Laurent [Mon, 9 Sep 2013 21:25:10 +0000 (14:25 -0700)]
am
6ca83fad: Merge "audioflinger: no effects on offloaded tracks" into klp-dev
* commit '
6ca83fad0c32f8d9c81c9e16b4f87025d1abbda1':
audioflinger: no effects on offloaded tracks
Eric Laurent [Mon, 9 Sep 2013 20:19:47 +0000 (20:19 +0000)]
Merge "audioflinger: no effects on offloaded tracks" into klp-dev
Zhijun He [Mon, 9 Sep 2013 18:31:30 +0000 (11:31 -0700)]
am
d1d6467d: Camera: Correct stream id types
* commit '
d1d6467d3bcbc1305eeba0176a2edf04925c368e':
Camera: Correct stream id types
Eric Laurent [Sat, 31 Aug 2013 19:59:48 +0000 (12:59 -0700)]
audioflinger: no effects on offloaded tracks
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
Zhijun He [Fri, 6 Sep 2013 22:00:01 +0000 (15:00 -0700)]
Camera: Correct stream id types
Bug:
10604704
Change-Id: I223ac5d200eb6439c08955fb7ad586592099fbae
Igor Murashkin [Fri, 6 Sep 2013 23:55:14 +0000 (16:55 -0700)]
camera3: Dump latest request sent with dumpsys
Bug:
10606535
Change-Id: I0dd5ca3e09f45701659ab9ebd3b51939a2f6e6ba
Zhijun He [Fri, 6 Sep 2013 23:44:33 +0000 (16:44 -0700)]
am
84b7fb0c: Camera: Send VIDEO_SNAPSHOT intent for video snapshot case
* commit '
84b7fb0c88ddd05ed7c148c82fe1691040a9404d':
Camera: Send VIDEO_SNAPSHOT intent for video snapshot case
Zhijun He [Fri, 6 Sep 2013 18:46:01 +0000 (11:46 -0700)]
Camera: Send VIDEO_SNAPSHOT intent for video snapshot case
Bug:
9924539
Change-Id: Ief39eff79c31f2c2aa5df2fe1a0f04c4afc74690
Eric Laurent [Fri, 6 Sep 2013 19:58:21 +0000 (12:58 -0700)]
am
3b4529e0: audioflinger: remove async write race conditions
* commit '
3b4529e03c5fc7a44c22f9091ad15a269bfca3a8':
audioflinger: remove async write race conditions
jpadmana [Fri, 6 Sep 2013 19:58:01 +0000 (12:58 -0700)]
am
60c60df7: Effect Offload Proxy for effects offload
* commit '
60c60df7db278d2fa5c90b0fa14f99a61d50272b':
Effect Offload Proxy for effects offload
Eric Laurent [Fri, 6 Sep 2013 19:57:59 +0000 (12:57 -0700)]
am
a82975e0: Merge "Effects Factory changes for effects offload" into klp-dev
* commit '
a82975e02ccf78fd9c4dd2f7c1a66c254b52fe3b':
Effects Factory changes for effects offload
Andreas Huber [Fri, 6 Sep 2013 19:03:26 +0000 (12:03 -0700)]
Make sure the encoder instance is safely release()'d before its
reference count drops to 0.
Change-Id: I6601226e2754f17e964125cacf02dc02cfbf6231
related-to-bug:
10150263
Eric Laurent [Fri, 6 Sep 2013 01:09:19 +0000 (18:09 -0700)]
audioflinger: remove async write race conditions
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
jpadmana [Tue, 4 Jun 2013 10:33:29 +0000 (16:03 +0530)]
Effect Offload Proxy for effects offload
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>
Eric Laurent [Fri, 6 Sep 2013 17:34:56 +0000 (17:34 +0000)]
Merge "Effects Factory changes for effects offload" into klp-dev
jpadmana [Tue, 4 Jun 2013 10:38:29 +0000 (16:08 +0530)]
Effects Factory changes for effects offload
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>
Marco Nelissen [Fri, 6 Sep 2013 17:00:33 +0000 (10:00 -0700)]
am
c23981d9: Merge "Better workaround for slow decoders." into klp-dev
* commit '
c23981d9375d4a55f5701a4090b36deecda92f92':
Better workaround for slow decoders.
Marco Nelissen [Fri, 6 Sep 2013 16:58:25 +0000 (16:58 +0000)]
Merge "Better workaround for slow decoders." into klp-dev
Ruben Brunk [Fri, 6 Sep 2013 01:24:37 +0000 (18:24 -0700)]
am
36a8b33a: Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev
* commit '
36a8b33a23dca49c9617e97e22e5d67f7d25c268':
camera: Fix race condition between setParameters() and stopPreview().
Ruben Brunk [Fri, 6 Sep 2013 01:21:52 +0000 (01:21 +0000)]
Merge "camera: Fix race condition between setParameters() and stopPreview()." into klp-dev
Ruben Brunk [Thu, 5 Sep 2013 01:18:26 +0000 (18:18 -0700)]
camera: Fix race condition between setParameters() and stopPreview().
Bug:
10414772
Change-Id: I928cb3935afb101da8a7931f88c27dccdb03b4a9
Andy McFadden [Thu, 5 Sep 2013 17:03:44 +0000 (10:03 -0700)]
am
72119ce8: Merge "Start \'am\' with exec()" into klp-dev
* commit '
72119ce833d4f0e1c0342f1722d1433f2ba12b87':
Start 'am' with exec()
Andy McFadden [Thu, 5 Sep 2013 17:00:15 +0000 (17:00 +0000)]
Merge "Start 'am' with exec()" into klp-dev
Andy McFadden [Wed, 4 Sep 2013 22:54:07 +0000 (15:54 -0700)]
Start 'am' with exec()
We were using system() to run 'am broadcast'. Switch to
fork()+exec().
Bug
10606037
Change-Id: Ifae1a2b4f1914f015d09f2cac8cd0b1896d87a84
Marco Nelissen [Wed, 4 Sep 2013 22:00:07 +0000 (15:00 -0700)]
Better workaround for slow decoders.
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
Chong Zhang [Wed, 4 Sep 2013 22:11:34 +0000 (15:11 -0700)]
am
a1991255: Merge "wifi-display: do not use HDCP\'s encryptNative method if its unsupported" into klp-dev
* commit '
a19912554f3779fac0c341ac702227bf4b5fe399':
wifi-display: do not use HDCP's encryptNative method if its unsupported
Chong Zhang [Wed, 4 Sep 2013 22:08:00 +0000 (22:08 +0000)]
Merge "wifi-display: do not use HDCP's encryptNative method if its unsupported" into klp-dev
Ruben Brunk [Wed, 4 Sep 2013 21:50:44 +0000 (14:50 -0700)]
am
7a4c2711: Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
* commit '
7a4c2711d7a85ce962b9d18fee41975f9c574c0b':
Fix CameraService error flag when running HAL1 with API2.
Ruben Brunk [Wed, 4 Sep 2013 21:48:14 +0000 (21:48 +0000)]
Merge "Fix CameraService error flag when running HAL1 with API2." into klp-dev
Ruben Brunk [Mon, 19 Aug 2013 22:21:19 +0000 (15:21 -0700)]
Fix CameraService error flag when running HAL1 with API2.
Bug:
10620944
Change-Id: I44c0d09a3d313ae8f724fbe61fa5f36cf5b38b6d
Rachad [Wed, 4 Sep 2013 16:26:13 +0000 (09:26 -0700)]
am
c85d6196: Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/
10294801" into klp-dev
* commit '
c85d61964cb6f9b23cd2e82e43d7052b3e7d4fbc':
Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/
10294801
Rachad [Wed, 4 Sep 2013 16:21:35 +0000 (16:21 +0000)]
Merge " Fixed timestamp handling in ESQueue Access Unit parser. This fixes bug b/
10294801" into klp-dev
Marco Nelissen [Wed, 4 Sep 2013 01:38:34 +0000 (18:38 -0700)]
am
df60eff8: Merge "Work around decoder slowness" into klp-dev
* commit '
df60eff872f276c1a94ab0355b252b73fe61faa9':
Work around decoder slowness
Marco Nelissen [Wed, 4 Sep 2013 01:35:40 +0000 (01:35 +0000)]
Merge "Work around decoder slowness" into klp-dev
Glenn Kasten [Tue, 3 Sep 2013 23:08:29 +0000 (16:08 -0700)]
am
fe346c70: Fix miscellanous AudioTrack::getTimestamp() bugs
* commit '
fe346c707f59d763ded93bc3d27b51f0c0408258':
Fix miscellanous AudioTrack::getTimestamp() bugs
Glenn Kasten [Tue, 3 Sep 2013 23:08:28 +0000 (16:08 -0700)]
am
4d0815d6: Implement MonoPipe::getTimestamp
* commit '
4d0815d694e5a2edb3ce48427de50f55d0f84c0b':
Implement MonoPipe::getTimestamp
Glenn Kasten [Tue, 3 Sep 2013 23:08:27 +0000 (16:08 -0700)]
am
732845c7: FastMixer computes presentation timestamps for fast tracks
* commit '
732845c7e8d294bb1aaa4cd9687da62b51f1f6e6':
FastMixer computes presentation timestamps for fast tracks
Glenn Kasten [Tue, 3 Sep 2013 23:08:26 +0000 (16:08 -0700)]
am
6466c9e6: Add ExtendedAudioBufferProvider::framesReleased and onTimestamp
* commit '
6466c9e6e6278c740aed77f695f679be9f5db478':
Add ExtendedAudioBufferProvider::framesReleased and onTimestamp
Glenn Kasten [Tue, 3 Sep 2013 23:08:26 +0000 (16:08 -0700)]
am
894d6be4: Add NBAIO_Source::onTimestamp()
* commit '
894d6be4f9b4721c77a01919ecf03b27cec90cc9':
Add NBAIO_Source::onTimestamp()
Glenn Kasten [Tue, 3 Sep 2013 23:08:25 +0000 (16:08 -0700)]
am
a07a1c2c: Instantiate SingleStateQueue<AudioTimestamp>
* commit '
a07a1c2c91dc7ee6ded319262499f20cd01edcf7':
Instantiate SingleStateQueue<AudioTimestamp>
Chong Zhang [Tue, 3 Sep 2013 21:35:37 +0000 (14:35 -0700)]
wifi-display: do not use HDCP's encryptNative method if its unsupported
Bug:
10609422
Change-Id: I005f1d04a4191b1503b5f3e895a98b8d6560c402
Marco Nelissen [Tue, 3 Sep 2013 22:29:33 +0000 (15:29 -0700)]
Work around decoder slowness
b/
10528409
Change-Id: Ifcaf0488d63e87676b1e9382437943138deb76a6
Glenn Kasten [Fri, 30 Aug 2013 20:28:22 +0000 (13:28 -0700)]
Fix miscellanous AudioTrack::getTimestamp() bugs
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
Glenn Kasten [Tue, 3 Sep 2013 22:12:48 +0000 (15:12 -0700)]
am
943ba3cc: Merge "Add NBAIO_Sink::getTimestamp()" into klp-dev
* commit '
943ba3cca8df0da24db38e97e43aaacb5b788a21':
Add NBAIO_Sink::getTimestamp()
Glenn Kasten [Thu, 29 Aug 2013 21:40:55 +0000 (14:40 -0700)]
Implement MonoPipe::getTimestamp
using SingleStateQueue observer
Change-Id: I7b1928b087f1e676c7b291df6cefa7707301662c
Glenn Kasten [Fri, 23 Aug 2013 16:26:31 +0000 (09:26 -0700)]
FastMixer computes presentation timestamps for fast tracks
and forwards them to each track's ExtendedAudioBufferProvider::onTimestamp().
Change-Id: I06fb9586bb7e20d5c0289abdc8cac6cd3fd2f6e8
Glenn Kasten [Fri, 23 Aug 2013 17:54:07 +0000 (10:54 -0700)]
Add ExtendedAudioBufferProvider::framesReleased and onTimestamp
and implement them in SourceAudioBufferProvider using the associated NBAIO_Source,
and in Track using the associated AudioTrackServerProxy.
Change-Id: I60dc4adba63fc1dc452ff16caf347e4a7c8242c2
Glenn Kasten [Mon, 26 Aug 2013 17:29:28 +0000 (10:29 -0700)]
Add NBAIO_Source::onTimestamp()
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