summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Initial software encoder checkinsJames Dong2010-05-19215-39/+44259
| | | | Change-Id: I27f387db23594e46384c4eb3a0093ce220bb6b60
* Fix issue 2553359: Pandora does not work well with Passion deskdock / Cardock.Eric Laurent2010-05-172-77/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The problem is due to a too big difference between the buffer size used at the hardware interface and at the A2DP interface. When no resampling occurs we don't notice problems but the timing is very tight. As soon as resampling is activated, the AudioTrack underruns. This is because the AudioTrack buffers are not resized when moving the AudioTrack from hardware to A2DP output. The AudioTrack buffers are calculated based on a hardware output buffer size of 3072 bytes. Which is much less than the A2DP output buffer size (10240). The solution consists in creating new tracks with new buffers in AudioFlinger when the A2DP output is opened instead of just transfering active tracks from hardware output mixer thread to the new A2DP output mixer thread. To avoid synchronization issues between mixer threads and client processes, this is done by invalidating tracks by setting a flag in their control block and having AudioTrack release the handle on this track (IAudioTrack) and create a new IAudioTrack when this flag is detected next time obtainBuffer() or start() is executed. AudioFlinger modifications: - invalidate the tracks when setStreamOutput() is called - make sure that notifications of output opening/closing and change of stream type to output mapping are sent synchronously to client process. This is necessary so that AudioSystem has the new stream to output mapping when the AudioTrack detects the invalidate flag in the client process. Previously their were sent when the corresponding thread loop was executed. AudioTrack modifications: - move frame count calculation and verification from set() to createTrack() so that is is updated every time a new IAudioTrack is created. - detect track invalidate flag in obtainBuffer() and start() and create a new IAudioTrack. AudioTrackShared modifications - group all flags (out, flowControlFlag, forceReady...) into a single bit filed to save space. Change-Id: I9ac26b6192230627d35084e1449640caaf7d56ee
* am a5cd816c: am eb9128f9: Fix sampleTable instantiation, this makes sure ↵Andreas Huber2010-05-141-1/+2
|\ | | | | | | | | | | | | | | | | that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking. Merge commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453' into kraken * commit 'a5cd816c720ed87b91a33aa5d000a0d308c74453': Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
| * am eb9128f9: Fix sampleTable instantiation, this makes sure that the sample ↵Andreas Huber2010-05-141-1/+2
| |\ | | | | | | | | | | | | | | | | | | | | | | | | table refers to the custom datasource that caches the metadata to prevent needless seeking. Merge commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd' into froyo-plus-aosp * commit 'eb9128f9b0ee660504621381fd96f82d5bf8a3fd': Fix sampleTable instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
| | * Fix sampleTable instantiation, this makes sure that the sample table refers ↵Andreas Huber2010-05-141-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | to the custom datasource that caches the metadata to prevent needless seeking. Change-Id: I576178144ffd753b809e1c4ae269ffc3aa34b511 related-to-bug: 2686604 QA-Impact: well, ..., everything related to streaming mpeg4/aac content over http
* | | Detect and handle premature termination of a recording sessionJames Dong2010-05-143-7/+17
| | | | | | | | | | | | Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
* | | Audio/video initial recording time synchronizationJames Dong2010-05-141-0/+34
| | | | | | | | | | | | Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
* | | Handle recording file size and/or duration limitJames Dong2010-05-143-0/+103
| | | | | | | | | | | | Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
* | | am 1d628c5d: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '1d628c5d3dd7998b29c339292a2dc391015d0782' into kraken * commit '1d628c5d3dd7998b29c339292a2dc391015d0782': Accept media files by file extension in case insensitive manner.
| * | merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
| |\ \ | | |/ | |/| | | | Change-Id: I934cf85c4673f9ca3a9549c2074907ad572310f4
| | * Merge "Accept media files by file extension in case insensitive manner."Jean-Baptiste Queru2010-05-141-1/+1
| | |\
| | | * Accept media files by file extension in case insensitive manner.Atsushi Eno2010-03-191-1/+1
| | | | | | | | | | | | | | | | Change-Id: I8e246010c96802ae87960797607fc8f8f2ab6031
* | | | Remove dummy surface in CameraSourceJames Dong2010-05-132-46/+3
| | | | | | | | | | | | | | | | | | | | | | | | bug - 2680919 Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
* | | | am 28fadef2: am 3c78a1b5: Return a runtime error instead of asserting if the ↵Andreas Huber2010-05-132-3/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | AACDecoder is passed an unsupported config. Merge commit '28fadef2ede2d74e9526266e779553bbd1dc66f4' into kraken * commit '28fadef2ede2d74e9526266e779553bbd1dc66f4': Return a runtime error instead of asserting if the AACDecoder is passed an unsupported config.
| * | | Return a runtime error instead of asserting if the AACDecoder is passed an ↵Andreas Huber2010-05-132-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unsupported config. Change-Id: Ie084ed4df5a5d286abd36d9149c2138f8e7ed08a related-to-bug: 2682221 QA-impact: none
* | | | should fix the buildMathias Agopian2010-05-121-0/+3
| | | | | | | | | | | | | | | | Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
* | | | am b003ad17: am e0dc80f8: Merge "Support for customizable socket-read ↵Andreas Huber2010-05-123-4/+33
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | timeouts through the HTTP response." into froyo Merge commit 'b003ad17bffeba7875b9708ffeef2300ef28c916' into kraken * commit 'b003ad17bffeba7875b9708ffeef2300ef28c916': Support for customizable socket-read timeouts through the HTTP response.
| * | | Merge "Support for customizable socket-read timeouts through the HTTP ↵Andreas Huber2010-05-113-4/+33
| |\ \ \ | | | | | | | | | | | | | | | response." into froyo
| | * | | Support for customizable socket-read timeouts through the HTTP response.Andreas Huber2010-05-113-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specify a response header of "X-SocketTimeout: 15" to override the default timeout of 5 secs with a timeout of 15 seconds. Specify a negative value to disable the timeout altogether. Change-Id: I545adf3d8b3f7efe5f8d081a641c6404440a77db related-to-bug: 2675721
* | | | | am 227e443a: am d6ad7c85: Merge "Better seek handling and proper reset of ↵Andreas Huber2010-05-122-9/+22
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the vorbis decoder after a discontinuity (seek)" into froyo Merge commit '227e443a43d70b9463b2e685688f73cfb1b72096' into kraken * commit '227e443a43d70b9463b2e685688f73cfb1b72096': Better seek handling and proper reset of the vorbis decoder after a discontinuity (seek)
| * | | | Better seek handling and proper reset of the vorbis decoder after a ↵Andreas Huber2010-05-112-9/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | discontinuity (seek) Change-Id: I3c76d35da48e0964f7a0fa2816f8573b5e1a9436 related-to-bug: 2674036 QA-impact: low, only affects ogg-vorbis playback through http
* | | | Added initial validation on video/audio encoding parameters before/at start()James Dong2010-05-112-22/+174
| | | | | | | | | | | | | | | | Change-Id: I1a40dd247202f70e3e5429d74533d349b88f1d54
* | | | Output streamable MP4 file during MP4 file recordingJames Dong2010-05-111-24/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the reserved moov box space is not big enough, fall back to non-streamable MP4 file. Change-Id: I93382d037d657a3f3fe2af31e4ea26e1898b4d95
* | | | Merge "Metadata construction optimization" into krakenJames Dong2010-05-101-38/+65
|\ \ \ \
| * | | | Metadata construction optimizationJames Dong2010-05-061-38/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Potentially much shorter stts box if samples have roughly the same duration - Potentially much shorter stsz box if all samples have the same size Change-Id: I4f7663dd64285070995585a02bb3ba1e1049a0cf
* | | | | am 17078510: am d13efb20: Merge "A new OggExtractor/VorbisDecoder combo to ↵Andreas Huber2010-05-1014-371/+964
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support approximate seeking." into froyo Merge commit '1707851090e6512a77247b0c260dd673ef687589' into kraken * commit '1707851090e6512a77247b0c260dd673ef687589': A new OggExtractor/VorbisDecoder combo to support approximate seeking.
| * | | | A new OggExtractor/VorbisDecoder combo to support approximate seeking.Andreas Huber2010-05-0714-371/+964
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95 related-to-bug: 2654400
* | | | | Support multiple cameras in framework.Chih-Chung Chang2010-05-101-1/+1
| |/ / / |/| | | | | | | | | | | Change-Id: I081f0fbdca4b633715ea7c3b3d42f8662d27598a
* | | | am 71bd9fc8: am 100ef9be: Merge "Disable vorbis seek when streaming from ↵Andreas Huber2010-05-068-5/+106
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | localhost." into froyo Merge commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c' into kraken * commit '71bd9fc81e3154b9cad22ca7ff2d9c6ed6fdbe6c': Disable vorbis seek when streaming from localhost.
| * | | Merge "Disable vorbis seek when streaming from localhost." into froyoAndreas Huber2010-05-068-5/+106
| |\ \ \
| | * | | Disable vorbis seek when streaming from localhost.Andreas Huber2010-05-068-5/+106
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icda523ae1c89e26482f1c1767fe3a8b9222bb30f related-to-bug: 2654400
* | | | | am 2a1674b1: am 2d315667: For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8' into kraken * commit '2a1674b1d00fda68980ec834d6ce61aacd379bc8': For issue #2651381, allow library prelinking.
| * | | | For issue #2651381, allow library prelinking.Dan Bornstein2010-05-055-10/+0
| |/ / / | | | | | | | | | | | | Change-Id: I119348b55ad0015a286e9c94709977cd1973a7e1
* | | | Support audio and video track interleaving in the recorded mp4 fileJames Dong2010-05-054-48/+148
| | | | | | | | | | | | | | | | Change-Id: Ifa27eb23ee265f84fe06773b29b0eb2b0b075b60
* | | | Merge "Support AAC recording" into krakenJames Dong2010-05-045-58/+380
|\ \ \ \
| * | | | Support AAC recordingJames Dong2010-05-035-58/+380
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Extend the audio recording to AAC format - Add support for setting some recording parameters - Add stss box to the meta data in the recorded file Change-Id: I41167bfd9d70ef9cd33906f8437b39c232b6d3b7
* | | | | am 8ea45aad: am e083d0a2: Merge "Support for Ogg Vorbis decoding in ↵Andreas Huber2010-05-047-7/+413
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | | | | | | | | | | | | | | | | | | | | stagefright." into froyo Merge commit '8ea45aad100ee25067b2e83703454c71a968ba4f' into kraken * commit '8ea45aad100ee25067b2e83703454c71a968ba4f': Support for Ogg Vorbis decoding in stagefright.
| * | | Support for Ogg Vorbis decoding in stagefright.Andreas Huber2010-05-047-7/+413
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the magic property media.stagefright.enable-vorbis to true to use the new implementation instead of the standalon vorbis player for file-based playback. HTTP streaming of vorbis content will always go through stagefright. Change-Id: Ie3843a99fadb22372f89540d0f8d65196e0c2af8 related-to-bug: 2654400
* | | | Use timestamp from camera driver for CameraSourceJames Dong2010-04-285-68/+118
| | | | | | | | | | | | | | | | Change-Id: I09ddec69997c43b8f17fdd21304c76cb4c5ab8cf
* | | | am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 ↵James Dong2010-04-261-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoder could lead to hang in the Music application, although the chance is very low. Merge commit '31431b34f895862ae13efba30bb5771085572687' into kraken * commit '31431b34f895862ae13efba30bb5771085572687': Switch to use software MP3 decoder
| * | | Switch to use software MP3 decoderJames Dong2010-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low. bug - 2608400 Change-Id: Ia0b5b6521015fc8d3e086117fa914dcc20ace5bd
* | | | am 89e28cbe: am 9e609b0d: Merge "Apparently select() does not immediately ↵Andreas Huber2010-04-202-27/+14
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead." into froyo Merge commit '89e28cbefaff6ae9499032bb446ae7e72e019466' into kraken * commit '89e28cbefaff6ae9499032bb446ae7e72e019466': Apparently select() does not immediately return if one of the masked socket descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead.
| * | | Apparently select() does not immediately return if one of the masked socket ↵Andreas Huber2010-04-202-27/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | descriptors is closed... Stop relying on select for read-with-timeout functionality and use SO_RCVTIMEO socket option instead. Change-Id: Ic2d4a8f5b6bbf16772fba39377809ec68d249c1f related-to-bug: 2611257
* | | | am 1e1edb2c: am 25dc5f30: Merge "Don\'t coalesce more than 250ms worth of ↵Andreas Huber2010-04-201-2/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | encoded data into a single codec input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place." into froyo Merge commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0' into kraken * commit '1e1edb2c7376dbd9ca24bbeefbddbe4221f397a0': Don't coalesce more than 250ms worth of encoded data into a single codec input buffer.
| * | | Don't coalesce more than 250ms worth of encoded data into a single codec ↵Andreas Huber2010-04-201-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | input buffer. This currently only applies to the component OMX.TI.AAC.decode, it is the only one to support coalescing in the first place. In certain edge cases (encoded audio track contains silence), each buffer would turn out to be an amazing 6(!!!) bytes, we'd spend lots and lots of time streaming network data to fill the codec's buffers of size 6144 bytes with .. silence. Change-Id: I9f449f310fc64ca384bd02e4a783e33cf5b46fcc related-to-bug: 2609049 QA-Impact: streamed (http) playback of aac audio content on Droid.
* | | | am 6852b198: am d3d445b1: Merge "Use PV_PLAYER to handle RTSP streaming" ↵James Dong2010-04-141-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | into froyo Merge commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677' into kraken * commit '6852b198fbedd9378ed79ca6528a4d6f33b0b677': Use PV_PLAYER to handle RTSP streaming
| * | | Use PV_PLAYER to handle RTSP streamingJames Dong2010-04-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | bug - 2594865 Change-Id: Ice5b89b1d53bbc4da033892fe545bdf51ac7267f
* | | | fix unintentional driftJean-Baptiste Queru2010-04-142-14/+23
| | | | | | | | | | | | | | | | Change-Id: I0bbf3d3f95296a41d71558d8de1ed2ed021f21cf
* | | | am c33f583b: am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types ↵James Dong2010-04-131-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | according to http://www.ftyps.com/3gpp.html" into froyo
| * \ \ \ am 4f3257cf: am dd684af8: Merge "Snif more 3GPP file types according to ↵James Dong2010-04-131-0/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | http://www.ftyps.com/3gpp.html" into froyo Merge commit '4f3257cf4667aa28908c401634db849fd2e516af' into kraken * commit '4f3257cf4667aa28908c401634db849fd2e516af': Snif more 3GPP file types according to http://www.ftyps.com/3gpp.html