summaryrefslogtreecommitdiffstats
path: root/media/libstagefright
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | StagefrightMediaScanner: Call endFile() for MIDI and OGG files.Hiroshi Takekawa2010-11-191-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addStringTag() caches non-ascii metadata strings for later processing, and then endFile() will be called at the end of processFile() to convert non-ascii strings from locale's charset to utf-8 if required. Stagefright's processFile() failed to call endFile() when the processing file is a MIDI file or an OGG file. This patch fixes this problem to populate metadata correctly. Reviewed by: Brad Fitzpatrick, Marco Nelissen. Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
| * | | am 14ac9546: Merge "build failed with g++ v. 4.4.5 err msg: ↵Jean-Baptiste Queru2010-11-191-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*" * commit '14ac9546367d4df37eead55f6762b944b49f33b2': build failed with g++ v. 4.4.5 err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char*
| | * | build failed with g++ v. 4.4.5Matthias Bady2010-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | err msg: frameworks/base/media/libstagefright/MediaExtractor.cpp:62: error: invalid conversion from ‘const char*’ to ‘char*’ strrchr provides two prototypes. the one used returns const char* instead of char* Change-Id: I6442ee642aebfbfc2f977bab40016cfedc7789ac
* | | | Merge "Removed uncessary FILE structure pointer for I/O"James Dong2010-11-195-54/+70
|\ \ \ \
| * | | | Removed uncessary FILE structure pointer for I/OJames Dong2010-11-195-54/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o also move the fd owner from caller to callee in the Writers Change-Id: I510ccfdd0fcc58f1777fea4ed1349fd251852c65
* | | | | Merge "Fix an artifact of going from off_t to off64_t"Andreas Huber2010-11-191-1/+1
|\ \ \ \ \
| * | | | | Fix an artifact of going from off_t to off64_tAndreas Huber2010-11-191-1/+1
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I999fb60a290f9b2db5b73bf926392c8f4e1b7829
* | | | | Squashed commit of the following:Andreas Huber2010-11-197-168/+27
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 610ed879d57785cb0457f7f127889496d325f732 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:28:52 2010 -0800 HTTP header keys are to be treated case insensitive. Change-Id: I9690880528a6b0f611958de7996c2753948a03c3 commit 554a2499a293d8d53907d01d972a9cfe9b92738e Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 09:22:45 2010 -0800 Remove one more legacy "string" implementation. Change-Id: I7638d849427a39bbc040082a8663b3b9b81a632b Change-Id: I626a60abdcd1dd6403be880dad4d0499d77ca71f
* | | | Merge "64-bit file size/offset support for media framework"James Dong2010-11-1835-215/+221
|\ \ \ \
| * | | | 64-bit file size/offset support for media frameworkJames Dong2010-11-1835-215/+221
| | | | | | | | | | | | | | | | | | | | Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
* | | | | Set the external display usage bit in Stagefright.Jamie Gennis2010-11-182-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie18fa773fdb83508d96300dd7e4e4c7c3cdc4540
* | | | | Log H.264 profile/level in OMXCodecAndreas Huber2010-11-181-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: I5bf98e1ace701b543234dd9dae1315037ff363c2
* | | | Support for "chunked" HTTP transfer encoding.Andreas Huber2010-11-184-21/+136
| | | | | | | | | | | | | | | | | | | | Change-Id: I2f20d2d9ec0fa0c840b429049b0385289a30e774 related-to-bug: 3205131
* | | | Merge "Add getUri() for streaming"Gloria Wang2010-11-184-0/+9
|\ \ \ \
| * | | | Add getUri() for streamingGloria Wang2010-11-184-0/+9
| | | | | | | | | | | | | | | | | | | | Change-Id: I56e15e67cc5f4d0f41c9e2985404a4d89d757e7e
* | | | | Support post-decode video rotation.Andreas Huber2010-11-165-63/+168
| | | | | | | | | | | | | | | | | | | | Change-Id: I9ac90871269c5e132e98a9bf3ad8cae00f329f17
* | | | | Remove all traces of legacy renderer support in stagefright.Andreas Huber2010-11-166-296/+43
| | | | | | | | | | | | | | | | | | | | Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
* | | | | Make sure live streamed http live content does not start playing from the ↵Andreas Huber2010-11-161-1/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | very beginning. The different bandwidth streams may not all start on the same seqnum, so switching bandwidths may fail lateron if we start playing from the very beginning. Change-Id: I03df8d1f44b3f7b4713d381a3d97847997e3ee59 related-to-bug: 2368598
* | | | Add initial stereo capture support for AAC encoderJames Dong2010-11-152-14/+30
| | | | | | | | | | | | | | | | Change-Id: I1b9335f036ff42d958d0b32f25359b21733f96d4
* | | | Merge "Proper support for variable NALsize lengths of AVC content in .mkv ↵Andreas Huber2010-11-151-54/+67
|\ \ \ \ | | | | | | | | | | | | | | | files."
| * | | | Proper support for variable NALsize lengths of AVC content in .mkv files.Andreas Huber2010-11-151-54/+67
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If60cc80998b3231b6aaedc39fc3f5a94f84a5929 related-to-bug: 3197442
* | | | | Fixed a race condition where some recording frames may not be released.James Dong2010-11-151-20/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When startRecording() is called before setListener(), recording frames are sent right after startRecording(), but there is no listener to release the recording frames. This causes the hang in media server. bug - 3166356 Change-Id: I19366ca682ef9f6b847590c190c30a15ed32b8e4
* | | | Merge "More HTTP live support, AES encryption etc."Andreas Huber2010-11-159-47/+361
|\ \ \ \
| * | | | More HTTP live support, AES encryption etc.Andreas Huber2010-11-159-47/+361
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia5088042dd0a2181cb73cf8c7a2ff81e34b3064c related-to-bug: 2368598
* | | | | Merge "Refactor h.264 profile/level support into avc_utils."Andreas Huber2010-11-153-34/+42
|\ \ \ \ \
| * | | | | Refactor h.264 profile/level support into avc_utils.Andreas Huber2010-11-153-34/+42
| |/ / / / | | | | | | | | | | | | | | | | | | | | Change-Id: Idb33636dc723aa79ea0122dc3582109ada4b1358 related-to-bug: 2368598
* | | | | Provide bandwidth estimation support in NuHTTPDataSourceAndreas Huber2010-11-152-0/+69
|/ / / / | | | | | | | | | | | | | | | | Change-Id: Ic98d8cf147bbba60ec735e7ca200addb2bd09f29 related-to-bug: 2368598
* | | | Separate the key for audio sampling rate and video frame rate in MetaData.hJames Dong2010-11-114-9/+9
| | | | | | | | | | | | | | | | Change-Id: Ia33befaa7e6df8762703002d01aa79c04f15f040
* | | | Increase the prefetcher's low water mark so it restarts fetching data earlier.Andreas Huber2010-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 720p high bitrate content pretty much requires this. Change-Id: I2cb29d1fa2e3c511f1b88a106a02c53c68a10f2f
* | | | Merge "Make sure the prefetcher is actively fetching data if we pause ↵Andreas Huber2010-11-114-4/+26
|\ \ \ \ | | | | | | | | | | | | | | | playback due to cache underrun."
| * | | | Make sure the prefetcher is actively fetching data if we pause playback due ↵Andreas Huber2010-11-114-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to cache underrun. Change-Id: Id5f4b7a0387137380dcd39995390a8e0d084b4b3 Conflicts: media/libstagefright/AwesomePlayer.cpp
* | | | | Add color format query support to QueryCodecs()James Dong2010-11-111-0/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic8589649cd09392a1b969a30082b4c9c4e6cc6a7
* | | | | Fix memory leak when 0-memcpy quirk is usedJames Dong2010-11-111-1/+18
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | o minor change to the original patch by Andreas: call restorePatchedDataPointer() method only if kAvoidMemcopyInputRecordingFrames is turned on Change-Id: Idf3710e6f759d37d28e866613f98d39215722cb9
* | | | Merge "Fix missing breaks in the profile/level conversion code in M4vH263 ↵James Dong2010-11-091-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | encoder"
| * | | | Fix missing breaks in the profile/level conversion code in M4vH263 encoderJames Dong2010-11-091-1/+6
| | | | | | | | | | | | | | | | | | | | Change-Id: Icd2cac68ffb0f38acb68b2968bbb36210431482d
* | | | | Merge "Some refactoring and added support for another form of vbr headers."Andreas Huber2010-11-098-196/+609
|\ \ \ \ \
| * | | | | Some refactoring and added support for another form of vbr headers.Andreas Huber2010-11-098-196/+609
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | related-to-bug: 3172324 Change-Id: Ic364da09eac7f0a815f9ceb719b6baa8a76e3730
* | | | | Rotation supportJames Dong2010-11-091-19/+63
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We only support 0, 90, 180, and 270 degree clockwise rotation - Some players are known to ignore composition matrix in the MP4 file, although this is part of the MP4 file standard. Both QT and YT are supporting the rotation The original patch (65a73f4e8c79d05c0d9001b660325748d4ecf37b) was not merged. The only change I made is to reuse the same kKeyRotation in MetaData.h; and thus do not neeed to use kKeyRotationDegree. Change-Id: Ib328716d4842201c4adf57e4ddfe1f1ac1ae4d8a
* | | | am c4a2ead2: am d2d62d04: Merge "Support extracting thumbnail from rotated ↵James Dong2010-11-081-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | video tracks" into gingerbread * commit 'c4a2ead2aa5ab4403553e4956ba71b44782f0c84': Support extracting thumbnail from rotated video tracks
| * | | am d2d62d04: Merge "Support extracting thumbnail from rotated video tracks" ↵James Dong2010-11-081-0/+6
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | into gingerbread * commit 'd2d62d04fc387e2f51d414e101a3e8e3c45f415e': Support extracting thumbnail from rotated video tracks
| | * | Support extracting thumbnail from rotated video tracksJames Dong2010-11-081-0/+6
| | | | | | | | | | | | | | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
| * | | resolved conflicts for merge of 31dc911a to gingerbread-plus-aospAndreas Huber2010-11-087-84/+216
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I2f51b2120b3c552566d91a7dc498a5e8b130205f
| | * | Support post-decode video rotation.Andreas Huber2010-11-057-83/+214
| | | | | | | | | | | | | | | | Change-Id: Ia371316e73a57e44610de86adce3eaa560afbf84
| * | | am 1653e261: Merge "Rotation support" into gingerbreadJames Dong2010-11-061-19/+62
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1653e261e84922facfe27d3d8acc455ed2b6b6da': Rotation support
| | * | Rotation supportJames Dong2010-11-051-19/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We only support 0, 90, 180, and 270 degree clockwise rotation - Some players are known to ignore composition matrix in the MP4 file, although this is part of the MP4 file standard. Both QT and YT are supporting the rotation Change-Id: I1b7f66a801e9d9c49d889c9b06dd6173fa7e76c4
| * | | am f3847e87: Merge "DO NOT MERGE" into gingerbreadJames Dong2010-11-031-3/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit 'f3847e875eb1c58094a2d159a2a6f3f0b381d77a': DO NOT MERGE
| | * | DO NOT MERGEJames Dong2010-11-021-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix premature release of recording frames when physical address or metadata is stored in input video buffers - bug 3158459 Change-Id: If297189d2a87fc3abfda68c29ac75b490b30a902
* | | | Merge "Use meta data in the media recording framework"James Dong2010-11-051-3/+32
|\ \ \ \
| * | | | Use meta data in the media recording frameworkJames Dong2010-11-041-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o This patch allows us to do 720p video recording Change-Id: I2ea37e80a59630145396b08ebcdc6ee71df53333
* | | | | Merge "Add support for WV DRM"Gloria Wang2010-11-0512-11/+233
|\ \ \ \ \ | |/ / / / |/| | | |