summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Unwedge ACodec if allocating output buffers fails while reconfiguring.Andreas Huber2012-05-291-5/+8
| | | | | Change-Id: I871cf639167c01860e65c0408d3ce935f8f8f1ea related-to-bug: 6571060
* Merge "Property to enable AAC 5.1 pass-through." into jb-devDave Burke2012-05-253-3/+18
|\
| * Property to enable AAC 5.1 pass-through.Dave Burke2012-05-253-3/+18
| | | | | | | | | | Bug: 6275957 Change-Id: I8debdce872fc8287a4f6340f1790e02c075886e3
* | Merge "Prevent occurences of clipping in loud downmixed scenes" into jb-devJean-Michel Trivi2012-05-251-20/+20
|\ \
| * | Prevent occurences of clipping in loud downmixed scenesJean-Michel Trivi2012-05-241-20/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | 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
* | Fix an error caused by sample size value by orderJames Dong2012-05-241-2/+2
| | | | | | | | | | | | | | | | | | 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
* | audioflinger: change session check in createTrack.Eric Laurent2012-05-241-7/+3
|/ | | | | | | | | | | | | | 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
* audioflinger: refine latency latency calculation.Eric Laurent2012-05-223-1/+23
| | | | | | | | | | | | 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
* Merge "Tell surface flinger that we want to protect output buffers from ↵Andreas Huber2012-05-223-0/+182
|\ | | | | | | being" into jb-dev
| * Tell surface flinger that we want to protect output buffers from beingAndreas Huber2012-05-223-0/+182
| | | | | | | | | | | | | | | | 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
* | Merge "Keep a copy of most recent audio played" into jb-devGlenn Kasten2012-05-227-3/+90
|\ \ | |/ |/|
| * Keep a copy of most recent audio playedGlenn Kasten2012-05-217-3/+90
| | | | | | | | Change-Id: I6b2f97881c39998a2fae9ab79d669af6c0a37e94
* | Only mark the audio player as started if it did so successfully.Andreas Huber2012-05-221-2/+2
| | | | | | | | | | Change-Id: I4683f5ca243f9f1b80990028d225d0f6c5973899 related-to-bug: 6500580
* | Revert "Stop audio source if AudioPlayer could not be started"Andreas Huber2012-05-221-7/+6
| | | | | | | | This reverts commit 022048e95f3f1d65cb776cf21de2001423fcf7d9.
* | Revert "Revert to PV for AAC codec for FactoryROM."Dave Burke2012-05-212-4/+4
| | | | | | | | | | | | This reverts commit d7d79a2bbf38d1d19ec7cc8d6a514fc999b5c444. Change-Id: I7076feab31ab64fccd364699280d821011edc099
* | Revert to PV for AAC codec for FactoryROM.Dave Burke2012-05-212-4/+4
| | | | | | | | Change-Id: I72cf856685c0c4bae745646f870a0415d416afb5
* | Merge "Fix a mediaserver crash caused by dereferencing a NULL pointer." into ↵James Dong2012-05-211-5/+5
|\ \ | | | | | | | | | jb-dev
| * | Fix a mediaserver crash caused by dereferencing a NULL pointer.James Dong2012-05-211-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "For an RTSP live stream we won't map rtp time to normal play time," ↵Andreas Huber2012-05-211-8/+3
|\ \ \ | |_|/ |/| | | | | into jb-dev
| * | For an RTSP live stream we won't map rtp time to normal play time,Andreas Huber2012-05-211-8/+3
| | | | | | | | | | | | | | | | | | | | | since we don't have the information necessary. Change-Id: I3119fcc061c4b6756a69c6139ffdf013d806fee1 related-to-bug: 6528548
* | | Merge "Add more verbose ADTS error logging to SoftAAC." into jb-devAndreas Huber2012-05-212-20/+46
|\ \ \
| * | | Add more verbose ADTS error logging to SoftAAC.Andreas Huber2012-05-212-20/+46
| |/ / | | | | | | | | | | | | | | | | | | and fix the corresponding code in SoftAAC2. Change-Id: I6c745fb6e8e093708fdfe2861963b0a35fa7b912 related-to-bug: 6519161
* | | If we encounter an error during buffer allocation change state backAndreas Huber2012-05-211-0/+2
|/ / | | | | | | | | | | | | | | 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
* | Instead of asserting on malformed ADTS headers or insufficient data,Andreas Huber2012-05-181-18/+43
| | | | | | | | | | | | | | stop decoding and signal a runtime error. Change-Id: Ib66a17a2908273f65a92999951439cc6f0752164 related-to-bug: 6519161
* | Merge "Add throttle to have pipe fill at more stable rate" into jb-devGlenn Kasten2012-05-182-17/+58
|\ \ | |/ |/|
| * Add throttle to have pipe fill at more stable rateGlenn Kasten2012-05-182-17/+58
| | | | | | | | Change-Id: Ibff9ab62764e2acd04518a4a00e25f19e28aff4a
* | Don't reconfigure stream after outputing data.Dave Burke2012-05-181-17/+40
|/ | | | | | | Handle invalid configuration. Bug: 6519161 Change-Id: Ib2d38bee769e63e627c93d7f3839c3a55de694e9
* Merge "systrace for audio" into jb-devGlenn Kasten2012-05-183-5/+27
|\
| * systrace for audioGlenn Kasten2012-05-173-5/+27
| | | | | | | | | | | | | | | | | | | | Trace fast track buffer fill status for underruns etc. Move the definition of macro to Android.mk. No overhead if disabled. Change-Id: If0e83e21b61b059ca38f543f8a6ffb58e08c79ee
* | Robustness - use defaults if we see bogus sample rate / channels from decoder.Dave Burke2012-05-171-5/+6
| | | | | | | | | | Bug: 6498711 Change-Id: I6950d316a292cfd0cb516ee6d95b6af071b08fdc
* | Handle stream changes at any point in the stream.Dave Burke2012-05-172-34/+15
| | | | | | | | | | | | | | Also, handle discontinuity properly (was using wrong flag before). Bug: 6498711 Change-Id: I18a6684f7dc96aa04b1e8113b54ec1053895ca98
* | Merge "Clear the decoder input buffer after it signalled an error to be able ↵Dave Burke2012-05-171-1/+3
|\ \ | | | | | | | | | to continue." into jb-dev
| * | Clear the decoder input buffer after it signalled an error to be able to ↵Andreas Huber2012-05-171-1/+3
| |/ | | | | | | | | | | | | continue. Change-Id: I06d43723dea7688d63cfb05e7fc7754672788562 related-to-bug: 6419102
* | Fixes parsing of PSI sections in MPEG2 transport streamsAndreas Huber2012-05-172-13/+160
|/ | | | | | | | They can span multiple transport stream packets, something the parser previously did not support. Change-Id: I78da6ffd2d422cceedb87aad61cba2062419e635 related-to-bug: 6166596
* Merge "Display pipe underrun counters in dumpsys" into jb-devGlenn Kasten2012-05-172-2/+7
|\
| * Display pipe underrun counters in dumpsysGlenn Kasten2012-05-172-2/+7
| | | | | | | | | | | | | | | | 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
* | Skip bad kHz values, and display them accuratelyGlenn Kasten2012-05-171-6/+9
|/ | | | | | | | 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
* Merge "Buffer at least 2 secs worth of data at startup of after a seek ↵Andreas Huber2012-05-174-0/+80
|\ | | | | | | before" into jb-dev
| * Buffer at least 2 secs worth of data at startup of after a seek beforeAndreas Huber2012-05-174-0/+80
| | | | | | | | | | | | | | resuming starting RTSP playback. Change-Id: I060c6c7fd627ab7ebd5c095ddcfdb4cc0f637aad related-to-bug: 6364126
* | Merge "Prefix MPEG4-generic audio data with ADTS headers" into jb-devAndreas Huber2012-05-176-35/+128
|\ \
| * | Prefix MPEG4-generic audio data with ADTS headersAndreas Huber2012-05-176-35/+128
| |/ | | | | | | | | | | | | to work around limitations of the new AAC decoder. Change-Id: I4988c7c39fedb7d04eb1ae2ba2d618aa6cb14e77 related-to-bug: 6488547
* | Merge "Add informational logging to track 0 channel issue." into jb-devDave Burke2012-05-171-3/+3
|\ \
| * | Add informational logging to track 0 channel issue.Dave Burke2012-05-171-3/+3
| | | | | | | | | | | | | | | | | | Bug #: 6498711 Change-Id: I952777923569511a171fe8b79eab579625eda073
* | | Stop audio source if AudioPlayer could not be startedJames Dong2012-05-171-6/+7
|/ / | | | | | | | | | | related-to-bug: 6500580 Change-Id: If47e442db2f1ea400e9b598502bb48513f28cd6d
* | Merge "Stop extrapolating audio time from the anchor if we're paused or ↵Andreas Huber2012-05-172-2/+20
|\ \ | |/ |/| | | reached eos." into jb-dev
| * Stop extrapolating audio time from the anchor if we're paused or reached eos.Andreas Huber2012-05-152-2/+20
| | | | | | | | | | Change-Id: I55903ba625d9c075a9a6e7bcd5ff95d450b915b2 related-to-bug: 6479613
* | Merge "Stereo downmixer supports generic configurations. Fix 7.1 downmix" ↵Jean-Michel Trivi2012-05-162-11/+282
|\ \ | | | | | | | | | into jb-dev
| * | Stereo downmixer supports generic configurations. Fix 7.1 downmixJean-Michel Trivi2012-05-162-11/+282
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a generic downmixer to stereo function to handle the multichannel configurations not supported by the dedicated downmix functions. It first verifies the mask is supported, and then derives channel indices for the downmix. Added support for forcing the generic downmixer to be always used instead of the format-specific functions (define DOWNMIX_ALWAYS_USE_GENERIC_DOWNMIXER to force it). Fixed 7.1 downmix function where handling of accumulate vs overwrite was inversed. Bug 4280902 Change-Id: I8259b32c4e90f76ef4dcd803592fc71df4ae90c5
* | | Remove libvideoeditor_jni.so's dependency on static libs in video editor engineJames Dong2012-05-167-48/+57
| | | | | | | | | | | | | | | | | | related-to-bug: 6502980 Change-Id: I9cbbf44eb53c406263df4003cc3de2af4d239180
* | | Merge "Add logging for invalid channel count or sample rate." into jb-devDave Burke2012-05-151-0/+3
|\ \ \