This allows the decoder context to be initialized with all stream parameters
before a packet is parsed.
Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/libdav1d.c | 45 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
index c39df418d5..8132ff1593 100644
--- a/libavcodec/libdav1d.c
+++ b/libavcodec/libdav1d.c
@@ -158,6 +158,47 @@ static void libdav1d_init_params(AVCodecContext *c, const
Dav1dSequenceHeader *s
}
}
+static av_cold int libdav1d_parse_extradata(AVCodecContext *c)
+{
+ Dav1dSequenceHeader seq;
+ size_t offset = 0;
+ int res, explode = !!(c->err_recognition & AV_EF_EXPLODE);
+
+ if (!c->extradata || c->extradata_size <= 0)
+ return 0;
+
+ if (c->extradata[0] & 0x80) {
+ int version = c->extradata[0] & 0x7F;
+
+ if (version != 1 || c->extradata_size < 4) {
+ av_log(c, explode ? AV_LOG_ERROR : AV_LOG_INFO,
+ "Error decoding extradata\n");
+ return explode ? AVERROR_INVALIDDATA : 0;
+ }
+
+ // Do nothing if there are no configOBUs to parse
+ if (c->extradata_size == 4)
+ return 0;
+
+ offset = 4;
+ }
+
+ res = dav1d_parse_sequence_header(&seq, c->extradata + offset,
+ c->extradata_size - offset);
+ if (res < 0) {
+ av_log(c, explode ? AV_LOG_ERROR : AV_LOG_INFO,
+ "Error decoding extradata\n");
+ return explode ? AVERROR_INVALIDDATA : 0;
+ }
+
+ libdav1d_init_params(c, &seq);
+ res = ff_set_dimensions(c, seq.max_width, seq.max_height);
+ if (res < 0)
+ return res;
+
+ return 0;
+}
+
static av_cold int libdav1d_init(AVCodecContext *c)
{
Libdav1dContext *dav1d = c->priv_data;
@@ -192,6 +233,10 @@ static av_cold int libdav1d_init(AVCodecContext *c)
av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
s.n_frame_threads, s.n_tile_threads);
+ res = libdav1d_parse_extradata(c);
+ if (res < 0)
+ return res;
+
res = dav1d_open(&dav1d->c, &s);
if (res < 0)
return AVERROR(ENOMEM);
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
