RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/libdav1d: add support for RGB streams 

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2019-05-21 14:57:39 -03:00
parent 7458fa119c
commit f78172b29a
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/libdav1d.c
View File

@ -49,6 +49,10 @@ static const enum AVPixelFormat pix_fmt[][3] = {
[DAV1D_PIXEL_LAYOUT_I444] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12 }, [DAV1D_PIXEL_LAYOUT_I444] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10, AV_PIX_FMT_YUV444P12 },
}; };
static const enum AVPixelFormat pix_fmt_rgb[3] = {
AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRP10, AV_PIX_FMT_GBRP12,
};
static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl) static void libdav1d_log_callback(void *opaque, const char *fmt, va_list vl)
{ {
AVCodecContext *c = opaque; AVCodecContext *c = opaque;
@ -225,7 +229,6 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
c->profile = p->seq_hdr->profile; c->profile = p->seq_hdr->profile;
c->level = ((p->seq_hdr->operating_points[0].major_level - 2) << 2) c->level = ((p->seq_hdr->operating_points[0].major_level - 2) << 2)
| p->seq_hdr->operating_points[0].minor_level; | p->seq_hdr->operating_points[0].minor_level;
frame->format = c->pix_fmt = pix_fmt[p->p.layout][p->seq_hdr->hbd];
frame->width = p->p.w; frame->width = p->p.w;
frame->height = p->p.h; frame->height = p->p.h;
if (c->width != p->p.w || c->height != p->p.h) { if (c->width != p->p.w || c->height != p->p.h) {
@ -247,6 +250,14 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame)
frame->color_trc = c->color_trc = (enum AVColorTransferCharacteristic) p->seq_hdr->trc; frame->color_trc = c->color_trc = (enum AVColorTransferCharacteristic) p->seq_hdr->trc;
frame->color_range = c->color_range = p->seq_hdr->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; frame->color_range = c->color_range = p->seq_hdr->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;
if (p->p.layout == DAV1D_PIXEL_LAYOUT_I444 &&
p->seq_hdr->mtrx == DAV1D_MC_IDENTITY &&
p->seq_hdr->pri == DAV1D_COLOR_PRI_BT709 &&
p->seq_hdr->trc == DAV1D_TRC_SRGB)
frame->format = c->pix_fmt = pix_fmt_rgb[p->seq_hdr->hbd];
else
frame->format = c->pix_fmt = pix_fmt[p->p.layout][p->seq_hdr->hbd];
// match timestamps and packet size // match timestamps and packet size
frame->pts = frame->best_effort_timestamp = p->m.timestamp; frame->pts = frame->best_effort_timestamp = p->m.timestamp;
#if FF_API_PKT_PTS #if FF_API_PKT_PTS