summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/StagefrightMetadataRetriever.cpp
Commit message (Collapse)AuthorAgeFilesLines
* resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-3/+4
|\ | | | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | Contains the necessary changes to make frameworks/av build and work on a 64-bit machine. Signed-off-by: Craig Barber <craig.barber@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com> Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Change-Id: I725feaae50ed8eee25ca2c947cf15aee1f395c43
| * Avoid memory leaks when handling metadata stringsDavid Williams2012-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | Don't duplicate strings when retrieveing metadata from media files. As any requests for metadata strings would pass through the binder, this would cause the reference to the duplicate string to be lost, causing a memory leak as the duplicate would not be freed. Change-Id: I2593733472b1bb589bc502b2c11080f581015bb5
| * Allow OMXCodec to specify an output color format for OMX decoder componentJames Dong2012-09-101-1/+36
| | | | | | | | | | | | | | | | The output color format is specified via the meta argument in OMXCodec::Create() o related-to-bug: 7122195 Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-2/+5
| | | | | | | | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* | Avoid memory leaks when handling metadata stringsDavid Williams2012-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | Don't duplicate strings when retrieveing metadata from media files. As any requests for metadata strings would pass through the binder, this would cause the reference to the duplicate string to be lost, causing a memory leak as the duplicate would not be freed. Change-Id: I2593733472b1bb589bc502b2c11080f581015bb5
* | Allow OMXCodec to specify an output color format for OMX decoder componentJames Dong2012-09-101-1/+36
|/ | | | | | | | The output color format is specified via the meta argument in OMXCodec::Create() o related-to-bug: 7122195 Change-Id: Id3247686b893af25cc190685201e53ad34b0399c
* Allows MediaMetadataRetriever to retrieve video rotation angleJames Dong2012-07-311-0/+7
| | | | | | o related-to-bug: 6872687 Change-Id: I34e74b0756f8269edefdf3a25d8806c76fd1e2f8
* Instead of asserting, turn an unsupported colorspace conversion into aAndreas Huber2012-05-151-10/+17
| | | | | | | runtime error. Change-Id: I0a1754ecaa2a6aac8b0b1bcc829aa873cf238b9b related-to-bug: 6499326
* Better error logging during meta data retrieval. Fixed the stagefrightAndreas Huber2012-04-111-0/+3
| | | | | | | | commandline tool to open the file to extract thumbnails from itself since mediaserver may not have permission to open files. Change-Id: Iabe16b3248e9bb0f266b0866a8d2ccba2ab7d2a8 related-to-bug: 6321237
* Move away from MediaDebug and use ADebug insteadJames Dong2012-02-101-3/+3
| | | | Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-3/+3
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-061-1/+1
| | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* am 510180f1: am 08e42967: Merge "Add support for retrieving location ↵James Dong2011-11-111-0/+1
|\ | | | | | | | | | | | | 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/+1
| | | | | | | | | | Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687 related-to-bug: 5560253
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-17/+17
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Stop metadata retriever from dereferencing a NULL pointer ifAndreas Huber2011-09-061-2/+14
| | | | | | | the media extractor failed to initialize (malformed or unsupported content) Change-Id: Icfad4e9eeb8d6713ad12eee7979ab30b696c06e0 related-to-bug: 5263840
* - Retrieve is_drm in MediaMetadataRetriever.Gloria Wang2011-07-011-0/+5
| | | | | | | | | - 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
* Extract embedded cover art (aka poster frame) in mp4 filesJames Dong2011-05-261-1/+13
| | | | Change-Id: Ic9421ee27b9aa3b27df00878b887de20f25d232b
* Initial CL for the timed text support:Gloria Wang2011-05-031-0/+14
| | | | | | | | - 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
* If the media extractor specifies an invalid thumbnail time, default to the ↵Andreas Huber2011-04-111-1/+2
| | | | | | | first frame. Change-Id: I96514fa661d26726b4562872a5ebe87be88db71e related-to-bug: 3447147
* Merge "Support passing headers to MediaMetadataRetriever's setDataSource API"Andreas Huber2011-03-211-2/+3
|\
| * Support passing headers to MediaMetadataRetriever's setDataSource APIAndreas Huber2011-03-211-2/+3
| | | | | | | | | | Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26 related-to-bug: 3506316
* | Scale the thumbnail if display dimension is different from the actual buffer ↵James Dong2011-03-201-1/+9
|/ | | | | | | | size bug - 3379293 Change-Id: I31c08010c97387716433da99d648bd364847b6aa
* Added more metadata published by the MediaMetaDataRetrieverAndreas Huber2011-03-041-0/+49
| | | | | | | | | - presence of audio/video content - video dimensions - avg. bitrate Change-Id: Ie6d478a3c2d0bb6bebaea99ac0a20a4c17808934 related-to-bug: 3506316
* Bug 3447027 Limit previews for DRM videoGlenn Kasten2011-02-281-0/+6
| | | | Change-Id: I5b15cf6a15623cf73f007c59143ab5e3fa5a07e8
* Publish MediaMetadataRetriever.java as public APIJames Dong2011-01-121-17/+0
| | | | | | | | | | | | o Removed setMode() methods and related mode constants o Removed some of the unused the metadata keys o Updated the javadoc o part of a multi-project change. bug - 2433195 Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
* Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-071-0/+1
| | | | | | | | | 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
* Colorconverter may not support some src/dst bitmap configurations.Andreas Huber2011-01-061-1/+8
| | | | | | | Let it return an appropriate error code instead of asserting. Change-Id: I7fe0dfa169e1cbdecb04c5fcbe8501e73362d05e related-to-bug: 3328212
* Remove captureFrame from MediaMetadataRetriever.java classJames Dong2011-01-041-1/+1
| | | | | | It has been replaced by getFrameAtTime() method Change-Id: I9ed762e10e61dbc188e2a740e489a3e2ef9a6bb2
* Fix thumbnail extraction for extractors that don't have a preference.Andreas Huber2010-12-081-1/+4
| | | | Change-Id: Id305a44416b08a667aae86c2109aa4dff9f17342
* Prepare for publishing MediaMetadataRetriever as public APIJames Dong2010-12-031-7/+24
| | | | | | | | | | step one: o replaced captureFrame with getFrameAtTime o removed getMode bug - 2433195 Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
* Squashed commit of the following:Andreas Huber2010-11-221-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 0870f7bdd10a7cd36087d723d1957d8e1b967ca7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 12:57:04 2010 -0800 set_surface_crop doesn't seem to work right yet, stop using it in the SoftwareRenderer. Change-Id: If0a24f78b7810a6cecaa82eb4f23d0f90c22cc42 commit 4767b52bee3a54ae117a8708d6832276a44e6a6a Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 11:14:57 2010 -0800 info->mMediaBuffer may still be NULL at this point... Change-Id: I25a71569015b1bb87f1ea7efff7588958774426f commit 0cef79874e1f1ddb10b7402177a87d3cffc7de92 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 10:55:12 2010 -0800 QCOM's YVU420 color format conversion has now been tested. Change-Id: I7fef4b642a928af15d42f006f7cdc107d5ff1d67 commit 84fe05a6c969ede0ce8a85a530e110afca07c7a7 Author: Andreas Huber <andih@google.com> Date: Mon Nov 22 09:59:50 2010 -0800 Removed remaining traces of suspend/resume. Proper reporting of video dimensions based on cropping rectangle. Change-Id: Ib238b80cbc1f19e7d312f2422eb5e9ab6b06b1bc commit 50970cdc837c5c498bcf0cb61b436196ca9e2ef7 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:11:06 2010 -0800 Revamped Software Renderer respects the crop rectangle. Removed obsolete ADRENO support code. Change-Id: I984cbc8a99c4d97e09e7d1b1292099c88b9ae535 commit 8abbc6a5608bff650f968540f24a2eab75f254ed Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:10:41 2010 -0800 The metadata retriever now respects the crop rectangle while capturing a video frame. Change-Id: Id3377176060086d16717f62c77ce26fabe899050 commit 2d42e4466609d304e88bd2cdd6eb7b297340cc21 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 16:09:50 2010 -0800 Changed ColorConverter APIs to be more general. Clients can now refer to crop rectangles in both source and destination. Change-Id: Ief151d736818396d0389ec04e7df5650e3ad7c04 commit 273184303d54a54febd3e9c3dd4df30507ea78b5 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 15:04:06 2010 -0800 The stagefright commandline tool now writes the extracted video frame to /sdcard/out.jpg Change-Id: Ieb2ab3fda7a7cd9294beccb8db0eed75096eeef4 commit 2d43390328cadf4ba94c1c3c02e4fb30baa29690 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 14:36:55 2010 -0800 The AVC software decoder now properly advertises the cropping rectangle. Change-Id: Idb7a8a7e2fde5740f0fc34b7e8c92eca2577104b commit 9a7ed23c2fac8ce19dce7a34a603acee945a89f6 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 13:40:39 2010 -0800 OMXCodec now signals a format change if the cropping rectangle changes. ...and puts the cropping info into its output format. Change-Id: I3ffbd8e877ba286fe06a82c536ef20d92548d2e2 commit efe0323947029df1c502599ccc288c8d676dfd31 Author: Andreas Huber <andih@google.com> Date: Fri Nov 19 11:29:39 2010 -0800 Stagefright's MetaData object now supports rectangle items. Change-Id: I5667bb5ee6622c76104b99fb57f60abb802a8504 Change-Id: I27cb78f2c5e0353f95fdfc5cb53991949ed75b70
* Support extracting thumbnail from rotated video tracksJames Dong2010-11-081-0/+6
| | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
* For thumbnail extraction make sure we instantiate a decoder that allows ↵Andreas Huber2010-10-181-1/+1
| | | | | | | access to the framebuffer. Implement the samsung workaround to support this by reconfiguring the decoder. related-to-bug: 3106534 Change-Id: Ie28d72af2f9e93818d1840ac83aa7bc11fa57b3b
* On this particular device the hardware video decoder spits out buffers that ↵Andreas Huber2010-10-071-0/+14
| | | | | | | don't actually contain our video data, so we cannot use them to restore the video frame after suspend/resume. Change-Id: I1b8fe68c1766299844fe84ebbff49cb8b3e4cc7c related-to-bug: 3070094
* Support for media extraction from .mkv/.mka Matroska files in stagefright.Andreas Huber2010-05-201-0/+18
| | | | | Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca related-to-bug: 2483739
* Better handling of codec initialization failure in the player and thumbnail ↵Andreas Huber2010-05-201-2/+5
| | | | | | | extractor. Return a runtime error instead of asserting if the software MPEG4/H.263 decoder fails to initialize. Change-Id: I5cba02ee85a41e43c2623053de40f26e2cf2efe4 related-to-bug: 2699505
* Fix the media metadata retriever (tests). The native constants must match ↵Andreas Huber2010-03-121-0/+18
| | | | | | those published at the java layer. Change-Id: Ic1efed709e4d93c61913b231a8cd3ef1074f8ca0
* HTTPStream and HTTPDataSource now support cancellation of the connection ↵Andreas Huber2010-03-121-1/+0
| | | | | | | process, AwesomePlayer takes advantage of this in cases where ::reset() or ::suspend() is called while in the preparation phase to bail out early. Also fixes in issue where the audio codec was not properly stopped if no audio player object ever took ownership. Change-Id: I6d73defe6d276693853a469db267bb2668d07af5 related-to-bugs: 2475845,2414536
* Reduce buffer sizes related to HTTP media data transfer in order to reduce ↵Andreas Huber2010-03-101-1/+0
| | | | | | | the probability of a connection timeout/reset due to long periods of time between socket activity. Change-Id: I799ce1d58d56a31088a89603d8a18d24780f5b57 related-to-bug: 2492187
* Add support for "album artist" tag.Marco Nelissen2010-02-111-0/+1
|
* Add support for the TPOS/TPA (disc number) id3 tag.Marco Nelissen2010-02-081-0/+1
|
* The qcom OMX video decoders do not allocate output buffer memory at the time ↵Andreas Huber2010-01-251-2/+0
| | | | OMX_AllocateBuffer is called, wait until we received the first FILL_BUFFER_DONE notification until we rely on the buffer data ptr.
* Support for 'iTunes-style' metadata in .mp4 and .3gp files.Andreas Huber2010-01-201-1/+1
| | | | related-to-bug: 2368967
* Squashed commit of the following:Andreas Huber2010-01-141-41/+71
| | | | | | | | | | | | | | commit cb11364feefc200f10af6a01f776803acba2792a Author: Andreas Huber <andih@google.com> Date: Thu Jan 14 14:05:36 2010 -0800 Even if the decoder didn't extract the thumbnail at the specified time, accept it for now. commit a54c0244b305caf11e67db49b7d3d8dba5f77751 Author: Andreas Huber <andih@google.com> Date: Thu Jan 14 11:37:15 2010 -0800 Add some checks to make sure we extract the correct thumbnail frame, also revert to the hardware decoders for thumnbail extraction if the software decoders failed.
* Support for determining the mime type of media via metadata extraction.Andreas Huber2010-01-131-0/+1
|
* More metadata support.Andreas Huber2010-01-131-2/+11
|
* Squashed commit of the following:Andreas Huber2010-01-121-23/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc Author: Andreas Huber <andih@google.com> Date: Mon Jan 11 14:55:56 2010 -0800 Support for duration metadata, midi and ogg-vorbis files (in mediascanner) commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39 Author: Andreas Huber <andih@google.com> Date: Mon Jan 11 14:20:45 2010 -0800 Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor. commit f9818dfac39c96e5fefe8c8295e60580692d5990 Author: Andreas Huber <andih@google.com> Date: Fri Jan 8 14:26:09 2010 -0800 A first pass at supporting metadata through ID3 tags. commit 476e9e253633336ab790f943e2d6c0cd8991d76a Author: Andreas Huber <andih@google.com> Date: Thu Jan 7 15:48:44 2010 -0800 Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright. related-to-bug: 2295456
* Reorganize some of the stagefright implementation related to metadata.Andreas Huber2010-01-081-0/+197
generated by cgit v1.1 at 2024-05-13 02:58:24 +0000