From 0c14e2fbe3c5cba16af27525aa6715819226e6d8 Mon Sep 17 00:00:00 2001 From: pulpe Date: Sat, 22 Feb 2014 13:55:51 +0100 Subject: [PATCH 1/5] add post processor --- youtube_dl/__init__.py | 7 +++ youtube_dl/postprocessor/__init__.py | 4 ++ youtube_dl/postprocessor/atomicparsley.py | 59 +++++++++++++++++++++++ youtube_dl/postprocessor/ffmpeg.py | 14 ++++++ 4 files changed, 84 insertions(+) create mode 100644 youtube_dl/postprocessor/atomicparsley.py diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 6af4b8aee..490f76dc9 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -90,6 +90,8 @@ from .version import __version__ from .YoutubeDL import YoutubeDL from .postprocessor import ( + AtomicParsleyPP, + FFmpegMediaFixPP, FFmpegMetadataPP, FFmpegVideoConvertor, FFmpegExtractAudioPP, @@ -497,6 +499,8 @@ def _hide_login_info(opts): help='do not overwrite post-processed files; the post-processed files are overwritten by default') postproc.add_option('--embed-subs', action='store_true', dest='embedsubtitles', default=False, help='embed subtitles in the video (only for mp4 videos)') + postproc.add_option('--embed-thumbnail', action='store_true', dest='embedthumbnail', default=False, + help='embed thumbnail in the audio as cover art') postproc.add_option('--add-metadata', action='store_true', dest='addmetadata', default=False, help='write metadata to the video file') postproc.add_option('--xattrs', action='store_true', dest='xattrs', default=False, @@ -803,6 +807,9 @@ def _real_main(argv=None): ydl.add_post_processor(FFmpegEmbedSubtitlePP(subtitlesformat=opts.subtitlesformat)) if opts.xattrs: ydl.add_post_processor(XAttrMetadataPP()) + if opts.embedthumbnail: + ydl.add_post_processor(FFmpegMediaFixPP()) + ydl.add_post_processor(AtomicParsleyPP()) # Update version if opts.update_self: diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py index 7f19f717f..9410dcf5b 100644 --- a/youtube_dl/postprocessor/__init__.py +++ b/youtube_dl/postprocessor/__init__.py @@ -1,5 +1,7 @@ +from .atomicparsley import AtomicParsleyPP from .ffmpeg import ( + FFmpegMediaFixPP, FFmpegMergerPP, FFmpegMetadataPP, FFmpegVideoConvertor, @@ -9,6 +11,8 @@ from .xattrpp import XAttrMetadataPP __all__ = [ + 'AtomicParsleyPP', + 'FFmpegMediaFixPP', 'FFmpegMergerPP', 'FFmpegMetadataPP', 'FFmpegVideoConvertor', diff --git a/youtube_dl/postprocessor/atomicparsley.py b/youtube_dl/postprocessor/atomicparsley.py new file mode 100644 index 000000000..0f7cf5417 --- /dev/null +++ b/youtube_dl/postprocessor/atomicparsley.py @@ -0,0 +1,59 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + + +import os +import subprocess + +from .common import PostProcessor + +from ..utils import ( + check_executable, + compat_urlretrieve, + encodeFilename, + PostProcessingError, + prepend_extension, + shell_quote +) + + +class AtomicParsleyPPError(PostProcessingError): + pass + + +class AtomicParsleyPP(PostProcessor): + def __init__(self, downloader=None): + PostProcessor.__init__(self, downloader) + + def run(self, info): + if not check_executable('AtomicParsley', ['-v']): + raise AtomicParsleyPPError('AtomicParsley was not found. Please install.') + + filename = info['filepath'] + temp_filename = prepend_extension(filename, 'temp') + temp_thumbnail = prepend_extension(filename, 'thumb') + + if not info.get('thumbnail'): + raise AtomicParsleyPPError('Thumbnail was not found. Nothing to do.') + + compat_urlretrieve(info['thumbnail'], temp_thumbnail) + + cmd = ['AtomicParsley', filename, '--artwork', temp_thumbnail, '-o', temp_filename] + + self._downloader.to_screen('[atomicparsley] Adding thumbnail to "%s"' % filename) + + if self._downloader.params.get('verbose', False): + self._downloader.to_screen('[debug] AtomicParsley command line: %s' % shell_quote(cmd)) + + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() + + if p.returncode != 0: + msg = stderr.decode('utf-8', 'replace').strip() + raise AtomicParsleyPPError(msg) + + os.remove(encodeFilename(filename)) + os.remove(encodeFilename(temp_thumbnail)) + os.rename(encodeFilename(temp_filename), encodeFilename(filename)) + + return True, info diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index c22f2cdc6..26a70491a 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -483,3 +483,17 @@ def run(self, info): self.run_ffmpeg_multiple_files(info['__files_to_merge'], filename, args) return True, info + +class FFmpegMediaFixPP(FFmpegPostProcessor): + def run(self, info): + filename = info['filepath'] + temp_filename = prepend_extension(filename, 'temp') + + options = ['-vcodec', 'copy', '-acodec', 'copy'] + self._downloader.to_screen(u'[ffmpeg] Fixing media file "%s"' % filename) + self.run_ffmpeg(filename, temp_filename, options) + + os.remove(encodeFilename(filename)) + os.rename(encodeFilename(temp_filename), encodeFilename(filename)) + + return True, info From 149254d0d5fd9407a008e31c2e4362316e625d35 Mon Sep 17 00:00:00 2001 From: pulpe Date: Sat, 22 Feb 2014 18:10:07 +0100 Subject: [PATCH 2/5] fix ffmpeg error, if youtube-dl runs more than once with --embed-thumbnail with same video --- youtube_dl/__init__.py | 4 ++-- youtube_dl/postprocessor/__init__.py | 4 ++-- youtube_dl/postprocessor/ffmpeg.py | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 490f76dc9..8b95a6d9b 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -91,7 +91,7 @@ from .YoutubeDL import YoutubeDL from .postprocessor import ( AtomicParsleyPP, - FFmpegMediaFixPP, + FFmpegAudioFixPP, FFmpegMetadataPP, FFmpegVideoConvertor, FFmpegExtractAudioPP, @@ -808,7 +808,7 @@ def _real_main(argv=None): if opts.xattrs: ydl.add_post_processor(XAttrMetadataPP()) if opts.embedthumbnail: - ydl.add_post_processor(FFmpegMediaFixPP()) + ydl.add_post_processor(FFmpegAudioFixPP()) ydl.add_post_processor(AtomicParsleyPP()) # Update version diff --git a/youtube_dl/postprocessor/__init__.py b/youtube_dl/postprocessor/__init__.py index 9410dcf5b..08e6ddd00 100644 --- a/youtube_dl/postprocessor/__init__.py +++ b/youtube_dl/postprocessor/__init__.py @@ -1,7 +1,7 @@ from .atomicparsley import AtomicParsleyPP from .ffmpeg import ( - FFmpegMediaFixPP, + FFmpegAudioFixPP, FFmpegMergerPP, FFmpegMetadataPP, FFmpegVideoConvertor, @@ -12,7 +12,7 @@ __all__ = [ 'AtomicParsleyPP', - 'FFmpegMediaFixPP', + 'FFmpegAudioFixPP', 'FFmpegMergerPP', 'FFmpegMetadataPP', 'FFmpegVideoConvertor', diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 26a70491a..75ee87e1a 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -484,13 +484,13 @@ def run(self, info): return True, info -class FFmpegMediaFixPP(FFmpegPostProcessor): +class FFmpegAudioFixPP(FFmpegPostProcessor): def run(self, info): filename = info['filepath'] temp_filename = prepend_extension(filename, 'temp') - options = ['-vcodec', 'copy', '-acodec', 'copy'] - self._downloader.to_screen(u'[ffmpeg] Fixing media file "%s"' % filename) + options = ['-vn', '-acodec', 'copy'] + self._downloader.to_screen(u'[ffmpeg] Fixing audio file "%s"' % filename) self.run_ffmpeg(filename, temp_filename, options) os.remove(encodeFilename(filename)) From 39c68260c0b308e250119fa136c7e4f76d14dfea Mon Sep 17 00:00:00 2001 From: pulpe Date: Sat, 22 Feb 2014 18:23:30 +0100 Subject: [PATCH 3/5] fix ffmpeg metadatapp --- youtube_dl/postprocessor/ffmpeg.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 75ee87e1a..d5b71b96f 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -464,7 +464,11 @@ def run(self, info): filename = info['filepath'] temp_filename = prepend_extension(filename, 'temp') - options = ['-c', 'copy'] + if info['ext'] == u'm4a': + options = ['-vn', '-acodec', 'copy'] + else: + options = ['-c', 'copy'] + for (name, value) in metadata.items(): options.extend(['-metadata', '%s=%s' % (name, value)]) From 784763c56500bfcdd6b539dffdffeae8dfb6b91e Mon Sep 17 00:00:00 2001 From: pulpe Date: Sat, 22 Feb 2014 18:31:54 +0100 Subject: [PATCH 4/5] we don't need to run ffmpeg more times --- youtube_dl/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py index 8b95a6d9b..4f4ec3871 100644 --- a/youtube_dl/__init__.py +++ b/youtube_dl/__init__.py @@ -808,7 +808,8 @@ def _real_main(argv=None): if opts.xattrs: ydl.add_post_processor(XAttrMetadataPP()) if opts.embedthumbnail: - ydl.add_post_processor(FFmpegAudioFixPP()) + if not opts.addmetadata: + ydl.add_post_processor(FFmpegAudioFixPP()) ydl.add_post_processor(AtomicParsleyPP()) # Update version From a169e18ce16567ef123007a22758bcda48d07f92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaime=20Marqui=CC=81nez=20Ferra=CC=81ndiz?= Date: Sat, 12 Apr 2014 15:51:40 +0200 Subject: [PATCH 5/5] [atomicparsley] Remove unneeded __init__ method --- youtube_dl/postprocessor/atomicparsley.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/youtube_dl/postprocessor/atomicparsley.py b/youtube_dl/postprocessor/atomicparsley.py index 0f7cf5417..765b2d9ee 100644 --- a/youtube_dl/postprocessor/atomicparsley.py +++ b/youtube_dl/postprocessor/atomicparsley.py @@ -22,9 +22,6 @@ class AtomicParsleyPPError(PostProcessingError): class AtomicParsleyPP(PostProcessor): - def __init__(self, downloader=None): - PostProcessor.__init__(self, downloader) - def run(self, info): if not check_executable('AtomicParsley', ['-v']): raise AtomicParsleyPPError('AtomicParsley was not found. Please install.')