Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Sync 2.0 with 1.9.17-201905121748 #187

Merged
merged 247 commits into from
May 26, 2019
Merged

[WIP] Sync 2.0 with 1.9.17-201905121748 #187

merged 247 commits into from
May 26, 2019

Conversation

StudioMaX
Copy link
Collaborator

No description provided.

VinnikovV and others added 30 commits January 20, 2017 03:09
@VinnikovV
Add TXXX frame data description field
bb72393 
In id3v2 some players uses user_text frame (TXXX) for additional data, and using description field like a flag. 
For example MusicBee have fields 	TXXX/QUALITY, TXXX/TEMPO, TXXX/OCCASION etc. (http://musicbee.wikia.com/wiki/Tagging)
@JamesHeinrich
Merge pull request JamesHeinrich#94 from VinnikovV/patch-1
b2f9515 
Add TXXX frame data description field
@emtudo
fixed [] operator not supported for strings
d913ebc
@JamesHeinrich
Merge pull request JamesHeinrich#95 from emtudo/master
780f82b 
fixed [] operator not supported for strings
@JamesHeinrich
RIFF.WAVE.iXML multiple TIMESTAMP_SAMPLE_RATE
618baab 
fatal error if XML contains two TIMESTAMP_SAMPLE_RATE tags
JamesHeinrich#105
@JamesHeinrich
Merge branch 'master' of https://github.com/JamesHeinrich/getID3
d108006
@JamesHeinrich
reformat whitespace
70a5809 
cosmetic update to b2f9515
@JamesHeinrich
v1.9.4
30bd114
@JamesHeinrich
latest-version url
e19098a
@JamesHeinrich
standardize demo filename
b9a503a 
getid3.demo.dirscan.php -> demo.dirscan.php
@JamesHeinrich
standardize "license" spelling
1acc17a 
Use American "license" (instead of Canadian "licence") for consistency
in all filenames
@JamesHeinrich
GPS track in QuickTime
4a9f1ae 
http://www.getid3.org/phpBB3/viewtopic.php?t=1966
Add support for "gps " atom, parse GPRMC string for interesting data,
return new GPS track in [quicktime][gps_track]
@JamesHeinrich
bugfix: JamesHeinrich#107 WebP support
4c8994b 
Added basic support for WebP image format
@JamesHeinrich
bugfix: JamesHeinrich#108 APNG support
1351d39 
Add support for APNG (animation extension to PNG)
@JamesHeinrich
bugfix JamesHeinrich#108 GIF animation NETSCAPE2.0 detect
7ebe4c8
@JamesHeinrich
bugfix JamesHeinrich#110
7fc5e5d 
Memory Limit might contain a space character (256 M)
@JamesHeinrich
bug JamesHeinrich#111 QuickTime stsd number_entries deadlock
335f544 
If an incorrect value is set in stsd.number_entries then the script can
appear to hang (not infinite, but very long loop). Detect, provide
warning, override as necessary.
@StudioMaX
Use hex value instead of binary string in getid3_mp3::decodeMPEGaudio…
8f89a58 
…Header()
@JamesHeinrich
Merge pull request JamesHeinrich#113 from StudioMaX/patch-1
7ef1a27 
Use hex value instead of binary string in getid3_mp3::decodeMPEGaudioHeader()
@devzing
support loci quicktime atom
b9598b9
@devzing
Loci embedded strings
136e443 
handle UTF-8 and UTF-16 embedded strings
@JamesHeinrich
Merge pull request JamesHeinrich#114 from devzing/loci-support
afcbdaf 
feature-loci atom support in quicktime files
@lifeofguenter
Add support for Google App Engine
0feffc4 
--
@lifeofguenter
fix regex
022955a 
--
@JamesHeinrich
Merge pull request JamesHeinrich#115 from lifeofguenter/support-googl…
0e2c3ba 
…e-appengine

Add support for gs:// urls (Google App Engine)
@ch1902
Change from is_writabe to fileperms
6e7ff1c 
Switch from using is_writable to checking actual fileperms for writable
to owner/group/world to get around ACL issues. See
http://php.net/manual/en/function.is-writable.php#61331
@JamesHeinrich
Merge pull request JamesHeinrich#118 from ch1902/master
7aedc40 
Change from is_writabe to fileperms
@JamesHeinrich
ID3v2 WXXX tags URL text encoding
31f2ba8 
JamesHeinrich#119
@JamesHeinrich
Merge branch 'master' of https://github.com/JamesHeinrich/getID3
b4194e7
@JamesHeinrich
bugfix: #2066 Quicktime/AAC audio-only video key
1fb459f 
Remove [video] key from returned structure if file only contains audio.
http://www.getid3.org/phpBB3/viewtopic.php?t=2066
StudioMaX and others added 24 commits May 23, 2019 00:45
@StudioMaX
Common typos and issues
9bca4a7
@StudioMaX
Added correct PHPDoc's
d3f7b7b
@JamesHeinrich @StudioMaX
MPEG bitrate_mode key check
d85567d
@JamesHeinrich @StudioMaX
version string update
85f6eaf 
Update getID3 version string for changes made in
JamesHeinrich#143
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#145 Incompatible variable types
356d683 
JamesHeinrich#145
@StudioMaX
Fix deprecated license names
eb4007c
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#145 Incompatible variable types
9f0628b 
JamesHeinrich#145
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#145 Incompatible variable types
102c469 
JamesHeinrich#145
@StudioMaX
JamesHeinrich#145 Incompatible variable types
fc43f71
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#145 Incompatible variable types
e82deb1 
JamesHeinrich#145
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#147 QuickTime fourcc codec name lookup
ebf0838 
JamesHeinrich#147
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#147 QuickTime audio/video bitrate guessing
77ec2e2 
JamesHeinrich#147
Calculate bitrate for PCM audio streams.
Assume video bitrate is remainder of file bitrate if audio bitrate known
and video bitrate unknown.
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#147 QuickTime audio/video bitrate guessing
e367df3 
JamesHeinrich#147
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#148 MPEG-2 aspect ratio
789f3a7 
JamesHeinrich#148
@bvibber @StudioMaX
Fixes for MPEG-2 aspect ratio detection
1a44cb8 
* fix array lookup
* calculate pixel aspect ratio from display aspect ratios
* delay calc of aspect ratio until after extended size is known
* mirror the updated pixel aspect ratio up to the 'video' section

Fixes remaining issues with JamesHeinrich#148
@Gemorroj @StudioMaX
remove duplicated ignore string (*.tmp)
d2c2558
@StudioMaX
Add more image formats supported by getimagesize()
fc96e80
@StudioMaX
Replace getid3_lib::ImageTypesLookup() with image_type_to_mime_type()
f3f29bd
@JamesHeinrich @StudioMaX
ImageTypesLookup change to image_type_to_mime_type
1b4d191 
Continuation of JamesHeinrich#156
@JamesHeinrich @StudioMaX
bugfix JamesHeinrich#157 quicktime GPS invalid argument
3c998ef 
JamesHeinrich#157
@StudioMaX
Sync with 1.9.15-201803161257
c16ca61
@StudioMaX
Fixes after merge
aabf6e8
@StudioMaX
Merge branch 'master' into 2.0-sync-with-master
fd98ac1 
# Conflicts:
#	.gitattributes
#	.travis.yml
#	README.md
#	changelog.txt
#	composer.json
#	demos/demo.audioinfo.class.php
#	demos/demo.browse.php
#	demos/demo.dirscan.php
#	demos/demo.simple.php
#	demos/demo.zip.php
#	docs/Structure.md
#	getid3/module.audio-video.matroska.php
#	getid3/module.audio-video.quicktime.php
#	getid3/module.graphic.gif.php
#	getid3/module.misc.exe.php
#	helperapps/metaflac.exe
#	helperapps/vorbiscomment.exe
#	license.txt
#	phpstan.neon
#	src/Cache/Dbm.php
#	src/Cache/Mysql.php
#	src/Cache/Mysqli.php
#	src/Cache/Sqlite3.php
#	src/GetID3.php
#	src/Module/Archive/Gzip.php
#	src/Module/Archive/Rar.php
#	src/Module/Archive/Szip.php
#	src/Module/Archive/Tar.php
#	src/Module/Archive/Zip.php
#	src/Module/Audio/Aa.php
#	src/Module/Audio/Aac.php
#	src/Module/Audio/Ac3.php
#	src/Module/Audio/Amr.php
#	src/Module/Audio/Au.php
#	src/Module/Audio/Avr.php
#	src/Module/Audio/Bonk.php
#	src/Module/Audio/Dsf.php
#	src/Module/Audio/Dss.php
#	src/Module/Audio/Dts.php
#	src/Module/Audio/Flac.php
#	src/Module/Audio/La.php
#	src/Module/Audio/Lpac.php
#	src/Module/Audio/Midi.php
#	src/Module/Audio/Mod.php
#	src/Module/Audio/Monkey.php
#	src/Module/Audio/Mp3.php
#	src/Module/Audio/Mpc.php
#	src/Module/Audio/Ogg.php
#	src/Module/Audio/OptimFrog.php
#	src/Module/Audio/Rkau.php
#	src/Module/Audio/Shorten.php
#	src/Module/Audio/Tta.php
#	src/Module/Audio/Voc.php
#	src/Module/Audio/Vqf.php
#	src/Module/Audio/WavPack.php
#	src/Module/AudioVideo/Asf.php
#	src/Module/AudioVideo/Flv.php
#	src/Module/AudioVideo/Mpeg.php
#	src/Module/AudioVideo/Nsv.php
#	src/Module/AudioVideo/Real.php
#	src/Module/AudioVideo/Riff.php
#	src/Module/AudioVideo/Swf.php
#	src/Module/AudioVideo/Ts.php
#	src/Module/Graphic/Bmp.php
#	src/Module/Graphic/Efax.php
#	src/Module/Graphic/Jpg.php
#	src/Module/Graphic/Pcd.php
#	src/Module/Graphic/Png.php
#	src/Module/Graphic/Svg.php
#	src/Module/Graphic/Tiff.php
#	src/Module/Misc/Cue.php
#	src/Module/Misc/Iso.php
#	src/Module/Misc/MsOffice.php
#	src/Module/Misc/Par2.php
#	src/Module/Misc/Pdf.php
#	src/Module/Tag/ApeTag.php
#	src/Module/Tag/ID3v1.php
#	src/Module/Tag/ID3v2.php
#	src/Module/Tag/Lyrics3.php
#	src/Module/Tag/Xmp.php
#	src/Utils.php
#	src/Write/ApeTag.php
#	src/Write/ID3v1.php
#	src/Write/ID3v2.php
#	src/Write/Lyrics3.php
#	src/Write/MetaFlac.php
#	src/Write/Real.php
#	src/Write/VorbisComment.php
#	src/WriteTags.php
@StudioMaX
Fixes after merge
26acc6e
@StudioMaX
Copy link
Collaborator Author

@JamesHeinrich can we release/tag current 2.0 branch as "v2.0.0-BETA1" and mark it as "Pre-release" BEFORE merging this? Just to track all changes in 2.0 since all this time.

@JamesHeinrich JamesHeinrich merged commit 0e1fa0e into JamesHeinrich:2.0 May 26, 2019
cbj4074 added a commit to indiehd/audio-manipulator that referenced this pull request Nov 7, 2019
@cbj4074
chore: Restore james-heinrich/getid3 constraint
057e935 
JamesHeinrich/getID3#121 was merged via JamesHeinrich/getID3#187 , so it is now safe to restore this constraint.
@StudioMaX StudioMaX deleted the 2.0-sync-with-master branch April 16, 2021 10:41
@StudioMaX StudioMaX added the 2.x Issues related to GetID3 2.x label May 14, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
2.x Issues related to GetID3 2.x
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet