summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Support vendor MPEG4 test content with apparently malformed chunks in ↵Andreas Huber2010-02-251-9/+18
|\ | | | | | | them."
| * Support vendor MPEG4 test content with apparently malformed chunks in them.Andreas Huber2010-02-251-9/+18
| | | | | | | | related-to-bug: 2472211
* | Merge "Add some space and total memory amount to the memory dump from the ↵James Dong2010-02-251-1/+3
|\ \ | | | | | | | | | media server process."
| * | Add some space and total memory amount to the memory dump from the media ↵James Dong2010-02-251-1/+3
| |/ | | | | | | server process.
* | Merge "Image encoding settings java API through xml configuration file"James Dong2010-02-254-5/+126
|\ \ | |/ |/|
| * Image encoding settings java API through xml configuration fileJames Dong2010-02-244-5/+126
| | | | | | | | | | | | - I decided to completely remove jpeg decoding related stuff from this change I think that setting is better off if it is specified by the system properties. We don't have to include MediaProfiles.h header in skia files
* | Recover from a certain mp3 decoder error instead of signalling an error and ↵Andreas Huber2010-02-241-6/+17
| | | | | | | | thereby stopping decoding.
* | Merge "Use Java API from xml configuration in the test application"James Dong2010-02-233-126/+101
|\ \
| * | Use Java API from xml configuration in the test applicationJames Dong2010-02-223-126/+101
| |/
* | Propagate errors all the way through the MediaSources and send either ↵Andreas Huber2010-02-236-10/+39
| | | | | | | | | | | | MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR depending on the final reason for running out of buffers to play back. related-to-bug: 2463749
* | Merge "Return runtime errors instead of asserting in MPEG4 file format ↵Andreas Huber2010-02-232-26/+87
|\ \ | | | | | | | | | validation, also add more validation to ensure presence of codec specific data for avc, aac and mpeg4."
| * | Return runtime errors instead of asserting in MPEG4 file format validation, ↵Andreas Huber2010-02-232-26/+87
| | | | | | | | | | | | | | | | | | also add more validation to ensure presence of codec specific data for avc, aac and mpeg4. related-to-bug: 2431967
* | | Merge "Replace system property retrieval calls with DecoderCapabilities Java ↵James Dong2010-02-231-3/+27
|\ \ \ | |/ / |/| | | | | API calls."
| * | Replace system property retrieval calls with DecoderCapabilities Java API calls.James Dong2010-02-171-3/+27
| | |
* | | Merge "Properly unload the renderer shared library after the renderer goes ↵Andreas Huber2010-02-221-5/+38
|\ \ \ | | | | | | | | | | | | away."
| * | | Properly unload the renderer shared library after the renderer goes away.Andreas Huber2010-02-221-5/+38
| | | |
* | | | Merge "Fix for the safty check. It checks that nFir21 + jNpoints <= ↵Gloria Wang2010-02-221-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | BUF_SIZE, but when it calls GetByteArrayRegion, it multiplies it by 2 which defeats the "// safety first" check at the beginning."
| * | | Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE,Gloria Wang2010-02-221-1/+1
| | | | | | | | | | | | | | | | | | | | but when it calls GetByteArrayRegion, it multiplies it by 2 which defeats the "// safety first" check at the beginning.
* | | | This hardware video decoder lies about its required input buffer sizes ↵Andreas Huber2010-02-221-2/+12
| |_|/ |/| | | | | | | | | | | | | | allocating 2.7 MB of memory instead of the required 176 KB... Added another quirk. related-to-bug: 2281327
* | | am 8978547f: am f5fe3949: Fix issue 2459650.Eric Laurent2010-02-221-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '8978547f254b6b6ba2e322794aa044803f3edc2a' * commit '8978547f254b6b6ba2e322794aa044803f3edc2a': Fix issue 2459650.
| * \ \ am f5fe3949: Fix issue 2459650.Eric Laurent2010-02-221-1/+3
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b' into eclair-plus-aosp * commit 'f5fe3949f5db69b19ce3fac7abce2088106f2e2b': Fix issue 2459650.
| | * | | Fix issue 2459650.Eric Laurent2010-02-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a problem where an unwanted tone is generated by audio policy manager when a MT call is answered. This is because of a policy that replaces high visibility system sounds (ringtones, alarms...) by a beep when in call. There is a transitory phase while the call is being answered where the phone state is changed to IN_CALL but the ringtone is still playing. The audio policy manager then mutes the end of the ringtone and starts playing a beep in replacement because the ringtone is categorized as high visibility. The fix consists in changing the ringtone stream type from high visibility to low visibility. This is not a problem as the only actual use case where a ringtone would be generated while in call is if another call is received. But in this case, the phone system does not generate a ringtone but a call waiting tone instead. It is therefore not required to handle a ringtone as a high visibiltiy tone that must be somehow signaled to the user while in call.
* | | | | Merge "Increase the sleep time to fix testTakePicture."Wu-cheng Li2010-02-212-2/+2
|\ \ \ \ \
| * | | | | Increase the sleep time to fix testTakePicture.Wu-cheng Li2010-02-222-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One of the build needs 5 seconds for snapshot in low light. I don't want to increase the sleep time, but this is what we have now. bug:2141755
* | | | | | sdutils: Get rid of sdutils - use vdc for similar low level functionsSan Mehat2010-02-202-213/+0
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: San Mehat <san@google.com>
* | | | | | Merge "Make sure that the event callback thread is Java capable in the ↵Marco Nelissen2010-02-192-0/+24
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | simulator."
| * | | | | Make sure that the event callback thread is Java capable in the simulator.Marco Nelissen2010-02-192-0/+24
| | | | | |
* | | | | | The MediaScanner is way too obsessed with restricting the files to be scanned.Andreas Huber2010-02-191-19/+1
| | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 2326148
* | | | | | Merge "Implement legacy behaviour for MediaPlayer's behaviour of starting ↵Andreas Huber2010-02-193-6/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | from the start of the media on a start() call instead of resuming at the current position, if previously reached the end of the stream. Also properly report number of frames played to audio flinger. Finally, delay spawing the queue thread until actually used."
| * | | | | | Implement legacy behaviour for MediaPlayer's behaviour of starting from the ↵Andreas Huber2010-02-183-6/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | start of the media on a start() call instead of resuming at the current position, if previously reached the end of the stream. Also properly report number of frames played to audio flinger. Finally, delay spawing the queue thread until actually used. related-to-bug: 2453220
* | | | | | Fix a race condition in the prefetcher, the source may be shutdown while ↵Andreas Huber2010-02-181-11/+7
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | we're reading data from it. related-to-bug: 2453414
* | | | | Merge "Range check in MediaScanner::processDirectory"Kenny Root2010-02-181-1/+1
|\ \ \ \ \
| * | | | | Range check in MediaScanner::processDirectoryKenny Root2010-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure we don't have an empty string before checking if it's a directory since this string is tainted. Change-Id: I5eb310ced58c3c64a7af2d11b80326efe5adbcab
* | | | | | Merge "Store AudioTrack return value for error condition"Kenny Root2010-02-181-2/+2
|\ \ \ \ \ \
| * | | | | | Store AudioTrack return value for error conditionKenny Root2010-02-181-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store AudioTrack->initCheck()'s return value so we can return it after the AudioTrack is deleted. Change-Id: Ie042a7d6a54d7f9afd8a5767cfd167dbeb2e5c04
* | | | | | We are cancelling this event during reset, but the event may have already ↵Andreas Huber2010-02-171-0/+12
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | been dispatched at the time, blocking on the mutex. While it's blocking, reset() cancels the event, we're then unblocked and bad things(tm) happen. related-to-bug: 2451174
* | | | | Merge "Disable the TI AMR hardware decoder for audio decoding until its ↵Andreas Huber2010-02-171-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | issues are resolved."
| * | | | | Disable the TI AMR hardware decoder for audio decoding until its issues are ↵Andreas Huber2010-02-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolved. related-to-bug: 2450938
* | | | | | Unhide new SoundPool API's. Bug 2415373.Dave Sparks2010-02-171-8/+0
|/ / / / /
* | | | | Merge "Fix logging in SoundPool."Dave Sparks2010-02-171-2/+2
|\ \ \ \ \
| * | | | | Fix logging in SoundPool.Dave Sparks2010-02-171-2/+2
| |/ / / /
* | | | | Merge "Fix issue 2440226: Car dock volume synchronization."Jaikumar Ganesh2010-02-172-9/+20
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix issue 2440226: Car dock volume synchronization.Eric Laurent2010-02-162-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AudioService now sends intent AudioManager.VOLUME_CHANGED_ACTION when the volume is changed on any stream type (previously the intent was sent only for STREAM_BLUETOOTH_SCO stream). A new extra for previous volume value is added to the intent.
* | | | | Merge "Add SoundPool API to pause and resume all active streams. Bug 2426531."Dave Sparks2010-02-165-10/+134
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Add SoundPool API to pause and resume all active streams. Bug 2426531.Dave Sparks2010-02-165-10/+134
| |/ / /
* | | | Merge "If we never triggered a range request but know the content length ↵Andreas Huber2010-02-162-2/+17
|\ \ \ \ | | | | | | | | | | | | | | | make sure to not read more data than there could be, otherwise we'd block indefinitely if the server doesn't close the connection."
| * | | | If we never triggered a range request but know the content length make sure ↵Andreas Huber2010-02-162-2/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | to not read more data than there could be, otherwise we'd block indefinitely if the server doesn't close the connection. related-to-bug: 2442307
* | | | Merge "Don't hold the prefetcher mutex while prefetching a single source, ↵Andreas Huber2010-02-161-30/+36
|\ \ \ \ | | | | | | | | | | | | | | | the lock protects the list of sources and does not guard access to the individual sources."
| * | | | Don't hold the prefetcher mutex while prefetching a single source, the lock ↵Andreas Huber2010-02-161-30/+36
| |/ / / | | | | | | | | | | | | | | | | | | | | protects the list of sources and does not guard access to the individual sources. related-to- bug: 2413024
* | | | Merge "The AMRSource failed to properly release a media buffer in case of ↵Andreas Huber2010-02-161-6/+11
|\ \ \ \ | | | | | | | | | | | | | | | error."