summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* SurfaceMediaSource: keep refs to current buffersJamie Gennis2012-06-221-48/+52
| | | | | | | | | This change fixes a bug in SurfaceMediaSource where it would not keep a reference to all of the Gralloc buffers that the video encoder is currently using. Bug: 6655597 Change-Id: Ifd99976cc7ae57ed724bbf2bbcff357a39497391
* Fix track selection code in AwesomePlayerInsun Kang2012-06-151-1/+1
| | | | | Change-Id: I1c5a2f13f562a0ba253a93b4346cbe2c60099ddd related-to-bug: 6671977
* Merge "stagefright: set scaling mode for blank frames" into jb-devJamie Gennis2012-06-141-0/+8
|\
| * stagefright: set scaling mode for blank framesJamie Gennis2012-06-141-0/+8
| | | | | | | | | | | | | | | | This change sets the ANativeWindow scaling mode before pushing the blank frames during decoder tear down. Bug: 6603254 Change-Id: Ic64011645e2d3671b4a8d302ac7f39e6fd3affcd
* | Fix audio track pause.Eric Laurent2012-06-141-0/+1
|/ | | | | | | | | | | | AudioTrack::pause() should signal the control block condition to release threads waiting for available buffers in obtainBuffer(). Otherwise the behavior relies on the timout on the condition or the fact that audioflinger will mix a new audio buffer while executing the pause. Bug 6653769. Change-Id: I5f8f73c471fe306070f30b814f32fd4b4dc1d575
* Merge "Better handle invalid duration in Xing/VBRI tags" into jb-devMarco Nelissen2012-06-142-7/+16
|\
| * Better handle invalid duration in Xing/VBRI tagsMarco Nelissen2012-06-132-7/+16
| | | | | | | | | | | | b/6654637 Change-Id: Ie92eddd84ef5914b77dbadaacd80b4de6cd66e1c
* | Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-141-3/+3
|\ \
| * | Log track name on obtain/releaseBuffer warningsGlenn Kasten2012-06-131-3/+3
| |/ | | | | | | | | | | | | This should help diagnose problems by allowing us to correlate the logs with the dumpsys media.audio_flinger output. Change-Id: I8c7c592b4f87d13b0f29c66ce7a2f301a0f063c9
* | Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under ↵James Dong2012-06-1388-0/+8360
|\ \ | | | | | | | | | /frameworks/av/" into jb-dev
| * | Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-1388-0/+8360
| |/ | | | | | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* | Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-devJames Dong2012-06-131-1/+7
|\ \ | |/ |/|
| * Fix one of the potential ANR issues from AwesomePlayerJames Dong2012-06-121-1/+7
| | | | | | | | | | Change-Id: I8ac7bbb5fe219f65bdbdd223538fbac0575e2957 related-to-bug: 6565826
* | Merge "stagefright: fix AudioRecord callback buffer size" into jb-devEric Laurent2012-06-121-13/+33
|\ \ | |/ |/|
| * stagefright: fix AudioRecord callback buffer sizeEric Laurent2012-06-121-13/+33
| | | | | | | | | | | | | | | | | | | | | | Make sure that the maximum number of frames passed to AudioSource by the AudioRecord callback always fits within the maximum buffer size defined by kMaxBufferSize. Also make sure that the total AudioRecord buffer size is more than the minimum required. Change-Id: I26a1f998e0cf75ac88b02e67ec9d8db3c0cca193
* | Add NOTICE and MODULE_LICENSE_APACHE2 for libstagefright_soft_h264dec and ↵James Dong2012-06-124-0/+380
|/ | | | | | | libstagefright_soft_vpxdec Change-Id: Id4f1ef8dfc21731846a9862b8d12940a92fe99bb related-to-bug: 6647465
* Merge "Update make file" into jb-devDave Burke2012-06-122-4/+2
|\
| * Update make fileDave Burke2012-06-122-4/+2
| | | | | | | | Change-Id: I7dbd128245f584df2689457df0dd12ce888cf8ef
* | Merge "Fix gapless for deep buffers" into jb-devMarco Nelissen2012-06-121-0/+1
|\ \
| * | Fix gapless for deep buffersMarco Nelissen2012-06-111-0/+1
| | | | | | | | | | | | | | | | | | | | | Forward current flags to next output. b/6645676 Change-Id: I584f7a67472d99cbd6bc38f3fe84763331d115d1
* | | Merge "Fix gapless playback" into jb-devMarco Nelissen2012-06-111-38/+47
|\ \ \ | |/ / | | / | |/ |/|
| * Fix gapless playbackMarco Nelissen2012-06-111-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | On some devices the actual framecount per buffer of an AudioTrack will be different than what was requested, which prevented the track from being reused. Now we create a new AudioTrack with the requested parameters, and then compare it to the track we already have. If they match, we throw away the new track and reuse the existing one. b/6644559 Change-Id: Id3e8c4460436f52e59b98ecaeb01c94f02877c1d
* | Revert "Added some informational log messages to track down ANR related issues"James Dong2012-06-111-3/+2
|/ | | | | | This reverts commit c558fa89016ba9583049b84dc57e66a913cabde8. related-to-bug: 6565826
* Reduce underruns in screen off, esp. with EQGlenn Kasten2012-06-081-0/+1
| | | | | | | | | | | | Add MonoPipe APIs to specify setpoint. Use screen state to configure pipe setpoint. Fix a long-standing bug where pipe sleep time was excessive, which interacted poorly with governor and low clock frequencies. Now it deducts the elapsed time since last write(), which was significant when there was EQ and low clock frequency. Bug: 6618373 Change-Id: I6f3b0072c2244aeb033ef0795ad164491a164ff5
* Take latency and current time into account for visualizationMarco Nelissen2012-06-071-34/+63
| | | | | | | | | | Buffer more data, and return the data that is currently being output from the audio output, to ensure that visualizations are smooth and responsive even when the audio output has a large latency and/or large buffers. b/6522728 Change-Id: I401637f01be7600b3c594a55c869036c13b206c0
* Part of fix for double spins & faster startupJeff Tinker2012-05-311-8/+12
| | | | | | | | | | | | | | | | | | This change alters the way that the media player interacts with the Widevine adaptive streaming buffer logic. It eliminates the reliance on cached buffer duration to determine pause/play states and instead only generates buffering events when the widevine library is not producing data (i.e. when it is buffering). This eliminates unnecessary pause and rebuffer cycles, reducing startup time and the frequency and duration of spinners. Multi-repo commit, depends on related changes in vendor/widevine Change-Id: I387db2decd83841775a8351bddf5a6381fe4104f related-to-bug:6503294 related-to-bug:6463780
* Do not keep audio wake lock when apps underrun.Eric Laurent2012-05-311-14/+24
| | | | | | | | | Do not automatically restart an AudioTrack after an underrun if the callback is executed but no data is written by the app. Bug 6541286. Change-Id: I11e7ab8dc968d7ff087058fec68f44490d3a7731
* Only send port settings changed if the number of channels and sample rate ↵James Dong2012-05-301-6/+12
| | | | | | | are both known to be valid. Change-Id: I9f8813eedc95db202488d8860cf485bdb8e69e11 related-to-bug: 6553089
* Merge "Precautionary logging to identify a potential infinite loop." into ↵Dave Burke2012-05-291-0/+3
|\ | | | | | | jb-dev
| * Precautionary logging to identify a potential infinite loop.Dave Burke2012-05-291-0/+3
| | | | | | | | | | Bug: 6571063 Change-Id: I433659c6da333d5acd25ad03cb7f4a6ab0b6a4a5
* | Added some informational log messages to track down ANR related issuesJames Dong2012-05-291-2/+3
| | | | | | | | | | Change-Id: Ie991c86e75d58f7eb4c9f524815c4de054d5f262 related-to-bug: 6565826
* | Merge "Unwedge ACodec if allocating output buffers fails while ↵Andreas Huber2012-05-291-5/+8
|\ \ | | | | | | | | | reconfiguring." into jb-dev
| * | Unwedge ACodec if allocating output buffers fails while reconfiguring.Andreas Huber2012-05-291-5/+8
| | | | | | | | | | | | | | | Change-Id: I871cf639167c01860e65c0408d3ce935f8f8f1ea related-to-bug: 6571060
* | | Force shutdown of the omx decoder even if it's in a wedged state...Andreas Huber2012-05-291-7/+31
|/ / | | | | | | | | Change-Id: I5899928a3df4bcf7715769992955a0b834db1e2f 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
* Tell surface flinger that we want to protect output buffers from beingAndreas Huber2012-05-222-0/+180
| | | | | | | | 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
* 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