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

lavc/librav1e: handle frame durations and AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE

Browse Source
This commit is contained in:
Anton Khirnov
2022-07-12 11:25:09 +02:00
parent a1a80f2e64
commit 1b25eb65cd
1 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
libavcodec/librav1e.c
View File

@@ -22,6 +22,7 @@
#include <rav1e.h>
#include "libavutil/buffer.h"
#include "libavutil/internal.h"
#include "libavutil/avassert.h"
#include "libavutil/base64.h"
@@ -53,6 +54,15 @@ typedef struct librav1eContext {
int tile_cols;
} librav1eContext;
typedef struct FrameData {
int64_t pts;
int64_t duration;
int64_t reordered_opaque;
void *frame_opaque;
AVBufferRef *frame_opaque_ref;
} FrameData;
static inline RaPixelRange range_map(enum AVPixelFormat pix_fmt, enum AVColorRange range)
{
switch (pix_fmt) {
@@ -419,11 +429,23 @@ end:
return ret;
}
static void frame_data_free(void *data)
{
FrameData *fd = data;
if (!fd)
return;
av_buffer_unref(&fd->frame_opaque_ref);
av_free(data);
}
static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt)
{
librav1eContext *ctx = avctx->priv_data;
RaFrame *rframe = ctx->rframe;
RaPacket *rpkt = NULL;
FrameData *fd;
int ret;
if (!rframe) {
@@ -436,18 +458,30 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt)
if (frame->buf[0]) {
const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format);
int64_t *pts = av_malloc(sizeof(int64_t));
if (!pts) {
fd = av_mallocz(sizeof(*fd));
if (!fd) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate PTS buffer.\n");
return AVERROR(ENOMEM);
}
*pts = frame->pts;
fd->pts = frame->pts;
fd->duration = frame->duration;
fd->reordered_opaque = frame->reordered_opaque;
if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
fd->frame_opaque = frame->opaque;
ret = av_buffer_replace(&fd->frame_opaque_ref, frame->opaque_ref);
if (ret < 0) {
frame_data_free(fd);
av_frame_unref(frame);
return ret;
}
}
rframe = rav1e_frame_new(ctx->ctx);
if (!rframe) {
av_log(avctx, AV_LOG_ERROR, "Could not allocate new rav1e frame.\n");
av_frame_unref(frame);
av_freep(&pts);
frame_data_free(fd);
return AVERROR(ENOMEM);
}
@@ -459,7 +493,7 @@ static int librav1e_receive_packet(AVCodecContext *avctx, AVPacket *pkt)
frame->linesize[i], bytes);
}
av_frame_unref(frame);
rav1e_frame_set_opaque(rframe, pts, av_free);
rav1e_frame_set_opaque(rframe, fd, frame_data_free);
}
}
@@ -535,8 +569,18 @@ retry:
if (rpkt->frame_type == RA_FRAME_TYPE_KEY)
pkt->flags |= AV_PKT_FLAG_KEY;
pkt->pts = pkt->dts = *((int64_t *) rpkt->opaque);
av_free(rpkt->opaque);
fd = rpkt->opaque;
pkt->pts = pkt->dts = fd->pts;
pkt->duration = fd->duration;
avctx->reordered_opaque = fd->reordered_opaque;
if (avctx->flags & AV_CODEC_FLAG_COPY_OPAQUE) {
pkt->opaque = fd->frame_opaque;
pkt->opaque_ref = fd->frame_opaque_ref;
fd->frame_opaque_ref = NULL;
}
frame_data_free(fd);
if (avctx->flags & AV_CODEC_FLAG_RECON_FRAME) {
AVCodecInternal *avci = avctx->internal;
@@ -626,7 +670,8 @@ const FFCodec ff_librav1e_encoder = {
.defaults = librav1e_defaults,
.p.pix_fmts = librav1e_pix_fmts,
.p.capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS |
AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_RECON_FRAME,
AV_CODEC_CAP_DR1 | AV_CODEC_CAP_ENCODER_RECON_FRAME |
AV_CODEC_CAP_ENCODER_REORDERED_OPAQUE,
.caps_internal = FF_CODEC_CAP_NOT_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP | FF_CODEC_CAP_AUTO_THREADS,
.p.wrapper_name = "librav1e",