summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* PTP host: Implement getObjectHandles and getObjectInfo commandsMike Lockwood2010-05-1910-26/+234
| | | | | Change-Id: I3ff6e52237f400b4e50c534a1f964c80789bfe98 Signed-off-by: Mike Lockwood <lockwood@android.com>
* More work on PTP host support.Mike Lockwood2010-05-1920-64/+500
| | | | | Change-Id: Ifbd5bd5efa3cdb750ae1a2aae38181457554d34d Signed-off-by: Mike Lockwood <mike@spruce.(none)>
* MTP: More prototyping work:Mike Lockwood2010-05-1810-170/+858
| | | | | | | | | | New media scanner test program Media scanner now cleans up after files that no longer exist Separate database table for audio files Extract metadata from audio files with libstagefright Change-Id: I2bd0fe877836c741658e72fcfeb89c11be0d9b41 Signed-off-by: Mike Lockwood <lockwood@android.com>
* am f62b6ff9: am eb8f850d: Fix issue 2553359: Pandora does not work well with ↵Eric Laurent2010-05-172-77/+107
|\ | | | | | | Passion deskdock / Cardock.
| * 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
* | Add -p option to mtptest program to run in PTP mode instead of MTPMike Lockwood2010-05-172-4/+29
| | | | | | | | | | Change-Id: Idbd1437756daab8d6141db49b07d4eb0814c9e7e Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am bc30d1d8: am 5d75a181: am a5cd816c: am eb9128f9: Fix sampleTable ↵Andreas Huber2010-05-141-1/+2
|\ \ | |/ | | | | instantiation, this makes sure that the sample table refers to the custom datasource that caches the metadata to prevent needless seeking.
| * 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
* | | | am ce3d8b31: am d95266c6: Merge "Detect and handle premature termination of ↵James Dong2010-05-143-7/+17
|\ \ \ \ | |/ / / | | | | | | | | a recording session" into kraken
| * | | Merge "Detect and handle premature termination of a recording session" into ↵James Dong2010-05-143-7/+17
| |\ \ \ | | | | | | | | | | | | | | | kraken
| | * | | Detect and handle premature termination of a recording sessionJames Dong2010-05-143-7/+17
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifb83b19f3e68580345b23efed5d5956fb81baeb8
* | | | | am f4ca2ad0: am f55e3222: Merge "Fix issue 2622023 Clean up all hardcoded ↵Ray Chen2010-05-141-7/+7
|\ \ \ \ \ | |/ / / / | | | | | | | | | | \'/sdcard\' in camera related codes." into kraken
| * | | | Merge "Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related ↵Ray Chen2010-05-141-7/+7
| |\ \ \ \ | | |/ / / | |/| | | | | | | | codes." into kraken
| | * | | Fix issue 2622023 Clean up all hardcoded '/sdcard' in camera related codes.Ray Chen2010-05-141-7/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I8a509d957a7b67ee1f59dc4ef5139c4e28adeb9c
* | | | | am 612058d1: am 9db798d0: Audio/video initial recording time synchronizationJames Dong2010-05-141-0/+34
|\ \ \ \ \ | |/ / / /
| * | | | Audio/video initial recording time synchronizationJames Dong2010-05-141-0/+34
| | | | | | | | | | | | | | | | | | | | Change-Id: Iac58b63d474fe09c1d36ba6ecde91dafbb7fef9a
* | | | | am 8b3611ee: am 1824486e: Handle recording file size and/or duration limitJames Dong2010-05-143-0/+103
|\ \ \ \ \ | |/ / / /
| * | | | Handle recording file size and/or duration limitJames Dong2010-05-143-0/+103
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib9ed1f3ebd8fef550cc130a7ef11f2905fa9aedc
* | | | | am 63c93077: am 21a534d9: am 1d628c5d: merge from open-source masterThe Android Open Source Project2010-05-141-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | 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
* | | | | | | am b9381956: am ead68d5c: Merge "Remove libdrm2. This code appears to be ↵Nick Kralevich2010-05-14123-19517/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | unused." into kraken
| * | | | | | Merge "Remove libdrm2. This code appears to be unused." into krakenNick Kralevich2010-05-14123-19517/+0
| |\ \ \ \ \ \
| | * | | | | | Remove libdrm2. This code appears to be unused.Nick Kralevich2010-05-13123-19517/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code generates warnings when compiled with -Wformat-security, and since it isn't being used, I figured it's better to just delete it. As always, this code can be restored by reverting this change. Change-Id: I1da2049f41312b6eae5fa42892beb4a2036eb12f
* | | | | | | | Move MTP code to the android namespaceMike Lockwood2010-05-1428-8/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5da48038fd5e4cdeefaeba42cdc74eb588b3448d Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | am 79dfb675: am ffd104a9: Merge "Remove dummy surface in CameraSource" into ↵James Dong2010-05-132-46/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | kraken
| * | | | | | | Remove dummy surface in CameraSourceJames Dong2010-05-132-46/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug - 2680919 Change-Id: Ia0308cf57fd67058b4dd0e042b3ce97f13df475f
* | | | | | | | Exclude mtptest program from simulator builds.Mike Lockwood2010-05-131-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9751a06d7607363e8c16b71f6f3c524833395a0 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | Checkpoint work on MTP and PTP investigation.Mike Lockwood2010-05-1331-0/+3656
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change includes work in progress on a C++ library for both host and device MTP and PTP support. Currently the makefile builds two test programs: mtptest - a command line test program that implements a small subset of device side MTP. Requires a kernel driver that has not been checked in yet. ptptest - a host tool to test USB host support for detecting and communicating with digital cameras over PTP. Runs on Linux host. Later this will be reformulated as a native library that will be used in the media process. Change-Id: I81aab279975b600b59d99013ab97f9adf0b58da7 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | | | | | | am 9df829bf: am fae47fd0: am 28fadef2: am 3c78a1b5: Return a runtime error ↵Andreas Huber2010-05-132-3/+10
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | instead of asserting if the AACDecoder is passed an unsupported config.
| * | | | | | | 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.
| | * | | | | | am 3c78a1b5: Return a runtime error instead of asserting if the AACDecoder ↵Andreas Huber2010-05-132-3/+10
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is passed an unsupported config. Merge commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b' into froyo-plus-aosp * commit '3c78a1b58957e31d2991fb6a609abecbb1987b3b': 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
* | | | | | | | am fb6bd833: am 7406eafe: should fix the buildMathias Agopian2010-05-121-0/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | should fix the buildMathias Agopian2010-05-121-0/+3
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I9957fc43d5fce317479f6c55fb0b9612bff9a495
* | | | | | | am 6914e17a: am 08eff49f: am d9712b69: am b1235a57: Merge "Hide two audio ↵Xavier Ducrohet2010-05-121-0/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | focus methods." into froyo
| * | | | | | am d9712b69: am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'd9712b69ce529fbf50b3b837032c1dc40e623381' into kraken * commit 'd9712b69ce529fbf50b3b837032c1dc40e623381': Hide two audio focus methods.
| | * | | | | am b1235a57: Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-121-0/+2
| | |\ \ \ \ \ | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'b1235a57a09174179553acecef2370354bdcbf41' into froyo-plus-aosp * commit 'b1235a57a09174179553acecef2370354bdcbf41': Hide two audio focus methods.
| | | * | | | Merge "Hide two audio focus methods." into froyoXavier Ducrohet2010-05-111-0/+2
| | | |\ \ \ \
| | | | * | | | Hide two audio focus methods.Xavier Ducrohet2010-05-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I53ddf736892cde8edfaffa7d69dd9c234df52efa
* | | | | | | | am 11291901: am 550884e2: am bbafdc64: am 836b2d75: Merge "Don\'t clear the ↵Marco Nelissen2010-05-121-2/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | _data column in the audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo
| * | | | | | | am bbafdc64: am 836b2d75: Merge "Don\'t clear the _data column in the ↵Marco Nelissen2010-05-121-2/+5
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | audio_meta table, since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo Merge commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b' into kraken * commit 'bbafdc6403488b0f7ad564a5a0ff2eed5b87ab7b': Don't clear the _data column in the audio_meta table, since it isn't
| | * | | | | | am 836b2d75: Merge "Don\'t clear the _data column in the audio_meta table, ↵Marco Nelissen2010-05-121-2/+5
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since it isn\'t needed, and causes a sqlite constraint exception. Bug 2671792." into froyo Merge commit '836b2d75ef86487ecae0ae834ecbab324fd99471' into froyo-plus-aosp * commit '836b2d75ef86487ecae0ae834ecbab324fd99471': Don't clear the _data column in the audio_meta table, since it isn't
| | | * | | | | Don't clear the _data column in the audio_meta table, since it isn'tMarco Nelissen2010-05-111-2/+5
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | needed, and causes a sqlite constraint exception. Bug 2671792. Change-Id: Ie6e5d0369c3750739fa155e651be4d87c016a41f
* | | | | | | am 1d0e5599: am 11777d6f: am b003ad17: am e0dc80f8: Merge "Support for ↵Andreas Huber2010-05-123-4/+33
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | customizable socket-read timeouts through the HTTP response." into froyo
| * | | | | | 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.
generated by cgit v1.1 at 2025-03-14 18:20:56 +0000