summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
* Merge "stagefright aacenc: Mark codeWord as UWord16"Conley Owens2011-07-181-1/+1
|\
| * stagefright aacenc: Mark codeWord as UWord16Martin Storsjo2011-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | Without this, the codeword 0xffff will be expanded to 0xffffffff when passed as a Word32 parameter. All code words set into this variable are UWord16 initially. When it was expanded to 0xffffffff, it could accidentally overwrite earlier cached bits in the bitstream writer. Change-Id: Id91a2b8a4e934876d9cb39eaeeee323202ec8e40
* | Merge "stagefright: Include stdlib.h for malloc/free"Deckard Autoverifier2011-07-181-3/+1
|\ \
| * | stagefright: Include stdlib.h for malloc/freeMartin Storsjo2011-06-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to ANSI C, malloc/free are provided by stdlib.h. Also, string.h is always available according to ANSI C, and provides the memset function, so there's no need to include it conditionally for linux only. This makes the code buildable on OS X, too. Change-Id: Ie5d1da02158797e7e45dea257cbe3e4996dde4db
* | | Merge "stagefright amrwbenc: Remove a duplicate, unused file"Deckard Autoverifier2011-07-181-73/+0
|\ \ \
| * | | stagefright amrwbenc: Remove a duplicate, unused fileMartin Storsjo2011-06-231-73/+0
| |/ / | | | | | | | | | | | | | | | | | | This file is identical to common/cmnMemory.c, and that's the file that is used by all the makefiles, not this one. Change-Id: I6a601c24a983285e55e5356bd5569853a1e2d7fe
* | | Merge "stagefright aacenc: Make the mem_malloc function 64-bit safe"Deckard Autoverifier2011-07-181-2/+7
|\ \ \
| * | | stagefright aacenc: Make the mem_malloc function 64-bit safeMartin Storsjo2011-06-221-2/+7
| |/ / | | | | | | | | | Change-Id: I720109133bf5e13388b26a3bdbd66ff1f5320b70
* | | Merge "stagefright: Only use __int64 on MSVC, not on all win32 compilers"Deckard Autoverifier2011-07-181-1/+1
|\ \ \
| * | | stagefright: Only use __int64 on MSVC, not on all win32 compilersMartin Storsjo2011-06-221-1/+1
| |/ / | | | | | | | | | Change-Id: I9eef7e1cb762753b792ab602333dc5a2fd8a173c
* | | Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"Conley Owens2011-07-18150-5154/+5154
|\ \ \ | |/ / |/| / | |/
| * stagefright aacenc/amrwbenc: Remove trailing whitespaceMans Rullgard2011-04-23150-5154/+5154
| | | | | | | | Change-Id: I3c85d8ba4cfb164455d137cdbf3b5ecc941dc6b8
* | Merge "stagefright aacenc/amrwbenc: Convert line breaks to Unix style"Conley Owens2011-06-09185-30089/+30089
|\ \ | |/
| * stagefright aacenc/amrwbenc: Convert line breaks to Unix styleMans Rullgard2011-04-23185-30089/+30089
| | | | | | | | Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
* | Merge "Improved conversion accuracy of exif geotag data"Conley Owens2011-04-291-13/+19
|\ \
| * | Improved conversion accuracy of exif geotag dataOscar Rydhe2011-01-171-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | Changed degrees and minutes of geotag data into double to avoid data loss during cast. Also improved error handling if geotag data can't be parsed. Change-Id: I864843c7fc699fe81e6acba801fe46d10a01925b
* | | am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately ↵Andreas Huber2011-04-183-12/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | when trying to satisfy a read. * commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5': DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
| * | | DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to ↵Andreas Huber2011-04-143-12/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | satisfy a read. Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247 related-to-bug: 4286618
* | | | am ea5d2c58: Merge "When read() from AudioRecord returns 0 or negative ↵James Dong2011-04-041-2/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | value, report an error to application. DO NOT MERGE." into gingerbread * commit 'ea5d2c584490424be6bbc27dec58b4f9868d631e': When read() from AudioRecord returns 0 or negative value, report an error to application. DO NOT MERGE.
| * | | When read() from AudioRecord returns 0 or negative value, report an error to ↵James Dong2011-03-301-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | application. DO NOT MERGE. Change-Id: I3a66fd0ed3f6b90350d706a608a39d8b4a398e32 related-to-bug: 4195127
* | | | am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ↵Brad Fitzpatrick2011-03-281-1/+3
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | ThumbnailUtils" * commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54': Handle OutOfMemoryError when decoding images in ThumbnailUtils
| * | | Handle OutOfMemoryError when decoding images in ThumbnailUtilsChrister Fletcher2011-03-281-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added handling of OutOfMemoryError handling to createImageThumbnail method in ThumbnailUtils.java. During mediascanner run it would run out of memory when trying to decode very large images. Now it handles this error and returns null which is handled by the media scanner. Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
* | | | am 2fdf829a: Merge "Remove unnecessary SkImageDecoder_libjpeg.cpp"Kenny Root2011-03-111-5/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '2fdf829a17fdac4e6d65f5a85a69d0ec9cfd0a7d': Remove unnecessary SkImageDecoder_libjpeg.cpp
| * | | Remove unnecessary SkImageDecoder_libjpeg.cppChih-Wei Huang2011-03-101-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding files outside $(LOCAL_PATH) is a bad idea. It generates output files to an unexpected directory. In this case, it's out/target/external/skia/src/images/SkImageDecoder_libjpeg.o It's not in $(PRODUCT_OUT), which is not correct. Worse, it makes the build system be unable to build different architectures (arm and x86) simultaneously, since the output files conflcit. Seems we can just remove SkImageDecoder_libjpeg.cpp since it's already in libskia. Change-Id: I3e7533126ef60fe2fd424fdc777760e73c93489b
* | | | am 68f66b94: Merge "MP3Extractor and MP3 decoder fixes - DO NOT MERGE" into ↵James Dong2011-03-112-8/+47
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | gingerbread * commit '68f66b945e7a69549689becd2e656d9056f1e7f5': MP3Extractor and MP3 decoder fixes - DO NOT MERGE
| * | | MP3Extractor and MP3 decoder fixes - DO NOT MERGEJames Dong2011-03-112-8/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherry-picked the following patches from HC branch: o PV's mp3 decoder mistreated inputBufferCurrentLength in unit of bytes as in unit of bits o Do not enforce the rule in MP3Extractor that all audio frames in an mp3 file must have the same mode o When the temp buffer wraps around, the next read position should start from what have been read to avoid reading the same remaining bytes in the buffer again. o Speed up MP3Extractor using cached reads bug - 4083532 Change-Id: I7bbd2bd358fd5ee322287866cb8ee0c2bb217fea
* | | | am bd0e806a: Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-091-14/+24
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'bd0e806a61df9b67890dc3b1390db554e7468b4a': Support IPv6->IPv4 fallback in HTTP streaming.
| * | | Support IPv6->IPv4 fallback in HTTP streaming.Lorenzo Colitti2011-03-081-14/+24
| | | | | | | | | | | | | | | | | | | | Bug: 4068057 Change-Id: I425f65a99eb9e0986d9e9c0e264c3c8f61fcfdbd
* | | | am b9da16a1: Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-091-9/+17
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b9da16a1e36fcf4e38a50adcf10ea59c12dea254': Support IPv6 in HTTP streaming.
| * | | Support IPv6 in HTTP streaming.Lorenzo Colitti2011-03-081-9/+17
| | | | | | | | | | | | | | | | | | | | Bug: 4068057 Change-Id: I1e141ec99fbfa43722eeb2e4161d56548ffc0640
* | | | am d581c047: Add missing copyright headers for a couple of files. DO NOT ↵James Dong2011-03-072-0/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MERGE Cherry-picked from other branch... * commit 'd581c04722e2610ca5471b9c3d1881043b1205b1': Add missing copyright headers for a couple of files. DO NOT MERGE Cherry-picked from other branch...
| * | | Add missing copyright headers for a couple of files. DO NOT MERGEJames Dong2011-03-072-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-picked from other branch... bug - 4025673 Change-Id: I6fd1baaf5625297fb1e358de3a3a632a7f5deb90
* | | | am dbe09da6: DO NOT MERGE: Respond to RTSP server->client requests.Andreas Huber2011-02-162-7/+83
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'dbe09da6ac4d1e9e78e5c8f33fbc6d32822ba7ed': DO NOT MERGE: Respond to RTSP server->client requests.
| * | | DO NOT MERGE: Respond to RTSP server->client requests.Andreas Huber2011-02-162-7/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if it's just to tell them that we don't support any (this is optional). Change-Id: Iee50b4020f28a47dfbe5d56f1732fe044b3b3655 related-to-bug: 3353752
* | | | am 8db7a7bf: Merge "DO NOT MERGE: Derive the Transport "source" attribute ↵Andreas Huber2011-02-161-23/+42
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | from the RTSP endpoint address if necessary" into gingerbread * commit '8db7a7bfadc7bdfa30f60bb06063f91b19234096': DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint address if necessary
| * | | DO NOT MERGE: Derive the Transport "source" attribute from the RTSP endpoint ↵Andreas Huber2011-02-151-23/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | address if necessary and continue even if we were unable to poke a hole into the firewall. Change-Id: I5757a2521b8d81a42d03cca379179ce2c9ee46e7 related-to-bug: 3457201
* | | | am d1ba051a: DO NOT MERGE: Work around several issues with non-compliant ↵Andreas Huber2011-02-156-25/+81
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | RTSP servers. * commit 'd1ba051a465518fa4325c364ed77025fc1a2a794': DO NOT MERGE: Work around several issues with non-compliant RTSP servers.
| * | DO NOT MERGE: Work around several issues with non-compliant RTSP servers.Andreas Huber2011-02-156-25/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this particular case these RTSP servers were implemented as local services, retransmitting live streams via a local RTSP server instance. They picked wrong rtp/rtcp port pairs (odd rtp port), blank lines in the session description, wrong case of the format description, relative base URLs... Change-Id: I502a04a7e1d690fd461b7ecf0b56c6a6c2ac1325 related-to-bug: 3452103
* | | am b6c2e2b4: DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
|\ \ \ | |/ / | | | | | | | | | * commit 'b6c2e2b46c574a90450438cccfb6cb97b7edc20f': DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.
| * | DO NOT MERGE: More robust parsing of NPT time ranges in RTSP.Andreas Huber2011-01-283-20/+46
| | | | | | | | | | | | | | | Change-Id: If5a00f1e29dbc12956e1fb000dac859706d19791 related-to-bug: 3217210
* | | am 2dce338e: DO NOT MERGE: This particular RTSP server streams MPEG4-LATM ↵Andreas Huber2011-01-261-1/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | audio with extra trailing bytes. * commit '2dce338e01678620db0734fc3d84bcb3f2512d62': DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with extra trailing bytes.
| * | DO NOT MERGE: This particular RTSP server streams MPEG4-LATM audio with ↵Andreas Huber2011-01-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | extra trailing bytes. And now we're just ignoring them. Yay standards. Change-Id: Ia8c0b9161e606152fb681f0dda3ba901954dc749 related-to-bug: 3353752
* | | am 2ba92c71: do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-266-4/+22
|\ \ \ | |/ / | | | | | | | | | * commit '2ba92c71b5684dce700cf848bf157153c156df1d': do not merge bug 3370834 Cherrypick from master
| * | do not merge bug 3370834 Cherrypick from masterJean-Michel Trivi2011-01-266-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherripick from master CL 79833, 79417, 78864, 80332, 87500 Add new audio mode and recording source for audio communications other than telelphony. The audio mode MODE_IN_CALL signals the system the device a phone call is currently underway. There was no way for audio video chat or VoIP applications to signal a call is underway, but not using the telephony resources. This change introduces a new mode to address this. Changes in other parts of the system (java and native) are required to take this new mode into account. The generic AudioPolicyManager is updated to not use its phone state variable directly, but to use two new convenience methods, isInCall() and isStateInCall(int) instead. Add a recording source used to designate a recording stream for voice communications such as VoIP. Update the platform-independent audio policy manager to pass the nature of the audio recording source to the audio policy client interface through the AudioPolicyClientInterface::setParameters() method. SIP calls should set the audio mode to MODE_IN_COMMUNICATION, Audio mode MODE_IN_CALL is reserved for telephony. SIP: Enable built-in echo canceler if available. 1. Always initialize AudioRecord with VOICE_COMMUNICATION. 2. If echo canceler is available, disable our echo suppressor. Note that this CL is intentionally not correcting the getAudioSourceMax() return value in MediaRecorder.java as the new source is hidden here. Change-Id: Ie68cd03c50553101aa2ad838fe9459b2cf151bc8
* | | am c929677e: Merge "Increase the number of useful bits in the spectrum." ↵Marco Nelissen2011-01-251-2/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | into gingerbread * commit 'c929677e017759047d94599faa1b80ebe278fefb': Increase the number of useful bits in the spectrum.
| * | Merge "Increase the number of useful bits in the spectrum." into gingerbreadMarco Nelissen2011-01-251-2/+7
| |\ \
| | * | Increase the number of useful bits in the spectrum.Marco Nelissen2011-01-241-2/+7
| | | | | | | | | | | | | | | | Change-Id: I3efc2ac8db689285566df35cb6f594aab41141db
* | | | am efebdf4b: DO NOT MERGE: Support non-multiple-of-16 dimensions in ↵Andreas Huber2011-01-243-9/+23
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | MPEG4/H.263 software decoder * commit 'efebdf4bd4da35bc50c7d81450c8473697f6654a': DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software decoder
| * | | DO NOT MERGE: Support non-multiple-of-16 dimensions in MPEG4/H.263 software ↵Andreas Huber2011-01-243-9/+23
| |/ / | | | | | | | | | | | | | | | | | | decoder Change-Id: I6c27c00a6e13cb3635e61089c0db0989f5810c37 related-to-bug: 3384367
* | | am 996de2dd: Merge "Avoid using String.format in MediaRecorder"Brad Fitzpatrick2011-01-241-5/+5
|\ \ \ | | | | | | | | | | | | | | | | * commit '996de2dd41498a48be6821cfa0a81b16c0b3975c': Avoid using String.format in MediaRecorder
generated by cgit v1.1 at 2025-08-04 16:03:15 +0000