diff options
| author | Steinar H. Gunderson <steinar+ffmpeg@gunderson.no> | 2017-01-08 12:07:09 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2017-01-11 16:02:10 +0100 |
| commit | 2a293ec7ac72723b5f07aa804bb981ce1de35b82 (patch) | |
| tree | 03280e07e6e6eb483974a55384adafc458c62dff /libavformat/riff.c | |
| parent | eaff1aa09e90e2711207c9463db8bf8e8dec8178 (diff) | |
avcodec: add Newtek SpeedHQ decoder
This decoder can decode all existing SpeedHQ formats (SHQ0–5, 7, and 9),
including correct decoding of the alpha channel.
1080p is decoded in 142 fps on one core of my i7-4600U (2.1 GHz Haswell),
about evenly split between bitstream reader and IDCT. There is currently
no attempt at slice or frame threading, even though the format trivially
supports both.
NewTek very helpfully provided a full set of SHQ samples, as well as
source code for an SHQ2 encoder (not included) and assistance with
understanding some details of the format.
Diffstat (limited to 'libavformat/riff.c')
| -rw-r--r-- | libavformat/riff.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/libavformat/riff.c b/libavformat/riff.c index cd2143c876..d44b908f8b 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -440,6 +440,14 @@ const AVCodecTag ff_codec_bmp_tags[] = { { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'G', '0') }, { AV_CODEC_ID_MAGICYUV, MKTAG('M', '0', 'Y', '2') }, { AV_CODEC_ID_YLC, MKTAG('Y', 'L', 'C', '0') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '0') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '1') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '2') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '3') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '4') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '5') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '7') }, + { AV_CODEC_ID_SPEEDHQ, MKTAG('S', 'H', 'Q', '9') }, { AV_CODEC_ID_NONE, 0 } }; |