RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-01-05 06:30:06 +00:00
Code Issues Releases Wiki Activity

Revert "mp_image_pool: disallow adding read only frames"

Browse Source 
This reverts commit 0ce3dce03a.

We actually explicitly add read-only frames in some of the hwaccel code
via mp_image_new_custom_ref(), which sets AV_BUFFER_FLAG_READONLY. It's
probably better to keep it this way.

Fixes #4652 (and some related issues with D3D).
This commit is contained in:
wm4 2017-08-08 16:16:55 +02:00
parent f7fb6e186a
commit 7f9193b353
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/mp_image_pool.c
View File

@ -152,9 +152,9 @@ struct mp_image *mp_image_pool_get_no_alloc(struct mp_image_pool *pool, int fmt,
// This assumes the buffer is at this point exclusively owned by us: we // This assumes the buffer is at this point exclusively owned by us: we
// can't track whether the buffer is unique otherwise. // can't track whether the buffer is unique otherwise.
// (av_buffer_is_writable() checks the refcount of the new buffer only.) // (av_buffer_is_writable() checks the refcount of the new buffer only.)
assert(av_buffer_is_writable(new->bufs[0])); int flags = av_buffer_is_writable(new->bufs[0]) ? 0 : AV_BUFFER_FLAG_READONLY;
ref->bufs[0] = av_buffer_create(new->bufs[0]->data, new->bufs[0]->size, ref->bufs[0] = av_buffer_create(new->bufs[0]->data, new->bufs[0]->size,
unref_image, new, 0); unref_image, new, flags);
if (!ref->bufs[0]) { if (!ref->bufs[0]) {
talloc_free(ref); talloc_free(ref);
return NULL; return NULL;
@ -169,10 +169,6 @@ struct mp_image *mp_image_pool_get_no_alloc(struct mp_image_pool *pool, int fmt,
void mp_image_pool_add(struct mp_image_pool *pool, struct mp_image *new) void mp_image_pool_add(struct mp_image_pool *pool, struct mp_image *new)
{ {
assert(new->bufs[0]);
assert(!new->bufs[1]);
assert(mp_image_is_writeable(new));
struct image_flags *it = talloc_ptrtype(new, it); struct image_flags *it = talloc_ptrtype(new, it);
*it = (struct image_flags) { .pool_alive = true }; *it = (struct image_flags) { .pool_alive = true };
new->priv = it; new->priv = it;