zhaarey/AppleMusicDecrypt
1
0
Fork 0
mirror of https://github.com/zhaarey/AppleMusicDecrypt.git synced 2025-10-23 15:11:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: aac convent vbr to cbr bug

Browse Source
This commit is contained in:
WorldObservationLog
2024-05-19 03:36:15 +08:00
parent 94a6ab1c8a
commit afd1213e5f
2 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mp4.py
View File

@@ -87,7 +87,8 @@ def extract_song(raw_song: bytes, codec: str) -> SongInfo:
match codec:
case Codec.ALAC:
alac_atom_name = (Path(tmp_dir.name) / Path(mp4_name).with_suffix('.atom')).absolute()
subprocess.run(f"mp4extract moov/trak/mdia/minf/stbl/stsd/enca[0]/alac {raw_mp4.absolute()} {alac_atom_name}",
subprocess.run(
f"mp4extract moov/trak/mdia/minf/stbl/stsd/enca[0]/alac {raw_mp4.absolute()} {alac_atom_name}",
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
with open(alac_atom_name, "rb") as f:
decoder_params = f.read()
@@ -209,3 +210,25 @@ def fix_encapsulate(song: bytes) -> bytes:
new_song_name.absolute()], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
with open(new_song_name.absolute(), "rb") as f:
return f.read()
# FFMPEG will overwrite maxBitrate in DecoderConfigDescriptor
# Using raw song's esds box to fix it
# see also https://trac.ffmpeg.org/ticket/4894
def fix_esds_box(raw_song: bytes, song: bytes) -> bytes:
tmp_dir = TemporaryDirectory()
name = uuid.uuid4().hex
esds_name = Path(tmp_dir.name) / Path(f"{name}.atom")
raw_song_name = Path(tmp_dir.name) / Path(f"{name}_raw.m4a")
song_name = Path(tmp_dir.name) / Path(f"{name}.m4a")
final_song_name = Path(tmp_dir.name) / Path(f"{name}_final.m4a")
with open(raw_song_name.absolute(), "wb") as f:
f.write(raw_song)
with open(song_name.absolute(), "wb") as f:
f.write(song)
subprocess.run(
f"mp4extract moov/trak/mdia/minf/stbl/stsd/enca[0]/esds {raw_song_name.absolute()} {esds_name.absolute()}", stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
subprocess.run(f"mp4edit --replace moov/trak/mdia/minf/stbl/stsd/mp4a/esds:{esds_name.absolute()} {song_name.absolute()} {final_song_name.absolute()}",
stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
with open(final_song_name.absolute(), "rb") as f:
return f.read()

4
src/rip.py
View File

@@ -11,7 +11,7 @@ from src.adb import Device
from src.decrypt import decrypt
from src.metadata import SongMetadata
from src.models import PlaylistInfo
from src.mp4 import extract_media, extract_song, encapsulate, write_metadata, fix_encapsulate
from src.mp4 import extract_media, extract_song, encapsulate, write_metadata, fix_encapsulate, fix_esds_box
from src.save import save
from src.types import GlobalAuthParams, Codec
from src.url import Song, Album, URLType, Artist, Playlist
@@ -75,6 +75,8 @@ async def rip_song(song: Song, auth_params: GlobalAuthParams, codec: str, config
if not if_raw_atmos(codec, config.download.atmosConventToM4a):
metadata_song = write_metadata(song, song_metadata, config.metadata.embedMetadata, config.download.coverFormat)
song = fix_encapsulate(metadata_song)
if codec == Codec.AAC or codec == Codec.AAC_DOWNMIX or codec == Codec.AAC_BINAURAL:
song = fix_esds_box(song_info.raw, song)
filename = save(song, codec, song_metadata, config.download, playlist)
logger.info(f"Song {song_metadata.artist} - {song_metadata.title} saved!")
if config.download.afterDownloaded: