RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-02 04:52:09 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/libdav1d: only return EAGAIN when there are no buffered packets

Browse Source 
Fixes decoding packets containing split temporal units, as generated for example
by the av1_frame_split bsf.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2023-05-20 10:18:29 -03:00
parent 557686ac63
commit f209614290
1 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libavcodec/libdav1d.c
View File

@ -316,20 +316,14 @@ static void libdav1d_user_data_free(const uint8_t *data, void *opaque) {
av_packet_free(&pkt); av_packet_free(&pkt);
} }
static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) static int libdav1d_receive_frame_internal(AVCodecContext *c, Dav1dPicture *p)
{ {
Libdav1dContext *dav1d = c->priv_data; Libdav1dContext *dav1d = c->priv_data;
Dav1dData *data = &dav1d->data; Dav1dData *data = &dav1d->data;
Dav1dPicture pic = { 0 }, *p = &pic;
AVPacket *pkt;
OpaqueData *od = NULL;
#if FF_DAV1D_VERSION_AT_LEAST(5,1)
enum Dav1dEventFlags event_flags = 0;
#endif
int res; int res;
if (!data->sz) { if (!data->sz) {
pkt = av_packet_alloc(); AVPacket *pkt = av_packet_alloc();
if (!pkt) if (!pkt)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
@ -341,6 +335,8 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
} }
if (pkt->size) { if (pkt->size) {
OpaqueData *od = NULL;
res = dav1d_data_wrap(data, pkt->data, pkt->size, res = dav1d_data_wrap(data, pkt->data, pkt->size,
libdav1d_data_free, pkt->buf); libdav1d_data_free, pkt->buf);
if (res < 0) { if (res < 0) {
@ -400,12 +396,31 @@ FF_ENABLE_DEPRECATION_WARNINGS
if (res < 0) { if (res < 0) {
if (res == AVERROR(EINVAL)) if (res == AVERROR(EINVAL))
res = AVERROR_INVALIDDATA; res = AVERROR_INVALIDDATA;
else if (res == AVERROR(EAGAIN) && c->internal->draining) else if (res == AVERROR(EAGAIN))
res = AVERROR_EOF; res = c->internal->draining ? AVERROR_EOF : 1;
return res;
} }
return res;
}
static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
{
Libdav1dContext *dav1d = c->priv_data;
Dav1dPicture pic = { 0 }, *p = &pic;
AVPacket *pkt;
OpaqueData *od = NULL;
#if FF_DAV1D_VERSION_AT_LEAST(5,1)
enum Dav1dEventFlags event_flags = 0;
#endif
int res;
do {
res = libdav1d_receive_frame_internal(c, p);
} while (res > 0);
if (res < 0)
return res;
av_assert0(p->data[0] && p->allocator_data); av_assert0(p->data[0] && p->allocator_data);
// This requires the custom allocator above // This requires the custom allocator above