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

[ie/tiktok] Fix audio-only format extraction #7712

Merged
merged 4 commits into from
Jul 29, 2023
Merged

[ie/tiktok] Fix audio-only format extraction #7712

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
251fefa
[ie/tiktok] Fix audio-only format extraction
bashonly Jul 27, 2023
7c50323
Add/update tests
bashonly Jul 27, 2023
bd4d4b1
Use `default_ext`
bashonly Jul 27, 2023
408b868
Fix test
bashonly Jul 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 35 additions & 8 deletions yt_dlp/extractor/tiktok.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,15 +205,16 @@ def parse_url_key(url_key):

known_resolutions = {}

def mp3_meta(url):
def audio_meta(url):
ext = determine_ext(url, default_ext='m4a')
return {
'format_note': 'Music track',
'ext': 'mp3',
'acodec': 'mp3',
'ext': ext,
'acodec': 'aac' if ext == 'm4a' else ext,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Many IEs incl youtube just sets acodec=m4a. So either's fine

'vcodec': 'none',
'width': None,
'height': None,
} if determine_ext(url) == 'mp3' else {}
} if ext == 'mp3' or '-music-' in url else {}

def extract_addr(addr, add_meta={}):
parsed_meta, res = parse_url_key(addr.get('url_key', ''))
Expand All @@ -231,7 +232,7 @@ def extract_addr(addr, add_meta={}):
**add_meta, **parsed_meta,
'format_note': join_nonempty(
add_meta.get('format_note'), '(API)' if 'aweme/v1' in url else None, delim=' '),
**mp3_meta(url),
**audio_meta(url),
} for url in addr.get('url_list') or []]

# Hack: Add direct video links first to prioritize them when removing duplicate formats
Expand Down Expand Up @@ -527,6 +528,7 @@ class TikTokIE(TikTokBaseIE):
'repost_count': int,
'comment_count': int,
},
'skip': 'unable to download video data: HTTP Error 403: Forbidden',
}, {
# Video without title and description
'url': 'https://www.tiktok.com/@pokemonlife22/video/7059698374567611694',
Expand Down Expand Up @@ -600,7 +602,7 @@ class TikTokIE(TikTokBaseIE):
}, {
# only available via web
'url': 'https://www.tiktok.com/@moxypatch/video/7206382937372134662',
'md5': '8d8c0be14127020cd9f5def4a2e6b411',
'md5': '6aba7fad816e8709ff2c149679ace165',
'info_dict': {
'id': '7206382937372134662',
'ext': 'mp4',
Expand Down Expand Up @@ -637,8 +639,8 @@ class TikTokIE(TikTokBaseIE):
'uploader_id': '86328792343818240',
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAA-0bQT0CqebTRr6I4IkYvMDMKSRSJHLNPBo5HrSklJwyA2psXLSZG5FP-LMNpHnJd',
'channel_id': 'MS4wLjABAAAA-0bQT0CqebTRr6I4IkYvMDMKSRSJHLNPBo5HrSklJwyA2psXLSZG5FP-LMNpHnJd',
'creator': 't8',
'artist': 't8',
'creator': 'tate mcrae',
'artist': 'tate mcrae',
'track': 'original sound',
'upload_date': '20220609',
'timestamp': 1654805899,
Expand All @@ -650,6 +652,31 @@ class TikTokIE(TikTokBaseIE):
'thumbnail': r're:^https://.+\.webp',
},
'params': {'format': 'bytevc1_1080p_808907-0'},
}, {
# Slideshow, audio-only m4a format
'url': 'https://www.tiktok.com/@hara_yoimiya/video/7253412088251534594',
'md5': '2ff8fe0174db2dbf49c597a7bef4e47d',
'info_dict': {
'id': '7253412088251534594',
'ext': 'm4a',
'title': 'я ред флаг простите #переписка #щитпост #тревожныйтиппривязанности #рекомендации ',
'description': 'я ред флаг простите #переписка #щитпост #тревожныйтиппривязанности #рекомендации ',
'uploader': 'hara_yoimiya',
'uploader_id': '6582536342634676230',
'uploader_url': 'https://www.tiktok.com/@MS4wLjABAAAAIAlDxriiPWLE-p8p1R_0Bx8qWKfi-7zwmGhzU8Mv25W8sNxjfIKrol31qTczzuLB',
'channel_id': 'MS4wLjABAAAAIAlDxriiPWLE-p8p1R_0Bx8qWKfi-7zwmGhzU8Mv25W8sNxjfIKrol31qTczzuLB',
'creator': 'лампочка',
'artist': 'Øneheart',
'album': 'watching the stars',
'track': 'watching the stars',
'upload_date': '20230708',
'timestamp': 1688816612,
'view_count': int,
'like_count': int,
'comment_count': int,
'repost_count': int,
'thumbnail': r're:^https://.+\.webp',
},
}, {
# Auto-captions available
'url': 'https://www.tiktok.com/@hankgreen1/video/7047596209028074758',
Expand Down