Commit Graph

99 Commits (b1ea6802703f6886b3be2a9975f598fa49fc6d3e)

Author SHA1 Message Date
Yen Chi Hsuan 23495d6a39
Revert "[ffmpeg] Fix embedding subtitles (#9063)"
This reverts commit ccff2c404d.

Fixes #10081.

The new approach breaks embedding subtitles into video-only or
audio-only files. FFMpeg provides a trick: add '?' after the argument of
'-map' so that a missing stream is ignored. For example:

opts = [
    '-map', '0:v?',
    '-c:v', 'copy',
    '-map', '0:a?',
    '-c:a', 'copy',
    # other options...
]

Unfortunately, such a format is not implemented in avconv, either.
I guess adding '-ignore_unknown' if self.basename == 'ffmpeg' is the
best solution. However, the example mentioned in #9063 no longer serves
problematic files, so I can't test it. I'll reopen #9063 and wait for
another example so that I can test '-ignore_unknown'.
8 years ago
Yen Chi Hsuan 5b6a74856b Merge pull request #9288 from reyyed/issue#9063fix
[ffmpeg] Fix embedding subtitles (#9063)
8 years ago
Sergey M․ 4bd143a3a0
[postprocessor/ffmpeg] Simplify metadata preparation and add track related metafields (Closes #9357) 9 years ago
Wang Jun Tham ccff2c404d [ffmpeg] Fix embedding subtitles (#9063)
Changed command line parameters for ffmpeg when embedding subtitles.
Changed to ‘-map 0:v -c:v copy -map 0:a -c:a copy’
9 years ago
remitamine b9f2fdd37f [ffmpeg] Clarify rationale for pipe(-) exclusion in _ffmpeg_filename_argument 9 years ago
remitamine d868f43c58 [ffmpeg] check for - file name in _ffmpeg_filename_argument 9 years ago
remitamine 0750b2491f [ffmpeg] try to convert tt subtitles usng dfxp2srt 9 years ago
Sergey M․ 40025ee2a3 [postprocessort/ffmpeg] Allow embedding webvtt into webm (Closes #8874) 9 years ago
remitamine 2e7e561c1d Merge pull request #8611 from remitamine/ffmpegfd
[downloader/external] Add FFmpegFD
9 years ago
remitamine a755f82549 [ffmpeg] convert format ext to ffmpeg output formats codes 9 years ago
remitamine f17f86513e Add fixup for media files produced by HlsNative downloader(fixes #4776) 9 years ago
Jaime Marquínez Ferrándiz d4f8e83404 [FFmpegSubtitlesConvertorPP] remove unused variable 9 years ago
Jaime Marquínez Ferrándiz 7b8b007cd9 [FFmpegSubtitlesConvertorPP] remove intermediate srt files 9 years ago
Jaime Marquínez Ferrándiz 3547d26587 [FFmpegSubtitlesConvertorPP] correctly update the extension (fixes #8444) 9 years ago
Jaime Marquínez Ferrándiz 7e62c2eb6d [FFmpegSubtitlesConvertorPP] fix not working when srt is used as the intermediate format between ttml/dfxp and other format
It was trying to use the ttml/dfxp file with ffmpeg, which doesn't have support for them.
I broke it in e04398e397.
9 years ago
remitamine 7d3a035ee0 [ffmpeg] check for m3u8 protocol in FFmpegMetadataPP 9 years ago
remitamine 593e0f43b4 [ffmpeg] fix condition(fixes #8440) 9 years ago
remitamine 6fba62c87a [ffmpeg] fix adding metadata when using --hls-prefer-native(#8350) 9 years ago
remitamine fae45ede08 Merge pull request #8354 from remitamine/m3u8_metadata
[ffmpeg] fix adding metadata when using m3u8_native(fixes #8350)
9 years ago
Jaime Marquínez Ferrándiz e04398e397 [FFmpegSubtitlesConvertorPP] delete old subtitle files (fixes #8382) 9 years ago
remitamine cf57433bbd [ffmpeg] fix adding metadata when using m3u8_native(fixes #8350) 9 years ago
Juan M Martínez 374c761e77 [FFmpegPostProcessor] Default of prefer ffmpeg
When no `downloader` is passed to `FFmpegPostProcessor`
an exception was raised trying to get the prefer ffmpeg param.

    AttributeError: 'NoneType' object has no attribute 'params'

This fixes and defaults to `False`.
9 years ago
Sergey M․ deb85c32bb [postprocessor/ffmpeg] Use ffmpeg as prefix since it's used all over the places (Closes #7371) 9 years ago
Jaime Marquínez Ferrándiz 8a7bbd1606 [postprocessor/ffmpeg] Always use the 'file:' protocol for filenames (fixes #6874)
If the filename contains ':' it is interpreted as a protocol.
It also handles filenames starting with '-'.
9 years ago
Jaime Marquínez Ferrándiz 9750e7d70e [postprocessor/ffmpeg] Don't use '[youtube] ...' in messages
Because it can be used for other extractors.
9 years ago
Sergey M․ 15006fedb9 [postprocessor/ffmpeg] Spread postprocessor args usage on all ffmpeg extractors 9 years ago
Sergey M․ f72b0a6032 Revert xvid to avi and make docs to be similar to existing external downloader option 9 years ago
Sergey M․ ac9ed061ec Merge branch 'master' of https://github.com/aurium/youtube-dl into aurium-master 9 years ago
Aurélio A. Heckert aa5d9a79d6 Simplify `postprocessor_args` transmission to PP base class
* Remove `extra_cmd_args` transmission from sub to super class.
* Simplify params transmission through `downloader.params`.
10 years ago
Aurélio A. Heckert 1866432db7 Rename --pp-params to --postprocessor-args and access value as super class attribute 10 years ago
Yen Chi Hsuan 396726244a [utils/ffmpeg] Move ISO 639 related codes to utils 10 years ago
Aurélio A. Heckert d84f1d14b5 Adds support for XviD output with extra parametrization
As the "LG Time Machine" (a (not so) smart TV) has a limitation for video dimensions (as for codecs), I take to implement an extra parameter `--pp-params` where we can send extra parameterization for the video converter (post-processor).

Example:
```
$ youtube-dl --recode-video=xvid --pp-params='-s 720x480' -c https://www.youtube.com/watch?v=BE7Qoe2ZiXE
```
That works fine on a 4yo LG Time Machine.

Closes #5733
10 years ago
Sergey M․ 13763ce599 [postprocessor/ffmpeg] Add `can_merge` method 10 years ago
Sergey M․ 70484b9f8a [postprocessor/ffmpeg] Extract `check_outdated` method 10 years ago
Nikoli 083c1bb960 Add ability to embed subtitles in mkv files (closes #5434) 10 years ago
Yen Chi Hsuan bf6427d2fb [ffmpeg] Add dfxp (TTML) subtitles support (#3432, #5146) 10 years ago
pulpe c0ea8ebb9b [ffmpeg] Remove unneeded class 10 years ago
pulpe ddbed36455 [embedthumbnail] Add support for mp3 cover embedding 10 years ago
Jaime Marquínez Ferrándiz 5b5fbc0867 Detect already merged videos
Without the '--keep-video' option the two files would be downloaded again and even using the option, ffmpeg would be run again, which for some videos can take a long time.
We use a temporary file with ffmpeg so that the final file only exists if it success
10 years ago
Jaime Marquínez Ferrándiz d47aeb2252 FFmpegMergerPP: use the new system for specifying which files can be delete 10 years ago
Jaime Marquínez Ferrándiz 14523ed969 FFmpegEmbedSubtitlePP: remove the subtitle files if '--keep-video' is not given (closes #5435) 10 years ago
Jaime Marquínez Ferrándiz 592e97e855 Postprocessors: use a list for the files that can be deleted
We could only know if we had to delete the original file, but this system allows to specify us more files (like subtitles).
10 years ago
Jaime Marquínez Ferrándiz ce81b1411d FFmpegExtractAudioPP: Simplify handling of already existing files 10 years ago
Sergey M․ dd29eb7f81 [postprocessor/common:postprocessor/ffmpeg] Generalize utime 10 years ago
Pete Hemery cc55d08832 [ffmpeg] adding exception catching for call to os.utime in run_ffmpeg_multiple_files 10 years ago
Jaime Marquínez Ferrándiz 3da4b31359 [postprocessor/ffmpeg] Fix crash when ffprobe/avprobe are not installed (closes #5349)
'self.probe_basename' was None, so 'probe_executable' raised a KeyError exception
10 years ago
Jaime Marquínez Ferrándiz 70a1165b32 Don't use bare 'except:'
They catch any exception, including KeyboardInterrupt, we don't want to catch it.
10 years ago
Jaime Marquínez Ferrándiz 88cf6fb368 [metadatafromtitle] Some improvements and cleanup
* Remove the 'songtitle' field, 'title' can be used instead.
* Remove newlines in the help text, for consistency with other options.
* Add 'from __future__ import unicode_literals'.
* Call '__init__' from the parent class.
* Add test for the format_to_regex method
10 years ago
phiresky e7db87f700 Add metadata from title parser
(Closes #5125)
10 years ago
Jaime Marquínez Ferrándiz e9fade72f3 Add postprocessor for converting subtitles (closes #4954) 10 years ago