[vlc-commits] Contribs: update to dav1d 0.2.1
Ewout ter Hoeven
git at videolan.org
Thu Mar 14 10:10:05 CET 2019
vlc | branch: master | Ewout ter Hoeven <E.M.terHoeven at student.tudelft.nl> | Thu Mar 14 01:04:08 2019 +0100| [754e35a4582b832a979e5e7256e1716a0ce99e78] | committer: Jean-Baptiste Kempf
Contribs: update to dav1d 0.2.1
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=754e35a4582b832a979e5e7256e1716a0ce99e78
---
...quence-header-corresponding-to-the-pictur.patch | 94 ----------------------
contrib/src/dav1d/SHA512SUMS | 2 +-
contrib/src/dav1d/rules.mak | 5 +-
3 files changed, 3 insertions(+), 98 deletions(-)
diff --git a/contrib/src/dav1d/0001-pass-the-sequence-header-corresponding-to-the-pictur.patch b/contrib/src/dav1d/0001-pass-the-sequence-header-corresponding-to-the-pictur.patch
deleted file mode 100644
index 5ef1df4027..0000000000
--- a/contrib/src/dav1d/0001-pass-the-sequence-header-corresponding-to-the-pictur.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From fe62b6cf1ebcde4f64868ce13ea58736beb68efd Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at videolan.org>
-Date: Thu, 13 Dec 2018 11:57:31 +0100
-Subject: [PATCH] pass the sequence header corresponding to the picture being
- allocated
-
-Otherwise there's no way to know the colorimetry parameters during allocation.
-
-This is a problem in VLC as getting it after decoding means we need to issue a
-costly format update.
----
- src/decode.c | 2 +-
- src/picture.c | 11 ++++++-----
- src/picture.h | 2 +-
- 3 files changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/decode.c b/src/decode.c
-index bacd097..1872050 100644
---- a/src/decode.c
-+++ b/src/decode.c
-@@ -3124,7 +3124,7 @@ int dav1d_submit_frame(Dav1dContext *const c) {
- // allocate frame
- res = dav1d_thread_picture_alloc(&f->sr_cur, f->frame_hdr->width[1],
- f->frame_hdr->height,
-- f->seq_hdr->layout, bpc,
-+ f->seq_hdr, bpc,
- c->n_fc > 1 ? &f->frame_thread.td : NULL,
- f->frame_hdr->show_frame, &c->allocator);
- if (res < 0) goto error;
-diff --git a/src/picture.c b/src/picture.c
-index ba51d82..2f52bbd 100644
---- a/src/picture.c
-+++ b/src/picture.c
-@@ -99,7 +99,7 @@ static void free_buffer(const uint8_t *const data, void *const user_data) {
-
- static int picture_alloc_with_edges(Dav1dPicture *const p,
- const int w, const int h,
-- const enum Dav1dPixelLayout layout,
-+ Dav1dSequenceHeader *seq_hdr,
- const int bpc,
- Dav1dPicAllocator *const p_allocator,
- const size_t extra, void **const extra_ptr)
-@@ -120,7 +120,8 @@ static int picture_alloc_with_edges(Dav1dPicture *const p,
- p->m.timestamp = INT64_MIN;
- p->m.duration = 0;
- p->m.offset = -1;
-- p->p.layout = layout;
-+ p->seq_hdr = seq_hdr;
-+ p->p.layout = seq_hdr->layout;
- p->p.bpc = bpc;
- int res = p_allocator->alloc_picture_callback(p, p_allocator->cookie);
- if (res < 0) {
-@@ -146,14 +147,14 @@ static int picture_alloc_with_edges(Dav1dPicture *const p,
-
- int dav1d_thread_picture_alloc(Dav1dThreadPicture *const p,
- const int w, const int h,
-- const enum Dav1dPixelLayout layout, const int bpc,
-+ Dav1dSequenceHeader *seq_hdr, const int bpc,
- struct thread_data *const t, const int visible,
- Dav1dPicAllocator *const p_allocator)
- {
- p->t = t;
-
- const int res =
-- picture_alloc_with_edges(&p->p, w, h, layout, bpc, p_allocator,
-+ picture_alloc_with_edges(&p->p, w, h, seq_hdr, bpc, p_allocator,
- t != NULL ? sizeof(atomic_int) * 2 : 0,
- (void **) &p->progress);
- if (res) return res;
-@@ -170,7 +171,7 @@ int dav1d_picture_alloc_copy(Dav1dPicture *const dst, const int w,
- const Dav1dPicture *const src)
- {
- struct pic_ctx_context *const pic_ctx = src->ref->user_data;
-- const int res = picture_alloc_with_edges(dst, w, src->p.h, src->p.layout,
-+ const int res = picture_alloc_with_edges(dst, w, src->p.h, src->seq_hdr,
- src->p.bpc, &pic_ctx->allocator,
- 0, NULL);
-
-diff --git a/src/picture.h b/src/picture.h
-index f31edb5..ca80a90 100644
---- a/src/picture.h
-+++ b/src/picture.h
-@@ -55,7 +55,7 @@ typedef struct Dav1dThreadPicture {
- * Allocate a picture with custom border size.
- */
- int dav1d_thread_picture_alloc(Dav1dThreadPicture *p, int w, int h,
-- enum Dav1dPixelLayout layout, int bpc,
-+ Dav1dSequenceHeader *seq_hdr, int bpc,
- struct thread_data *t, int visible,
- Dav1dPicAllocator *);
-
---
-2.19.1.windows.1
-
diff --git a/contrib/src/dav1d/SHA512SUMS b/contrib/src/dav1d/SHA512SUMS
index ba97324144..3f1be32b7d 100644
--- a/contrib/src/dav1d/SHA512SUMS
+++ b/contrib/src/dav1d/SHA512SUMS
@@ -1 +1 @@
-0da596ec7f487bcbfb3a5934aceb405c228bd8efe201e9495f00f261c91aec1d9bdd6e46932c44aabfd16fc4cc0c0db1dea1d8174107164cfe88b120c7facf2a dav1d-0.1.0.tar.xz
+9af91c39592fd52825fe4ff8482c9a5f84e23c383fa4084d4ec507adc93d6732523f7645577a256eec2dd7a2611ee5351c88b34d5e9c0f632dd871e85f60517d dav1d-0.2.1.tar.xz
diff --git a/contrib/src/dav1d/rules.mak b/contrib/src/dav1d/rules.mak
index a4cb58b079..072da55d07 100644
--- a/contrib/src/dav1d/rules.mak
+++ b/contrib/src/dav1d/rules.mak
@@ -1,8 +1,8 @@
# libdav1d
-DAV1D_VERSION := 0.1.0
+DAV1D_VERSION := 0.2.1
DAV1D_URL := $(VIDEOLAN)/dav1d/$(DAV1D_VERSION)/dav1d-$(DAV1D_VERSION).tar.xz
-#~ DAV1D_HASH := 8c95771dfa7a0bdb542eef8924bd0d3009e5efff
+#~ DAV1D_HASH := 408d0486889f4f6d92f73abdeaef250659a10bc7
#~ DAV1D_VERSION := git-$(DAV1D_HASH)
#~ DAV1D_GITURL := https://code.videolan.org/videolan/dav1d.git
@@ -24,7 +24,6 @@ $(TARBALLS)/dav1d-$(DAV1D_VERSION).tar.xz:
dav1d: dav1d-$(DAV1D_VERSION).tar.xz .sum-dav1d
$(UNPACK)
- $(APPLY) $(SRC)/dav1d/0001-pass-the-sequence-header-corresponding-to-the-pictur.patch
$(MOVE)
.dav1d: dav1d crossfile.meson
More information about the vlc-commits
mailing list