picture: fix attaching props to delayed output pictures
If a Metadata OBU appeared right before a Frame Header OBU with
show_existing_picture = 1, it was not being attached to it but to the next
assembled picture, which was in the following TU.
Signed-off-by: James Almer <jamrial@gmail.com>
diff --git a/src/obu.c b/src/obu.c
index b6c2b69..e08129a 100644
--- a/src/obu.c
+++ b/src/obu.c
@@ -1560,7 +1560,14 @@
if (c->n_fc == 1) {
dav1d_thread_picture_ref(&c->out,
&c->refs[c->frame_hdr->existing_frame_idx].p);
- dav1d_data_props_copy(&c->out.p.m, &in->m);
+ dav1d_picture_copy_props(&c->out.p,
+ c->content_light, c->content_light_ref,
+ c->mastering_display, c->mastering_display_ref,
+ c->itut_t35, c->itut_t35_ref,
+ &in->m);
+ // Must be removed from the context after being attached to the frame
+ dav1d_ref_dec(&c->itut_t35_ref);
+ c->itut_t35 = NULL;
c->event_flags |= dav1d_picture_get_event_flags(&c->refs[c->frame_hdr->existing_frame_idx].p);
} else {
pthread_mutex_lock(&c->task_thread.lock);
@@ -1606,7 +1613,15 @@
dav1d_thread_picture_ref(out_delayed,
&c->refs[c->frame_hdr->existing_frame_idx].p);
out_delayed->visible = 1;
- dav1d_data_props_copy(&out_delayed->p.m, &in->m);
+ dav1d_picture_copy_props(&out_delayed->p,
+ c->content_light, c->content_light_ref,
+ c->mastering_display, c->mastering_display_ref,
+ c->itut_t35, c->itut_t35_ref,
+ &in->m);
+ // Must be removed from the context after being attached to the frame
+ dav1d_ref_dec(&c->itut_t35_ref);
+ c->itut_t35 = NULL;
+
pthread_mutex_unlock(&c->task_thread.lock);
}
if (c->refs[c->frame_hdr->existing_frame_idx].p.p.frame_hdr->frame_type == DAV1D_FRAME_TYPE_KEY) {
diff --git a/src/picture.c b/src/picture.c
index 30e224c..3e55d3f 100644
--- a/src/picture.c
+++ b/src/picture.c
@@ -142,9 +142,6 @@
p->p.h = h;
p->seq_hdr = seq_hdr;
p->frame_hdr = frame_hdr;
- p->content_light = content_light;
- p->mastering_display = mastering_display;
- p->itut_t35 = itut_t35;
p->p.layout = seq_hdr->layout;
p->p.bpc = bpc;
dav1d_data_props_set_defaults(&p->m);
@@ -194,21 +191,38 @@
p->frame_hdr_ref = frame_hdr_ref;
if (frame_hdr_ref) dav1d_ref_inc(frame_hdr_ref);
- dav1d_data_props_copy(&p->m, props);
+ dav1d_picture_copy_props(p, content_light, content_light_ref,
+ mastering_display, mastering_display_ref,
+ itut_t35, itut_t35_ref, props);
if (extra && extra_ptr)
*extra_ptr = &pic_ctx->extra_ptr;
+ return 0;
+}
+
+void dav1d_picture_copy_props(Dav1dPicture *const p,
+ Dav1dContentLightLevel *const content_light, Dav1dRef *const content_light_ref,
+ Dav1dMasteringDisplay *const mastering_display, Dav1dRef *const mastering_display_ref,
+ Dav1dITUTT35 *const itut_t35, Dav1dRef *const itut_t35_ref,
+ const Dav1dDataProps *const props)
+{
+ dav1d_data_props_copy(&p->m, props);
+
+ dav1d_ref_dec(&p->content_light_ref);
p->content_light_ref = content_light_ref;
+ p->content_light = content_light;
if (content_light_ref) dav1d_ref_inc(content_light_ref);
+ dav1d_ref_dec(&p->mastering_display_ref);
p->mastering_display_ref = mastering_display_ref;
+ p->mastering_display = mastering_display;
if (mastering_display_ref) dav1d_ref_inc(mastering_display_ref);
+ dav1d_ref_dec(&p->itut_t35_ref);
p->itut_t35_ref = itut_t35_ref;
+ p->itut_t35 = itut_t35;
if (itut_t35_ref) dav1d_ref_inc(itut_t35_ref);
-
- return 0;
}
int dav1d_thread_picture_alloc(Dav1dContext *const c, Dav1dFrameContext *const f,
diff --git a/src/picture.h b/src/picture.h
index 154c85a..0c3a0ec 100644
--- a/src/picture.h
+++ b/src/picture.h
@@ -101,6 +101,12 @@
void dav1d_default_picture_release(Dav1dPicture *p, void *cookie);
void dav1d_picture_unref_internal(Dav1dPicture *p);
+void dav1d_picture_copy_props(Dav1dPicture *p,
+ Dav1dContentLightLevel *content_light, Dav1dRef *content_light_ref,
+ Dav1dMasteringDisplay *mastering_display, Dav1dRef *mastering_display_ref,
+ Dav1dITUTT35 *itut_t35, Dav1dRef *itut_t35_ref,
+ const Dav1dDataProps *props);
+
/**
* Get event flags from picture flags.
*/
