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

Add support for multiple streams and metadata parsing to 'ffmpeg_parse_infos' #1466

Merged
merged 10 commits into from
Jan 21, 2021
Merged

Add support for multiple streams and metadata parsing to 'ffmpeg_parse_infos' #1466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fd1f3bd
Fix conflicts
mondeja Jan 20, 2021
a3c79fa
Fix formatting
mondeja Jan 20, 2021
e97b57b
Improve documentation and minor changes to ffmpeg_parse_infos func def
mondeja Jan 20, 2021
002c788
Fix error parsing when 'decode_file=True' and add test
mondeja Jan 20, 2021
87fb859
Refactor a bit the parser
mondeja Jan 20, 2021
41ad26f
Add two doctrings in tests
mondeja Jan 20, 2021
c7bbd38
Fix formatting
mondeja Jan 20, 2021
e4c0ca6
Better exception catching
mondeja Jan 20, 2021
68d04fd
More comments
mondeja Jan 20, 2021
8aeed0c
Raise proper errors if file not found in 'parse_ffmpeg_infos'
mondeja Jan 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Support for `copy.copy(clip)` and `copy.deepcopy(clip)` with same behaviour as `clip.copy()` [\#1442](https://github.com/Zulko/moviepy/pull/1442)
- `audio.fx.multiply_stereo_volume` to control volume by audio channels [\#1424](https://github.com/Zulko/moviepy/pull/1424)
- Support for retrieve clip frames number using `clip.n_frames` [\#1471](https://github.com/Zulko/moviepy/pull/1471)
- `video.io.ffmpeg_reader.ffmpeg_parse_infos` returns data from all streams by FFmpeg inputs in attribute `inputs` [\#1466](https://github.com/Zulko/moviepy/pull/1466)
- `video.io.ffmpeg_reader.ffmpeg_parse_infos` returns metadata of the container in attribute `metadata` [\#1466](https://github.com/Zulko/moviepy/pull/1466)

### Changed <!-- for changes in existing functionality -->
- Lots of method and parameter names have been changed. This will be explained better in the documentation soon. See https://github.com/Zulko/moviepy/pull/1170 for more information. [\#1170](https://github.com/Zulko/moviepy/pull/1170)
Expand Down
0 media/sintel_with_15_chapters.mp4 → media/sintel_with_14_chapters.mp4
View file
Open in desktop
File renamed without changes.
4 changes: 0 additions & 4 deletions moviepy/audio/io/readers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,6 @@ def __init__(
self.nchannels = nchannels
infos = ffmpeg_parse_infos(filename, decode_file=decode_file)
self.duration = infos["duration"]
if "video_duration" in infos:
self.duration = infos["video_duration"]
else:
self.duration = infos["duration"]
self.bitrate = infos["audio_bitrate"]
self.infos = infos
self.proc = None
Expand Down
Loading