+ if (!s->pkt)
+ return AVERROR(ENOMEM);
+
for (int i = 0; i < FF_ARRAY_ELEMS(s->ref); i++) {
s->ref[i].f = av_frame_alloc();
if (!s->ref[i].f) {
@@ -1042,7 +1047,7 @@ static int export_film_grain(AVCodecContext *avctx,
AVFrame *frame)
}
static int set_output_frame(AVCodecContext *avctx, AVFrame *frame,
- const AVPacket *pkt, int *got_frame)
+ const AVPacket *pkt)
{
AV1DecContext *s = avctx->priv_data;
const AVFrame *srcframe = s->cur_frame.f;
@@ -1079,8 +1084,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
FF_ENABLE_DEPRECATION_WARNINGS
#endif
- *got_frame = 1;
-
return 0;
}
@@ -1145,22 +1148,32 @@ static int get_current_frame(AVCodecContext *avctx)
return ret;
}
-static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame,
- int *got_frame, AVPacket *pkt)
+static int av1_receive_frame(AVCodecContext *avctx, AVFrame *frame)
{
AV1DecContext *s = avctx->priv_data;
AV1RawTileGroup *raw_tile_group = NULL;
- int ret;
+ int i, ret;
- ret = ff_cbs_read_packet(s->cbc, &s->current_obu, pkt);
- if (ret < 0) {
- av_log(avctx, AV_LOG_ERROR, "Failed to read packet.\n");
- goto end;
+again:
+ if (!s->current_obu.nb_units) {
+ ret = ff_decode_get_packet(avctx, s->pkt);
+ if (ret < 0)
+ return ret;
+
+ ret = ff_cbs_read_packet(s->cbc, &s->current_obu, s->pkt);
+ av_packet_unref(s->pkt);
+ if (ret < 0) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to read packet.\n");
+ goto end;
+ }
+
+ s->nb_unit = 0;
+
+ av_log(avctx, AV_LOG_DEBUG, "Total OBUs for this TU:%d.\n",
+ s->current_obu.nb_units);
}
- av_log(avctx, AV_LOG_DEBUG, "Total obu for this frame:%d.\n",
- s->current_obu.nb_units);
- for (int i = 0; i < s->current_obu.nb_units; i++) {
+ for (i = s->nb_unit; i < s->current_obu.nb_units; i++) {
CodedBitstreamUnit *unit = &s->current_obu.units[i];
AV1RawOBU *obu = unit->content;
const AV1RawOBUHeader *header;
@@ -1168,6 +1181,7 @@ static int av1_decode_frame(AVCodecContext *avctx,
AVFrame *frame,
if (!obu)
continue;
+ ret = 0;
header = &obu->header;
av_log(avctx, AV_LOG_DEBUG, "Obu idx:%d, obu type:%d.\n", i,
unit->type);
@@ -1251,13 +1265,15 @@ static int av1_decode_frame(AVCodecContext *avctx, AVFrame *frame,
goto end;
}
+ ret = 0;
if (s->cur_frame.f->buf[0]) {
- ret = set_output_frame(avctx, frame, pkt, got_frame);
+ ret = set_output_frame(avctx, frame, s->pkt);
if (ret < 0)
av_log(avctx, AV_LOG_ERROR, "Set output frame
error.\n");
}
s->raw_frame_header = NULL;
+ i++;
goto end;
}
@@ -1361,6 +1377,7 @@ static int av1_decode_frame(AVCodecContext *avctx,
AVFrame *frame,
}
if (raw_tile_group && (s->tile_num == raw_tile_group->tg_end + 1)) {
+ int show_frame = s->raw_frame_header->show_frame;
if (avctx->hwaccel && s->cur_frame.f->buf[0]) {
ret = avctx->hwaccel->end_frame(avctx);
if (ret < 0) {
@@ -1375,8 +1392,9 @@ static int av1_decode_frame(AVCodecContext *avctx,
AVFrame *frame,
goto end;
}
+ ret = 0;
if (s->raw_frame_header->show_frame && s->cur_frame.f->buf[0]) {
- ret = set_output_frame(avctx, frame, pkt, got_frame);
+ ret = set_output_frame(avctx, frame, s->pkt);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Set output frame error\n");
goto end;
@@ -1384,13 +1402,30 @@ static int av1_decode_frame(AVCodecContext *avctx,
AVFrame *frame,
}
raw_tile_group = NULL;
s->raw_frame_header = NULL;
+ if (show_frame) {
+ i++;
+ goto end;
+ }
}
+ ret = AVERROR(EAGAIN);
}
end:
- ff_cbs_fragment_reset(&s->current_obu);
- if (ret < 0)
+ av_assert0(i <= s->current_obu.nb_units);
+ s->nb_unit = i;
+
+ if (s->current_obu.nb_units == i) {
+ ff_cbs_fragment_reset(&s->current_obu);
+ s->nb_unit = 0;
+ }
+ if (ret == AVERROR(EAGAIN))
+ goto again;
+ if (ret < 0) {
s->raw_frame_header = NULL;
+ ff_cbs_fragment_reset(&s->current_obu);
+ s->nb_unit = 0;
+ }
+
return ret;
}
@@ -1403,7 +1438,9 @@ static void av1_decode_flush(AVCodecContext *avctx)
av1_frame_unref(avctx, &s->ref[i]);
av1_frame_unref(avctx, &s->cur_frame);
+ av_packet_unref(s->pkt);
s->operating_point_idc = 0;
+ s->nb_unit = 0;
s->raw_frame_header = NULL;
s->raw_seq = NULL;
s->cll = NULL;
@@ -1411,6 +1448,7 @@ static void av1_decode_flush(AVCodecContext *avctx)
while (av_fifo_read(s->itut_t35_fifo, &itut_t35, 1) >= 0)
av_buffer_unref(&itut_t35.payload_ref);
+ ff_cbs_fragment_reset(&s->current_obu);
ff_cbs_flush(s->cbc);
}
@@ -1437,14 +1475,13 @@ const FFCodec ff_av1_decoder = {
.priv_data_size = sizeof(AV1DecContext),
.init = av1_decode_init,
.close = av1_decode_free,
- FF_CODEC_DECODE_CB(av1_decode_frame),
+ FF_CODEC_RECEIVE_FRAME_CB(av1_receive_frame),
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_AVOID_PROBING,
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP |
FF_CODEC_CAP_SETS_PKT_DTS,
.flush = av1_decode_flush,
.p.profiles = NULL_IF_CONFIG_SMALL(ff_av1_profiles),
.p.priv_class = &av1_class,
- .bsfs = "av1_frame_split",
.hw_configs = (const AVCodecHWConfigInternal *const []) {
#if CONFIG_AV1_DXVA2_HWACCEL
HWACCEL_DXVA2(av1),
diff --git a/libavcodec/av1dec.h b/libavcodec/av1dec.h
index cef899f81f..59ffed1d9b 100644
--- a/libavcodec/av1dec.h
+++ b/libavcodec/av1dec.h
@@ -28,6 +28,7 @@
#include "libavutil/frame.h"
#include "libavutil/pixfmt.h"
#include "avcodec.h"
+#include "packet.h"
#include "cbs.h"
#include "cbs_av1.h"
@@ -68,6 +69,7 @@ typedef struct AV1DecContext {
enum AVPixelFormat pix_fmt;
CodedBitstreamContext *cbc;
CodedBitstreamFragment current_obu;
+ AVPacket *pkt;
AVBufferRef *seq_ref;
AV1RawSequenceHeader *raw_seq;
@@ -90,6 +92,8 @@ typedef struct AV1DecContext {
AV1Frame ref[AV1_NUM_REF_FRAMES];
AV1Frame cur_frame;
+ int nb_unit;
+
// AVOptions
int operating_point;
} AV1DecContext;
