ffmpeg | branch: master | James Almer <jamrial@gmail.com> | Wed Nov 28 22:49:06 2018 -0300| [0fca2f60dac7a294719919ca32813e9fde19cc66] | committer: James Almer avcodec/libdav1d: read profile from the sequence header referenced by the ouput picture Signed-off-by: James Almer <jamrial@gmail.com>

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fca2f60dac7a29471...

libavcodec/libdav1d.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index ed2262df7c..9a24a3e408 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -84,14 +84,6 @@ static const enum AVPixelFormat pix_fmt[][2] = { [DAV1D_PIXEL_LAYOUT_I444] = { AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV444P10 }, }; -// TODO: Update once 12bit support is added. -static const int profile[] = { - [DAV1D_PIXEL_LAYOUT_I400] = FF_PROFILE_AV1_MAIN, - [DAV1D_PIXEL_LAYOUT_I420] = FF_PROFILE_AV1_MAIN, - [DAV1D_PIXEL_LAYOUT_I422] = FF_PROFILE_AV1_PROFESSIONAL, - [DAV1D_PIXEL_LAYOUT_I444] = FF_PROFILE_AV1_HIGH, -}; - static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) { Libdav1dContext *dav1d = c->priv_data; @@ -156,7 +148,7 @@ static int libdav1d_receive_frame(AVCodecContext *c, AVFrame *frame) frame->linesize[1] = p.stride[1]; frame->linesize[2] = p.stride[1]; - c->profile = profile[p.p.layout]; + c->profile = p.seq_hdr->profile; frame->format = c->pix_fmt = pix_fmt[p.p.layout][p.p.bpc == 10]; frame->width = p.p.w; frame->height = p.p.h;