summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | NuPlayerDriver: Maintain the timeStamp after seekHaynes Mathew George2015-04-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While offload playback is going on, if user pause and seeks to new position before offload tear-down, on resume playback starts from old time-stamp. Once tear-down happens NuPlayer loses updated time-stamp so while resuming it resumes playback with stale time-stamp. Make sure the updated time-stamp is maintained in NuPlayerDriver which is used while starting the playback after resume. authored-by: Sharad Sangle <assangle@codeaurora.org> Change-Id: Ie125cf0fab1b0a237e67e43b0e5b4a704483ef99
* | | | | | Merge "stagefright: initial timed id3 support in hls"Robert Shih2015-04-1718-84/+399
|\ \ \ \ \ \
| * | | | | | stagefright: initial timed id3 support in hlsRobert Shih2015-04-1618-84/+399
| |/ / / / / | | | | | | | | | | | | | | | | | | Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
* | | | | | MediaSync: sanity check native sample rate.Wei Jia2015-04-161-0/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 19666434 Change-Id: I0eb7a70c81c4fcc336f52f014eeb6d261ac2c501
* | | | | MediaCodec: hold input buffers during FLUSHED stateChong Zhang2015-04-161-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 20267388 Change-Id: I21a12cb2ebb74e17dcdb7b502c3f674e9e64b5dc
* | | | | Merge "Work around lack of pitch adjustment in Timestretcher"Andy Hung2015-04-161-12/+40
|\ \ \ \ \
| * | | | | Work around lack of pitch adjustment in TimestretcherAndy Hung2015-04-161-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3e057b97c250a826133248b6aa1ff9ed677d88df
* | | | | | am 6705a49f: am 541a9ac7: am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end ↵Marco Nelissen2015-04-164-1/+33
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | of mpeg video to flush out final sample" * commit '6705a49f6481ad1728215a2a72472fe43c786cd0': Signal EOS at end of mpeg video to flush out final sample
| * | | | | am 8cd4132a: am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush ↵Marco Nelissen2015-04-164-1/+33
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | out final sample" * commit '8cd4132a85239fd318193e10c0817ac7784c304a': Signal EOS at end of mpeg video to flush out final sample
| | * | | | am 3f22f5a2: Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit '3f22f5a2d95699650a454041bcaa1d5a248cca88': Signal EOS at end of mpeg video to flush out final sample
| | | * | | Merge "Signal EOS at end of mpeg video to flush out final sample"Marco Nelissen2015-04-164-1/+33
| | | |\ \ \
| | | | * | | Signal EOS at end of mpeg video to flush out final sampleMarco Nelissen2015-04-154-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I27196a4a4b7fe37da52d3ee99da8cb80294d36d0
* | | | | | | Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-1625-26/+469
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-1525-26/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
* | | | | | | am 5c16a387: am 382bcd5a: am 6a2dffb1: am 4491a4ab: Merge "libstagefright: ↵Lajos Molnar2015-04-161-0/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | free mMoovBoxBuffer" * commit '5c16a3877c0b32f21cbee7f1bdc77a2a4d2b79c6': libstagefright: free mMoovBoxBuffer
| * | | | | | am 6a2dffb1: am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '6a2dffb1c7a0e45388257bc5d2ec763f234f8cca': libstagefright: free mMoovBoxBuffer
| | * | | | | am 4491a4ab: Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | * commit '4491a4ab2d6991baa1ce15f24025aa24430d15d1': libstagefright: free mMoovBoxBuffer
| | | * | | | Merge "libstagefright: free mMoovBoxBuffer"Lajos Molnar2015-04-161-0/+2
| | | |\ \ \ \
| | | | * | | | libstagefright: free mMoovBoxBufferSuresh Choudhary2015-04-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add free(mMoovBoxBuffer) in MPEG4Writer::release() Change-Id: Ic396e64e9e238bdc23cb0b02b7aa341d879d2237
* | | | | | | | am f16511ca: am 0a4d22e5: am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set ↵Lajos Molnar2015-04-161-2/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the correct audio bit rate for camera recorded content" * commit 'f16511ca737b8bf8a33ce589a28630e98c3aaae5': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| * | | | | | | am 9985f6af: am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate ↵Lajos Molnar2015-04-161-2/+4
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for camera recorded content" * commit '9985f6af71061c9340fffa9a6e7c8fea5dac04ab': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| | * | | | | | am 30d7b488: Merge "MPEG4Writer: Set the correct audio bit rate for camera ↵Lajos Molnar2015-04-161-2/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recorded content" * commit '30d7b4883bf3198bfba0d0acf14e0bcbb67716d1': MPEG4Writer: Set the correct audio bit rate for camera recorded content
| | | * | | | | Merge "MPEG4Writer: Set the correct audio bit rate for camera recorded content"Lajos Molnar2015-04-161-2/+4
| | | |\ \ \ \ \
| | | | * | | | | MPEG4Writer: Set the correct audio bit rate for camera recorded contentDaniel Bonnevier2015-04-151-2/+4
| | | | | |_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the hard coded value for bit rate. Use the audio bit rate from the stream format, if it is specified, otherwise default to 96kpbs. Change-Id: Ib643c79bbdddaafb3dc703448645606267f7ca4d
* | | | | | | | am 655084f9: am e7a53499: am 0a45cda6: am 187b196e: Merge changes ↵Lajos Molnar2015-04-1611-11/+3668
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ic51e92e9,Ie808aa82,I74f5f4a1 * commit '655084f979b3067cb5a6fd2d4de148b411fbec23': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| * | | | | | | am 0a45cda6: am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0a45cda68209717767412d040c24e8253c1b5847': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | * | | | | | am 187b196e: Merge changes Ic51e92e9,Ie808aa82,I74f5f4a1Lajos Molnar2015-04-1611-11/+3668
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '187b196e48ed6ea655c7a0e48908d92d670627a8': stagefright: add SoftAVCEnc using libavc stagefright: add SoftAVCDec using libavc stagefright: add SoftMPEG2 decoder using libmpeg2
| | | * | | | | stagefright: add SoftAVCEnc using libavcVenkatarama Avadhani2015-04-155-6/+1680
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic51e92e9d86db21109b8714e822697869e184cd1
| | | * | | | | stagefright: add SoftAVCDec using libavcVenkatarama Avadhani2015-04-155-5/+1017
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie808aa82c624dbbcaeb6b41662c9b7770bc80bd9
| | | * | | | | stagefright: add SoftMPEG2 decoder using libmpeg2Venkatarama Avadhani2015-04-155-0/+971
| | | |/ / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: I74f5f4a1e6d7be8df45bcbc83a965111454b97ea
| * | | | | | am 85bb3235: am 8eae9223: am a05bd3c1: am 2f47bb53: am eb204f82: am ↵Nick Kralevich2015-04-111-0/+6
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-dev * commit '85bb3235ef58120131e20801dd37eb9708ddc570': Fix integer underflow in ESDS processing
| | * \ \ \ \ \ am 2f47bb53: am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer ↵Nick Kralevich2015-04-111-0/+6
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underflow in ESDS processing" into klp-dev * commit '2f47bb53f65e34ba9cff66106390351440b9409b': Fix integer underflow in ESDS processing
| | | * \ \ \ \ \ am eb204f82: am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS ↵Nick Kralevich2015-04-101-0/+6
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processing" into klp-dev * commit 'eb204f82afd5519eb544bf8bee692e7152820c3b': Fix integer underflow in ESDS processing
| | | | * \ \ \ \ \ am b919a3a3: am 64290793: Merge "Fix integer underflow in ESDS processing" ↵Nick Kralevich2015-04-101-0/+6
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit 'b919a3a3d38c4b1cbb378c38cc6154a81ebe01c7': Fix integer underflow in ESDS processing
| | | | | * \ \ \ \ \ am 64290793: Merge "Fix integer underflow in ESDS processing" into klp-devNick Kralevich2015-04-101-0/+6
| | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '6429079345404932c5be5956efc7154390d2ed0e': Fix integer underflow in ESDS processing
| | | | | | * \ \ \ \ \ Merge "Fix integer underflow in ESDS processing" into klp-devNick Kralevich2015-04-101-0/+6
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Fix integer underflow in ESDS processingJoshua J. Drake2015-04-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several arithmetic operations within parseESDescriptor could underflow, leading to an out-of-bounds read operation. Ensure that subtractions from 'size' do not cause it to wrap around. Bug: 20139950 (cherry picked from commit 07c0f59d6c48874982d2b5c713487612e5af465a) Change-Id: I377d21051e07ca654ea1f7037120429d3f71924a
| * | | | | | | | | | | | am 3b042ea5: am 7d62a918: am 14c686c0: am 940189d9: am 475de998: am ↵Nick Kralevich2015-04-111-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into klp-dev * commit '3b042ea54bbaf75bac63bd4d3d7064007b4b0d8d': Fix integer overflow during MP4 atom processing
| | * | | | | | | | | | | am 940189d9: am 475de998: am 47759307: am 17b625b7: Merge "Fix integer ↵Nick Kralevich2015-04-111-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow during MP4 atom processing" into klp-dev * commit '940189d991f9f7eb55d8a379cf6fda6ec486ceb5': Fix integer overflow during MP4 atom processing
| | | * | | | | | | | | | am 475de998: am 47759307: am 17b625b7: Merge "Fix integer overflow during ↵Nick Kralevich2015-04-101-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MP4 atom processing" into klp-dev * commit '475de998b755f0995645e979501f59fca135009c': Fix integer overflow during MP4 atom processing
| | | | * | | | | | | | | am 47759307: am 17b625b7: Merge "Fix integer overflow during MP4 atom ↵Nick Kralevich2015-04-101-0/+3
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processing" into klp-dev * commit '4775930799bd9a9fbad8efe5d338e890dd7444ed': Fix integer overflow during MP4 atom processing
| | | | | * | | | | | | | am 17b625b7: Merge "Fix integer overflow during MP4 atom processing" into ↵Nick Kralevich2015-04-101-0/+3
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '17b625b7f51b75fde6640c737474b8b2c51412bf': Fix integer overflow during MP4 atom processing
| | | | | | * | | | | | | Merge "Fix integer overflow during MP4 atom processing" into klp-devNick Kralevich2015-04-101-0/+3
| | | | | | |\ \ \ \ \ \ \
| | | | | | | * | | | | | | Fix integer overflow during MP4 atom processingJoshua J. Drake2015-04-091-0/+3
| | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few sample table related FourCC values are handled by the setSampleToChunkParams function. An integer overflow exists within this function. Validate that mNumSampleToChunkOffets will not cause an integer overflow. Bug: 20139950 (cherry picked from commit c24607c29c96f939aed9e33bfa702b1dd79da4b7) Change-Id: I49086952451b09a234d8b82669251ab9f1ef58d9
| * | | | | | | | | | | | am 86fb9185: am 75a8776e: am 3cff4324: am 520434cd: am 24acf11d: am ↵Joshua J. Drake2015-04-111-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a131250: am 030d8d0a: Fix several ineffective integer overflow checks * commit '86fb91857ecaca2a0dc27abcd369c5f35203e922': Fix several ineffective integer overflow checks
| | * | | | | | | | | | | am 520434cd: am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective ↵Joshua J. Drake2015-04-111-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integer overflow checks * commit '520434cdf572d13efbca693ae9e42bfe42211b85': Fix several ineffective integer overflow checks
| | | * | | | | | | | | | am 24acf11d: am 4a131250: am 030d8d0a: Fix several ineffective integer ↵Joshua J. Drake2015-04-101-3/+3
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow checks * commit '24acf11dbec8e7071f9adcc24fa883c71d005215': Fix several ineffective integer overflow checks
| | | | * | | | | | | | | am 4a131250: am 030d8d0a: Fix several ineffective integer overflow checksJoshua J. Drake2015-04-101-3/+3
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4a13125033f2130cadb4c48b3e6e0085d8c98829': Fix several ineffective integer overflow checks
| | | | | * | | | | | | | am 030d8d0a: Fix several ineffective integer overflow checksJoshua J. Drake2015-04-101-3/+3
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '030d8d0a557097b88d6ecbf6d04823213512b620': Fix several ineffective integer overflow checks
| | | | | | * | | | | | | Fix several ineffective integer overflow checksJoshua J. Drake2015-04-091-3/+3
| | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit edd4a76 (which addressed bugs 15328708, 15342615, 15342751) added several integer overflow checks. Unfortunately, those checks fail to take into account integer promotion rules and are thus themselves subject to an integer overflow. Cast the sizeof() operator to a uint64_t to force promotion while multiplying. Bug: 20139950 (cherry picked from commit e2e812e58e8d2716b00d7d82db99b08d3afb4b32) Change-Id: I080eb3fa147601f18cedab86e0360406c3963d7b
generated by cgit v1.1 at 2024-05-17 20:30:08 +0000