diff options
| author | wm4 <wm4@nowhere> | 2018-04-22 19:40:36 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-04-29 02:21:32 +0300 |
| commit | 6c8362ef54f4e90476553cb6b64996cc414da06d (patch) | |
| tree | ab3fa75a18958bacc08c473304f59519a58f5969 /common/encode.h | |
| parent | 8135e25600ace2894df274e6a825cfef525fee77 (diff) | |
| download | mpv-6c8362ef54f4e90476553cb6b64996cc414da06d.tar.bz2 mpv-6c8362ef54f4e90476553cb6b64996cc414da06d.tar.xz | |
encode: rewrite half of it
The main change is that we wait with opening the muxer ("writing
headers") until we have data from all streams. This fixes race
conditions at init due to broken assumptions in the old code.
This also changes a lot of other stuff. I found and fixed a few API
violations (often things for which better mechanisms were invented, and
the old ones are not valid anymore). I try to get away from the public
mutex and shared fields in encode_lavc_context. For now it's still
needed for some timestamp-related fields, but most are gone. It also
removes some bad code duplication between audio and video paths.
Diffstat (limited to 'common/encode.h')
| -rw-r--r-- | common/encode.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/common/encode.h b/common/encode.h index c29cb3bc67..fcf4a8317e 100644 --- a/common/encode.h +++ b/common/encode.h @@ -54,17 +54,16 @@ struct encode_opts { char **remove_metadata; }; -// interface for mplayer.c -struct encode_lavc_context *encode_lavc_init(struct encode_opts *options, - struct mpv_global *global); -void encode_lavc_free(struct encode_lavc_context *ctx); +// interface for player core +struct encode_lavc_context *encode_lavc_init(struct mpv_global *global); +bool encode_lavc_free(struct encode_lavc_context *ctx); void encode_lavc_discontinuity(struct encode_lavc_context *ctx); bool encode_lavc_showhelp(struct mp_log *log, struct encode_opts *options); int encode_lavc_getstatus(struct encode_lavc_context *ctx, char *buf, int bufsize, float relative_position); -void encode_lavc_expect_stream(struct encode_lavc_context *ctx, int mt); +void encode_lavc_expect_stream(struct encode_lavc_context *ctx, + enum stream_type type); void encode_lavc_set_metadata(struct encode_lavc_context *ctx, struct mp_tags *metadata); -void encode_lavc_set_video_fps(struct encode_lavc_context *ctx, float fps); void encode_lavc_set_audio_pts(struct encode_lavc_context *ctx, double pts); bool encode_lavc_didfail(struct encode_lavc_context *ctx); // check if encoding failed |