summaryrefslogtreecommitdiffstats
path: root/include/media
Commit message (Collapse)AuthorAgeFilesLines
* In the absence of width/height information in the sdp, extract the ↵Andreas Huber2010-08-191-0/+53
| | | | | | dimensions from the avc codec specific data. Change-Id: I98c4194593c7e6e24f6fc339c862245111800293
* Use audio clock as the reference media clockJames Dong2010-08-132-2/+8
| | | | | | | | | | | | o Only do this for realtime applications o Adjust other track clock based on audio clock o Assume other track uses wall clock as the media clock o Use some heuristics to reduce the size of stts box by 2/3. - also o Remove one unused key from MetaData.h Change-Id: Ib9432842627b61795b533508158c25258a527332
* Handle large audio lostJames Dong2010-08-101-1/+2
| | | | Change-Id: I2687ad855aac758946954d0b3fe7aff9f7b5ae7c
* Support for extracting G.711 a-law and mu-law audio from WAV files and a ↵Andreas Huber2010-08-091-0/+2
| | | | | | | corresponding software decoder. Change-Id: I92685d09456c220b8c09842defb721bd55b0b9f6 related-to-bug: 2900021
* Use the target color format from the camera source if possibleJames Dong2010-08-051-0/+5
| | | | | | | | | | - If the target color format is unavailable, the default platform-dependent color format will be used. - Also add some logic to prevent looping forever if the omx component is buggy supporting color format enumeration. Change-Id: I119a78f0d6201b4c3621235cca2f523ec14e24e3
* Support for Gtalk video, includes AMR/H.263 assembler and packetization ↵Andreas Huber2010-08-042-0/+4
| | | | | | support, extensions to MediaRecorder to stream via RTP over a pair of UDP sockets as well as various fixes to the RTP implementation. Change-Id: I95b8dd487061add9bade15749e563b01cd99d9a6
* Merge "File writer has a designated writer thread now" into gingerbreadJames Dong2010-08-031-0/+41
|\
| * File writer has a designated writer thread nowJames Dong2010-08-021-0/+41
| | | | | | | | | | | | | | | | + This reduces the file I/O block time for audio/video track processing - Since the file writer is buffering some output samples, the memory usage would go up, depending on how many output samples are buffered. Change-Id: I780cc5b26f4b53a5efbd643fcf9505dfc19cd4cd
* | Merge "Add lost frame handling in AudioSource" into gingerbreadJames Dong2010-08-021-3/+2
|\ \ | |/ |/|
| * Add lost frame handling in AudioSourceJames Dong2010-07-301-3/+2
| | | | | | | | | | | | - Also collect stats on lost audio frames instead of time spent on reading Change-Id: I6380b143e4fbdcd894491aaae523331e90d0f04f
* | resolved conflicts for merge of 27eecb70 to gingerbreadJean-Baptiste Queru2010-07-302-2/+2
|\ \ | |/ |/| | | Change-Id: If064f2f4950fc1a4ff38e6927fe2120af76b26f1
| * Merge branch 'froyo' of ↵The Android Open Source Project2010-07-292-2/+2
| |\ | | | | | | | | | git://android.git.kernel.org/platform/frameworks/base into HEAD
| | * fix inaccurate copyrightsJean-Baptiste Queru2010-07-292-2/+2
| | | | | | | | | | | | Change-Id: I33b0f68f2da34ca4728211d83159cf32a127f6dd
| * | Squashed commit of the following:Andreas Huber2010-07-291-0/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 4abf16bb04dc9695fedf4007a84f903074312ccd Author: Andreas Huber <andih@google.com> Date: Tue Jul 20 09:21:17 2010 -0700 Support a single format change at the beginning of audio playback. This way the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly. Change-Id: Icc790122744745e9a88099788d4818ca1e265a82 related-to-bug: 2826841 commit 09c74da63e6ad5cb5dafb70f62696d75d2978967 Author: James Dong <jdong@google.com> Date: Sun Jul 18 17:57:01 2010 -0700 Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled. Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8 commit f672bf2a782dc7d5fb6325d611a7fe17045dfe9a Author: James Dong <jdong@google.com> Date: Thu Jul 8 20:56:13 2010 -0700 Enable the support for decoding audio with AAC+ and eAAC+ features bug - 282684 Change-Id: I73c8377af3cc4edd3ee7cea86dc3b1c369fbd78b Change-Id: I012f1179e933b6d1345d2368f357576c722485f7
* | Audio effects: modified command() parameter types.Eric Laurent2010-07-284-12/+24
| | | | | | | | | | | | | | The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command() function have been modified from int to uint32_t. This is more consistent with their role. Change-Id: I84d289fc262d6753747910f06f485597dfee6591
* | Audio Effects: added methods to effects java classes to store and load ↵Eric Laurent2010-07-276-14/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | current effect settings in a single call. Addional changes: - Fixed simulator build - Use effect interface UUIDs from OpenSL ES includes when available - Added cleanspec rules to remove now obsolete test effect libraries - Fixed bug in AudioEffect JNI setParameter function. Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
* | Allows the authoring engine to skip frame.James Dong2010-07-222-0/+14
| | | | | | | | | | | | | | | | | | | | | | This is 1st part of the work to allow audio and video resync if we found out that audio and video are out of sync during authoring - also fixed a problem in AACEncoder::read() where the buffer acquired from the buffer group does not release when error out at reading from source. Change-Id: I8a2740097fcfdf85e6178869afeb9f3687a99118
* | Various changes to improve rtsp networking, reduce packet loss and adapt to ↵Andreas Huber2010-07-221-1/+3
| | | | | | | | | | | | ALooper API changes. Change-Id: I110e19d5ce33e597add3ffbd3e3ff3815862396d
* | Merge "Support finer seek control on MediaSources." into gingerbreadAndreas Huber2010-07-213-2/+13
|\ \
| * | Support finer seek control on MediaSources.Andreas Huber2010-07-213-2/+13
| | | | | | | | | | | | | | | | | | related-to-bug: 2858448 Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
* | | Added support for auxiliary audio effects to AudioTrack and MediaPlayer.Eric Laurent2010-07-213-2/+8
|/ / | | | | | | | | | | | | | | Added methods to AudioTrack and MediaPlayer java classes to enable use of auxiliary audio effects. The effect can be attached and detached by specifying its ID and the send level controlled. Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
* | Merge "Progress status notification" into gingerbreadJames Dong2010-07-201-0/+1
|\ \
| * | Progress status notificationJames Dong2010-07-201-0/+1
| | | | | | | | | | | | | | | | | | - Keep track of per-track progress Change-Id: Ibd36f0e8c78581928c8aa2f5e23c5e7e0615c2cc
* | | Merge "Audio policy manager changes for audio effects" into gingerbreadEric Laurent2010-07-203-4/+41
|\ \ \
| * | | Audio policy manager changes for audio effectsEric Laurent2010-07-203-4/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added methods for audio effects management by audio policy manager. - control of total CPU load and memory used by effect engines - selection of output stream for global effects - added audio session id in parameter list for startOutput() and stopOutput(). this is not used in default audio policy manager implementation. Modifications of audio effect framework in AudioFlinger to allow moving and reconfiguring effect engines from one output mixer thread to another when audio tracks in the same session are moved or when requested by audio policy manager. Also fixed mutex deadlock problem with effect chains locks. Change-Id: Ida43484b06e9b890d6b9e53c13958d042720ebdb
* | | | Support a single format change at the beginning of audio playback. This way ↵Andreas Huber2010-07-201-0/+4
|/ / / | | | | | | | | | | | | | | | | | | the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly. Change-Id: Icc790122744745e9a88099788d4818ca1e265a82 related-to-bug: 2826841
* | | Merge "Several improvements in audio effects volume control." into gingerbreadEric Laurent2010-07-161-1/+1
|\ \ \ | |/ / |/| |
| * | Several improvements in audio effects volume control.Eric Laurent2010-07-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed crash when deleting an effect chained before an effect having volume control - Changed EFFECT_FLAG_VOLUME_CTRL to implicitely include EFFECT_FLAG_VOLUME_IND (not need to set both in effect descriptor). - Volume control changes from one effect to another if needed according to effect enable state - EFFECT_CMD_SET_VOLUME is only sent when their is an actual change in volume Change-Id: Ieebaf09157e2627366023569d95516646e03e26c
* | | Support user-supplied timescales for authoringJames Dong2010-07-142-0/+3
|/ / | | | | | | | | | | - also, change all the real time unit to microseconds in MPEG4Writer Change-Id: I260f512f2eb670ade7b8858a56335a5d639de756
* | Use the OpenSL ES definition of SL_IID_EQUALIZER for the EQJean-Michel Trivi2010-07-141-4/+3
| | | | | | | | | | | | effect UUID instead of defining it locally. Change-Id: Id6018fef20d286899cf7503fec3521dcd56db7e0
* | Modifications in audio effect engine state management.Eric Laurent2010-07-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | - Separate the updating of effect engine state from the process call in EffectModule so that the state of all effects in the same effect chain is updated simultaneusly before all process functions are called. - Added a mechanism for the effect engine to continue being called for processing after receiving the disable commands untils it considers that the framework can stop calling the process function without causing a glitch or loosing some effect tail. - Updated test reverb and equalizer to support this new feature Change-Id: Icb56ae2c84c076d4dbad6cf733b1a62f823febe7
* | Add runtime dumpsys support for media recorder clientJames Dong2010-07-082-0/+2
| | | | | | | | Change-Id: I4c8a81720f3be2db54678a7e84fe12849255046b
* | Added JAVA classes to control bass boost, equalizer, reverberation and ↵Eric Laurent2010-07-084-20/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | virtualizer Effects. Defined the following JAVA classes on top of AudioEffect class to facilitate control off built-in audio effects with APIs aligned with interfaces defined in OpenSL ES specification: - BastBoot.java - Equalizer.java - PresetReverb.java - EnvironmentalReverb.java - Virtualizer.java Split reverb API header file in two, one for preset reverb and one for environmental reverb. Some changes in test reverb to support preset reverb. Change-Id: Ie0a5ba06002e63dfd6da22cace5568c1e0b76ea1
* | Merge "Added Visualizer effect." into gingerbreadEric Laurent2010-07-075-38/+252
|\ \
| * | Added Visualizer effect.Eric Laurent2010-07-075-38/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The visualizer enables application to retrieve part of the currently playing audio for visualization purpose. It is not an audio recording interface and only returns partial and low quality audio content as a waveform or a frequency representation (FFT). Removed temporary hack made in MediaPlayer for animated wall papers based on audio visualization (snoop() method. This commit also includes a change in AudioEffect class: - the enable()/disable() methods have been replaced bya more standard setEnabled() method. - some fixes in javadoc Change-Id: Id092a1340e9e38dae68646ade7be054e3a36980e
* | | Allow application to set two more encoding paramters: video profile and levelJames Dong2010-07-072-0/+11
| | | | | | | | | | | | Change-Id: I673e681cefe184d5c556c612c54600a24a2143e5
* | | ALooperRoster no longer holds strong references to handlers and loopers.Andreas Huber2010-07-071-2/+2
| | | | | | | | | | | | Change-Id: I038d69b0a34eda1bfc5216d92c837a5ddf4fb802
* | | Merge "An AHandler can now find its associated ALooper." into gingerbreadAndreas Huber2010-07-072-0/+4
|\ \ \
| * | | An AHandler can now find its associated ALooper.Andreas Huber2010-07-022-0/+4
| | | | | | | | | | | | | | | | Change-Id: Ic7087b8dcbc0d9abda272df0cb01b04b006f82ad
* | | | Merge "Add an option to ALooper::start that allows it to call back into java ↵Andreas Huber2010-07-021-1/+4
|\ \ \ \ | |/ / / |/| | | | | | | or not." into gingerbread
| * | | Add an option to ALooper::start that allows it to call back into java or not.Andreas Huber2010-07-021-1/+4
| | | | | | | | | | | | | | | | Change-Id: Iec172901a04a575d8d350bd162565f04677c3f26
* | | | Merge "Added AMessage::debugString() for debugging purposes." into gingerbreadAndreas Huber2010-07-021-0/+2
|\ \ \ \
| * | | | Added AMessage::debugString() for debugging purposes.Andreas Huber2010-07-011-0/+2
| |/ / / | | | | | | | | | | | | Change-Id: Id43ffd2c56d659dc29f37e277f8c7b38f11c1591
* | | | Support for writing the extracted data to an .mp4 file in the stagefright ↵Andreas Huber2010-07-011-1/+4
|/ / / | | | | | | | | | | | | | | | commandline tool. Change-Id: I972324a8fc9757e6e8116b0270ec0882106f8733
* | | Add multiple camera support for in MediaProfiles.Chih-Chung Chang2010-07-011-15/+20
| | | | | | | | | | | | Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
* | | Support for vanilla YUV420sp => RGB565 color conversion.Andreas Huber2010-06-301-0/+5
| | | | | | | | | | | | Change-Id: I22e5b554909e169eaf153d1f25b636f6f04a1871
* | | Added encoding parameters set up for H263 video encoderJames Dong2010-06-291-0/+3
|/ / | | | | | | | | | | | | | | Also: - Allowed start() call when encoder already starts and stop() call when encoder has not started yet - Handled default value for audio/video sources/encoders and file output format Change-Id: I03b2f7d3cf570baa0fd011a8c0ad200f2f2a5da1
* | Separate MediaRecorderClient with MediaPlayerClientJames Dong2010-06-286-10/+58
| | | | | | | | | | | | | | | | | | | | - An alternative would be to define a common base class that both MediaRecorderClient and MediaPlayerClient can derive. But since the common code, onTransact() and notify() uses some Binder code, having a common base class may not gain us too much in terms of code reuse. Change-Id: Ibc06720278ad173fceacff3d267b7060856c6316
* | Provide progress status report during authoringJames Dong2010-06-253-3/+19
| | | | | | | | | | | | | | | | | | - Track either the number of A/V frames authored, or the time elapsed - Track the completion of the authoring - Add multiple camera support for authoring by accepting a camera id parameter - Set file type based on the OUTPUT_FORMAT requested Change-Id: I0f9d31b3b7a8fa43eb53f572410fb0ebd4fa0bb7
* | Merge "Various fixes and improvements in audio effects implementation" into ↵Eric Laurent2010-06-256-250/+411
|\ \ | | | | | | | | | gingerbread