summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGEEdwin Wong2012-07-175-24/+19
| | | | | | | jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36 Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d related-to-bug: 6732061
* libstagefright: dynamically load libstagefright_chromium_httpColin Cross2012-07-027-12/+170
| | | | | | | | | dlopen libstagefright_chromium_http to allow it to be on the platform side of the pdk without getting overwritten during a pdk fusion build. Bug: 6772533 Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
* am 109347d4: audioflinger: fix regression in attachAuxEffect().Eric Laurent2012-07-021-4/+1
|\ | | | | | | | | * commit '109347d421413303eb1678dd9e2aa9d40acf89d2': audioflinger: fix regression in attachAuxEffect().
| * audioflinger: fix regression in attachAuxEffect().Eric Laurent2012-07-021-4/+1
| | | | | | | | | | | | | | | | | | | | | | Commit 717e1286 introduced a regression in PlaybackThread::Track::attachAuxEffect() when called with an effect ID of 0 to detach the auxiliary effect. It is normal in this case that AudioFlinger::getEffectThread_l() returns 0. Bug 6768757. Change-Id: I7430bd1aad2f68da38f7c3e4794e7ad657bfc6be
* | am 717e1286: audioflinger: fix auxiliary effect attachmentEric Laurent2012-07-012-0/+65
|\ \ | |/ | | | | | | * commit '717e128691f083a9469a1d0e363ac6ecd5c65d58': audioflinger: fix auxiliary effect attachment
| * audioflinger: fix auxiliary effect attachmentEric Laurent2012-06-292-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auxiliary effects (Reverb) are global effects and as such follow the default rule which is to attach them to the output thread that handles music streams by default. This causes a problem when several threads are eligible to handle music streams as tracks can be attached to either thread based on criteria unknown when teh effect is created. The fix consists in moving the auxiliary effect if necessary when an AudioTrack is attached to it and this track is not on the same output thread. Bug 6608561. Change-Id: Ib32c3cabc731b2046aba728be1771982999c6069
* | Process EBD and FBD messages in ERROR stateHaynes Mathew George2012-06-281-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | - OMXCodec::on_message() function drops all OMX messages if OMXCodec is in ERROR state - This can cause EBD/FBD messages containing valid buffers to be dropped - Avoid dropping EBD/FBD messages so that buffer book-keeping is still possible Change-Id: Idc1174b3fa946b26458d49394b87fba1738b228e Signed-off-by: Iliyan Malchev <malchev@google.com>
* | am 33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into ↵Jamie Gennis2012-06-252-60/+58
|\ \ | |/ | | | | | | | | | | jb-dev * commit '33e28dd3c033641f4db9d1b99c7c88d6d08c61f7': SurfaceMediaSource: keep refs to current buffers
| * Merge "SurfaceMediaSource: keep refs to current buffers" into jb-devJamie Gennis2012-06-222-60/+58
| |\
| | * SurfaceMediaSource: keep refs to current buffersJamie Gennis2012-06-222-60/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Add vendor specific output color formatHaynes Mathew George2012-06-212-2/+4
| | | | | | | | | | | | | | | | | | | | | - Add Qualcomm specific color format support to OMXCodec and ACodec - This is the default color format supported on QCom chipsets Change-Id: Id947b158c3b403c2d347f708bc1e780b4d65e220
* | | am 39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
|\ \ \ | |/ / | | | | | | | | | * commit '39a3113539f9bcc86a8efe562780c23ac8731098': Revert input buffer count for the SoftAAC* decoders back to 4.
| * | Revert input buffer count for the SoftAAC* decoders back to 4.Andreas Huber2012-06-202-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the netflix bandwidth change responsiveness. With the old count of 32 the audio decoder running at a higher priority would starve the video decoder for about 1 sec while draining the input data. I haven't been able to break any stream playback using MediaCodec using the lower count, even though I'm sure I had a good reason to increase it in the first place (see bug 6478823) Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4 related-to-bug: 6685031
* | am eb15716b: Change definition of warmup periodGlenn Kasten2012-06-151-2/+5
|\ \ | |/ | | | | | | * commit 'eb15716b59020f342df62bce5b293f0603b94861': Change definition of warmup period
| * Change definition of warmup periodGlenn Kasten2012-06-151-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, warmup was considered done as soon as any write() took more than 0.5 nominal cycle time. In practice, this was always the first write() that turned on power to the output path, and it didn't accurately account for filling the full kernel buffer queue, or for buffering in the HAL sample rate conversion. Now warmup is considered done when a write() _after_ the first write takes more than 0.5 nominal cycle time. This will throttle the initial pull rate after coming out of standby. When combined with another change to throttle the pull rate for devices with HAL sample rate conversion, it may help reduce some of the notification glitches. The only downside is that it will increase the warmup time a bit. Bug: 6508317, 6650846, 6607056 Change-Id: I39f324c5195578170a55308e9601d3a1b41db3e0
* | am 972af221: FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-151-6/+14
|\ \ | |/ | | | | | | * commit '972af221ae7253e406e0e1ea853e56a3010ed6b1': FastMixer compensates for SRC jitter in audio HAL
| * FastMixer compensates for SRC jitter in audio HALGlenn Kasten2012-06-151-6/+14
| | | | | | | | | | | | | | Force a sleep if audio HAL write() returns too quickly. Bug: 6661275 Change-Id: Ie810f5a087b89fb24dab229a0e500af1dee53571
* | am fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
|\ \ | |/ | | | | | | * commit 'fc42e16d96b7e1b18b573f40df1319c56f8ab933': Fix track selection code in AwesomePlayer
| * Merge "Fix track selection code in AwesomePlayer" into jb-devJames Dong2012-06-151-1/+1
| |\
| | * Fix track selection code in AwesomePlayerInsun Kang2012-06-151-1/+1
| | | | | | | | | | | | | | | Change-Id: I1c5a2f13f562a0ba253a93b4346cbe2c60099ddd related-to-bug: 6671977
* | | am 0a14c4ce: Make CPU frequency statistics optionalGlenn Kasten2012-06-153-4/+24
|\ \ \ | |/ / | | | | | | | | | * commit '0a14c4ce1a41bc09eb7855fa531a3af629a69139': Make CPU frequency statistics optional
| * | Make CPU frequency statistics optionalGlenn Kasten2012-06-143-4/+24
| |/ | | | | | | | | | | | | | | | | | | Certain CPUs with dynamic cluster swapping and hotplug don't report CPU frequency accurately. The file descriptors used to read the frequency become stale and report bogus data. So make this feature a build time option for debugging only. This will also improve performance of the fast mixer loop. Change-Id: I602f81ec3281a37992769208be08084ed1469e8c
* | am 362ebcbf: (-s ours) DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-140-0/+0
|\ \ | |/ | | | | | | * commit '362ebcbf100f7fccd37551c77e67c4faa7241b63': DO NOT MERGE Remove log spam for fast track denied
| * DO NOT MERGE Remove log spam for fast track deniedGlenn Kasten2012-06-141-1/+1
|/ | | | | Bug: 6531054 Change-Id: Iedf58e810a157aae88b5900da27c81054c437058
* 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 "Shorten dumpsys media.audio_flinger output" into jb-devGlenn Kasten2012-06-141-0/+4
|\ \
| * | Shorten dumpsys media.audio_flinger outputGlenn Kasten2012-06-131-0/+4
| |/ | | | | | | | | | | | | | | | | Don't include in FastMixer if it's not present. This removes confusing clutter especially for devices with a separate deep buffer output thread, or for the duplicating thread and A2DP output thread. Change-Id: I84933f5555593256f11ba0895ec915c09cf16963
* | Merge "Log track name on obtain/releaseBuffer warnings" into jb-devGlenn Kasten2012-06-143-6/+6
|\ \
| * | Log track name on obtain/releaseBuffer warningsGlenn Kasten2012-06-133-6/+6
| |/ | | | | | | | | | | | | 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-13110-0/+10450
|\ \ | | | | | | | | | /frameworks/av/" into jb-dev
| * | Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-13110-0/+10450
| |/ | | | | | | | | 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 "Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditor" into jb-devJames Dong2012-06-1214-0/+1330
|\ \ | |/ |/|
| * Add NOTICE and MODULE_LICENSE_APATCH2 to libvideoeditorJames Dong2012-06-1214-0/+1330
| | | | | | | | | | Change-Id: I19308c5fb0f39f8e696092186f4386e3dad06894 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
* | Merge "Revert "Added some informational log messages to track down ANR ↵James Dong2012-06-111-3/+2
|\ \ | |/ |/| | | related issues"" into jb-dev
| * 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