summaryrefslogtreecommitdiff
path: root/libavformat/mxf.c
Commit message (Collapse)AuthorAge
* avformat/mxf: Establish register of local tagsTomas Härdin2021-02-01
| | | | | | Tags can be marked "not used" upfront, saving some space in the primer. av_asserts0() is used to enforce that only tags that are in the primer can actually be written. Sharing of MasteringDisplay ULs is now done via macros.
* avformat/mxf: Deduplicate random_index_pack_keyAndreas Rheinhardt2021-01-08
| | | | | Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
* avformat/mxfdec: Read Mastering Display Colour Volume from MXFHarry Mallon2020-09-17
| | | | | | Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
* avformat/mxfdec: Read color metadata from MXFHarry Mallon2020-08-06
| | | | | | | Reads color_primaries, color_trc and color_space from mxf headers. ULs are from https://registry.smpte-ra.org/ site. Signed-off-by: Harry Mallon <harry.mallon@codex.online>
* avformat/mxfenc: add some missing content package ratesMarton Balint2020-03-14
| | | | | | Fixes ticket #8523. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mxfenc: move content package rates and timebase combinations to a ↵Marton Balint2020-03-14
| | | | | | separate struct Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mxf: get rid of samples per frame array usageMarton Balint2020-03-14
| | | | Signed-off-by: Marton Balint <cus@passwd.hu>
* lavf/mxfenc: support creating s436m data tracksBaptiste Coudurier2018-10-12
|
* avformat/mxfenc: correctly set content package rate in system elementBaptiste Coudurier2018-10-12
|
* avformat/mxf: fix NTSC 59.94 samples per frame layoutMarton Balint2018-05-27
| | | | | | | | | FFmbc uses this. bmx uses this. XAVC MXF Mapping and Operating Points prefers this. Basic rounding rules also yields these numbers. Signed-off-by: Marton Balint <cus@passwd.hu>
* avformat/mxf: use FFABS to instead of absSteven Liu2017-11-20
| | | | Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
* lavf/mxf: Support 60fps output.Carl Eugen Hoyos2017-11-16
|
* lavf/mxf: Add a universal label for ProRes used in FCP.Carl Eugen Hoyos2017-01-12
| | | | Fixes ticket #6075.
* Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'Clément Bœsch2016-06-21
|\ | | | | | | | | | | | | * commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb': cosmetics: Fix spelling mistakes Merged-by: Clément Bœsch <u@pkh.me>
| * cosmetics: Fix spelling mistakesVittorio Giovara2016-05-04
| | | | | | | | Signed-off-by: Diego Biurrun <diego@biurrun.de>
* | lavf/mxf: Support video essence container uls for vc1.Arnaud Bienner2015-09-05
| | | | | | | | Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.Carl Eugen Hoyos2015-07-22
| |
* | libavformat/mxf.c: Relaxed ProRes patternSteve Dierker2015-04-03
| | | | | | | | | | | | | | | | | | | | I found another MXF File containing ProRes with the following codec_uls: 060E2B34040101010E04020102110500 Therefor I relaxed the pattern. Related to issue #4349 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxf: Support ProRes decoding.Carl Eugen Hoyos2015-03-04
| | | | | | | | Fixes ticket #4349.
* | libavformat/mxfdec.c: initial support for EssenceGroupsMark Reid2014-11-30
| | | | | | | | | | Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxf: added ULs for demuxing avid media composer mxf filesMark Reid2014-08-18
| | | | | | | | | | | | The AAF SDK refers to these ULs as Legacy. These ULs are the same as the ones found in FFmbc's version of mxf.c and the ones found in libMXF Fixes Ticket#1554, Ticket#3100 and Ticket#3450
* | Merge commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '369380e1c4c6fc9b0d9ff04ec23d46b252ba7110': mxf: Support AAC Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Support AACLuca Barbato2014-08-17
| | | | | | | | | | | | | | Update mxf_set_audio_pts to use the container-provided information. The UL is marked as "to be changed in the future", but the current samples in the wild do use it.
* | Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'Michael Niedermayer2014-03-19
|\| | | | | | | | | | | | | | | | | | | * commit '92ebb332157195b7c1212e734c5668afbf19cf2b': mxf: Add additional H264 PictureEssenceCoding Conflicts: libavformat/mxf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add additional H264 PictureEssenceCodingLuca Barbato2014-03-19
| | | | | | | | Unbreak some MXF Proxy files.
* | Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'Michael Niedermayer2014-03-06
|\| | | | | | | | | | | | | | | | | | | | | | | * commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32': mxf: Introduce ff_mxf_get_samples_per_frame Conflicts: libavformat/mxf.c libavformat/mxf.h See: 906a2638139bfcce17d423cfa3a8ee633b38a2af Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Introduce ff_mxf_get_samples_per_frameMatthieu Bouron2014-03-06
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxf: Add DNxHD ULTomas Härdin2014-02-21
| | | | | | | | | | | | | | Note that the old DNxHD UL is actually JPEG 2000 according to RP224. Leaving it as-is for now. Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| * mxf: Add uncompressed 422 8-bit rawvideo ULPhilip de Nier2014-02-21
| | | | | | | | Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
* | Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer2012-10-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '716d413c13981da15323c7a3821860536eefdbbb': Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat Conflicts: doc/examples/muxing.c ffmpeg.h ffmpeg_filter.c ffmpeg_opt.c ffplay.c ffprobe.c libavcodec/8bps.c libavcodec/aasc.c libavcodec/aura.c libavcodec/avcodec.h libavcodec/avs.c libavcodec/bfi.c libavcodec/bmp.c libavcodec/bmpenc.c libavcodec/c93.c libavcodec/cscd.c libavcodec/cyuv.c libavcodec/dpx.c libavcodec/dpxenc.c libavcodec/eatgv.c libavcodec/escape124.c libavcodec/ffv1.c libavcodec/flashsv.c libavcodec/fraps.c libavcodec/h264.c libavcodec/huffyuv.c libavcodec/iff.c libavcodec/imgconvert.c libavcodec/indeo3.c libavcodec/kmvc.c libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/ljpegenc.c libavcodec/mjpegdec.c libavcodec/mjpegenc.c libavcodec/motionpixels.c libavcodec/mpeg12.c libavcodec/mpeg12enc.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo_enc.c libavcodec/pamenc.c libavcodec/pcxenc.c libavcodec/pgssubdec.c libavcodec/pngdec.c libavcodec/pngenc.c libavcodec/pnm.c libavcodec/pnmdec.c libavcodec/pnmenc.c libavcodec/ptx.c libavcodec/qdrw.c libavcodec/qpeg.c libavcodec/qtrleenc.c libavcodec/raw.c libavcodec/rawdec.c libavcodec/rl2.c libavcodec/sgidec.c libavcodec/sgienc.c libavcodec/snowdec.c libavcodec/snowenc.c libavcodec/sunrast.c libavcodec/targa.c libavcodec/targaenc.c libavcodec/tiff.c libavcodec/tiffenc.c libavcodec/tmv.c libavcodec/truemotion2.c libavcodec/utils.c libavcodec/vb.c libavcodec/vp3.c libavcodec/wnv1.c libavcodec/xl.c libavcodec/xwddec.c libavcodec/xwdenc.c libavcodec/yop.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/avfilter.c libavfilter/avfilter.h libavfilter/buffersrc.c libavfilter/drawutils.c libavfilter/formats.c libavfilter/src_movie.c libavfilter/vf_ass.c libavfilter/vf_drawtext.c libavfilter/vf_fade.c libavfilter/vf_format.c libavfilter/vf_hflip.c libavfilter/vf_lut.c libavfilter/vf_overlay.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavfilter/vf_transpose.c libavfilter/vf_yadif.c libavfilter/video.c libavfilter/vsrc_testsrc.c libavformat/movenc.c libavformat/mxf.h libavformat/utils.c libavformat/yuv4mpeg.c libavutil/imgutils.c libavutil/pixdesc.c libswscale/input.c libswscale/output.c libswscale/swscale_internal.h libswscale/swscale_unscaled.c libswscale/utils.c libswscale/x86/swscale_template.c libswscale/x86/yuv2rgb.c libswscale/x86/yuv2rgb_template.c libswscale/yuv2rgb.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov2012-10-08
| |
* | mxf: export ff_mxf_get_samples_per_frame to lavfMatthieu Bouron2012-09-21
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'Michael Niedermayer2012-08-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '36ef5369ee9b336febc2c270f8718cec4476cb85': Replace all CODEC_ID_* with AV_CODEC_ID_* lavc: add AV prefix to codec ids. Conflicts: doc/APIchanges doc/examples/decoding_encoding.c doc/examples/muxing.c ffmpeg.c ffprobe.c ffserver.c libavcodec/8svx.c libavcodec/avcodec.h libavcodec/dnxhd_parser.c libavcodec/dvdsubdec.c libavcodec/error_resilience.c libavcodec/h263dec.c libavcodec/libvorbisenc.c libavcodec/mjpeg_parser.c libavcodec/mjpegenc.c libavcodec/mpeg12.c libavcodec/mpeg4videodec.c libavcodec/mpegvideo.c libavcodec/mpegvideo_enc.c libavcodec/pcm.c libavcodec/r210dec.c libavcodec/utils.c libavcodec/v210dec.c libavcodec/version.h libavdevice/alsa-audio-dec.c libavdevice/bktr.c libavdevice/v4l2.c libavformat/asfdec.c libavformat/asfenc.c libavformat/avformat.h libavformat/avidec.c libavformat/caf.c libavformat/electronicarts.c libavformat/flacdec.c libavformat/flvdec.c libavformat/flvenc.c libavformat/framecrcenc.c libavformat/img2.c libavformat/img2dec.c libavformat/img2enc.c libavformat/ipmovie.c libavformat/isom.c libavformat/matroska.c libavformat/matroskadec.c libavformat/matroskaenc.c libavformat/mov.c libavformat/movenc.c libavformat/mp3dec.c libavformat/mpeg.c libavformat/mpegts.c libavformat/mxf.c libavformat/mxfdec.c libavformat/mxfenc.c libavformat/nsvdec.c libavformat/nut.c libavformat/oggenc.c libavformat/pmpdec.c libavformat/rawdec.c libavformat/rawenc.c libavformat/riff.c libavformat/sdp.c libavformat/utils.c libavformat/vocenc.c libavformat/wtv.c libavformat/xmv.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace all CODEC_ID_* with AV_CODEC_ID_*Anton Khirnov2012-08-07
| |
| * mxfdec: set pixel format for cdci picture formatsPhilip de Nier2012-07-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties of the CDCI Descriptor are insufficient to specify the pixel format for uncompressed picture data. SMPTE 377-1 and RP224v10 have defined a set of picture coding labels to indicate what formatting was used. This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats. It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files that were created before the coding labels were introduced ~2008 The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to -1 (PIX_FMT_NONE) Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add PictureEssenceCoding UL for V210.Tomas Härdin2011-12-21
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
| * mxf: H.264/MPEG-4 AVC Intra supportBaptiste Coudurier2011-12-21
| | | | | | | | Signed-off-by: Janne Grunau <janne-libav@jannau.net>
* | mxf: Add DNxHD ULTomas Härdin2012-03-10
| | | | | | | | | | | | | | Note that the old DNxHD UL is actually JPEG 2000 according to RP224. Leaving it as-is for now. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: set pixel format for cdci picture formatsPhilip de Nier2012-02-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The properties of the CDCI Descriptor are insufficient to specify the pixel format for uncompressed picture data. SMPTE 377-1 and RP224v10 have defined a set of picture coding labels to indicate what formatting was used. This patch uses 2 labels to detect UYVY422 or YUYV422 pixel formats. It defaults to UYVY422 for 8-bit 4:2:2 pictures to support files that were created before the coding labels were introduced ~2008 The codec pix_fmt default was changed from 0 (PIX_FMT_YUV420P) to -1 (PIX_FMT_NONE) Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf: add uncompressed 422 8-bit rawvideo labelPhilip de Nier2012-02-28
| | | | | | | | | | Reviewed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf: fix v210 label matching lenPhilip de Nier2012-02-28
| | | | | | | | | | | | | | | | Must check all 16 bytes because there is a planar 10-bit format label that has equal first 15 bytes Review-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxf: Add PictureEssenceCoding UL for V210Tomas Härdin2011-09-27
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-09-08
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: Employ FF_ARRAY_ELEMS instead of manually calculating array length. Fixed invalid access in wavpack decoder on corrupted bitstream. Fixed invalid writes in wavpack decoder on corrupted bitstreams. Fixed invalid access in wavpack decoder on corrupted extra bits sub-blocks. rtpdec_asf: Fix integer underflow that could allow remote code execution Conflicts: libavformat/rtpdec_asf.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Employ FF_ARRAY_ELEMS instead of manually calculating array length.Diego Biurrun2011-09-08
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-19
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Make ff_mxf_pixel_layouts static to mxf.c.Diego Elio Pettenò2011-01-25
| | | | | | | | | | | | Also make it an anonymous structure as never it is accessed by name. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
* | mxf: H.264/MPEG-4 AVC Intra supportBaptiste Coudurier2011-08-15
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Make ff_mxf_pixel_layouts static to mxf.c.Diego Elio Pettenò2011-01-26
|/ | | | | | | Also make it an anonymous structure as never it is accessed by name. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net> (cherry picked from commit a3dffc0627dfd85f8b1a72b9b637938dfa197208)
* mxfdec: Improve parsing of the PixelLayout itemTomas Härdin2010-06-30
| | | | Originally committed as revision 23898 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Define AVMediaType enum, and use it instead of enum CodecType, whichStefano Sabatini2010-03-30
| | | | | | is deprecated and will be dropped at the next major bump. Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 14:05:59 +0000