summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* am b1e165eb: am d4760c24: Collect statistical data from authoring engine ↵James Dong2010-06-281-25/+41
|\ | | | | | | | | | | | | | | | | (second part) Merge commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6' * commit 'b1e165ebae798431e3569c28dc5d7c2e584834a6': Collect statistical data from authoring engine (second part)
| * am d4760c24: Collect statistical data from authoring engine (second part)James Dong2010-06-281-25/+41
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'd4760c243fb129ebda43972c0fadf43a02c9849f' into gingerbread-plus-aosp * commit 'd4760c243fb129ebda43972c0fadf43a02c9849f': Collect statistical data from authoring engine (second part)
| | * Collect statistical data from authoring engine (second part)James Dong2010-06-281-25/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added sample duration to the statistcal log messages. - fixed the bug on miscalcuting the average frame rate. - also fixed an issue where both frame and time progress status notifications are sent out even though only one of them is explicitly requsted. Change-Id: Ib86f15a85fad3dbeabde120c3c782b79c16da46c
* | | am c2c59f69: am 2a76b316: Merge "Separate MediaRecorderClient with ↵James Dong2010-06-287-9/+80
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | MediaPlayerClient" into gingerbread Merge commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b' * commit 'c2c59f690deafe34c7701b01b612fd777cee8d4b': Separate MediaRecorderClient with MediaPlayerClient
| * | am 2a76b316: Merge "Separate MediaRecorderClient with MediaPlayerClient" ↵James Dong2010-06-287-9/+80
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | into gingerbread Merge commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587' into gingerbread-plus-aosp * commit '2a76b3163b934e833d2eea8eb5269ae3fdc8a587': Separate MediaRecorderClient with MediaPlayerClient
| | * Separate MediaRecorderClient with MediaPlayerClientJames Dong2010-06-287-9/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | am fd45c1e6: am 41debbc6: Merge "Provide progress status report during ↵James Dong2010-06-254-28/+155
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | authoring" into gingerbread Merge commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798' * commit 'fd45c1e68dbc0c821c2b6d7e0b7e2a3493400798': Provide progress status report during authoring
| * | am 41debbc6: Merge "Provide progress status report during authoring" into ↵James Dong2010-06-254-28/+155
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '41debbc613ec57aa892f604229df376402942687' into gingerbread-plus-aosp * commit '41debbc613ec57aa892f604229df376402942687': Provide progress status report during authoring
| | * Provide progress status report during authoringJames Dong2010-06-254-28/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | am cdf1357b: am 8e103da1: Merge "Various fixes and improvements in audio ↵Eric Laurent2010-06-2513-84/+196
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | effects implementation" into gingerbread Merge commit 'cdf1357b6e0152280dcd611b5f096db4887d8126' * commit 'cdf1357b6e0152280dcd611b5f096db4887d8126': Various fixes and improvements in audio effects implementation
| * | am 8e103da1: Merge "Various fixes and improvements in audio effects ↵Eric Laurent2010-06-2513-84/+196
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | implementation" into gingerbread Merge commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5' into gingerbread-plus-aosp * commit '8e103da1f1b0656e3427b34b75f02d7ddf6073d5': Various fixes and improvements in audio effects implementation
| | * Merge "Various fixes and improvements in audio effects implementation" into ↵Eric Laurent2010-06-2513-84/+196
| | |\ | | | | | | | | | | | | gingerbread
| | | * Various fixes and improvements in audio effects implementationEric Laurent2010-06-2513-84/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effect API: - Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi: Removed media/AudioCommon.h file created for initial version of EffectApi - Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware. - Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode: now an index is passed for the queried effect instead of implicitly querying the next one. - Added CPU load and memory usage indication in effects descriptor - Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine - Added flag to indicate hardware accelerated effect implementation. - Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h Effect libraries: - Reflected changes in Effect API - Several fixes in reverb implementation - Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library. - Replaced pointer by integer identifier for library handle returned by effects factory Audio effect framework: - Added support for audio session -1 in preparation of output stage effects configuration. - Reflected changes in Effect API - Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines. - Added some overflow verification on indexes used for deferred parameter updates via shared memory - Added hardcoded CPU and memory limit check when creating a new effect instance Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
* | | | am f29fbc58: merge from froyo-plus-aospThe Android Open Source Project2010-06-251-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c' * commit 'f29fbc58ec6a85115322100ed86c61679ac09c1c': Change in media scanner to set correct date
| * | | merge from froyo-plus-aospThe Android Open Source Project2010-06-251-1/+5
| |\ \ \ | | |/ / | |/| | | | | | Change-Id: Ibaa84571e3b5a7ea29e55d41f773aa5f301086de
| | * | merge from open-source masterThe Android Open Source Project2010-06-181-1/+5
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I17a51b7cebe1486103d4b0af00e7297ddccb60b8
| | | * | Change in media scanner to set correct dateMikael2 Svensson2010-06-061-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the media scanner scanned a single file, the modified date (DATE_MODIFIED) was not correctly set in the content provider. It was set as milliseconds but should have been set as seconds. This caused downloaded media items to display wrongly in the camera album, since the date was wrong. Change-Id: I24cd92215c26f579eb33a4a3890f96c6ef9ec8c0
| | * | | am 39e876ad: Merge "When filling the cache, we always time out waiting for a ↵James Dong2010-06-171-1/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | condition that won\'t occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo Merge commit '39e876ad743f203fe005333947c61383772b0d14' into froyo-plus-aosp * commit '39e876ad743f203fe005333947c61383772b0d14': When filling the cache, we always time out waiting for a condition that won't occur.
| | | * \ \ Merge "When filling the cache, we always time out waiting for a condition ↵James Dong2010-06-161-1/+3
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | that won't occur. We are actually improving the power consumption for streaming applications like Pandora." into froyo
| | | | * | | When filling the cache, we always time out waiting for a condition that ↵James Dong2010-06-161-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | won't occur. We are actually improving the power consumption for streaming applications like Pandora. Change-Id: Id32bacbc962e8c69c056599479b308d6a07b7a20
| | * | | | | am 3242cc27: Merge "TimedEventQueue is apparently important for glitch-free ↵Dave Sparks2010-06-171-0/+3
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | media playback, and so having it inherit its priority from the thread that created it is a bad idea. Instead, set the priority explicitly, and bump it to slightly higher than normal." into fro Merge commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b' into froyo-plus-aosp * commit '3242cc2719a4aeb64ac5ed273cf222d8d326d44b': TimedEventQueue is apparently important for glitch-free media playback, and so
* | | | | | | am 75fb44b2: am 357f8209: Merge "Finetune some of the prefetcher parameters ↵Andreas Huber2010-06-251-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread Merge commit '75fb44b2344b900485aaf4506531010a8335b5a7' * commit '75fb44b2344b900485aaf4506531010a8335b5a7': Finetune some of the prefetcher parameters to a) buffer as much as froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers
| * | | | | | Merge "Finetune some of the prefetcher parameters to a) buffer as much as ↵Andreas Huber2010-06-251-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | froyo did b) ensure that keepalives actually trigger a network read instead of just draining internal buffers" into gingerbread
| | * | | | | | Finetune some of the prefetcher parameters to a) buffer as much as froyo did ↵Andreas Huber2010-06-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b) ensure that keepalives actually trigger a network read instead of just draining internal buffers Change-Id: Iaedfb5645e3052a63789244c90900573f8449bac
* | | | | | | | am bc704ddd: am 6feaa464: Enable passing parameters to the MediaWriter at ↵James Dong2010-06-254-11/+95
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | runtime (at start() call). Merge commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219' * commit 'bc704dddb6d1239c55f6cd0f93d349f7cc3d1219': Enable passing parameters to the MediaWriter at runtime (at start() call).
| * | | | | | | Enable passing parameters to the MediaWriter at runtime (at start() call).James Dong2010-06-254-11/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - estimate the moov box size for mp4 file writer based on the file size/duration limit and target bit rate. - can switch to use 64 bit file offset at runtime rebased Change-Id: Ibbe1f57e91ab2605820d5d96e8048d11e5559c53
* | | | | | | | am d115304c: am 5a905ceb: Merge "Track maximum amplitude and fix ↵James Dong2010-06-253-1/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getMaxAmplitude()" into gingerbread Merge commit 'd115304c0900713d6f8d4033722d9c647f40ceae' * commit 'd115304c0900713d6f8d4033722d9c647f40ceae': Track maximum amplitude and fix getMaxAmplitude()
| * | | | | | | Merge "Track maximum amplitude and fix getMaxAmplitude()" into gingerbreadJames Dong2010-06-253-1/+38
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Track maximum amplitude and fix getMaxAmplitude()James Dong2010-06-243-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - only start to track the max amplitude after the first call to getMaxAmplitude() Change-Id: I64d3d9ca0542202a8535a211425e8bccceca50fc
* | | | | | | | am 95d26de9: am 7b5b27ad: Merge "Properly identify malformed (too short) ↵Andreas Huber2010-06-241-0/+8
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chunks in mpeg4 files." into gingerbread Merge commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493' * commit '95d26de9e048ef0342e3aed15a4d5d5c8a6e8493': Properly identify malformed (too short) chunks in mpeg4 files.
| * | | | | | | Merge "Properly identify malformed (too short) chunks in mpeg4 files." into ↵Andreas Huber2010-06-241-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | gingerbread
| | * | | | | | Properly identify malformed (too short) chunks in mpeg4 files.Andreas Huber2010-06-241-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id2efb1bba195c4ad6f132cd706cc813135ead8a4
* | | | | | | | am 40d9f010: am 7fd22aab: Merge "Fixed the software AAC encoder" into ↵James Dong2010-06-243-31/+64
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread Merge commit '40d9f0105f0a8f484724619154b18c5d85589eff' * commit '40d9f0105f0a8f484724619154b18c5d85589eff': Fixed the software AAC encoder
| * | | | | | | Merge "Fixed the software AAC encoder" into gingerbreadJames Dong2010-06-243-31/+64
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Fixed the software AAC encoderJames Dong2010-06-233-31/+64
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that each input frame contains at least 1024 samples, as required by the AAC encoder, and fix the incorrect timestamp. Change-Id: I344cafe8c89be51d6e64552fab70539990ff6049
* | | | | | | am 0d964c94: am a2549bb6: Merge "Remove most stagefright property overrides, ↵Andreas Huber2010-06-2415-947/+47
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread Merge commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd' * commit '0d964c94459e25b9b2221a7c7c789b29f77f15dd': Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright.
| * | | | | | Merge "Remove most stagefright property overrides, remove VorbisPlayer and ↵Andreas Huber2010-06-2415-947/+47
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | VorbisMetadataRetriever as this functionality is now provided by stagefright." into gingerbread
| | * | | | | Remove most stagefright property overrides, remove VorbisPlayer and ↵Andreas Huber2010-06-2315-947/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VorbisMetadataRetriever as this functionality is now provided by stagefright. Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce related-to-bug: 2370115
* | | | | | | am 90ade3f2: am 9afc1b3e: Merge "Fixed some meta data issues in the recorded ↵James Dong2010-06-231-31/+68
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mp4 file" into gingerbread Merge commit '90ade3f25d16afe8fd64ec1fcc5fede466256719' * commit '90ade3f25d16afe8fd64ec1fcc5fede466256719': Fixed some meta data issues in the recorded mp4 file
| * | | | | | Merge "Fixed some meta data issues in the recorded mp4 file" into gingerbreadJames Dong2010-06-231-31/+68
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fixed some meta data issues in the recorded mp4 fileJames Dong2010-06-231-31/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Mainly correcting the location of stbl box which should be a child of minf box. This resolved the issue where the mis-muxed encoded file could not be played by QT/VLC. - Enabled the the recorded tracks by setting the flags to 0x07 by default - Allows for encoding either 32-bit or 64-bit offsets. By default encoding 32-bit offsets to reduce the metadata overhead - Fixed a edts box issue where an empty elst box was used at the end Change-Id: I570621a26714a81dc9400271aa5d3a07b483172f
* | | | | | | am 03e90f7e: am 58e9402b: Merge "Properly assign LOG_TAGs in OMXMaster.cpp ↵Andreas Huber2010-06-232-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and MediaScanner.cpp" into gingerbread Merge commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97' * commit '03e90f7eeb032c981fc2952aa33f6ba1fae20d97': Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp
| * | | | | | Merge "Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cpp" into ↵Andreas Huber2010-06-232-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | | Properly assign LOG_TAGs in OMXMaster.cpp and MediaScanner.cppAndreas Huber2010-06-232-0/+8
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I863651619f84b2b66e9a926ce1fef8ce6a53a42d related-to-bug: 2639116
* | | | | | | am 800af390: am b64af9a2: Fix a number of timestamp mismatches in the mp3 ↵Andreas Huber2010-06-233-30/+39
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. Merge commit '800af39038dcded12b66eccb8932a761e20b1976' * commit '800af39038dcded12b66eccb8932a761e20b1976': Fix a number of timestamp mismatches in the mp3 extractor and decoder that would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s.
| * | | | | | Fix a number of timestamp mismatches in the mp3 extractor and decoder that ↵Andreas Huber2010-06-233-30/+39
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | would lead to invalid reporting of the current playback time for mono and/or non-44100 kHz mp3s. Change-Id: I11abc05b62a958ffbc99ca997cd184a2f2199352 related-to-bug: 2667479
* | | | | | am 845f5414: am 2c2ce8e5: Merge "Added support for audio sessions in ↵Eric Laurent2010-06-238-32/+215
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MediaPlayer and AudioTrack." into gingerbread Merge commit '845f541454d1fa9f328c0b0bf79acf2fba363177' * commit '845f541454d1fa9f328c0b0bf79acf2fba363177': Added support for audio sessions in MediaPlayer and AudioTrack.
| * | | | | Merge "Added support for audio sessions in MediaPlayer and AudioTrack." into ↵Eric Laurent2010-06-228-32/+215
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | gingerbread
| | * | | | | Added support for audio sessions in MediaPlayer and AudioTrack.Eric Laurent2010-06-228-32/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks. Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
* | | | | | | am da9269af: am 3238302b: Merge "media: add ↵Chia-chi Yeh2010-06-231-25/+38
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioRecord::getMinFrameCount()." into gingerbread Merge commit 'da9269af5e94e25c142c519429aa77eb40f68e58' * commit 'da9269af5e94e25c142c519429aa77eb40f68e58': media: add AudioRecord::getMinFrameCount().
generated by cgit v1.1 at 2025-04-02 12:08:17 +0000