summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/MPEG4Extractor.cpp
Commit message (Collapse)AuthorAgeFilesLines
...
* | am 510180f1: am 08e42967: Merge "Add support for retrieving location ↵James Dong2011-11-111-0/+35
|\ \ | |/ | | | | | | | | | | information in mp4/3gpp files" into ics-mr1 * commit '510180f162dee3ae5416a98caa07f58a754f4b3f': Add support for retrieving location information in mp4/3gpp files
| * Add support for retrieving location information in mp4/3gpp filesJames Dong2011-11-101-0/+35
| | | | | | | | | | Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687 related-to-bug: 5560253
* | Adds handler type 'sbtl' to support subtitles in various containers.Insun Kang2011-11-101-2/+3
| | | | | | | | Change-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-4/+4
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 ↵Andreas Huber2011-10-061-4/+6
| | | | | | | files. Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749 related-to-bug: 5418914
* Make sure we have all the sample table metadata before declaring a track valid.Andreas Huber2011-08-171-0/+5
| | | | | Change-Id: I2dfbc3e6017b5cd264e4cccfa47d19047b2e7f31 related-to-bug: 5178976
* - Retrieve is_drm in MediaMetadataRetriever.Gloria Wang2011-07-011-4/+0
| | | | | | | | | - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
* Timed text display format support:Gloria Wang2011-06-221-6/+56
| | | | | | | | | 1. Extract 3GPP global format descriptions 2. Extract 3GPP local format descriptions 3. Define data structure (TimedText) for applications to retrieve the format metadata Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
* Extract embedded cover art (aka poster frame) in mp4 filesJames Dong2011-05-261-0/+24
| | | | Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
* For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-251-1/+1
| | | | Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
* Claim support for .3gpp2 A/B files.Andreas Huber2011-05-171-0/+3
| | | | | Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8 related-to-bug: 4406745
* Initial CL for the timed text support:Gloria Wang2011-05-031-1/+37
| | | | | | | | - Add support for MP4 timed text - Add API for app to turn on/off a text track - Add timed text metadata(language) in the MediaMetadataRetriever Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
* Merge "Give PSP and QuickTime compatible mp4 files a chance to play"James Dong2011-04-251-0/+5
|\
| * Give PSP and QuickTime compatible mp4 files a chance to playJames Dong2011-04-071-0/+5
| | | | | | | | | | Change-Id: I2618946b242b581fb8ed5de9a13ede23a4191b11 related-to-bug: 4173290
* | Remove the assertion and report content malform error to applicationJames Dong2011-04-221-5/+9
| | | | | | | | | | Change-Id: I8e30c586048d38334fd4366959a124a99d8efe28 related-to-bug: 4267147
* | Remove streamability verification, it's taking too long. Also...Andreas Huber2011-04-151-86/+5
|/ | | | | | | | make sure that findSampleAtTime uses composition time instead of decoding time, at the expense of extra memory. Change-Id: I67d09389b3df7ed265f614bdd0b142ca7f19f86a related-to-bug: 4294536
* Reject streaming .mp4 files over http that are not muxed reasonably.Andreas Huber2011-03-031-7/+105
| | | | | | | | Audio and video samples must be reasonably close by at any given timestamp, for now we define "reasonably" as "their offsets must not be more than 1MB apart". related-to-bug: 3509977 Change-Id: I4c3a2a239bf911306833f3b17b73c9e2f76ab901
* mp4a box contains mp3 audio when the object type indication is 0x6bJames Dong2011-02-251-0/+8
| | | | | | | | | | In this case, the MediaExtractor returns ERROR_UNSUPPORTED since our software MP3 audio decoder may not be able to handle packetized MP3 audio. bug - 3377570 Change-Id: I8bb6b3813716b5fa019e318842e8e1908b3c8bf8
* d263 may contain optional bitr box, and thus its size can be up to 23 bytesJames Dong2011-02-231-7/+14
| | | | | | bug - 3482703 Change-Id: Id6fdf9d1f4a304954c018b67d50bd79a07164687
* Make available h263 DSI information from MPEG4ExtractorJames Dong2011-02-111-0/+24
| | | | | | bug - 3446863 Change-Id: Idbaf7a564d544784fdbc36ed0339c98a519adc88
* Make sure timestamps attached to encoded media are composition timestamps.Andreas Huber2011-02-031-0/+14
| | | | | | | | not decoding timestamps. Obviously there is no difference between them if the content in question does not involve frame reordering. Change-Id: Iac4d06cfeb8a136f735c1148e98cac340d3ef893 related-to-bug: 3398314
* Expose average video frame rate via MPEG4ExtractorJames Dong2011-01-191-1/+16
| | | | | | bug - 3362483 Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
* Fix the presentation video resolution when it is different from the actual ↵James Dong2011-01-191-2/+4
| | | | | | | | image resolution of the video. bug - 3352413 Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
* Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-071-0/+11
| | | | | | | | | support for two common ways of specifying album artist in ogg files. b/3311831 (cherry-picked from GB because of weird automerger failure) Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
* Give the standard not compliant video sample a chance if its size in the mp4 ↵James Dong2010-12-151-0/+7
| | | | | | header is invalid Change-Id: Ib573ededb9c73285822fa238120faa484402bcf7
* Opted to recognize "h263" or "H263" boxes in an mp4 fileJames Dong2010-12-151-0/+4
| | | | | | bug - 3278240 Change-Id: Ifd1b1f3e5dd55dbf2c33bbad9dd51998c25bfc15
* 64-bit file size/offset support for media frameworkJames Dong2010-11-181-28/+28
| | | | Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
* Support post-decode video rotation.Andreas Huber2010-11-161-51/+94
| | | | Change-Id: I9ac90871269c5e132e98a9bf3ad8cae00f329f17
* resolved conflicts for merge of 9084631d to gingerbread-plus-aospGloria Wang2010-10-251-31/+245
|\ | | | | | | Change-Id: Ie2b675d50bfca3f33aee80f1a67c9f03d1f97472
| * DRM framework support:Gloria Wang2010-10-251-31/+245
| | | | | | | | | | | | | | | | | | | | - add a sniffer for DRM files - add DRMSource and DRMExtractor for es_based DRM - add pread in FileSource.cpp for container_based DRM - add native DRM framework API calls in the player for DRM audio/video playback Change-Id: I4b9ef19165c9b4f44ff40eeededb9a665e78a90f
* | Make sure we cache the sampleTable again if using the caching datasource.Andreas Huber2010-10-151-1/+3
| | | | | | | | | | | | | | QA-impact: This fixes http streaming again which I broke about 2 days ago. The previously observed symptoms were stuttering playback of http streams (think YouTube) after a certain playback position. Change-Id: I14050e3522ecd62c90d29310efdf508fdd2e87b5 related-to-bug: 3098873
* | Instead of asserting return a runtime error if the maximum sample size ↵Andreas Huber2010-09-091-1/+5
| | | | | | | | | | | | | | cannot be determined. Change-Id: Icf17ed04323f5415e0f9f1e4fd9f19ca60ce15ac related-to-bug: 2602446
* | Allow sniffers to return a packet of opaque data that the corresponding ↵Andreas Huber2010-08-251-3/+4
| | | | | | | | | | | | | | extractor can take advantage of to not duplicate work already done sniffing. The mp3 extractor takes advantage of this now. Change-Id: Icb77ae3ee95a69c7da25b4d3b8696c0a2d33028a related-to-bug: 2948754
* | Be more lenient when validating ESDS information in mp4 audio tracks. Allow ↵Andreas Huber2010-08-181-0/+8
| | | | | | | | | | | | the absence of any codec specific data and assume that the mpeg4 headers are not lying to us. Change-Id: Ia29b967cbee9eabb21c6c26508b27b379ff9ba17
* | Support for communicating if a buffer read from the _extractor_ is a sync ↵Andreas Huber2010-08-061-1/+10
| | | | | | | | | | | | | | sample or not. Change-Id: Ie71506224d937cfff1fa1273bfac31c47db8845f related-to-bug: 2900534
* | Properly skip the 'skip' chunk in mpeg4 files.Andreas Huber2010-08-061-1/+0
| | | | | | | | | | Change-Id: I6795347f91f24d5379e8dc80a24ae016a9629c9c related-to-bug: 2901311
* | Support finer seek control on MediaSources.Andreas Huber2010-07-211-4/+69
| | | | | | | | | | | | related-to-bug: 2858448 Change-Id: Ifb4b13b990fd5889113e47e2c62249ac43391fa1
* | Support a single format change at the beginning of audio playback. This way ↵Andreas Huber2010-07-201-66/+4
| | | | | | | | | | | | | | the AAC+ decoder may change its output format from what is originally encoded in the audio stream and we'll still play it back correctly. Change-Id: Icc790122744745e9a88099788d4818ca1e265a82 related-to-bug: 2826841
* | Fix MPEG4Extractor to extract sampling frequency correctly when SBR is enabled.James Dong2010-07-191-4/+66
| | | | | | | | Change-Id: I883c81dad3ea465e71cb5590e89d763671a90ff8
* | Properly identify malformed (too short) chunks in mpeg4 files.Andreas Huber2010-06-241-0/+8
| | | | | | | | Change-Id: Id2efb1bba195c4ad6f132cd706cc813135ead8a4
* | Better sniffing of MPEG4 content by checking for a compatible sub-brand.Andreas Huber2010-05-271-1/+79
|/ | | | | Change-Id: I076908822ad0e663b9932e61fb33edc12c2e1948 related-to-bug: 2673192
* 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
* Snif more 3GPP file types according to http://www.ftyps.com/3gpp.htmlJames Dong2010-04-131-0/+2
| | | | | | bug - 2575956 Change-Id: Iaa79e74d3b0585397a7e833ec45472710fc52fa6
* Distinguish QCELP audio from mpeg4 audio, ignore QCELP audio tracks since we ↵Andreas Huber2010-04-121-8/+26
| | | | | | | don't have a decoder for it, ignore potentially malformed metadata for AMR NB and WB tracks. Change-Id: Ic9a9198413431db4ea40bb63b9de91aa8a7183af related-to-bug: 2587341
* Support another kind of iso mpeg4 file.Andreas Huber2010-04-011-1/+1
| | | | | Change-Id: I052aa1c971c577e50679b6a9263acd32895906c7 related-to-bug: 2558114
* We no longer do sanity checks based on "hdlr" tags in .mp4 files. Pretty ↵Andreas Huber2010-03-151-51/+0
| | | | | | | soon we'll play any bytestream that even vaguely resembles the spec... Change-Id: I43e05404860d8856b8aa566cc9b256bb3fa57e6f related-to-bug: 2483328
* Hack to "support" "enhanced" podcasts... slang for malformed .mp4 files.Andreas Huber2010-03-151-7/+49
| | | | | Change-Id: I690b9f336062a0ff1a667d6461d66b1386db866d related-to-bug: 2511744
* Support vendor MPEG4 test content with apparently malformed chunks in them.Andreas Huber2010-02-251-9/+18
| | | | related-to-bug: 2472211
* Propagate errors all the way through the MediaSources and send either ↵Andreas Huber2010-02-231-0/+8
| | | | | | MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR depending on the final reason for running out of buffers to play back. related-to-bug: 2463749
* Return runtime errors instead of asserting in MPEG4 file format validation, ↵Andreas Huber2010-02-231-26/+85
| | | | | | also add more validation to ensure presence of codec specific data for avc, aac and mpeg4. related-to-bug: 2431967