OSDN Git Service
The Android Open Source Project [Wed, 30 May 2012 17:13:13 +0000 (10:13 -0700)]
Reconcile with jb-release
Change-Id: Ia7adbc708c661ef21a54ae85315de1b061d3cd53
The Android Automerger [Wed, 30 May 2012 14:02:09 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev
James Dong [Tue, 29 May 2012 21:10:05 +0000 (14:10 -0700)]
Added some informational log messages to track down ANR related issues
Change-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262
related-to-bug:
6565826
Dave Burke [Wed, 30 May 2012 00:32:34 +0000 (17:32 -0700)]
am
4364d2d1: Merge "Precautionary logging to identify a potential infinite loop." into jb-dev
* commit '
4364d2d1fd712faed7e839b58fedba3f48f626d0':
Precautionary logging to identify a potential infinite loop.
Dave Burke [Wed, 30 May 2012 00:29:33 +0000 (17:29 -0700)]
Merge "Precautionary logging to identify a potential infinite loop." into jb-dev
Dave Burke [Tue, 29 May 2012 23:41:49 +0000 (16:41 -0700)]
Precautionary logging to identify a potential infinite loop.
Bug:
6571063
Change-Id: I433659c6da333d5acd25ad03cb7f4a6ab0b6a4a5
James Dong [Tue, 29 May 2012 23:29:26 +0000 (16:29 -0700)]
am
c558fa89: Added some informational log messages to track down ANR related issues
* commit '
c558fa89016ba9583049b84dc57e66a913cabde8':
Added some informational log messages to track down ANR related issues
James Dong [Tue, 29 May 2012 21:10:05 +0000 (14:10 -0700)]
Added some informational log messages to track down ANR related issues
Change-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262
related-to-bug:
6565826
Eino-Ville Talvala [Tue, 29 May 2012 20:42:17 +0000 (13:42 -0700)]
am
0bbf868d: Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev
* commit '
0bbf868d53f55646651db6717468faeac618859d':
DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock
Eino-Ville Talvala [Tue, 29 May 2012 20:39:41 +0000 (13:39 -0700)]
Merge "DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock" into jb-dev
Andreas Huber [Tue, 29 May 2012 18:38:34 +0000 (11:38 -0700)]
am
91b0d43a: Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring." into jb-dev
* commit '
91b0d43a27b3a1cebd75270f953f3fb9fa4f2047':
Unwedge ACodec if allocating output buffers fails while reconfiguring.
Andreas Huber [Tue, 29 May 2012 18:36:08 +0000 (11:36 -0700)]
Merge "Unwedge ACodec if allocating output buffers fails while reconfiguring." into jb-dev
Andreas Huber [Tue, 29 May 2012 18:33:29 +0000 (11:33 -0700)]
Unwedge ACodec if allocating output buffers fails while reconfiguring.
Change-Id: I871cf639167c01860e65c0408d3ce935f8f8f1ea
related-to-bug:
6571060
Eino-Ville Talvala [Tue, 29 May 2012 18:17:48 +0000 (11:17 -0700)]
DO NOT MERGE: Minimal fix for takePicture/previewCallback deadlock
- Caused by already held lock in camera service
- Introduce one more lock, mICameraLock, to control access to camera
client through ICamera binder interface.
- mLock is released before calling HAL takePicture, allowing HAL
callbacks to access camera client during takePicture processing.
Bug:
5804701
Change-Id: Ibcef4857a2c844c964afefa70f9cdccdd0a55fd0
Andreas Huber [Tue, 29 May 2012 18:19:03 +0000 (11:19 -0700)]
am
40fe18f2: Force shutdown of the omx decoder even if it\'s in a wedged state...
* commit '
40fe18f20e07f3626ff23d89ebdd5113733e155d':
Force shutdown of the omx decoder even if it's in a wedged state...
Andreas Huber [Tue, 29 May 2012 17:37:15 +0000 (10:37 -0700)]
Force shutdown of the omx decoder even if it's in a wedged state...
Change-Id: I5899928a3df4bcf7715769992955a0b834db1e2f
related-to-bug:
6571060
The Android Open Source Project [Tue, 29 May 2012 16:39:32 +0000 (09:39 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I51f6059054379d1cc1cc4bc6080f3bb48cf77a48
The Android Automerger [Tue, 29 May 2012 15:57:17 +0000 (08:57 -0700)]
merge in jb-release history after reset to jb-dev
Martin Storsjo [Fri, 25 May 2012 16:46:34 +0000 (19:46 +0300)]
stagefright aacenc: Fix reading out of bounds in pow2_xy
This fixes cases where x was a large number, causing fPart to
exceed the 32 bit signed integer range (while fitting in an
unsigned 32 bit integer), making the table index a negative
number.
Change-Id: I674047db65f89148a93d218c138b42cd8305f80e
Dave Burke [Fri, 25 May 2012 17:06:24 +0000 (10:06 -0700)]
am
6350e21e: Merge "Property to enable AAC 5.1 pass-through." into jb-dev
* commit '
6350e21e8947398a94402bc2969d13d407fbc3fb':
Property to enable AAC 5.1 pass-through.
Dave Burke [Fri, 25 May 2012 17:02:32 +0000 (10:02 -0700)]
Merge "Property to enable AAC 5.1 pass-through." into jb-dev
Dave Burke [Wed, 23 May 2012 07:00:53 +0000 (00:00 -0700)]
Property to enable AAC 5.1 pass-through.
Bug:
6275957
Change-Id: I8debdce872fc8287a4f6340f1790e02c075886e3
Jean-Michel Trivi [Fri, 25 May 2012 15:40:51 +0000 (08:40 -0700)]
am
c9d0294e: Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-dev
* commit '
c9d0294e0526510267a0c4148a0dbc0449bed223':
Prevent occurences of clipping in loud downmixed scenes
Jean-Michel Trivi [Fri, 25 May 2012 15:38:53 +0000 (08:38 -0700)]
Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-dev
Eric Laurent [Thu, 24 May 2012 18:07:14 +0000 (11:07 -0700)]
audioflinger: change session check in createTrack.
Do not refuse to create a track on an output thread if the same session
is present on another thread. It is now possible that two tracks
with the same session ID are on different threads if one can use deep
buffering and the other can't.
In this case, move effects attached to this session to the output
thread ion which the new track is created.
Bug
6530324.
Change-Id: I9019b3ee382e374c89d2319033afcfa7f886e4c4
James Dong [Thu, 24 May 2012 22:23:40 +0000 (15:23 -0700)]
am
49fcd3cc: Fix an error caused by sample size value by order
* commit '
49fcd3cc0c0bf352c5c0516e53805278e94951ca':
Fix an error caused by sample size value by order
James Dong [Thu, 24 May 2012 22:05:12 +0000 (15:05 -0700)]
Fix an error caused by sample size value by order
The sample size was saved in the array in network order, but it was treated as host order when
writeInt32() is called. Calling write(void *, int, int) resolves the issue.
related-to-bug:
6555366
Change-Id: If7ef99911ad65108c61b533673ac4d4cd580a370
Jean-Michel Trivi [Thu, 24 May 2012 17:11:07 +0000 (10:11 -0700)]
Prevent occurences of clipping in loud downmixed scenes
The downmixer effect is a mixer, wich, like the platform mixer,
hard-clips. To prevent clipping during loud scenes across multiple
chanels, apply a fixed attenuation on the result of the downmix.
Note that this attenuation is lower the theoretical required
attenuation (except for quad and surround) but is adequate for
most content.
Bug
4280902
Change-Id: Iec520e9f1367284d6102633f532429361717692d
Eric Laurent [Thu, 24 May 2012 18:42:50 +0000 (11:42 -0700)]
am
f436fdcf: audioflinger: change session check in createTrack.
* commit '
f436fdcf93bd417fd3c9d2a8b19fd221d894b5e3':
audioflinger: change session check in createTrack.
Eric Laurent [Thu, 24 May 2012 18:07:14 +0000 (11:07 -0700)]
audioflinger: change session check in createTrack.
Do not refuse to create a track on an output thread if the same session
is present on another thread. It is now possible that two tracks
with the same session ID are on different threads if one can use deep
buffering and the other can't.
In this case, move effects attached to this session to the output
thread ion which the new track is created.
Bug
6530324.
Change-Id: I9019b3ee382e374c89d2319033afcfa7f886e4c4
The Android Automerger [Thu, 24 May 2012 17:34:25 +0000 (10:34 -0700)]
Revert "Revert "Revert to PV for AAC codec for FactoryROM.""
This reverts commit
c9ef89cd40bea216046ed28e5366f8ac361d3dd4.
The Android Automerger [Thu, 24 May 2012 17:16:54 +0000 (10:16 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Thu, 24 May 2012 16:01:13 +0000 (09:01 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Id5f721d64bceada4e4d00fc49e0564af0497778d
Bernhard Rosenkraenzer [Thu, 29 Mar 2012 09:41:17 +0000 (11:41 +0200)]
libstagefright/matroska: Fix build with gcc 4.7
gcc 4.7 doesn't like the redefinition of i in the
same scope
Change-Id: Idf1b33af7041f0302f2f2562442a3e11ce9607d9
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Bernhard Rosenkraenzer [Thu, 29 Mar 2012 09:38:59 +0000 (11:38 +0200)]
libmedia: Fix build with gcc 4.7
gcc 4.7 doesn't like the redefinition of n in the same
scope:
for(size_t n=...;;) {
size_t n = 2; // <-- duplicate definition
}
Change-Id: Idfc2e768a0eb85a3dacccd3431b4ad44775432a4
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Kei Takahashi [Wed, 18 Jan 2012 08:10:19 +0000 (17:10 +0900)]
Add a new API on DRM Framework for streaming
In case of DRM streaming, decrypt session can start just after
receiving the header, and it doesn't need to wait for the entire
content. However, current API of DRM framework only accepts file
handle or URI. With this new API, DRM session can start
without waiting for the entire content.
Changes are made by SEMC and Sony.
Change-Id: I74375fe127df636067f1c300ea91654ba3d1aa3c
The Android Automerger [Wed, 23 May 2012 14:01:41 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev
Eric Laurent [Wed, 23 May 2012 04:13:29 +0000 (21:13 -0700)]
am
e737cda6: audioflinger: refine latency latency calculation.
* commit '
e737cda649acbfa43fc1b74612a83f2fac9aa449':
audioflinger: refine latency latency calculation.
Eric Laurent [Wed, 23 May 2012 01:55:44 +0000 (18:55 -0700)]
audioflinger: refine latency latency calculation.
There is an audio pipe between the normal mixer output and the fast
mixer to cope for scheduling delays and buffer size difference.
This pipe depth was not taken into account in latency calculation.
Adding the pipe contribution to the latency significantly improves A/V sync.
Bug
6520569.
Change-Id: I5584908e8aa8a02170eb38b22b4370eea800a235
The Android Automerger [Tue, 22 May 2012 20:56:51 +0000 (13:56 -0700)]
Revert "Revert "Revert to PV for AAC codec for FactoryROM.""
This reverts commit
c9ef89cd40bea216046ed28e5366f8ac361d3dd4.
Andreas Huber [Tue, 22 May 2012 20:50:55 +0000 (13:50 -0700)]
am
8d9846c0: Merge "Tell surface flinger that we want to protect output buffers from being" into jb-dev
* commit '
8d9846c0693b7651b243f0161caa86be506f764a':
Tell surface flinger that we want to protect output buffers from being
Andreas Huber [Tue, 22 May 2012 20:48:59 +0000 (13:48 -0700)]
Merge "Tell surface flinger that we want to protect output buffers from being" into jb-dev
The Android Automerger [Tue, 22 May 2012 20:23:06 +0000 (13:23 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Tue, 22 May 2012 20:05:11 +0000 (13:05 -0700)]
Reconcile with jb-release
Change-Id: I1f173833b337368c87084eccddb4d9b7d46294fd
Andreas Huber [Tue, 22 May 2012 19:55:03 +0000 (12:55 -0700)]
Tell surface flinger that we want to protect output buffers from being
sent to HDMI (without HDCP) and push a few black frames on IDLE->LOADED
similar to OMXCodec's behaviour.
Change-Id: Iea6055a115151ca881220a70a31af6ade2c58cb3
related-to-bug:
6537187
Glenn Kasten [Tue, 22 May 2012 19:15:35 +0000 (12:15 -0700)]
am
67e54402: Merge "Keep a copy of most recent audio played" into jb-dev
* commit '
67e5440202cc442621c352756537ead31fca80cf':
Keep a copy of most recent audio played
Glenn Kasten [Tue, 22 May 2012 19:13:58 +0000 (12:13 -0700)]
Merge "Keep a copy of most recent audio played" into jb-dev
Andreas Huber [Tue, 22 May 2012 18:05:57 +0000 (11:05 -0700)]
am
a6490c65: Only mark the audio player as started if it did so successfully.
* commit '
a6490c65f93e1cbe969fba499978e8d64214108a':
Only mark the audio player as started if it did so successfully.
Andreas Huber [Tue, 22 May 2012 18:05:56 +0000 (11:05 -0700)]
am
4575beb3: Revert "Stop audio source if AudioPlayer could not be started"
* commit '
4575beb3dea80e271eaa6619234fdc02e914e6e6':
Revert "Stop audio source if AudioPlayer could not be started"
Andreas Huber [Tue, 22 May 2012 17:51:06 +0000 (10:51 -0700)]
Only mark the audio player as started if it did so successfully.
Change-Id: I4683f5ca243f9f1b80990028d225d0f6c5973899
related-to-bug:
6500580
Andreas Huber [Tue, 22 May 2012 17:03:57 +0000 (10:03 -0700)]
Revert "Stop audio source if AudioPlayer could not be started"
This reverts commit
022048e95f3f1d65cb776cf21de2001423fcf7d9.
The Android Automerger [Tue, 22 May 2012 14:04:39 +0000 (07:04 -0700)]
merge in jb-release history after reset to jb-dev
Dave Burke [Tue, 22 May 2012 04:24:00 +0000 (21:24 -0700)]
am
c9ef89cd: Revert "Revert to PV for AAC codec for FactoryROM."
* commit '
c9ef89cd40bea216046ed28e5366f8ac361d3dd4':
Revert "Revert to PV for AAC codec for FactoryROM."
Dave Burke [Tue, 22 May 2012 04:20:39 +0000 (21:20 -0700)]
am
d7d79a2b: Revert to PV for AAC codec for FactoryROM.
* commit '
d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444':
Revert to PV for AAC codec for FactoryROM.
Dave Burke [Tue, 22 May 2012 04:18:22 +0000 (21:18 -0700)]
Revert "Revert to PV for AAC codec for FactoryROM."
This reverts commit
d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444.
Change-Id: I7076feab31ab64fccd364699280d821011edc099
Dave Burke [Sat, 19 May 2012 00:44:51 +0000 (17:44 -0700)]
Revert to PV for AAC codec for FactoryROM.
Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
Martin Storsjo [Fri, 13 Apr 2012 11:15:58 +0000 (14:15 +0300)]
stagefright avcenc: Use intptr_t for casting pointers to integers
This is used for doing integer arithmetic on the pointers, for
checking pointer alignment.
Change-Id: I7a7ff834dc631ac9cce90e46216f64645e1ae6e5
Martin Storsjo [Fri, 13 Apr 2012 11:16:26 +0000 (14:16 +0300)]
stagefright avcenc: Switch tmp variables to use the right type, to avoid casting
This fixes building on platforms where int is smaller than
pointers, e.g. 64 bit platforms.
Change-Id: I3da0459bac10cbffd1db699bf4782fe926cd391f
James Dong [Mon, 21 May 2012 20:59:32 +0000 (13:59 -0700)]
am
a92896f6: Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
* commit '
a92896f62d8f4a4a6ff61f26439ad61c210ce728':
Fix a mediaserver crash caused by dereferencing a NULL pointer.
Andreas Huber [Mon, 21 May 2012 20:57:32 +0000 (13:57 -0700)]
am
9ec3547e: Merge "For an RTSP live stream we won\'t map rtp time to normal play time," into jb-dev
* commit '
9ec3547e741f72adcf0ce5d173b1f4ab2cdd5db1':
For an RTSP live stream we won't map rtp time to normal play time,
James Dong [Mon, 21 May 2012 20:57:06 +0000 (13:57 -0700)]
Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into jb-dev
Andreas Huber [Mon, 21 May 2012 20:56:06 +0000 (13:56 -0700)]
Merge "For an RTSP live stream we won't map rtp time to normal play time," into jb-dev
James Dong [Mon, 21 May 2012 20:38:42 +0000 (13:38 -0700)]
Fix a mediaserver crash caused by dereferencing a NULL pointer.
The pointer (info in method drainInputBuffer) in can be null at the point of the dereference,
but it will get updated subsequently. Thus, we should move the logging after the pointer gets updated.
related-to-bug:
6530159
Change-Id: Ifa5f19a694953af6942454e5c28cd3fa024f11d2
Glenn Kasten [Mon, 21 May 2012 16:17:20 +0000 (09:17 -0700)]
Keep a copy of most recent audio played
Change-Id: I6b2f97881c39998a2fae9ab79d669af6c0a37e94
Andreas Huber [Mon, 21 May 2012 18:12:40 +0000 (11:12 -0700)]
For an RTSP live stream we won't map rtp time to normal play time,
since we don't have the information necessary.
Change-Id: I3119fcc061c4b6756a69c6139ffdf013d806fee1
related-to-bug:
6528548
Andreas Huber [Mon, 21 May 2012 17:14:45 +0000 (10:14 -0700)]
am
cd8a36fd: Merge "Add more verbose ADTS error logging to SoftAAC." into jb-dev
* commit '
cd8a36fdc49a823f78d45e8e1a464dc261553b26':
Add more verbose ADTS error logging to SoftAAC.
Andreas Huber [Mon, 21 May 2012 17:11:52 +0000 (10:11 -0700)]
Merge "Add more verbose ADTS error logging to SoftAAC." into jb-dev
Andreas Huber [Mon, 21 May 2012 17:02:14 +0000 (10:02 -0700)]
Add more verbose ADTS error logging to SoftAAC.
and fix the corresponding code in SoftAAC2.
Change-Id: I6c745fb6e8e093708fdfe2861963b0a35fa7b912
related-to-bug:
6519161
Andreas Huber [Mon, 21 May 2012 17:06:38 +0000 (10:06 -0700)]
am
91bfadb4: If we encounter an error during buffer allocation change state back
* commit '
91bfadb4aa75444c60e9949232de3c184cfe060a':
If we encounter an error during buffer allocation change state back
Andreas Huber [Mon, 21 May 2012 16:51:14 +0000 (09:51 -0700)]
If we encounter an error during buffer allocation change state back
to LOADED instead of remaining in the transitional state LOADED->IDLE
that won't properly handle flush or shutdown requests.
Change-Id: Ica1bf22eb884b220f18ed2a4f7a9c56eec228796
related-to-bug:
6516512
The Android Automerger [Sun, 20 May 2012 14:39:43 +0000 (07:39 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 19 May 2012 18:42:47 +0000 (11:42 -0700)]
merge in jb-release history after reset to jb-dev
The Android Automerger [Sat, 19 May 2012 17:05:47 +0000 (10:05 -0700)]
merge in jb-release history after reset to jb-dev
The Android Open Source Project [Sat, 19 May 2012 01:42:16 +0000 (18:42 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I8efb3018010f96a9a7dbcf004172c6069ea62f95
Andreas Huber [Fri, 18 May 2012 21:21:49 +0000 (14:21 -0700)]
am
8370c7ad: Instead of asserting on malformed ADTS headers or insufficient data,
* commit '
8370c7ad4136ad7e0787d5a91ccfa3d63cfbe5cc':
Instead of asserting on malformed ADTS headers or insufficient data,
Glenn Kasten [Fri, 18 May 2012 21:21:48 +0000 (14:21 -0700)]
am
7c2af29e: Merge "Add throttle to have pipe fill at more stable rate" into jb-dev
* commit '
7c2af29ebced41b1b7ed32910cc9b587fb8bbf5c':
Add throttle to have pipe fill at more stable rate
Dave Burke [Fri, 18 May 2012 21:21:47 +0000 (14:21 -0700)]
am
bf2461ec: Don\'t reconfigure stream after outputing data.
* commit '
bf2461ecc71c0aacf8c03fcdaf0dc46bc8285c7f':
Don't reconfigure stream after outputing data.
Glenn Kasten [Fri, 18 May 2012 21:21:47 +0000 (14:21 -0700)]
am
874a897f: Merge "systrace for audio" into jb-dev
* commit '
874a897f09dc7b06679bb273506d7e0fa0152220':
systrace for audio
Andreas Huber [Fri, 18 May 2012 20:08:14 +0000 (13:08 -0700)]
Instead of asserting on malformed ADTS headers or insufficient data,
stop decoding and signal a runtime error.
Change-Id: Ib66a17a2908273f65a92999951439cc6f0752164
related-to-bug:
6519161
Glenn Kasten [Fri, 18 May 2012 20:04:25 +0000 (13:04 -0700)]
Merge "Add throttle to have pipe fill at more stable rate" into jb-dev
Glenn Kasten [Fri, 18 May 2012 17:47:28 +0000 (10:47 -0700)]
Add throttle to have pipe fill at more stable rate
Change-Id: Ibff9ab62764e2acd04518a4a00e25f19e28aff4a
The Android Automerger [Fri, 18 May 2012 17:46:55 +0000 (10:46 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
Dave Burke [Fri, 18 May 2012 17:46:11 +0000 (10:46 -0700)]
Don't reconfigure stream after outputing data.
Handle invalid configuration.
Bug:
6519161
Change-Id: Ib2d38bee769e63e627c93d7f3839c3a55de694e9
Glenn Kasten [Fri, 18 May 2012 14:23:12 +0000 (07:23 -0700)]
Merge "systrace for audio" into jb-dev
Dave Burke [Fri, 18 May 2012 07:00:33 +0000 (00:00 -0700)]
am
441fbdea: Robustness - use defaults if we see bogus sample rate / channels from decoder.
* commit '
441fbdea6e46ddc6b99fa864ab1edaa9759ec033':
Robustness - use defaults if we see bogus sample rate / channels from decoder.
Dave Burke [Fri, 18 May 2012 06:55:34 +0000 (23:55 -0700)]
Robustness - use defaults if we see bogus sample rate / channels from decoder.
Bug:
6498711
Change-Id: I6950d316a292cfd0cb516ee6d95b6af071b08fdc
Dave Burke [Fri, 18 May 2012 06:16:56 +0000 (23:16 -0700)]
am
3748b71a: Handle stream changes at any point in the stream.
* commit '
3748b71a7fe73b0365a93f1fd28ced14219f85e5':
Handle stream changes at any point in the stream.
Dave Burke [Fri, 18 May 2012 06:08:08 +0000 (23:08 -0700)]
Handle stream changes at any point in the stream.
Also, handle discontinuity properly (was using wrong flag before).
Bug:
6498711
Change-Id: I18a6684f7dc96aa04b1e8113b54ec1053895ca98
Dave Burke [Fri, 18 May 2012 04:07:25 +0000 (21:07 -0700)]
am
3eda271f: Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev
* commit '
3eda271f8b1879467759f98e5538577b1b6804f4':
Clear the decoder input buffer after it signalled an error to be able to continue.
Dave Burke [Fri, 18 May 2012 04:05:38 +0000 (21:05 -0700)]
Merge "Clear the decoder input buffer after it signalled an error to be able to continue." into jb-dev
Andreas Huber [Fri, 18 May 2012 00:17:23 +0000 (17:17 -0700)]
am
8dfa2282: Fixes parsing of PSI sections in MPEG2 transport streams
* commit '
8dfa228201131da0bf3ba1d74c819c27c0500f6b':
Fixes parsing of PSI sections in MPEG2 transport streams
Glenn Kasten [Mon, 14 May 2012 23:37:13 +0000 (16:37 -0700)]
systrace for audio
Trace fast track buffer fill status for underruns etc.
Move the definition of macro to Android.mk.
No overhead if disabled.
Change-Id: If0e83e21b61b059ca38f543f8a6ffb58e08c79ee
Andreas Huber [Tue, 15 May 2012 19:37:29 +0000 (12:37 -0700)]
Fixes parsing of PSI sections in MPEG2 transport streams
They can span multiple transport stream packets, something the parser
previously did not support.
Change-Id: I78da6ffd2d422cceedb87aad61cba2062419e635
related-to-bug:
6166596
Andreas Huber [Thu, 17 May 2012 23:06:01 +0000 (16:06 -0700)]
Clear the decoder input buffer after it signalled an error to be able to continue.
Change-Id: I06d43723dea7688d63cfb05e7fc7754672788562
related-to-bug:
6419102
Glenn Kasten [Thu, 17 May 2012 22:48:56 +0000 (15:48 -0700)]
am
55247760: Merge "Display pipe underrun counters in dumpsys" into jb-dev
* commit '
552477608b137fb66af126655c6865207a82d888':
Display pipe underrun counters in dumpsys
Glenn Kasten [Thu, 17 May 2012 22:48:55 +0000 (15:48 -0700)]
am
c059bd42: Skip bad kHz values, and display them accurately
* commit '
c059bd4246c1b3944965be921e5b334d51cd236c':
Skip bad kHz values, and display them accurately
Glenn Kasten [Thu, 17 May 2012 22:47:18 +0000 (15:47 -0700)]
Merge "Display pipe underrun counters in dumpsys" into jb-dev
Glenn Kasten [Tue, 15 May 2012 14:39:27 +0000 (07:39 -0700)]
Display pipe underrun counters in dumpsys
The normal mixer writes it's submix to a pipe, which is read by the fast
mixer. Now dumpsys media.audio_flinger display the raw underrun counters
when fast mixer tries to pull from the pipe but doesn't get enough frames.
Change-Id: I72505f149f9e12802784da654a651d43734e1c79
Glenn Kasten [Tue, 15 May 2012 00:41:09 +0000 (17:41 -0700)]
Skip bad kHz values, and display them accurately
One device reports zero CPU kHz occasionally, so skip those values.
Preserve accuracy of the low-order 4 bits of the the CPU frequency.
Change-Id: I7d934f697412277462464fca82d112d0306a214e
Andreas Huber [Thu, 17 May 2012 21:54:55 +0000 (14:54 -0700)]
am
e00e0485: Merge "Buffer at least 2 secs worth of data at startup of after a seek before" into jb-dev
* commit '
e00e0485b0aa1e432be8c639da0eb5285942777b':
Buffer at least 2 secs worth of data at startup of after a seek before