summaryrefslogtreecommitdiff
path: root/libavcodec/dnxhddata.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary libavutil/(avutil|common|internal).h inclusionsAndreas Rheinhardt2022-02-241-1/+3
| | | | | | | | | | Some of these were made possible by moving several common macros to libavutil/macros.h. While just at it, also improve the other headers a bit. Reviewed-by: Martin Storsjö <martin@martin.st> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avcodec/dnxhddata: Unavpriv dnxhd_get_(hr_|)_frame_size()Andreas Rheinhardt2021-11-191-2/+2
| | | | | | It is no longer used in libavformat. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avcodec/dnxhddata: Remove avpriv_dnxhd_get_interlaced()Andreas Rheinhardt2021-11-191-8/+0
| | | | | | It is unused. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
* avcodec/dnxhd: Make ff_dxnhd_get_cid_table return a pointer, not indexAndreas Rheinhardt2021-01-261-23/+23
| | | | | | | All callers only use the index into ff_dnxhd_cid_table to get a pointer to the desired entry. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* libavcodec/dnxhd: change ff_dnxhd_get_hr_frame_size to avpriv_Jason Stevens2018-09-101-0/+13
| | | | | | | | refactor ff_dnxhd_get_hr_frame_size to avpriv_dnxhd_get_hr_frame_size, to allow cross library usage in libavformat/mxfenc this change makes this function no longer be always inlined. Signed-off-by: Jason Stevens <jay@wizardofthenet.com>
* lavc/dnxhddata: Improve help output, mention yuv444p10 and gbrp10.Carl Eugen Hoyos2017-11-181-1/+1
| | | | Fixes ticket #6836.
* avcodec/dnxhddata: remove dead codeJames Almer2017-11-111-7/+0
| | | | Signed-off-by: James Almer <jamrial@gmail.com>
* lavc/dnxhddata: Do not print frame rates with supported profiles.Carl Eugen Hoyos2017-11-081-31/+19
| | | | | The list is unmaintained, misleading and the frame rates are ignored by all compatible players.
* avcodec/dnxhddata: add support for cid 1244Paul B Mahol2016-09-191-0/+10
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* avcodec/dnxhddata: move avpriv_dnxhd_parse_header_prefix to a headerJames Almer2016-07-251-4/+3
| | | | | | | | | It's a small and simple function that can be inlined. This removes one private symbol and should reduce object dependencies with the next major bump Signed-off-by: James Almer <jamrial@gmail.com>
* libavcodec/dnxhdenc: add support for dnxhr encodingMark Reid2016-07-231-5/+26
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* libavcodec/dnxhd_parser: add parser and probe support raw 444 and dnxhr formatsMark Reid2016-02-141-0/+8
| | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhd: interleave AC levels and flagsChristophe Gisquet2015-10-151-268/+224
| | | | | | | This allows more efficient access to the array as the level and flags are contiguous. Around 4% faster coefficient decoding. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhdenc: mark CID 1260 encoder experimentalChristophe Gisquet2015-10-081-0/+5
| | | | | | | | | | | The MBAFF handling recently introduced on the decoder side shows that the encoder does not support it correctly. Therefore, make the related profile experimental. Furthermore, current encoder logic treats it as unable to encode as progressive, which isn't the case. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhddata: introduce and use MBAFF flagChristophe Gisquet2015-10-071-1/+1
| | | | | | | MBAFF-like handling of interlaced content in CID 1260 is different from the other CIDs, and in particular doesn't use the same syntax. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhd: add better support for CIDs 1270 to 1274Jeremy James2015-10-051-17/+47
| | | | | | | | | | | These are DNxHR profiles with the following properties: - Variable size in a profile (property added in a previous commit), requiring variable-sized macroblock table; - Variable bitdepth, up to 12 bits. - Better validation of buffer sizes and positions Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhd: add CID 1270Christophe Gisquet2015-10-051-8/+16
| | | | | | | | | | This a 4:4:4 10 bits profile, where image size is not fixed by the profile, and which strays a bit outside the old frame header parsing code. Fixes ticket #4581 (DNxHR is not stricly supported, but that sequence is). Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhd: add decoder support for DNxHRJeremy James2015-10-051-0/+8
| | | | | Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhdenc: do not select 4:4:4 profilesChristophe Gisquet2015-10-051-1/+1
| | | | | | The encoder can only deal with 4:2:2. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* dnxhd: profile flagsChristophe Gisquet2015-10-051-17/+32
| | | | | | | Move the 'interlaced' flag to this element (arbitrarily set to 16bits). This should allow better detection/selection of profiles. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* Merge commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333'Hendrik Leppkes2015-10-031-0/+1
|\ | | | | | | | | | | | | * commit 'e54d7e4e8ef7d778e2ddc5a60bf7307ed55d6333': dnxhddata: Deduplicate cid 1256 chroma table Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Deduplicate cid 1256 chroma tableChristophe Gisquet2015-10-021-12/+2
| | | | | | | | | | | | | | | | | | | | CID 1256 is specified as using the same table for luma and chroma, which is the same as CID 1235 luma table. This is consistent with the format supposedly being RGB, although most sequences seem to actually be YCbCr-encoded. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * dnxhddata: Deduplicate dnx100 tablesJeremy James2015-10-021-48/+7
| | | | | | | | | | | | | | Tables 1258 and 1259 were not zigzagged when added, so it was not possible to notice the equivalence. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * dnxhddata: Fix cid 1260 luma and chroma tablesJeremy James2015-10-021-16/+16
| | | | | | | | | | | | These table was not zigzagged when added. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
| * dnxhddata: Fix 10-bit DNxHD quant matricesJoseph Artsimovich2015-10-021-32/+34
| | | | | | | | | | | | | | | | | | | | | | | | Convert them to zigzag order, as the rest of them are. When I was adding support for 10-bit DNxHD, I just copy-pasted the missing quant matrices from the spec. Now it turns out the existing matrices in dnxhddata.c were in zigzag order. This resulted in wrong quantization for 10-bit DNxHD. The attached patch fixes the problem by converting 10-bit quant matrices to zigzag order. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * dnxhddata: Double frame_size for cid 1260Michael Niedermayer2015-08-311-1/+1
| | | | | | | | | | | | | | | | Despite '417792' being reported in the binary decoder, the buffer at encoding time needs to be bigger to avoid running out of space due to interlace handling. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | dnxhddata: deduplicate tableChristophe Gisquet2015-09-301-12/+1
| | | | | | | | | | | | | | | | | | CID 1256 is specified as using the same table for luma and chroma, which is the same as CID 1235 luma table. This is consistent with the format supposedly being RGB, although most sequences seem to actually be YCbCr-encoded. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | dnxhddata: correct weight tablesJeremy James2015-09-251-72/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CID 1260 (as evidenced by incorrect decoding of a sample from ticket 4876) seems to use incorrect weight tables. It appears those tables were not zigzag-scanned. Apply zigzag on weight tables for new CIDs 1258, 1259, and 1260, and fix an incorrect chroma table for CID 1256. Fixes last issue from ticket #4876. Found-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Christophe Gisquet <christophe.gisquet@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avcodec/dnxhddata: Fix inconsistent table entryMichael Niedermayer2015-08-281-1/+1
| | | | | | | | | | | | | | Fixes segfault Fixes Ticket4809 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Merge commit 'd68705c9756e6558c8e28d90b4c364f25ba72083'Hendrik Leppkes2015-08-271-9/+67
|\ \ | |/ | | | | | | | | | | * commit 'd68705c9756e6558c8e28d90b4c364f25ba72083': dnxhddata: Add tables for missing DNx100 profiles Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Add tables for missing DNx100 profilesVittorio Giovara2015-08-241-10/+68
| | | | | | | | | | | | 1440x1080@8 progressive (1259) and interlaced (1260). Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8'Hendrik Leppkes2015-08-271-31/+6
|\ \ | |/ | | | | | | | | | | * commit 'a4615572b576d3ef7ee2f11529d935e61bf4ebb8': dnxhddata: Merge a few duplicated RUN tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Merge a few duplicated RUN tablesVittorio Giovara2015-08-241-31/+6
| |
* | Merge commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc'Hendrik Leppkes2015-08-271-113/+116
|\ \ | |/ | | | | | | | | | | * commit 'efbfb1ad1112cea79bef51fd9f30c0c94735abfc': dnxhddata: Group together RUN-related tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Group together RUN-related tablesVittorio Giovara2015-08-241-113/+116
| | | | | | | | This helps in finding duplicates.
* | Merge commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1'Hendrik Leppkes2015-08-271-52/+10
|\ \ | |/ | | | | | | | | | | * commit '403ea4ac7289ac39229452b6b5e2f8ebcc00f2a1': dnxhddata: Merge a few duplicated DC tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Merge a few duplicated DC tablesVittorio Giovara2015-08-241-52/+10
| |
* | Merge commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec'Hendrik Leppkes2015-08-271-50/+52
|\ \ | |/ | | | | | | | | | | * commit '5e129ed655bff5b6d90355c0b713d7aaba3898ec': dnxhddata: Group together DC-related tables Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Group together DC-related tablesVittorio Giovara2015-08-241-50/+52
| | | | | | | | This helps in finding duplicates.
* | Merge commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f'Hendrik Leppkes2015-08-271-9/+31
|\ \ | |/ | | | | | | | | | | * commit 'd3ae4c65942d67a294fd56eabbbdcce6756fab5f': dnxhddata: List the reused tables in a comment Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: List the reused tables in a commentVittorio Giovara2015-08-241-10/+38
| |
* | Merge commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b'Hendrik Leppkes2015-08-271-23/+32
|\ \ | |/ | | | | | | | | | | * commit 'fdd021884d5c06fb9ad65cb0040bb5717a7b084b': dnxhddata: Keep a single CID in the table names Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| * dnxhddata: Keep a single CID in the table namesVittorio Giovara2015-08-241-24/+34
| | | | | | | | | | | | Use a comment to list the reused tables, since it's more flexible than a table name to keep information like this. The list will expand in later commits.
* | Merge commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615'Michael Niedermayer2015-07-271-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c6eb0a1b7bf1aac7f033a7ec6d8cacc3b5c2615': lavc: AV-prefix all codec flags Conflicts: doc/examples/muxing.c ffmpeg.c ffmpeg_opt.c ffplay.c libavcodec/aacdec.c libavcodec/aacenc.c libavcodec/ac3dec.c libavcodec/ac3enc_float.c libavcodec/atrac1.c libavcodec/atrac3.c libavcodec/atrac3plusdec.c libavcodec/dcadec.c libavcodec/ffv1enc.c libavcodec/h264.c libavcodec/h264_loopfilter.c libavcodec/h264_mb.c libavcodec/imc.c libavcodec/libmp3lame.c libavcodec/libtheoraenc.c libavcodec/libtwolame.c libavcodec/libvpxenc.c libavcodec/libxavs.c libavcodec/libxvid.c libavcodec/mpeg12dec.c libavcodec/mpeg12enc.c libavcodec/mpegaudiodec_template.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/mpegvideo_motion.c libavcodec/nellymoserdec.c libavcodec/nellymoserenc.c libavcodec/nvenc.c libavcodec/on2avc.c libavcodec/options_table.h libavcodec/opus_celt.c libavcodec/pngenc.c libavcodec/ra288.c libavcodec/ratecontrol.c libavcodec/twinvq.c libavcodec/vc1_block.c libavcodec/vc1_loopfilter.c libavcodec/vc1_mc.c libavcodec/vc1dec.c libavcodec/vorbisdec.c libavcodec/vp3.c libavcodec/wma.c libavcodec/wmaprodec.c libavcodec/x86/hpeldsp_init.c libavcodec/x86/me_cmp_init.c Merged-by: Michael Niedermayer <michael@niedermayer.cc>
| * lavc: AV-prefix all codec flagsVittorio Giovara2015-07-271-1/+1
| | | | | | | | | | | | Convert doxygen to multiline and express bitfields more simply. Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | lavf/mxfenc: Write correct interlaced flag when muxing dnxhd.Carl Eugen Hoyos2015-05-041-0/+8
| | | | | | | | | | Reported and early patch version tested by forum user gridtank. Reviewed-by: Tomas Härdin
* | Merge commit '1a07df31128da3a0020b66502399989b91770d44'Michael Niedermayer2015-01-291-0/+38
|\ \ | |/ | | | | | | | | | | | | | | | | | | * commit '1a07df31128da3a0020b66502399989b91770d44': DNxHD: Add support for id 1258 (DNx100 960x720@8) Conflicts: Changelog libavcodec/dnxhddata.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * DNxHD: Add support for id 1258 (DNx100 960x720@8)Vittorio Giovara2015-01-291-0/+37
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | Merge commit '89ef08c992c484a46711b1a68a988303679c288e'Michael Niedermayer2014-04-111-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * commit '89ef08c992c484a46711b1a68a988303679c288e': DNxHD: K&R formatting cosmetics Conflicts: libavcodec/dnxhd_parser.c libavcodec/dnxhddec.c libavcodec/dnxhdenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * DNxHD: K&R formatting cosmeticsVittorio Giovara2014-04-111-1/+1
| |
View Lorry Controller Status