Skip to content
Snippets Groups Projects
Commit eb904545 authored by Paul B Mahol's avatar Paul B Mahol
Browse files

avcodec/hdrdec: implement FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM

parent 1e079525
No related branches found
No related tags found
No related merge requests found
...@@ -88,14 +88,13 @@ static int decompress(uint8_t *scanline, int w, GetByteContext *gb, const uint8_ ...@@ -88,14 +88,13 @@ static int decompress(uint8_t *scanline, int w, GetByteContext *gb, const uint8_
static int hdr_decode_frame(AVCodecContext *avctx, AVFrame *p, static int hdr_decode_frame(AVCodecContext *avctx, AVFrame *p,
int *got_frame, AVPacket *avpkt) int *got_frame, AVPacket *avpkt)
{ {
const uint8_t *buf = avpkt->data;
int ret, buf_size = avpkt->size;
int width = 0, height = 0; int width = 0, height = 0;
GetByteContext gb; GetByteContext gb;
uint8_t line[512]; uint8_t line[512];
float sar; float sar;
int ret;
bytestream2_init(&gb, buf, buf_size); bytestream2_init(&gb, avpkt->data, avpkt->size);
hdr_get_line(&gb, line, sizeof(line)); hdr_get_line(&gb, line, sizeof(line));
if (memcmp("#?RADIANCE\n", line, 11)) if (memcmp("#?RADIANCE\n", line, 11))
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
...@@ -129,6 +128,10 @@ static int hdr_decode_frame(AVCodecContext *avctx, AVFrame *p, ...@@ -129,6 +128,10 @@ static int hdr_decode_frame(AVCodecContext *avctx, AVFrame *p,
return ret; return ret;
avctx->pix_fmt = AV_PIX_FMT_GBRPF32; avctx->pix_fmt = AV_PIX_FMT_GBRPF32;
if (avctx->skip_frame >= AVDISCARD_ALL)
return avpkt->size;
if ((ret = ff_thread_get_buffer(avctx, p, 0)) < 0) if ((ret = ff_thread_get_buffer(avctx, p, 0)) < 0)
return ret; return ret;
...@@ -206,7 +209,7 @@ convert: ...@@ -206,7 +209,7 @@ convert:
*got_frame = 1; *got_frame = 1;
return buf_size; return avpkt->size;
} }
const FFCodec ff_hdr_decoder = { const FFCodec ff_hdr_decoder = {
...@@ -215,5 +218,6 @@ const FFCodec ff_hdr_decoder = { ...@@ -215,5 +218,6 @@ const FFCodec ff_hdr_decoder = {
.p.type = AVMEDIA_TYPE_VIDEO, .p.type = AVMEDIA_TYPE_VIDEO,
.p.id = AV_CODEC_ID_RADIANCE_HDR, .p.id = AV_CODEC_ID_RADIANCE_HDR,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS, .p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_FRAME_THREADS,
.caps_internal = FF_CODEC_CAP_SKIP_FRAME_FILL_PARAM,
FF_CODEC_DECODE_CB(hdr_decode_frame), FF_CODEC_DECODE_CB(hdr_decode_frame),
}; };
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment