diff options
| author | wm4 <wm4@nowhere> | 2012-11-05 14:25:04 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-01-13 20:04:10 +0100 |
| commit | c54fc507da8edcc2c5d3bc3f50b0881d1c1406d7 (patch) | |
| tree | 530d112301256e1c3ea50d7bb416b7ba2109130b /video/out/vo_lavc.c | |
| parent | 1c412169aca2f0ad38380b0c89f2485e6a256766 (diff) | |
| download | mpv-c54fc507da8edcc2c5d3bc3f50b0881d1c1406d7.tar.bz2 mpv-c54fc507da8edcc2c5d3bc3f50b0881d1c1406d7.tar.xz | |
video/filter: change filter API, use refcounting, remove filter DR
Change the entire filter API to use reference counted images instead
of vf_get_image().
Remove filter "direct rendering". This was useful for vf_expand and (in
rare cases) vf_sub: DR allowed these filters to pass a cropped image to
the filters before them. Then, on filtering, the image was "uncropped",
so that black bars could be added around the image without copying. This
means that in some cases, vf_expand will be slower (-vf gradfun,expand
for example).
Note that another form of DR used for in-place filters has been replaced
by simpler logic. Instead of trying to do DR, filters can check if the
image is writeable (with mp_image_is_writeable()), and do true in-place
if that's the case. This affects filters like vf_gradfun and vf_sub.
Everything has to support strides now. If something doesn't, making a
copy of the image data is required.
Diffstat (limited to 'video/out/vo_lavc.c')
| -rw-r--r-- | video/out/vo_lavc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 6ae06fffec..7d846da92d 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -74,7 +74,7 @@ static int preinit(struct vo *vo, const char *arg) return 0; } -static void draw_image(struct vo *vo, mp_image_t *mpi, double pts); +static void draw_image(struct vo *vo, mp_image_t *mpi); static void uninit(struct vo *vo) { struct priv *vc = vo->priv; @@ -82,7 +82,7 @@ static void uninit(struct vo *vo) return; if (vc->lastipts >= 0 && vc->stream) - draw_image(vo, NULL, MP_NOPTS_VALUE); + draw_image(vo, NULL); if (vc->lastimg) { // palette hack @@ -284,7 +284,7 @@ static int encode_video(struct vo *vo, AVFrame *frame, AVPacket *packet) } } -static void draw_image(struct vo *vo, mp_image_t *mpi, double pts) +static void draw_image(struct vo *vo, mp_image_t *mpi) { struct priv *vc = vo->priv; struct encode_lavc_context *ectx = vo->encode_lavc_ctx; @@ -294,6 +294,8 @@ static void draw_image(struct vo *vo, mp_image_t *mpi, double pts) int64_t frameipts; double nextpts; + double pts = mpi ? mpi->pts : MP_NOPTS_VALUE; + if (!vc) return; if (!encode_lavc_start(ectx)) { @@ -540,7 +542,7 @@ const struct vo_driver video_out_lavc = { .control = control, .uninit = uninit, .check_events = check_events, - .draw_image_pts = draw_image, + .draw_image = draw_image, .draw_osd = draw_osd, .flip_page_timed = flip_page_timed, }; |