Commit Graph

40 Commits

Author SHA1 Message Date
Zhiming Wang
b493af9a69
[ffmpeg] fix concat list when output dir is not pwd
Relative paths in the concat list are considered relative to the parent
directory of the script, not the calling directory. This isn't entirely
obvious from the documentation, but it is easy to infer from the concat
demuxer's concept of "safety", and easy to test (confirmed on FFmpeg
3.2.2). See https://ffmpeg.org/ffmpeg-all.html#concat-1 for details.

This commit fixes the wrong relative paths when --output-dir is
specified and not pwd.

This commit also
- Factors out common concat list writer code;
- Slightly simplifies the code to collect FFmpeg params (on Py35+ we can
  further simplify by unpacking LOGLEVEL with the star operator right in
  the list literal).
2016-12-24 13:44:22 -05:00
Mort Yao
d2206b3fdf
Merge branch 'fix-ffmpeg-error-on-mgtv' of https://github.com/StephenPCG/you-get into StephenPCG-fix-ffmpeg-error-on-mgtv 2016-11-18 22:59:43 +01:00
Zhang Cheng
a7635e96a5 [mgtv] add bsf:a aac_adtstoasc to ffmpeg args, fix #1458. 2016-11-17 11:18:01 +08:00
Mort Yao
feffcb656a
[processor.ffmpeg] fix params in ffmpeg_download_stream 2016-10-30 00:24:31 +02:00
H.G
2baeed762a [universal] fix issue: "flush" is not available in Python under 3.3 2016-09-05 10:50:58 +12:00
Mort Yao
3a8ce8819d
[ffmpeg] remove unuseful ffmpeg_play_stream(), fix #1336 2016-08-14 03:52:02 +02:00
David Zhuang
bb485a1110 [ffmpeg] Fix wrong format of output dir 2016-08-11 03:30:21 -04:00
David Zhuang
468fb6f403 [Processor]FFmpeg: check arguments not None 2016-07-29 01:27:22 -04:00
David Zhuang
09bfe28472 [Processor] Fix rtmpdump not portable under Windows 2016-07-21 00:50:21 -04:00
David Zhuang
18bc44ea41 [FFmpeg] Fix stream corrupted if Ctrl+C
Use q instead.
2016-06-29 23:42:19 -04:00
David Zhuang
fd93b0380d [FFmpeg] Change arguments to record M3U 2016-06-29 23:15:28 -04:00
David Zhuang
5966a090f4 [Common, ffmpeg]Exp: Add a ffmpeg downloader and player for any URL 2016-06-29 15:56:39 -04:00
Mort Yao
67d18c766a
processor/ffmpeg.py: 644 2016-05-22 17:28:01 +02:00
cnbeining
b4eb73965c
Add -bsf:a aac_adtstoasc when merging
As in #813.
2016-05-22 17:23:30 +02:00
Mort Yao
53cb97def5 [processor.ffmpeg] set safe option to -1 (as default value changed from -1 to 1 in ffmpeg 3.0.1), fix #1023 2016-04-05 00:39:28 +02:00
Mort Yao
46a1f51a8f [ffmpeg] fix #1009 2016-03-26 16:56:08 +01:00
lilydjwg
d470c8c29a [ffmpeg] more check_call replacing wrong 'raise's 2016-01-23 13:15:07 +08:00
Mort Yao
5567f68539 [rtmpdump] 2015-10-21 02:09:51 +02:00
Mort Yao
de38e0f7c8 [ffmpeg] set "-loglevel quiet" to suppress verbose FFmpeg output 2015-10-17 18:17:14 +02:00
Mort Yao
6e2087cc94 [ffmpeg] implement ffmpeg_concat_av() 2015-10-17 17:53:01 +02:00
lilydjwg
acda697f54 [ffmpeg] use subprocess.check_call
This fixes RuntimeError: No active exception to reraise
2015-09-27 16:38:38 +08:00
liushuyu
c5e09fd549 Fix zhanqi
Zhanqi extractor works again...
And added ts merging implementation...

Signed-off-by: liushuyu <liushuyu_011@163.com>
2015-06-16 18:33:45 +08:00
lilydjwg
e6581b99aa escape filenames for ffmpeg concatenating 2015-02-14 18:54:43 +08:00
pastebt
7b0dc1d330 Support multi stts and mdhd version = 1
modified:   src/you_get/processor/join_mp4.py
2015-01-07 17:00:49 -08:00
pastebt
d8c0c0594e Support skipping udta box, and ignore samples > 1
modified:   src/you_get/processor/join_mp4.py
2015-01-05 16:48:04 -08:00
Mort Yao
cbf0a6afcc Merge branch 'develop' of https://github.com/merlinran/you-get into merlinran-develop 2014-12-11 21:51:19 +01:00
Merlin Ran
08a9e73406 force override when concat files 2014-12-08 21:35:46 +08:00
Merlin Ran
cc03d86909 open concat list file with 'encoding="utf-8"'
To prevent error when video file name contains non-ascii characters.
2014-12-04 10:24:53 +08:00
fengyu
6442849519 set FFMPEG and FFMPEG_VERSION gracefully 2014-08-12 21:46:33 +08:00
FengYu
f92af54d28 set ffmpeg fallback version to 1.0 2014-08-12 21:10:21 +08:00
FengYu
eaf59fc745 fix ffmpeg version error 2014-08-12 17:08:51 +08:00
Mort Yao
f8f9b7778b use concat demuxer on FFmpeg >= 1.1, fix #324 2014-08-03 21:05:51 +02:00
jackyzy823
e286d91a09 refactor rtmp processor to support rtmp parameters 2014-07-15 14:24:21 +08:00
Mort Yao
6dd119436b add play_rtmpdump_stream() 2014-05-22 14:21:17 +02:00
Mort Yao
b3d10e32a9 add rtmpdump wrapper 2014-04-26 15:17:45 +02:00
Mort Yao
bc759b0a27 add ffmpeg_concat_mp4_to_mp4 2013-04-28 22:22:07 +02:00
Mort Yao
2e033fb75d supporting both ffmpeg 1.x and libav, fix #159 2013-04-17 14:38:13 +02:00
Mort Yao
bbd50c4e6c avoid using the libav fork of FFmpeg, as in #159 2013-04-17 12:27:14 +02:00
Mort Yao
00cd5b1bbc quick & dirty fix #61, default to use FFmpeg for merging flv files 2013-03-14 23:17:06 +01:00
Mort Yao
2b47ccd5d2 add unit tests 2013-02-12 22:04:39 +01:00