summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/id3
Commit message (Collapse)AuthorAgeFilesLines
* libstagefright: fix 64-bit warningsColin Cross2014-03-191-7/+7
| | | | | | | | | %lld -> %" PRId64 " for int64_t %d -> %zu for size_t Also fixes some casts from void* to integer types, and some comparisons between signed and unsigned. Change-Id: I9c52f76240e39399da252c66459042a6fc626a90
* Merge commit 'c250980f' into manualmergeGlenn Kasten2014-03-191-2/+0
|\ | | | | | | Change-Id: I254d456e8cb6c580dd77d602b391bed09110454e
| * libstagefright is no longer 32 bit only.Narayan Kamath2014-03-191-2/+0
| | | | | | | | Change-Id: I88d5fcfc005a2c2acd0246cdd9c08b6c00b6c39b Signed-off-by: Glenn Kasten <gkasten@android.com>
* | am 098b28fc: am 64727dd7: Merge "More precise 32-bit only for ↵Glenn Kasten2014-03-181-0/+2
|\ \ | |/ | | | | | | | | | | libstagefright/ subdirectories" * commit '098b28fc88b3d96eada2f9db318d9c38c70cf674': More precise 32-bit only for libstagefright/ subdirectories
| * More precise 32-bit only for libstagefright/ subdirectoriesGlenn Kasten2014-03-171-0/+2
| | | | | | | | Change-Id: Ie4e8f9ccd834b902287d3452cc9fa739809ddb68
* | warnings be gone.Andreas Huber2014-02-111-0/+4
| | | | | | | | Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
* | resolved conflicts for merge of 566be7c3 to masterNarayan Kamath2014-02-111-2/+2
|\ \ | |/ | | | | Change-Id: I7b1cc71057b2bd4f771e7bcf508a8c3abd6017ce
| * Make frameworks/av 64-bit compatibleKévin PETIT2014-02-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | 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
* | am 6146f60c: am 319c5640: am 07a017d3: Merge "Added support for ID3v2 meta ↵Marco Nelissen2014-01-171-6/+6
|\ \ | |/ | | | | | | | | | | data in 3gp files" * commit '6146f60c87a8a9c66036325c66dea826d2e98f6f': Added support for ID3v2 meta data in 3gp files
| * Added support for ID3v2 meta data in 3gp filesOscar Rydhé2014-01-161-6/+6
| | | | | | | | | | | | | | | | Added support for parsing ID3v2 meta data from the ID32 chunk in 3gp files. The priority will be 3gpp -> ID3v2 -> iTunes per field. Change-Id: I0282ecab58e3e5fa6bd738078d562c8bb8ce00ed
* | Better character set encoding detectionMarco Nelissen2013-12-111-50/+29
|/ | | | | | | | | | Id3 tags are supposed to be ISO-8859-1 or unicode, but often aren't. To better detect the real encoding we now use ICU to detect possible encodings for a given byte sequence, then apply additional heuristics to determine the most likely one. b/5564857 Change-Id: I53bc83b006433da5c2f2ccfcd770ddb3a26b64d0
* Speed up id3v2 unsynchronizationMarco Nelissen2013-06-171-5/+10
| | | | | | | | | | Instead of doing many overlapping memmoves, do a single copy pass that skips over the inserted unsynchronization bytes. For some files this reduces parsing time from minutes to milliseconds. b/9463262 Change-Id: I735b7051e77a093d86fb7a3e46209875946225ed
* New HLS implementation supporting independent stream sources, audio-only streamsAndreas Huber2013-05-311-2/+46
| | | | | | and more. Change-Id: Icfc45a0100243b2f7a14a9e65696be45b67d6495
* am e63f850b: am da0dc0af: Add liblogYing Wang2013-04-091-1/+1
|\ | | | | | | | | * commit 'e63f850b179a43a344d438f202ad34ec7566f955': Add liblog
| * Add liblogYing Wang2013-04-091-1/+1
| | | | | | | | | | Bug: 8580410 Change-Id: If493d87d60d71be664ad75b140c62acadb75b0d0
* | Turn off debug tags in stagefright modules.Dan Morrill2013-03-191-1/+1
|/ | | | | | | | | LOCAL_MODULE_TAGS := debug causes the module to be included in every userdebug build, regardless of whether it's specified as a dep by the device config. This CL switches them all to optional (i.e. default behavior) so that we can do (userdebug) device builds without pulling these in. Change-Id: I4b7b65afea61865dd38b3af55550fb8f10edf66d
* Bug fix for the MediaPlayer::prepare() api.Dylan Powers2012-11-271-2/+2
| | | | | | | | | | | | | | | For an MP3 source, within the prepare command, ID3 tags are checked in search of gapless playback info. This causes problems for streamed sources. If ID3v2 tags aren't present, then a check is done for ID3v1 tags. This results in a read command that asks the cache to jump to the end of the file, and subsequently make an extra http call to request those bytes. For a streamed source, this causes the file to not be downloaded automatically when MediaPlayer::prepare() is called, and causes stuttering and extra buffering time to be needed when start() is finally called. The solution is to ignore the ID3v1 tags as the gapless info would never exist there, and only check for ID3v2 tags. Change-Id: I7d1b94cffbfe7c38ca094834dedbc92a58855e20
* Correct ID3::StringSize calculation for UCS-2 data.Jesper Tragardh2012-07-111-1/+2
| | | | | | | | | | | Album art was not displayed when albums were transferred via MediaGo because the length of the description in the APIC tag was not correctly calculated. The method StringSize used to calculate the length of the tag does not add the size of the null termination in UCS-2 case. Change-Id: I5409d42f5e87d315e6e03c4d7e6cbd8a378a160d
* Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/James Dong2012-06-132-0/+190
| | | | | Change-Id: I0a3af3e2abdedebd5934f3d941d01c32cfc75e26 related-to-bug: 6647465
* Parse mp3 encoder padding/delayMarco Nelissen2012-03-201-11/+36
| | | | | | Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag. Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
* Move away from MediaDebug and use ADebug insteadJames Dong2012-02-103-4/+4
| | | | Change-Id: I963a3b6f79a7292891973cbeeaf3378b38629f08
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-6/+6
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Support malformed ID3 V2.4 tags written by early versions of iTunes.Andreas Huber2010-12-141-4/+24
| | | | | Change-Id: I90c2a9bbf216e2ae9a37accdaa2214233f5e54ea related-to-bug: 3275576
* 64-bit file size/offset support for media frameworkJames Dong2010-11-181-2/+2
| | | | Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
* Fix support for per-frame unsynchronization in ID3V2.4 tags.Andreas Huber2010-08-251-4/+84
| | | | | Change-Id: I6874b596f88817347756a375d9fb1c9bff418eca related-to-bug: 2949149
* Remove most stagefright property overrides, remove VorbisPlayer and ↵Andreas Huber2010-06-231-4/+0
| | | | | | | VorbisMetadataRetriever as this functionality is now provided by stagefright. Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce related-to-bug: 2370115
* Support for ID3 V2.4 tags.Andreas Huber2010-04-081-23/+114
| | | | | Change-Id: I74ee02451bdfd7e50f0d5ff6fa5da5147b683e4c related-to-bug: 2581869
* Limit the total amount of ID3 metadata to something (un-)reasonable: 3MB.Andreas Huber2010-03-291-0/+7
| | | | | Change-Id: I3f9bbcdd4f563bac27c4ccae58e4179656c264b6 related-to-bug: 1903971
* Adjust expected text frame length in ID3Kenny Root2010-03-151-0/+1
| | | | | | | | | When encountering a null character in an ID3 text frame, adjust the expected size accordingly so it isn't misidentified as ASCII. This fixes http://b/2517444 Change-Id: I19a3284d378e882c33b28ecee528a434716c7707
* Tag the "testid3" commandline tool as "debug-only". It doesn't need to be ↵Andreas Huber2010-03-151-0/+2
| | | | | | | included in release builds. Change-Id: I7e489af3d569015e2a93d340088e059e984f8153 related-to-bug: 2513148
* Use bswap_16 instead of swap16, because swap16 is not available in glibcMarco Nelissen2010-02-091-2/+2
|
* ID3v1 tag's strings are ISO8859, not UTF-8, so do the proper conversion when ↵Andreas Huber2010-02-081-3/+7
| | | | | | extracting metadata. related-to-bug: 2399408
* Skip the endianness marker when converting UCS-2 to UTF-8, since itMarco Nelissen2010-02-081-1/+21
| | | | ends up in the UTF-8 string otherwise.
* Stop using the PV software decoders and use ours (based on PV code) instead ↵Andreas Huber2010-02-041-0/+3
| | | | even in non-FULL_STAGEFRIGHT builds.
* Fix trailing garbage after UCS-2 encoded strings in ID3 V2.Andreas Huber2010-01-191-1/+2
| | | | related-to-bug: 2381919
* Support for ID3 version 1 (and 1.1) tags in .mp3 files.Andreas Huber2010-01-192-11/+155
| | | | related-to-bug: 2375219
* Squashed commit of the following:Andreas Huber2010-01-123-0/+648
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