Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-08-07avformat/mxfdec: SMPTE RDD 48:2018 Amd 1:2022 supportMichael Niedermayer
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2022-06-16avformat/mxf: Use AVUUID for uidsAndreas Rheinhardt
This is in preparation for using av_uuid functions directly. Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2022-01-09avformat/mxfdec: support MCA audio informationMarc-Antoine Arnaud
Channel reordering is removed from this patch because the new channel layout API will support it properly. Signed-off-by: Marton Balint <cus@passwd.hu>
2021-07-29avformat/mxfdec: fix frame wrapping detection for J2K essence containerPierre-Anthony Lemieux
For JPEG 2000 essence, the MXF input format module currently uses the value of byte 14 of the essence container UL to determine whether the J2K essence is clip- (byte 14 is 0x02) or frame-wrapped (byte 14 is 0x01). Otherwise it assumes an unknown wrapping. Additional wrappings are documented in SMPTE ST422:2019: 0x03: Interlaced Frame, 1 field/KLV 0x04: Interlaced Frame, 2 fields/KLV 0x05: Field-wrapped Picture Element 0x06: Frame-wrapped Picture Element And these should also be handled as frame wrapped content. Signed-off-by: Pierre-Anthony Lemieux <pal@sandflow.com> Signed-off-by: Marton Balint <cus@passwd.hu>
2021-07-22Remove/replace some unnecessary avcodec.h inclusionsAndreas Rheinhardt
Also remove other unnecessary headers and include headers directly while at it. Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
2021-02-02avformat/mxf: Establish register of local tagsTomas Härdin
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.
2021-01-08avformat/mxf: Deduplicate random_index_pack_keyAndreas Rheinhardt
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
2020-09-17avformat/mxfdec: Read Mastering Display Colour Volume from MXFHarry Mallon
Described in Annex B SMPTE ST 2067-21:2020 Signed-off-by: Harry Mallon <harry.mallon@codex.online>
2020-08-06avformat/mxfdec: Read color metadata from MXFHarry Mallon
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>
2020-03-15avformat/mxfenc: move content package rates and timebase combinations to a ↵Marton Balint
separate struct Signed-off-by: Marton Balint <cus@passwd.hu>
2020-03-15avformat/mxf: get rid of samples per frame array usageMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2019-05-20avformat/mxfenc: support XAVC long gopBaptiste Coudurier
2018-10-12avformat/mxfenc: correctly set content package rate in system elementBaptiste Coudurier
2018-06-24avformat/mxfdec: add support for determining essence wrapping schemeMarton Balint
Some code is based on bmxlib-libmxf/mxf/mxf_utils.c. Signed-off-by: Marton Balint <cus@passwd.hu>
2018-06-24avformat/mxfdec: store next_klv in KLVPacketMarton Balint
Signed-off-by: Marton Balint <cus@passwd.hu>
2018-06-09avformat/mxfdec: use MXFCodecUL struct to store essence description for ↵Marton Balint
data_essence_container_uls Signed-off-by: Marton Balint <cus@passwd.hu>
2017-12-08avformat/mxfenc: write reel_name if metadata key is presentMark Reid
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2017-12-08avformat/mxfenc: use track count to generate component instance uuidMark Reid
Reviewed-by: Tomas Härdin <tjoppen@acc.umu.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-07-22lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.Carl Eugen Hoyos
2015-05-10avformat/mxf: Always evaluate PRINT_KEY() arguments at compile timeMichael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-05-10avformat/mxf: Simplify PRINT_KEY()Michael Niedermayer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-15libavformat/mxfdec: export user comments metadataMark Reid
Previous-revision-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-01libavformat/mxfdec.c: initial support for EssenceGroupsMark Reid
Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-26libavformat/mxfdec: read source timecode from pulldown componentMark Reid
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-17Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'Michael Niedermayer
* commit '304089aca7d238ae184e09993b5c737aa22e2c2c': mxf: Add UID print helpers Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-17mxf: Add UID print helpersLuca Barbato
And use it to print non-parsed ULs.
2014-03-19Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5'Michael Niedermayer
* commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5': mxf: Verbose debug logging Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-19mxf: Verbose debug loggingLuca Barbato
Print the UL in code format and in the short format used by the specification.
2014-03-06mxf: Introduce ff_mxf_get_samples_per_frameMatthieu Bouron
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-10-08Merge commit '716d413c13981da15323c7a3821860536eefdbbb'Michael Niedermayer
* 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>
2012-10-08Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormatAnton Khirnov
2012-10-06Merge remote-tracking branch 'qatar/master'Michael Niedermayer
* qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06Give all anonymously typedeffed structs in headers a nameDiego Biurrun
Anonymous structs cannot be forward declared and have no benefit.
2012-09-21mxf: export ff_mxf_get_samples_per_frame to lavfMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-10mxfdec: fix frame height vs field height confusionJoseph Artsimovich
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at> Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
2012-07-10mxfdec: set pixel format for cdci picture formatsPhilip de Nier
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>
2012-04-19mxf: Fix frame layout valuesMatthieu Bouron
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-11Fix frame height vs field height confusion in MXF decoding.Joseph Artsimovich
Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Reveiwed-by: Baptiste Coudurier <baptiste.coudurier@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-28mxfdec: set pixel format for cdci picture formatsPhilip de Nier
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>
2011-03-19Replace FFmpeg with Libav in licence headersMans Rullgard
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-30Replace dprintf with av_dlogLuca Barbato
dprintf clashes with POSIX.1-2008 (cherry picked from commit dfd2a005eb29e4b9f2fdb97036eb7d5c38ae4bd4)
2011-01-30Replace dprintf with av_dlogLuca Barbato
dprintf clashes with POSIX.1-2008
2011-01-26Make ff_mxf_pixel_layouts static to mxf.c.Diego Elio Pettenò
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)
2011-01-26Don't check for DEBUG before using dprintf.Diego Elio 'Flameeyes' Pettenò
The dprintf macro is no-op when DEBUG is unset, so there is no need to put it conditional to DEBUG. Signed-off-by: Mans Rullgard <mans@mansr.com> (cherry picked from commit 73a0b19ba39a4aca79a768feeacd83307a62836e)
2011-01-25Make ff_mxf_pixel_layouts static to mxf.c.Diego Elio Pettenò
Also make it an anonymous structure as never it is accessed by name. Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
2011-01-25Don't check for DEBUG before using dprintf.Diego Elio 'Flameeyes' Pettenò
The dprintf macro is no-op when DEBUG is unset, so there is no need to put it conditional to DEBUG. Signed-off-by: Mans Rullgard <mans@mansr.com>
2010-06-30mxfdec: Improve parsing of the PixelLayout itemTomas Härdin
Originally committed as revision 23898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08reuse MXFCodecUL for data def and simplifyBaptiste Coudurier
Originally committed as revision 17042 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-08remove implicit header inclusions from mxf.hBaptiste Coudurier
Originally committed as revision 17041 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-25Directly #include some required headers.Diego Biurrun
Originally committed as revision 16780 to svn://svn.ffmpeg.org/ffmpeg/trunk