virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/libdav1d: set frame props from the reordered packet

Browse Source 
Attach the AVPacket instead of only a few values to the corresponding Dav1dData
struct and use it to set all output frame props.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2022-12-08 10:05:00 -03:00
parent 81bea2e98b
commit b27f3f9b50
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
libavcodec/libdav1d.c
View File

@@ -286,8 +286,10 @@ static void libdav1d_data_free(const uint8_t *data, void *opaque) {
} }
static void libdav1d_user_data_free(const uint8_t *data, void *opaque) { static void libdav1d_user_data_free(const uint8_t *data, void *opaque) {
AVPacket *pkt = opaque;
av_assert0(data == opaque); av_assert0(data == opaque);
av_free(opaque); av_free(pkt->opaque);
av_packet_free(&pkt);
} }
static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
@@ -295,13 +297,14 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
Libdav1dContext *dav1d = c->priv_data; Libdav1dContext *dav1d = c->priv_data;
Dav1dData *data = &dav1d->data; Dav1dData *data = &dav1d->data;
Dav1dPicture pic = { 0 }, *p = &pic; Dav1dPicture pic = { 0 }, *p = &pic;
AVPacket *pkt;
#if FF_DAV1D_VERSION_AT_LEAST(5,1) #if FF_DAV1D_VERSION_AT_LEAST(5,1)
enum Dav1dEventFlags event_flags = 0; enum Dav1dEventFlags event_flags = 0;
#endif #endif
int res; int res;
if (!data->sz) { if (!data->sz) {
AVPacket *pkt = av_packet_alloc(); pkt = av_packet_alloc();
if (!pkt) if (!pkt)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@@ -320,29 +323,28 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
return res; return res;
} }
data->m.timestamp = pkt->pts;
data->m.offset = pkt->pos;
data->m.duration = pkt->duration;
pkt->buf = NULL; pkt->buf = NULL;
av_packet_free(&pkt); pkt->opaque = NULL;
if (c->reordered_opaque != AV_NOPTS_VALUE) { if (c->reordered_opaque != AV_NOPTS_VALUE) {
uint8_t *reordered_opaque = av_memdup(&c->reordered_opaque, pkt->opaque = av_memdup(&c->reordered_opaque,
sizeof(c->reordered_opaque)); sizeof(c->reordered_opaque));
if (!reordered_opaque) { if (!pkt->opaque) {
av_packet_free(&pkt);
dav1d_data_unref(data); dav1d_data_unref(data);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
}
res = dav1d_data_wrap_user_data(data, reordered_opaque, res = dav1d_data_wrap_user_data(data, (const uint8_t *)pkt,
libdav1d_user_data_free, reordered_opaque); libdav1d_user_data_free, pkt);
if (res < 0) { if (res < 0) {
av_free(reordered_opaque); av_free(pkt->opaque);
av_packet_free(&pkt);
dav1d_data_unref(data); dav1d_data_unref(data);
return res; return res;
} }
} pkt = NULL;
} else { } else {
av_packet_free(&pkt); av_packet_free(&pkt);
if (res >= 0) if (res >= 0)
@@ -411,17 +413,18 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
INT_MAX); INT_MAX);
ff_set_sar(c, frame->sample_aspect_ratio); ff_set_sar(c, frame->sample_aspect_ratio);
if (p->m.user_data.data) pkt = (AVPacket *)p->m.user_data.data;
memcpy(&frame->reordered_opaque, p->m.user_data.data, sizeof(frame->reordered_opaque)); if (pkt->opaque)
memcpy(&frame->reordered_opaque, pkt->opaque, sizeof(frame->reordered_opaque));
else else
frame->reordered_opaque = AV_NOPTS_VALUE; frame->reordered_opaque = AV_NOPTS_VALUE;
// match timestamps and packet size // match timestamps and packet size
frame->pts = p->m.timestamp; res = ff_decode_frame_props_from_pkt(frame, pkt);
frame->pkt_dts = p->m.timestamp; if (res < 0)
frame->pkt_pos = p->m.offset; goto fail;
frame->pkt_size = p->m.size;
frame->duration = p->m.duration; frame->pkt_dts = pkt->pts;
frame->key_frame = p->frame_hdr->frame_type == DAV1D_FRAME_TYPE_KEY; frame->key_frame = p->frame_hdr->frame_type == DAV1D_FRAME_TYPE_KEY;
switch (p->frame_hdr->frame_type) { switch (p->frame_hdr->frame_type) {
@@ -595,7 +598,7 @@ const FFCodec ff_libdav1d_decoder = {
.flush = libdav1d_flush, .flush = libdav1d_flush,
FF_CODEC_RECEIVE_FRAME_CB(libdav1d_receive_frame), FF_CODEC_RECEIVE_FRAME_CB(libdav1d_receive_frame),
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS, .p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
.caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | .caps_internal = FF_CODEC_CAP_SETS_PKT_DTS | FF_CODEC_CAP_SETS_FRAME_PROPS |
FF_CODEC_CAP_AUTO_THREADS, FF_CODEC_CAP_AUTO_THREADS,
.p.priv_class = &libdav1d_class, .p.priv_class = &libdav1d_class,
.p.wrapper_name = "libdav1d", .p.wrapper_name = "libdav1d",