summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/StagefrightMetadataRetriever.cpp
Commit message (Collapse)AuthorAgeFilesLines
* StagefrightMetadataRetriever: correct the status flagKim Zhang2016-01-181-0/+3
| | | | | | | | | | In case of EOS or ERROR from source, correct the status flag and clear the input index to continue to wait for output buffer from decoder. This is to fix thumbnail generation failure for some clips with one frame. CRs-Fixed: 951250 Change-Id: If9889dbcc32bf49368add408a317da026879fec8
* stagefright: Fix videot thumbnail retrival for wmvKeith Mok2015-12-091-0/+10
| | | | | | | | | | | | | | We override some h/w decoders in video configure since we know some h/w decoder does not support certain types of video. e.g. WMV7/8. But we did not do that when application retrieving video frame for thumbnail causing video frame retrieved is corrupted. Fix it by calling FFMPEGSoftCodec::overrideComponentName when we retrieve a single video frame for thumbnail purpose. Change-Id: I334698c331dfd3d49bb5d8b8e9c1fe381b304179
* Merge tag 'android-6.0.0_r5' into HEADRicardo Cerqueira2015-11-031-1/+4
|\ | | | | | | | | | | | | | | | | | | Android 6.0.0 release 5 Conflicts: media/libstagefright/OggExtractor.cpp media/libstagefright/Utils.cpp Change-Id: I2ea44836c5cc3da8ffa2092522293c433bf7538c
| * StagefrightMetadataRetriever: handle error returned from ↵Wei Jia2015-09-281-1/+4
| | | | | | | | | | | | | | convertMetaDataToMessage(). Bug: 23680780 Change-Id: I09dbbf95b2c874b9760938646e48a7ed543f1577
* | libstagefright: Handle unsupported codec metaDataSuresh Choudhary2015-10-231-0/+11
| | | | | | | | | | | | | | | | Modification done in StagefrightMetadataRetriver to handle NULL return for meta data if codec is unsupported by extractor. Change-Id: I905cec5ee91b098d99e1935437b562d2d9206381
* | avextensions: Add support for Codec Extension featuresShalaj Jain2015-10-061-0/+3
| | | | | | | | | | | | | | | | | | | | Add support for Codec extension features like skype, vqzip, b-frame encoding, prefer adaptive playback etc. Add extensions to support encode batching. Also enable Werror for libavextensions. Change-Id: Ia342d4abe4bb1e21b9ff2b8213fb96421485a333
* | libstagefright: Use stride/slice-height instead of w/h for buffer dimsDeva Ramasubramanian2015-10-061-2/+4
| | | | | | | | | | | | | | | | | | | | The stride and slice are better suited as dimension parameters to ColorConvertor, as it considers the width to be be "line length". This fixes thumbnail generation issues for clips with strange resolutions, where the stride != width. Change-Id: I84143956a113cf1976202bd9c4ddac988278a5c0
* | Stagefright: video: Default thumbnail generation to hardware decoderPraveen Chavan2015-10-061-1/+1
| | | | | | | | | | | | | | | | | | Prefer hardware decoder over software for better performance and more coverage of supported content. Eg: Software decoder may not handle interlaced content properly Change-Id: I045ab87cb6877f3318f38c50f06d32e19595d83b CRs-Fixed: 899714
* | stagefright: Stop MediaSource if buffer setup failsApurupa Pattapu2015-10-061-0/+2
| | | | | | | | | | | | | | | | | | extractVideoFrame can be called multiple times with the same MediaSource object. This fix will ensure that MediaSource state is cleared for all failure cases. CRs-Fixed: 894140 Change-Id: Iecfcae7c78d74a1aa7b5a218b9ba28b2ab1ed4a9
* | video: Add key to indicate thumbnail modeSurajit Podder2015-10-061-0/+2
| | | | | | | | | | | | | | Add key "thumbnail-mode" in metadata to signal thumbnail decoding. Change-Id: I9d78f026989c48f62c403cbb88dc24c5f74771a4
* | stagefright: Handle missing text track languageLeena Winterrowd2015-10-061-3/+6
| | | | | | | | | | | | | | | | Only set timed text language if kKeyMediaLanguage is found. Crs-Fixed: 641896 Change-Id: Ie471bc458e42f5728064e447ac5c33b07311d3fd
* | libstagefright: Explicitly disconnect HTTP connectionSurajit Podder2015-10-061-0/+7
|/ | | | | | | | | | | The HTTP connection created by StagefrightMetadataRetriever is not closed explicitly, and tcp activity continues even after metadata retriever is destroyed Explicitly disconnect HTTP connection in StagefrightMetadataRetriever Change-Id: I261d369e8dcff1bc0a3c7225243e865858b4fc7c CRs-Fixed: 754684
* fix build: use proper fmt in StagefrightMetadataRetriever.cpp logLajos Molnar2015-06-121-1/+1
| | | | Change-Id: Iadf74ed8c5b3a3bdb799c6e926fb7bea02511071
* stagefright: Decode video thumbnail using MediaCodecPraveen Chavan2015-06-121-108/+197
| | | | | | | Use MediaCodec (in place of OMXCodec) to decode video thumbnail Change-Id: I05beaa3d67edff51aa17f58444fd34afb3933580
* Merge "Unhide the android.media.[Media]DataSource interface."Chris Watkins2015-04-161-14/+27
|\
| * Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-151-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | stagefright: metadata retriever changes for capture fpsChong Zhang2015-04-131-0/+6
|/ | | | | bug: 19460202 Change-Id: I20afded0b7eec45b2f25b51cf59d9f48eada74d8
* Use CharacterEncodingDetector in metadataretrieverMarco Nelissen2014-09-021-16/+43
| | | | | | | | | | | instead of media scanner. This way the java MediaMetadataRetriever API will give the same result as the media scanner. Also apply some tweaks to the encoding detector to improve handling of ISO-8859-1 tags. Bug: 16302581, 17205395 Change-Id: I1682a7a6a8bf04cffaa455044ba72dd7fd152d49
* libstagefright: 64-bit compile warningsMark Salyzyn2014-06-261-3/+5
| | | | Change-Id: I3d1146714fa23be3d4e696599b6f70cac1f9d28b
* am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-121-9/+3
|\ | | | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * Offer a type-safe album art interface.Elliott Hughes2014-06-111-9/+3
| | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | 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
generated by cgit v1.1 at 2024-05-15 01:21:39 +0000