summaryrefslogtreecommitdiff
path: root/libavformat/mxfdec.c
Commit message (Collapse)AuthorAge
* Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'James Almer2017-03-21
|\ | | | | | | | | | | | | * commit '83548fe894cdb455cc127f754d09905b6d23c173': lavf: fix usage of AVIOContext.seekable Merged-by: James Almer <jamrial@gmail.com>
| * lavf: fix usage of AVIOContext.seekableAnton Khirnov2016-09-30
| | | | | | | | | | | | | | | | It is supposed to be a flag. The only currently defined value is AVIO_SEEKABLE_NORMAL, but other ones may be added in the future. However all the current lavf code treats this field as a bool (mainly for historical reasons). Change all those cases to properly check for AVIO_SEEKABLE_NORMAL.
| * Fix instances of broken indentation found by gcc 6Anton Khirnov2016-07-31
| |
* | mxfdec: fix NULL pointer dereference in mxf_read_packet_oldAndreas Cadhalpun2016-11-23
| | | | | | | | | | | | | | Metadata streams have priv_data set to NULL. Reviewed-by: Josh de Kock <josh@itanimul.li> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | mxfdec: fix NULL pointer dereferenceAndreas Cadhalpun2016-11-05
| | | | | | | | | | | | | | Metadata streams have priv_data set to NULL. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | avformat/mxfdec: Check size to avoid integer overflow in mxf_read_utf16_string()Michael Niedermayer2016-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mxfdec: Fix mixed declaration and codeMichael Niedermayer2016-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/mxfdec: add metadata streams for external referenced sourclipsMark Reid2016-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/mxfdec: don't assume first stream index to be primaryMark Reid2016-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/mxfdec: export track name metadataMark Reid2016-10-21
| | | | | | | | Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mxfdec: Detect field_order based on video_line_mapTobias Rapp2016-10-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Read video_line_map from MXF generic picture essence descriptor and use it to derive the coded field order. Use field_dominance to derive the display field order from coded field order. If field_dominance is not available the default value "1" is used as defined in SMPTE S377-1. Fixes field_order detection for a bunch of DV/DVCPRO files. The heuristic for deriving coded field order from video_line_map is inspired by MediaInfo. Signed-off-by: Tobias Rapp <t.rapp@noa-archive.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat/mxfdec: use first valid sourceclip found if material track has ↵Mark Reid2016-09-21
| | | | | | | | | | | | | | | | | | multiple components This commit fixes a issue with mxf footage having multiple components on a material track. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | avformat: fix decoded creation_time timestampsMarton Balint2016-08-28
| | | | | | | | | | | | | | | | | | | | | | Use proper ISO 8601 timestamps which also signal that they are in UTC. This changes the format of creation_time and modification_date metadata values from 2016-06-01 22:30:00 to 2016-01-01T22:30:00.000000Z Fixes ticket #5673. Signed-off-by: Marton Balint <cus@passwd.hu>
* | 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>
* | avformat/mxfdec: check if source_package is NULLMarton Balint2016-06-13
| | | | | | | | | | | | | | Fixes ticket #5554. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Marton Balint <cus@passwd.hu>
* | Merge commit '9200514ad8717c63f82101dc394f4378854325bf'Derek Buitenhuis2016-04-10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9200514ad8717c63f82101dc394f4378854325bf': lavf: replace AVStream.codec with AVStream.codecpar This has been a HUGE effort from: - Derek Buitenhuis <derek.buitenhuis@gmail.com> - Hendrik Leppkes <h.leppkes@gmail.com> - wm4 <nfxjfg@googlemail.com> - Clément Bœsch <clement@stupeflix.com> - James Almer <jamrial@gmail.com> - Michael Niedermayer <michael@niedermayer.cc> - Rostislav Pehlivanov <atomnuker@gmail.com> Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
| * lavf: replace AVStream.codec with AVStream.codecparAnton Khirnov2016-02-23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, AVStream contains an embedded AVCodecContext instance, which is used by demuxers to export stream parameters to the caller and by muxers to receive stream parameters from the caller. It is also used internally as the codec context that is passed to parsers. In addition, it is also widely used by the callers as the decoding (when demuxer) or encoding (when muxing) context, though this has been officially discouraged since Libav 11. There are multiple important problems with this approach: - the fields in AVCodecContext are in general one of * stream parameters * codec options * codec state However, it's not clear which ones are which. It is consequently unclear which fields are a demuxer allowed to set or a muxer allowed to read. This leads to erratic behaviour depending on whether decoding or encoding is being performed or not (and whether it uses the AVStream embedded codec context). - various synchronization issues arising from the fact that the same context is used by several different APIs (muxers/demuxers, parsers, bitstream filters and encoders/decoders) simultaneously, with there being no clear rules for who can modify what and the different processes being typically delayed with respect to each other. - avformat_find_stream_info() making it necessary to support opening and closing a single codec context multiple times, thus complicating the semantics of freeing various allocated objects in the codec context. Those problems are resolved by replacing the AVStream embedded codec context with a newly added AVCodecParameters instance, which stores only the stream parameters exported by the demuxers or read by the muxers.
| * lavc: Consistently prefix input buffer definesVittorio Giovara2015-07-27
| | | | | | | | Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
* | fix some a/an typosLou Logan2016-03-28
| | | | | | | | Signed-off-by: Lou Logan <lou@lrcd.com>
* | lavf/mxfdec: Fix Canopus essence element size.Carl Eugen Hoyos2016-03-14
| |
* | lavf/mxfdec: Support Canopus codecs.Carl Eugen Hoyos2016-03-10
| | | | | | | | Fixes ticket #5316.
* | lavf/mxfdec: fix seeking before the first keyframeMarton Balint2015-12-08
| | | | | | | | | | | | | | Regression since 53f2ef2c4afb1d49a679dea9163cb0e4671f3117. Fixes ticket #5017. Signed-off-by: Marton Balint <cus@passwd.hu>
* | Remove Redundant Entry of MPEG2 Video DescAnshul Maheshwari2015-12-07
| | | | | | | | | | Signed-off-by: Anshul Maheshwari <er.anshul.maheshwari@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mxfdec: Set width to actual coded_width for AVCI50.Carl Eugen Hoyos2015-11-29
| | | | | | | | | | Fixes ticket #5029. Reported and analyzed by videolan trac user HenkDemper in vlc ticket #15762.
* | mxfdec: check edit_rate also for physical_trackAndreas Cadhalpun2015-11-18
| | | | | | | | | | | | | | | | Previously only the edit_rate of material_track was checked. If it's negative, it causes assertion failures in av_rescale_rnd. Reviewed-by: Tim Nicholson <nichot20-at-yahoo.com@ffmpeg.org> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* | libavformat/mxfdec.c: Report dark metadata keys only when they match no ↵Alexis Ballier2015-10-22
| | | | | | | | | | | | | | parser at all, not everytime they fail to match one. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | libavformat/mxfdec.c: cosmetics: Add missing space after '?' in log message.Alexis Ballier2015-10-22
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | lavf/mxfdec: Support more codecs in mxf_picture_essence_container_uls[].Arnaud Bienner2015-09-05
| | | | | | | | Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* | lavc/mxfdec: Support more mxf files with codec_ul.Carl Eugen Hoyos2015-09-04
| | | | | | | | Fixes decoding for the sample from ticket #4820.
* | mxfdec: set AVFMT_SEEK_TO_PTS demuxer flagMarton Balint2015-08-14
| | | | | | | | | | | | Since 53f2ef2c4afb1d49a679dea9163cb0e4671f3117 seeking is done using PTS. Signed-off-by: Marton Balint <cus@passwd.hu>
* | lavf/mxfdec: support segmented frame layout as separate fields layoutMatthieu Bouron2015-08-04
| | | | | | | | | | | | | | | | | | According to S377M, segmented frame layout is identical to separate field layout except that the two fields are taken from a single scan of the incoming image, ie: they are coincident in time. Thus the resulting frame is progressive. Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
* | Cosmetics: Reindent after last commit.Carl Eugen Hoyos2015-07-22
| |
* | lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.Carl Eugen Hoyos2015-07-22
| |
* | mxfdec: calculate the index in display orderMarton Balint2015-07-16
| | | | | | | | | | | | | | This should fix seeking for open GOP files as well. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Marton Balint <cus@passwd.hu>
* | avformat/mxfdec: Change version byte for JPEG2000 to match mxf.c and RP224v12Michael Niedermayer2015-06-16
| | | | | | | | | | | | | | | | This should make no difference as the byte is ignored Found-by: tim nicholson <nichot20@yahoo.com> Reviewed-by: tim nicholson <nichot20@yahoo.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Detect jpeg2000 through codec_ul tooMichael Niedermayer2015-06-12
| | | | | | | | | | | | | | Fixes Ticket2345 Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: return error instead of segfaulting if there are no streamsMichael Niedermayer2015-06-02
| | | | | | | | | | | | Fixes segfault from ticket 4350 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-20
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1a3eb042c704dea190c644def5b32c9cee8832b8': Replace av_dlog with normal av_log at trace level Conflicts: ffplay.c libavdevice/fbdev_dec.c libavfilter/avfilter.c libavfilter/internal.h libavfilter/setpts.c libavfilter/src_movie.c libavfilter/vf_crop.c libavfilter/vf_drawtext.c libavfilter/vf_fieldorder.c libavformat/assdec.c libavformat/avidec.c libavformat/flvdec.c libavformat/http.c libavformat/ipmovie.c libavformat/isom.c libavformat/mov.c libavformat/mpegenc.c libavformat/mpegts.c libavformat/mpegtsenc.c libavformat/mux.c libavformat/mxfdec.c libavformat/nsvdec.c libavformat/oggdec.c libavformat/r3d.c libavformat/rtspdec.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * Replace av_dlog with normal av_log at trace levelVittorio Giovara2015-04-19
| | | | | | | | This applies to every library where performance is not critical.
* | libavformat/mxfdec: fix MXFPackage->comment_refs memory leakMark Reid2015-03-16
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec: export user comments metadataMark Reid2015-03-14
| | | | | | | | | | Previous-revision-reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '6448f15af02f2c3cf0df8cb8237957e426041f2d'Michael Niedermayer2015-03-08
|\| | | | | | | | | | | | | * commit '6448f15af02f2c3cf0df8cb8237957e426041f2d': mxfdec: Fix the error handling for when strftime fails Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxfdec: Fix the error handling for when strftime failsMartin Storsjö2015-03-08
| | | | | | | | | | | | The str variable is a char ** here. Signed-off-by: Martin Storsjö <martin@martin.st>
* | avformat/mxfdec: Detect XYZ pixel format for digital cinema filesVilius Grigaliūnas2015-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the native jpeg2000 decoder can determine pixel format correctly from the codestream, libopenjpeg wrapper cannot. To make sure that the output is correct when using libopenjpeg to decode digital cinema files, we do detection from the metadata included in the MXF wrapper. If the container has "JPEG 2000 Coding Parameters" metadata element with Rsiz value set to one of digital cinema profiles, we can safely assume that the given input file is DCI compliant, therefore the pixel format should be XYZ. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec: refactor reading strong ref arrayMark Reid2015-03-04
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-14
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e': avformat: Don't anonymously typedef structs Conflicts: libavformat/adtsenc.c libavformat/aiffenc.c libavformat/avidec.c libavformat/gif.c libavformat/iff.c libavformat/img2dec.c libavformat/jvdec.c libavformat/matroskadec.c libavformat/udp.c libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * avformat: Don't anonymously typedef structsDiego Biurrun2015-02-14
| |
| * mxfdec: reduce loop bound in mxf_read_pixel_layout()Tomas Härdin2014-10-27
| | | | | | | | | | | | Makes coverity less confused and code more readable. Bug-Id: CID 732262
* | avformat/mxfdec: Fix cleanup in mxf_free_metadataset()Carl Eugen Hoyos2015-01-28
| | | | | | | | | | | | | | Fixes Ticket4256 Found-by: tholin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>