summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Add AAC extractorGloria Wang2011-02-1510-52/+442
| | | | Change-Id: Iedb08525ac72e65ba98e5c791734da0720a0e3f6
* Start playing (and decoding) audio only after the first video frame has been ↵Andreas Huber2011-02-112-24/+68
| | | | | | | | | | decoded. if there's both audio and video content. This gives the video decoder an opportunity to fill its internal buffer queue at the start of playback. Change-Id: Ib2c95753b430e4e47207953b913b607024a328d7 related-to-bug: 3431702
* Merge "Bug 3352047 Wrong message when adjusting volume"Glenn Kasten2011-02-102-1/+26
|\
| * Bug 3352047 Wrong message when adjusting volumeGlenn Kasten2011-02-102-1/+26
| | | | | | | | | | | | Add hidden AudioManager.getDevicesForStream and output device codes. Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
* | Fix the build.Andreas Huber2011-02-101-1/+1
| | | | | | | | Change-Id: I9b777ffb260eb0f3790ae0907e4a443d33fa3f2f
* | Change timestamp handling in RTSP, remove unused, experimental, gtalk supportAndreas Huber2011-02-1010-291/+174
|/ | | | | | | | related-to-bug: 3216447 NTP timestamp handling is now done at a higher layer than before. Change-Id: I9fb23f1335110ec59e534f9aa0fe6f6a6406dd52
* Reduce blocking time in file writeJames Dong2011-02-091-37/+49
| | | | | | bug - 3418787 Change-Id: I4723662bf46ed07271be8468f84ae5d93cb793fa
* Catch read error from AudioRecord and do not assertJames Dong2011-02-091-4/+3
| | | | | | bug - 3439313 Change-Id: Ie29d6e4945978ef27fc3e5849e467d895c7736d3
* Merge "Should reset errno to 0 before calling strtoll()."James Dong2011-02-081-0/+4
|\
| * Should reset errno to 0 before calling strtoll().James Dong2011-02-081-0/+4
| | | | | | | | | | | | bug - 3431238 Change-Id: I855847209d2e022242b8eb62985759922ab94779
* | Merge "Add more check before using the DRM manager client."Gloria Wang2011-02-084-3/+9
|\ \ | |/ |/|
| * Add more check before using the DRM manager client.Gloria Wang2011-02-084-3/+9
| | | | | | | | Change-Id: I7369dcd6b6abd1945430373200fd5353bca70652
* | Merge "Handle some edge cases when seeking while starting up OMXCodec"Andreas Huber2011-02-081-0/+28
|\ \
| * | Handle some edge cases when seeking while starting up OMXCodecAndreas Huber2011-02-081-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These were exposed by the new preview-seekframe while paused code. In particular, the codec may have been in state RECONFIGURING when attempting to seek, or we may have initiated flushing of the output port and this may not have completed yet by the time we want to reconfigure the output port. Change-Id: Id7640ade11dbc7205a22f648ea0b5e3e9b49cf4b related-to-bug: 3392259
* | | Merge "Remove one log message from the VPXDecoder"Andreas Huber2011-02-081-1/+3
|\ \ \ | |_|/ |/| |
| * | Remove one log message from the VPXDecoderAndreas Huber2011-02-081-1/+3
| |/ | | | | | | | | | | | | | | | | | | | | related-to-bug: 3402216 The VPX format supports "internal-only" frames that are referenced by future content but never actually displayed, so this is a perfectly valid scenario that doesn't require a log message. Change-Id: I8330bfdfefcdf4ab66ae6d2b59b99fd9b89350df
* | Merge "- Do not use global DrmManagerClient - Release the DrmManagerClient ↵Gloria Wang2011-02-088-35/+57
|\ \ | |/ |/| | | and DecryptHandle in DataSource Fix for bug 3429811"
| * - Do not use global DrmManagerClientGloria Wang2011-02-078-35/+57
| | | | | | | | | | | | | | - Release the DrmManagerClient and DecryptHandle in DataSource Fix for bug 3429811 Change-Id: I549f72b75225751877eb0e630ce8098f8ec6316f
* | Display a single (still-)frame of video after seeking while paused.Andreas Huber2011-02-072-29/+41
|/ | | | | Change-Id: Ia78bf29ba6d649043e70c49913725cecdf918c03 related-to-bug: 3392259
* Improvements/fixes to ACodec.Andreas Huber2011-02-041-10/+86
| | | | | | | | | | | - Make sure ACodec reverts its state when it's shutdown - Defer "resume" to after handling the OutputPortSettingsChange - If the OMX_EventPortSettingsChanged event comes in while we're flushing, defer it and make sure the output port can be disabled by deleting all buffers not already owned by the component. Change-Id: I1f8cdffa71237b57d4275a48b834647a7b263e8b
* am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycombEric Laurent2011-02-033-26/+27
|\ | | | | | | | | * commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836': Fix issue 3371080
| * Fix issue 3371080Eric Laurent2011-02-033-26/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modified default volume control logic in AudioService: 1 IN_CALL volume if in video/audio chat 2 NOTIFICATION if notification is playing or was playing less than 5s ago. 3 MUSIC Modified silent mode: - now also affect MUSIC stream type - entering silent mode when VOL- hard key is pressed once while selected stream volume is already at 0 (except for VOICE_CALL stream). - exiting silent mode when pressing VOL+ hard key while in silent mode Play sound FX (audible selections, keyboard clicks) at a fixed volume. Modified audio framework: - isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger) - iStreamActive() now specifies a time window during which the stream is considered active after it actually stopped. Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
* | Merge "Make AwesomePlayer's reset process more verbose to track down ANRs ↵Andreas Huber2011-02-032-1/+14
|\ \ | | | | | | | | | (yet again)"
| * | Make AwesomePlayer's reset process more verbose to track down ANRs (yet again)Andreas Huber2011-02-032-1/+14
| | | | | | | | | | | | Change-Id: Ie1d853c31ad75ec5b12303c1131c9a74eb8cfc9f
* | | Make sure timestamps attached to encoded media are composition timestamps.Andreas Huber2011-02-034-0/+97
|/ / | | | | | | | | | | | | | | not decoding timestamps. Obviously there is no difference between them if the content in question does not involve frame reordering. Change-Id: Iac4d06cfeb8a136f735c1148e98cac340d3ef893 related-to-bug: 3398314
* | Bug 1804058 FLAC extractorGlenn Kasten2011-02-039-17/+912
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: dependent on external/flac for libFLAC Implemented and tested: * FLAC container * mono and stereo * standard sample rates * standard bit depths * sniffer * media scanner * Vorbis comment metadata including album art * random access seeking with "torture test" * web browser integration for audio/flac (not audio/x-flac), but note that most web servers don't correctly report the MIME type Not implemented: * 24-bit to 16-bit dither or noise shaping in AudioFlinger * 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger * replay gain is better done in AudioFlinger * multi-channel, would need AudioFlinger support * Ogg container, does not seem to be very popular yet Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
* | Fix some memory leaks found in static analysisKenny Root2011-02-021-14/+40
| | | | | | | | Change-Id: Icd630009793c51acfaed45763ef50489ead40024
* | Merge "- Support comfort noise in AMRExtractor - Support duration and ↵Gloria Wang2011-02-012-38/+92
|\ \ | | | | | | | | | seeking in AMRExtractor for different bit rates"
| * | - Support comfort noise in AMRExtractorGloria Wang2011-02-012-38/+92
| | | | | | | | | | | | | | | | | | | | | | | | - Support duration and seeking in AMRExtractor for different bit rates Bug 2530101 Change-Id: I12beffea73cea0ec056f0e0cf51a4a8d46d897b8
* | | am b450d96b: am 537fa17f: Merge "Disconnect HTTP live sessions as soon as ↵Andreas Huber2011-01-312-1/+25
|\ \ \ | | |/ | |/| | | | | | | | | | | | | the request comes in." into honeycomb * commit 'b450d96b3d13cd341ef7aa4483c2223ddfecce3c': Disconnect HTTP live sessions as soon as the request comes in.
| * | Disconnect HTTP live sessions as soon as the request comes in.Andreas Huber2011-01-312-1/+25
| | | | | | | | | | | | | | | | | | | | | Instead of waiting until pending events have been processed. Change-Id: Id758f5508a514561e18aade82175d69e9156965e related-to-bug: 3409681
| * | Mass merge from gingerbread - do not mergeThe Android Open Source Project2011-01-301-2/+7
| |\ \ | | | | | | | | | | | | Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
| | * \ am c929677e: Merge "Increase the number of useful bits in the spectrum." ↵Marco Nelissen2011-01-291-2/+7
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit 'c929677e017759047d94599faa1b80ebe278fefb': Increase the number of useful bits in the spectrum.
* | | | | MTP: Use ro.product.manufacturer system property value for MTP manufacturer nameMike Lockwood2011-01-311-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was hard coded to "Google, Inc." BUG: 3405965 Change-Id: I5f962d474814c22e990c39b501c0f01da9e8dc6d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | am 35a1f771: am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process ↵Andreas Huber2011-01-281-13/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more verbose to track down ANRs (again)"" into honeycomb * commit '35a1f771759459fc6c9b355d548c5b97cd50e110': Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
| * \ \ \ \ am 79c46485: Merge "Revert "Make AwesomePlayer\'s reset process more verbose ↵Andreas Huber2011-01-281-13/+0
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to track down ANRs (again)"" into honeycomb * commit '79c4648597dab2b7786c8f067896ab66abe190de': Revert "Make AwesomePlayer's reset process more verbose to track down ANRs (again)"
| | * | | | Revert "Make AwesomePlayer's reset process more verbose to track down ANRs ↵Andreas Huber2011-01-281-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (again)" This reverts commit aac2e9e1566a3bb0ef811ebd3a56b538324c95c1. Change-Id: Ic84dfa829981fdc1a1330ccfe6b9dccf64a80719 related-to-bug: 3392386
* | | | | | am 970436ee: am b0eb8bb7: Merge "More robust parsing of NPT time ranges in ↵Andreas Huber2011-01-283-20/+46
|\ \ \ \ \ \ | |/ / / / / | | | | | / | |_|_|_|/ |/| | | | | | | | | | | | | | RTSP." into honeycomb * commit '970436ee42bad03940a73666f8150a28c5789713': More robust parsing of NPT time ranges in RTSP.
| * | | | am b0eb8bb7: Merge "More robust parsing of NPT time ranges in RTSP." into ↵Andreas Huber2011-01-283-20/+46
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb * commit 'b0eb8bb76c585e5e9d426fa8b8f4df17a240e6c4': More robust parsing of NPT time ranges in RTSP.
| | * | | More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3674501d2fd66aaface805c0a8678c74671a6dd3 related-to-bug: 3217210
* | | | | Add support for synchronous bulk USB transfersMike Lockwood2011-01-271-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5de49e4d728a702fa1583ecc24f83f36cc57d21 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | am bba92023: am 63b38e31: Merge "This particular RTSP server streams ↵Andreas Huber2011-01-261-1/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | MPEG4-LATM audio with extra trailing bytes." into honeycomb * commit 'bba92023e55f46e8b4f8b81b3412e663a5e71ceb': This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
| * | | | am 63b38e31: Merge "This particular RTSP server streams MPEG4-LATM audio ↵Andreas Huber2011-01-261-1/+4
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | with extra trailing bytes." into honeycomb * commit '63b38e31aaea5a3e75c7bbe0c9e40e8bdb78ff73': This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
| | * | | Merge "This particular RTSP server streams MPEG4-LATM audio with extra ↵Andreas Huber2011-01-261-1/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | trailing bytes." into honeycomb
| | | * | | This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.Andreas Huber2011-01-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And now we're just ignoring them. Yay standards. Change-Id: I76529ad8d585f143d6f99621ff671d179caf7b35 related-to-bug: 3353752
* | | | | | am bd65c065: am a13732e1: Merge "MTP: Fix month off by one error in date ↵Mike Lockwood2011-01-261-2/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parsing and formatting code" into honeycomb * commit 'bd65c065b2dcb54dde563a8a21c9f92da947c7dd': MTP: Fix month off by one error in date parsing and formatting code
| * | | | | am a13732e1: Merge "MTP: Fix month off by one error in date parsing and ↵Mike Lockwood2011-01-261-2/+4
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | formatting code" into honeycomb * commit 'a13732e17a0f3d69df9c418407985b3ad64b1852': MTP: Fix month off by one error in date parsing and formatting code
| | * | | | Merge "MTP: Fix month off by one error in date parsing and formatting code" ↵Mike Lockwood2011-01-261-2/+4
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into honeycomb
| | | * | | MTP: Fix month off by one error in date parsing and formatting codeMike Lockwood2011-01-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 3379100 Change-Id: Ib386f0def9d611529ce0528b8159cef48df9cd85 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | am 8bea1d55: am 7fb232c4: Merge "Make sure that key frame is generated for ↵James Dong2011-01-264-3/+30
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | timelapse video recording if there are at least two input video frames from camera source." into honeycomb * commit '8bea1d5585822bb62996e789f59c7629dfd9ac50': Make sure that key frame is generated for timelapse video recording if there are at least two input video frames from camera source.