Update to dav1d-0.2.0.
from Brad (maintainer)
This commit is contained in:
parent
624a6e6410
commit
a4d6d75d18
@ -1,14 +1,14 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2019/02/28 00:55:00 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2019/03/09 06:19:39 ajacoutot Exp $
|
||||
|
||||
COMMENT= small and fast AV1 decoder
|
||||
|
||||
VER= 0.1.0
|
||||
VER= 0.2.0
|
||||
DISTNAME= dav1d-${VER}
|
||||
CATEGORIES= multimedia
|
||||
MASTER_SITES= https://download.videolan.org/pub/videolan/dav1d/${VER}/
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
MASTER_SITES= https://code.videolan.org/videolan/dav1d/-/archive/${VER}/
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
SHARED_LIBS= dav1d 0.0
|
||||
SHARED_LIBS= dav1d 1.0
|
||||
|
||||
HOMEPAGE= https://code.videolan.org/videolan/dav1d/
|
||||
|
||||
@ -30,8 +30,7 @@ BUILD_DEPENDS+= devel/nasm
|
||||
|
||||
CONFIGURE_STYLE=meson
|
||||
|
||||
# aarch64 has assembly issues with clang - temporarily disable
|
||||
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "i386"
|
||||
.if ${MACHINE_ARCH} == "i386"
|
||||
CONFIGURE_ARGS+=-Dbuild_asm=false
|
||||
.endif
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (dav1d-0.1.0.tar.xz) = TOfNsNPtoTEwbdNdbY3xjZHX4X/LVJhj9oshr1qkgDc=
|
||||
SIZE (dav1d-0.1.0.tar.xz) = 309236
|
||||
SHA256 (dav1d-0.2.0.tar.bz2) = t9DblG4RL0YUAEM2Cg19rNWzCHzIiP/8tNLrkOhaDWA=
|
||||
SIZE (dav1d-0.2.0.tar.bz2) = 408361
|
||||
|
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-src_decode_c,v 1.1.1.1 2019/01/10 20:34:32 sthen Exp $
|
||||
|
||||
[PATCH] pass the sequence header corresponding to the picture being allocated
|
||||
|
||||
Index: src/decode.c
|
||||
--- src/decode.c.orig
|
||||
+++ 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;
|
@ -1,52 +0,0 @@
|
||||
$OpenBSD: patch-src_picture_c,v 1.1.1.1 2019/01/10 20:34:32 sthen Exp $
|
||||
|
||||
[PATCH] pass the sequence header corresponding to the picture being allocated
|
||||
|
||||
Index: src/picture.c
|
||||
--- src/picture.c.orig
|
||||
+++ src/picture.c
|
||||
@@ -99,7 +99,7 @@ static void free_buffer(const uint8_t *const data, voi
|
||||
|
||||
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 *cons
|
||||
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 *cons
|
||||
|
||||
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 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);
|
||||
|
@ -1,16 +0,0 @@
|
||||
$OpenBSD: patch-src_picture_h,v 1.1.1.1 2019/01/10 20:34:32 sthen Exp $
|
||||
|
||||
[PATCH] pass the sequence header corresponding to the picture being allocated
|
||||
|
||||
Index: src/picture.h
|
||||
--- src/picture.h.orig
|
||||
+++ 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 *);
|
||||
|
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2019/01/10 20:34:32 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.2 2019/03/09 06:19:40 ajacoutot Exp $
|
||||
@bin bin/dav1d
|
||||
include/dav1d/
|
||||
include/dav1d/common.h
|
||||
@ -6,5 +6,6 @@ include/dav1d/data.h
|
||||
include/dav1d/dav1d.h
|
||||
include/dav1d/headers.h
|
||||
include/dav1d/picture.h
|
||||
include/dav1d/version.h
|
||||
@lib lib/libdav1d.so.${LIBdav1d_VERSION}
|
||||
lib/pkgconfig/dav1d.pc
|
||||
|
Loading…
Reference in New Issue
Block a user