OSDN Git Service
Changwan Ryu [Wed, 6 Nov 2013 18:48:03 +0000 (18:48 +0000)]
Merge "Support TS + AC3 for ATSC standard"
Changwan Ryu [Wed, 6 Nov 2013 18:44:46 +0000 (18:44 +0000)]
Merge "Support AC3 in stagefright"
Glenn Kasten [Wed, 6 Nov 2013 17:51:46 +0000 (17:51 +0000)]
Merge "Move local declarations to point of first use"
Eric Laurent [Wed, 6 Nov 2013 17:46:53 +0000 (09:46 -0800)]
am
44dc9155: am
48b6cd98: Merge "audioflinger: fix direct output underrun" into klp-dev
* commit '
44dc91554521eaab478674a7f812cb8a4fa4f809':
audioflinger: fix direct output underrun
Glenn Kasten [Wed, 6 Nov 2013 17:38:02 +0000 (17:38 +0000)]
Merge "Rename TrackPaused to trackPaused"
Eric Laurent [Wed, 6 Nov 2013 17:35:00 +0000 (09:35 -0800)]
am
48b6cd98: Merge "audioflinger: fix direct output underrun" into klp-dev
* commit '
48b6cd98b23b2cf9dee88f075f7575ecb5aaf545':
audioflinger: fix direct output underrun
Eric Laurent [Wed, 6 Nov 2013 17:29:58 +0000 (17:29 +0000)]
Merge "audioflinger: fix direct output underrun" into klp-dev
Glenn Kasten [Wed, 6 Nov 2013 17:13:15 +0000 (17:13 +0000)]
Merge "Use const more places"
Glenn Kasten [Wed, 6 Nov 2013 16:34:32 +0000 (16:34 +0000)]
Merge "Clean up channel mask handling"
Eric Laurent [Wed, 6 Nov 2013 02:22:08 +0000 (18:22 -0800)]
audioflinger: fix direct output underrun
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
Changwan Ryu [Mon, 28 Oct 2013 02:08:44 +0000 (11:08 +0900)]
Support TS + AC3 for ATSC standard
Change-Id: I141667f3f54b242bafdf0ab9db86852c56f49ffa
Changwan Ryu [Mon, 28 Oct 2013 01:53:48 +0000 (10:53 +0900)]
Support AC3 in stagefright
Change-Id: I12016b424bd069413bd6e380ff11484e175e05f3
Marco Nelissen [Tue, 5 Nov 2013 05:59:12 +0000 (21:59 -0800)]
am
92168885: am
f8a1169d: Merge "Notify current video size if available" into klp-dev
* commit '
921688852b72bfa921913b8afe18c0d749c6797d':
Notify current video size if available
Lajos Molnar [Tue, 5 Nov 2013 05:59:11 +0000 (21:59 -0800)]
am
2922d230: am
065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-dev
* commit '
2922d230155cb1be7acc0c11bef6f0ca0345bdb7':
Restore NuPlayer error and EOS handling
Marco Nelissen [Tue, 5 Nov 2013 05:54:06 +0000 (21:54 -0800)]
am
f8a1169d: Merge "Notify current video size if available" into klp-dev
* commit '
f8a1169d98a09d1473f289c363353d08301576f6':
Notify current video size if available
Lajos Molnar [Tue, 5 Nov 2013 05:53:21 +0000 (21:53 -0800)]
am
065789f2: Merge "Restore NuPlayer error and EOS handling" into klp-dev
* commit '
065789f24890b0a9f3614dc175e6f7664af1f2ce':
Restore NuPlayer error and EOS handling
Glenn Kasten [Mon, 19 Aug 2013 15:40:21 +0000 (08:40 -0700)]
Move local declarations to point of first use
Change-Id: I8a078386e371caab5174fc07b47f48fb9f21609a
Glenn Kasten [Mon, 19 Aug 2013 16:58:50 +0000 (09:58 -0700)]
Rename TrackPaused to trackPaused
Change-Id: I3b38e0c9a6bbb6e18cb5b1f72670139a3071cb8f
Glenn Kasten [Mon, 19 Aug 2013 19:03:11 +0000 (12:03 -0700)]
Use const more places
Change-Id: Ibc068d319d6fff26f2d11248e17481d8f7f027e0
Marco Nelissen [Mon, 4 Nov 2013 17:42:11 +0000 (17:42 +0000)]
Merge "Notify current video size if available" into klp-dev
Lajos Molnar [Fri, 1 Nov 2013 23:17:47 +0000 (23:17 +0000)]
Merge "Restore NuPlayer error and EOS handling" into klp-dev
Marco Nelissen [Fri, 1 Nov 2013 17:33:18 +0000 (10:33 -0700)]
Notify current video size if available
b/
11248101
Change-Id: I0fa3b5592efcf400c86692002267da6825e331ad
Eric Laurent [Thu, 31 Oct 2013 22:39:14 +0000 (15:39 -0700)]
am
4cf799fb: am
5c7ffaed: Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
* commit '
4cf799fbbb74de102d34ccb014ba7fbd9bfa5e14':
AudioFlinger: fix duplicating thread standby.
Eric Laurent [Thu, 31 Oct 2013 22:36:49 +0000 (15:36 -0700)]
am
5c7ffaed: Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
* commit '
5c7ffaed6f04b844c2e4e2024bfb0203ac2233dd':
AudioFlinger: fix duplicating thread standby.
Eric Laurent [Thu, 31 Oct 2013 22:29:50 +0000 (22:29 +0000)]
Merge "AudioFlinger: fix duplicating thread standby." into klp-dev
Changwan Ryu [Tue, 29 Oct 2013 05:31:00 +0000 (14:31 +0900)]
Support for MPEG2 video
Change-Id: If1f4e20939c96c87c65c84d56e529501facb8597
Eric Laurent [Wed, 30 Oct 2013 23:57:06 +0000 (16:57 -0700)]
AudioFlinger: fix duplicating thread standby.
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
Igor Murashkin [Wed, 30 Oct 2013 21:18:45 +0000 (14:18 -0700)]
am
34790c86: am
3ff5792a: Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
* commit '
34790c866cdc309e3779b811db43f63aa7eae7ef':
camera: Collect stack traces when bad things happen, print with dumpsys
Igor Murashkin [Wed, 30 Oct 2013 21:16:18 +0000 (14:16 -0700)]
am
3ff5792a: Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
* commit '
3ff5792adfdbf67662a5f8064315a55690d53944':
camera: Collect stack traces when bad things happen, print with dumpsys
Igor Murashkin [Wed, 30 Oct 2013 21:09:49 +0000 (21:09 +0000)]
Merge "camera: Collect stack traces when bad things happen, print with dumpsys" into klp-dev
Lajos Molnar [Mon, 28 Oct 2013 21:59:21 +0000 (14:59 -0700)]
Restore NuPlayer error and EOS handling
This was erroneously removed by commit
a73c954
Change-Id: I4742339139e770f0181c99d427875897fd60b68e
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11413439
Lajos Molnar [Wed, 30 Oct 2013 20:28:36 +0000 (13:28 -0700)]
am
8578eb36: am
c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
* commit '
8578eb364799f83c6f237d286e1447c02db6afbc':
AwesomePlayer: ensure STARTED message works after reset
Lajos Molnar [Wed, 30 Oct 2013 20:26:53 +0000 (13:26 -0700)]
am
c76b9f52: Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
* commit '
c76b9f52cf4e39f6943c53f5b3657dfee65857ac':
AwesomePlayer: ensure STARTED message works after reset
Lajos Molnar [Wed, 30 Oct 2013 20:23:17 +0000 (20:23 +0000)]
Merge "AwesomePlayer: ensure STARTED message works after reset" into klp-dev
Glenn Kasten [Wed, 30 Oct 2013 16:47:17 +0000 (09:47 -0700)]
Clean up channel mask handling
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
Lajos Molnar [Wed, 30 Oct 2013 01:36:16 +0000 (18:36 -0700)]
am
b6b97f60: am
eb76f318: am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
b6b97f6071a3948494b5e9cb1a9c175157bdaf07':
avcenc: Prepend startcodes to output buffers
Lajos Molnar [Wed, 30 Oct 2013 01:31:05 +0000 (18:31 -0700)]
am
eb76f318: am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
eb76f318e9daf91dbf195bcb74852b3bd736a32a':
avcenc: Prepend startcodes to output buffers
Eric Laurent [Wed, 30 Oct 2013 01:20:38 +0000 (18:20 -0700)]
am
ce275b7d: am
1c594b63: Merge "audioflinger: enable effects after registration if needed" into klp-dev
* commit '
ce275b7dd20e3d4781a46126c753e6eb998e6c0f':
audioflinger: enable effects after registration if needed
Eric Laurent [Wed, 30 Oct 2013 01:17:46 +0000 (18:17 -0700)]
am
1c594b63: Merge "audioflinger: enable effects after registration if needed" into klp-dev
* commit '
1c594b637df26499ce1dae2db34f2b3290efd838':
audioflinger: enable effects after registration if needed
Eric Laurent [Wed, 30 Oct 2013 01:13:52 +0000 (01:13 +0000)]
Merge "audioflinger: enable effects after registration if needed" into klp-dev
Lajos Molnar [Tue, 29 Oct 2013 22:41:50 +0000 (15:41 -0700)]
am
96aed4fb: Merge "avcenc: Prepend startcodes to output buffers"
* commit '
96aed4fb18e5303b039cc7e5dc252e0827491d09':
avcenc: Prepend startcodes to output buffers
Lajos Molnar [Tue, 29 Oct 2013 22:39:25 +0000 (22:39 +0000)]
Merge "avcenc: Prepend startcodes to output buffers"
Igor Murashkin [Wed, 23 Oct 2013 23:40:06 +0000 (16:40 -0700)]
camera: Collect stack traces when bad things happen, print with dumpsys
Bug:
11324229
Change-Id: Ic920e170a8f5a389fc139bbf5416c0e3186c7fb6
Eric Laurent [Tue, 29 Oct 2013 00:18:53 +0000 (17:18 -0700)]
am
7f8f7585: am
fd477974: AudioFlinger: more fixes for offload audio lost
* commit '
7f8f758506a95d6fe5c0e52aa7b5ef82fb18861a':
AudioFlinger: more fixes for offload audio lost
Eric Laurent [Tue, 29 Oct 2013 00:17:03 +0000 (17:17 -0700)]
am
fd477974: AudioFlinger: more fixes for offload audio lost
* commit '
fd4779740ec3e9e865d5514464df26d015354388':
AudioFlinger: more fixes for offload audio lost
Lajos Molnar [Mon, 28 Oct 2013 22:01:15 +0000 (15:01 -0700)]
AwesomePlayer: ensure STARTED message works after reset
Change-Id: I06217c07c0b68476cb296fd6151f6a0d8d4e02d0
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
11412881
Eric Laurent [Sat, 26 Oct 2013 01:10:40 +0000 (18:10 -0700)]
AudioFlinger: more fixes for offload audio lost
mStandby being false was not a reliable indication that
something had been written to audio HAL.
Considering the last track in mActiveTracks vector as the
latest activated track was wrong as this is a SortedVector.
Bug:
11247103.
Change-Id: I397d011c5afcdd779def3fe25aaae7669a472cfc
Marco Nelissen [Sat, 26 Oct 2013 22:21:09 +0000 (15:21 -0700)]
am
241be8d5: (-s ours) am
9cae2170: Assign blame for playback wakelocks.
* commit '
241be8d5874023761121043b8709a6062baac6f1':
Assign blame for playback wakelocks.
Marco Nelissen [Sat, 26 Oct 2013 15:32:50 +0000 (08:32 -0700)]
am
9cae2170: Assign blame for playback wakelocks.
* commit '
9cae217050aa1347d4ac5053c305754879e3f97f':
Assign blame for playback wakelocks.
Marco Nelissen [Mon, 14 Jan 2013 22:12:05 +0000 (14:12 -0800)]
Assign blame for playback wakelocks.
Set a work source for the playback wakelock, so that playback is
counted against the requesting app instead of the media server.
Cherrypicked from master.
b/
9464621
Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
Marco Nelissen [Mon, 14 Jan 2013 22:12:05 +0000 (14:12 -0800)]
Assign blame for playback wakelocks.
Set a work source for the playback wakelock, so that playback is
counted against the requesting app instead of the media server.
Change-Id: I7329f88a288a95a582a78005a1c3d16a5a611e31
Andy McFadden [Thu, 24 Oct 2013 17:49:11 +0000 (10:49 -0700)]
am
de5f7cd6: am
be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-dev
* commit '
de5f7cd61df74027834cd1ed2f1e482238f3ed4b':
Check for NULL buffer in repeat-latest
Vineeta Srivastava [Thu, 24 Oct 2013 17:49:11 +0000 (10:49 -0700)]
am
57c1f758: am
f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
* commit '
57c1f758d8811024aa1298d2ba244577c44ef7b9':
Fix kAutoRampDurationUs overflow issue
Andy McFadden [Thu, 24 Oct 2013 17:45:06 +0000 (10:45 -0700)]
am
be567be3: Merge "Check for NULL buffer in repeat-latest" into klp-dev
* commit '
be567be3f92026f5964c1c9ecce00e30bb7df412':
Check for NULL buffer in repeat-latest
Andy McFadden [Thu, 24 Oct 2013 17:35:43 +0000 (17:35 +0000)]
Merge "Check for NULL buffer in repeat-latest" into klp-dev
Andy McFadden [Wed, 23 Oct 2013 20:39:43 +0000 (13:39 -0700)]
Check for NULL buffer in repeat-latest
Repeating the most-recent buffer appears to fail when the producer
disconnects. This adds a NULL check to avoid crashing.
Bug
10607920
Change-Id: Ied036004425f046fcf9c26303823681f3fddb99e
Vineeta Srivastava [Wed, 23 Oct 2013 20:02:58 +0000 (13:02 -0700)]
am
f3a6234b: Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
* commit '
f3a6234ba21640cf2bc893dbcb98fb9b0fa47481':
Fix kAutoRampDurationUs overflow issue
Vineeta Srivastava [Wed, 23 Oct 2013 19:58:15 +0000 (19:58 +0000)]
Merge "Fix kAutoRampDurationUs overflow issue" into klp-dev
Elliott Hughes [Wed, 23 Oct 2013 17:35:30 +0000 (10:35 -0700)]
am
c20636f7: am
e7329bd5: am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
c20636f7a4053c6f93a8808617252afcd5dc8d50':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:30:40 +0000 (10:30 -0700)]
am
e7329bd5: am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
e7329bd564e7c5f671b786dc7d0cc684d6d11fca':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:25:57 +0000 (10:25 -0700)]
am
d5255d1d: Merge "If dlopen("libwvm.so") fails, log the reason why."
* commit '
d5255d1de125d15afae6cfc35701a5255b5e2933':
If dlopen("libwvm.so") fails, log the reason why.
Elliott Hughes [Wed, 23 Oct 2013 17:22:43 +0000 (17:22 +0000)]
Merge "If dlopen("libwvm.so") fails, log the reason why."
Elliott Hughes [Wed, 23 Oct 2013 17:03:20 +0000 (10:03 -0700)]
If dlopen("libwvm.so") fails, log the reason why.
Bug:
11342992
Change-Id: I99986b6181df6d7615fdc1520d2edaadaccd9bb4
Nick Kralevich [Sun, 20 Oct 2013 16:36:14 +0000 (09:36 -0700)]
am
173f0125: am
9857473f: am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
173f0125bdd54ba325068d51baa5c31c3e685b1e':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:34:04 +0000 (09:34 -0700)]
am
9857473f: am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
9857473f48abf1333ddd3454ab3c916b4e69daa4':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:31:32 +0000 (09:31 -0700)]
am
0f4b0d23: Merge "libeffects: do not use GNU old-style field designators"
* commit '
0f4b0d238613cd98fe0b8931f7e6cbcc8b9ad7b1':
libeffects: do not use GNU old-style field designators
Nick Kralevich [Sun, 20 Oct 2013 16:28:47 +0000 (16:28 +0000)]
Merge "libeffects: do not use GNU old-style field designators"
synergydev [Sun, 20 Oct 2013 05:51:33 +0000 (22:51 -0700)]
libeffects: do not use GNU old-style field designators
Not using a GNU extension improves portability
Change-Id: I4e8a0376c089828ca4fc7f1aaf3914bfd917d4c5
Nick Kralevich [Sat, 19 Oct 2013 02:35:38 +0000 (19:35 -0700)]
am
3f93c8f8: am
998c4e88: am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
3f93c8f8dbfb8b7cfed2cd21210f875497cbb39c':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:32:44 +0000 (19:32 -0700)]
am
998c4e88: am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
998c4e88f962336472c5e1c3afbf0ed8d6d3a971':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:30:45 +0000 (19:30 -0700)]
am
0219856e: Merge "libvideoeditor: fix M4OSA_Clock header guard"
* commit '
0219856e5e45c0bdd20f2199297ec92f11f0875f':
libvideoeditor: fix M4OSA_Clock header guard
Nick Kralevich [Sat, 19 Oct 2013 02:28:09 +0000 (02:28 +0000)]
Merge "libvideoeditor: fix M4OSA_Clock header guard"
synergydev [Sat, 19 Oct 2013 02:20:59 +0000 (19:20 -0700)]
libvideoeditor: fix M4OSA_Clock header guard
CLOCK was mispelled as CLOCH
Change-Id: Ie7163fc8723d7a5b9df113f55a4a550e5465d9b5
Glenn Kasten [Fri, 18 Oct 2013 22:09:03 +0000 (15:09 -0700)]
am
77177fa2: am
95c03858: Merge "Allow releaseBuffer after flush" into klp-dev
* commit '
77177fa20773d02b4f9c4147ecb98107f019fa7d':
Allow releaseBuffer after flush
Glenn Kasten [Fri, 18 Oct 2013 22:06:37 +0000 (15:06 -0700)]
am
95c03858: Merge "Allow releaseBuffer after flush" into klp-dev
* commit '
95c03858e2ab4fb693a2bfe47b3caa806e43c044':
Allow releaseBuffer after flush
Glenn Kasten [Fri, 18 Oct 2013 22:02:46 +0000 (22:02 +0000)]
Merge "Allow releaseBuffer after flush" into klp-dev
Vineeta Srivastava [Thu, 17 Oct 2013 21:23:00 +0000 (14:23 -0700)]
Fix kAutoRampDurationUs overflow issue
When kAutoRampDurationUs multiplies with mSampleRate, it overflows to int64.
Type cast it to int64 to make sure RampDurationUs properly.
BUg:
11162491
Change-Id: I4f93bc9acc8456e25623a9255ca7a5b206425009
Glenn Kasten [Fri, 18 Oct 2013 20:00:29 +0000 (13:00 -0700)]
Allow releaseBuffer after flush
After AudioTrack start checks for pending flush,
allow releaseBuffer on any previously obtained buffer.
For example, this can happen if the resampler has obtained
a buffer but not released the whole buffer yet.
Note that the resampler will be reading obsolete data.
Bug:
11285590
Change-Id: I0614fbb62e43604aac3089cce4b7797c87a306b5
Eric Laurent [Fri, 18 Oct 2013 20:03:34 +0000 (13:03 -0700)]
am
6edd8ca5: am
6a51d7ed: audioflinger: fix track terminated before playing
* commit '
6edd8ca5b7e3d169db4314d2b994bc9d48e9e082':
audioflinger: fix track terminated before playing
Eric Laurent [Fri, 18 Oct 2013 20:00:04 +0000 (13:00 -0700)]
am
6a51d7ed: audioflinger: fix track terminated before playing
* commit '
6a51d7ed7062536ccc892c8850a34ed55cbc8d5c':
audioflinger: fix track terminated before playing
Eric Laurent [Fri, 18 Oct 2013 01:59:26 +0000 (18:59 -0700)]
audioflinger: fix track terminated before playing
When a track is terminated before any audio was written,
we should not send a drain request to the HAL. The drain
will be ignored and we will wait the async callback for ever.
Also fix a potential deadlock by not deleting a track with the
thread mutex held: mPreviousTrack changed from a sp to a raw pointer.
Bug:
11247103.
Change-Id: I0a4b47b099204c7c326d45d700234ab8f72d8eae
Glenn Kasten [Thu, 17 Oct 2013 23:23:39 +0000 (16:23 -0700)]
am
e45796de: am
dedc7b0f: Merge "Fix flush() followed by start()" into klp-dev
* commit '
e45796dee9c072cdb13a00b407e68be2cd55e2f2':
Fix flush() followed by start()
Glenn Kasten [Thu, 17 Oct 2013 23:19:44 +0000 (16:19 -0700)]
am
dedc7b0f: Merge "Fix flush() followed by start()" into klp-dev
* commit '
dedc7b0fa23c21b525dc8abb572bb8161ad66a9b':
Fix flush() followed by start()
Glenn Kasten [Thu, 17 Oct 2013 23:12:05 +0000 (23:12 +0000)]
Merge "Fix flush() followed by start()" into klp-dev
Andreas Huber [Thu, 17 Oct 2013 21:40:45 +0000 (14:40 -0700)]
am
694d0295: am
6fa20187: Make sure we get to discover that the cache is sufficiently full again
* commit '
694d0295b986e4ed8f91e71cc5ac8af0341be1de':
Make sure we get to discover that the cache is sufficiently full again
Andreas Huber [Thu, 17 Oct 2013 21:16:43 +0000 (14:16 -0700)]
am
6fa20187: Make sure we get to discover that the cache is sufficiently full again
* commit '
6fa20187e4cf9ace5692979a84741484f19e3f57':
Make sure we get to discover that the cache is sufficiently full again
Andreas Huber [Thu, 17 Oct 2013 20:24:42 +0000 (13:24 -0700)]
Make sure we get to discover that the cache is sufficiently full again
by posting buffering events while in the CACHE_UNDERRUN state.
Change-Id: Ic60c8d57f0ae502aa2b6eec7160dc4224b989604
related-to-bug:
11262689
Glenn Kasten [Thu, 17 Oct 2013 18:32:39 +0000 (11:32 -0700)]
Fix flush() followed by start()
Bug:
11259166
Change-Id: I72526cdfd4e3ff4b06e6a317e577f57cc285205d
Glenn Kasten [Thu, 17 Oct 2013 01:12:55 +0000 (18:12 -0700)]
am
b2059ff3: am
f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
* commit '
b2059ff384eee8ffb70a7ec8fc5570405201c734':
Fix race condition in AudioTrack::pause followed by start
Glenn Kasten [Thu, 17 Oct 2013 01:07:33 +0000 (18:07 -0700)]
am
f8f15b05: Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
* commit '
f8f15b05fe051009945c9042a1a9260280e0feb2':
Fix race condition in AudioTrack::pause followed by start
Ed Heyl [Thu, 17 Oct 2013 01:02:14 +0000 (18:02 -0700)]
am
fc24dc1a: am
787c0d04: merge in klp-release (no-op)
* commit '
fc24dc1a2e2ba8d74bfadfadb01d12a542828561':
Camera: Skip AE precapture when possible
Cleanup openRecord error handling
TimedEventQueue takes a wake lock
fix offload audio effect proxy implementation uuid
MediaCodecInfo: report supported color formats for non-native-window mode
Camera2 API: Hack: Always use async mode with GLConsumer
AudioTrack: fix music resume
Zhijun He [Thu, 17 Oct 2013 01:02:14 +0000 (18:02 -0700)]
am
dddafa84: am
3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev
* commit '
dddafa84dcbd85c11a732e7553d0b884e5a08c27':
Camera: don't do hw support check for ZSL
Glenn Kasten [Thu, 17 Oct 2013 00:59:33 +0000 (00:59 +0000)]
Merge "Fix race condition in AudioTrack::pause followed by start" into klp-dev
Ed Heyl [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
787c0d04: merge in klp-release (no-op)
* commit '
787c0d04ac4f9c938a1311f8e30d9d7ac2b8a6da':
Camera: Skip AE precapture when possible
Cleanup openRecord error handling
TimedEventQueue takes a wake lock
fix offload audio effect proxy implementation uuid
MediaCodecInfo: report supported color formats for non-native-window mode
Camera2 API: Hack: Always use async mode with GLConsumer
AudioTrack: fix music resume
Zhijun He [Thu, 17 Oct 2013 00:56:41 +0000 (17:56 -0700)]
am
3defdab8: Merge "Camera: don\'t do hw support check for ZSL" into klp-dev
* commit '
3defdab829de7df3a343393b2b277e99d071744c':
Camera: don't do hw support check for ZSL
Ed Heyl [Thu, 17 Oct 2013 00:42:20 +0000 (17:42 -0700)]
merge in klp-release (no-op)
Glenn Kasten [Thu, 17 Oct 2013 00:02:13 +0000 (17:02 -0700)]
Fix race condition in AudioTrack::pause followed by start
Bug:
11148722
Change-Id: Iec88f00c8510363d4418e4b8d5b34feb06ecf04d
Zhijun He [Wed, 16 Oct 2013 22:47:47 +0000 (22:47 +0000)]
Merge "Camera: don't do hw support check for ZSL" into klp-dev
Eric Laurent [Wed, 16 Oct 2013 22:38:30 +0000 (15:38 -0700)]
am
7f8c3973: am
120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '
7f8c397378a7ee5abd395413be71388ad36d3ed2':
AudioTrack: fix head position after restore
Eric Laurent [Wed, 16 Oct 2013 22:35:35 +0000 (15:35 -0700)]
am
120a8847: Merge "AudioTrack: fix head position after restore" into klp-dev
* commit '
120a88471a607c85c4d60300d73c3be0a1e8f8c8':
AudioTrack: fix head position after restore
OSDN Git Service
