summaryrefslogtreecommitdiff
path: root/libavformat/mxfdec.c
Commit message (Collapse)AuthorAgeFilesLines
* mxfdec: check edit_rate also for physical_trackAndreas Cadhalpun2015-11-261-0/+10
| | | | | | | | | | 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> (cherry picked from commit 047bf82c181c1220b3087b37f28445f8b87a7a23) Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
* lavf/mxfdec: Support more codecs in mxf_picture_essence_container_uls[].Arnaud Bienner2015-09-051-0/+4
| | | | Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
* lavc/mxfdec: Support more mxf files with codec_ul.Carl Eugen Hoyos2015-09-041-6/+1
| | | | Fixes decoding for the sample from ticket #4820.
* mxfdec: set AVFMT_SEEK_TO_PTS demuxer flagMarton Balint2015-08-141-0/+1
| | | | | | 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-041-4/+2
| | | | | | | | | 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-221-7/+7
|
* lavf/mxfdec: Set codec_tag AVup for Avid 1:1 input.Carl Eugen Hoyos2015-07-221-0/+4
|
* mxfdec: calculate the index in display orderMarton Balint2015-07-161-3/+20
| | | | | | | 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-161-1/+1
| | | | | | | | 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-121-0/+14
| | | | | | | 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-021-0/+4
| | | | | | Fixes segfault from ticket 4350 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'Michael Niedermayer2015-04-201-18/+18
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-191-18/+18
| | | | | | | | This applies to every library where performance is not critical.
* | libavformat/mxfdec: fix MXFPackage->comment_refs memory leakMark Reid2015-03-161-0/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec: export user comments metadataMark Reid2015-03-141-4/+90
| | | | | | | | | | 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-081-1/+1
|\ \ | |/ | | | | | | | | | | * 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-081-1/+1
| | | | | | | | | | | | 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-051-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-39/+22
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'Michael Niedermayer2015-02-141-12/+12
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-141-12/+12
| |
| * mxfdec: reduce loop bound in mxf_read_pixel_layout()Tomas Härdin2014-10-271-1/+1
| | | | | | | | | | | | Makes coverity less confused and code more readable. Bug-Id: CID 732262
* | avformat/mxfdec: Fix cleanup in mxf_free_metadataset()Carl Eugen Hoyos2015-01-281-5/+6
| | | | | | | | | | | | | | Fixes Ticket4256 Found-by: tholin Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c: support demuxing opatom audio without indexMark Reid2015-01-181-0/+59
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c: export the full UMID as metadataMark Reid2015-01-131-7/+31
| | | | | | | | | | | | Previous version reviewed-by: tim nicholson Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c: read project_name metadataMark Reid2015-01-121-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MXF files generated by Media Composer or LibMXF can contain a project name property in the Preface. Lots of existing samples have them. http://samples.ffmpeg.org/MXF/issue2160/PW0805A0V01.4C5B5636.EFA330.mxf project_name : DNX145 PW Test http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3450/WriteAvidMXFgenerated/5502_0010_v1.mxf project_name : Rombus http://samples.ffmpeg.org/ffmpeg-bugs/trac/ticket3100/1sec_mxf_test_Video5270C795.mxf project_name : NVB_DOOD Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | lavf/mxfdec: Fix memleaks reading corrupt files.Carl Eugen Hoyos2014-12-151-6/+14
| | | | | | | | | | | | Fixes ticket #4173. Reviewed-by: Tomas Härdin
* | lavf/mxfdec: Factorize mxf_read_close().Carl Eugen Hoyos2014-12-151-29/+33
| | | | | | | | This will allow to fix leaks in a subsequent commit.
* | libavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence ↵Mark Reid2014-12-041-24/+38
| | | | | | | | | | | | | | | | | | | | group hack I think this is a better way to deal with single frame essence data then my previous way. Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Reset structural_components_count when allocation failsMichael Niedermayer2014-11-301-2/+6
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c: initial support for EssenceGroupsMark Reid2014-11-301-27/+121
| | | | | | | | | | Previous version reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: dont ask for samples with field dominance 0 anymoreMichael Niedermayer2014-11-261-0/+1
| | | | | | | | | | | | | | Based on discussion and patch from "[FFmpeg-devel] [PATCH]Do not ask for mxf samples with unknown field dominance" Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: minor simplification.Reimar Döffinger2014-11-221-1/+1
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | libavformat/mxfdec.c: export source package uids and names as metadataMark Reid2014-11-221-37/+41
| | | | | | | | | | | | | | | | Changes since v1: * renamed mxf_read_source_package -> mxf_read_package v1 reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Read (display) aspect ratio from mxf files.Carl Eugen Hoyos2014-11-171-0/+2
| | | | | | | | Fixes ticket #4107.
* | libavformat/mxfdec.c: refactored resolving timecode componentMark Reid2014-11-151-13/+23
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: fix null pointer dereferenceMichael Niedermayer2014-10-291-1/+1
| | | | | | | | | | | | Fixes: signal_sigsegv_b5b3d4_2_001.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Tighten RIP length bounds in mxf_read_random_index_pack()Tomas Härdin2014-10-281-2/+25
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Merge last_partition and footer_partitionTomas Härdin2014-10-281-14/+10
| | | | | | | | | | | | | | | | FooterPartition offset specified in RIP takes precedence over any value written in PartitionPacks. This fixes the same issue f06f6da tries to fix without introducing an extra variable. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Revert "avformat/mxfdec: detect loops during header parsing"Tomas Härdin2014-10-281-8/+1
| | | | | | | | | | | | This reverts commit 1c010fd035c1a14dc73827b84f21f593e969a5d6. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Parse PreviousPartition in mxf_seek_to_previous_partition()Tomas Härdin2014-10-281-1/+34
| | | | | | | | | | | | | | | | | | | | Without this patch the demuxer can get stuck in a loop if PreviousPartition points somewhere where there's no PartitionPack, or if klv_read_packet() syncs back up to the current partition. This should fix Ticket3278 properly and unbreak Ticket4040. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Break out parts of mxf_read_header() into separate functionsTomas Härdin2014-10-281-22/+47
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'Michael Niedermayer2014-10-261-1/+2
|\ \ | |/ | | | | | | | | | | | | | | | | * commit '9dcf2397219ca796f0fafce2a703770d6fd09920': lavf: Check the return value of strftime Conflicts: libavformat/wtvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavf: Check the return value of strftimeMartin Storsjö2014-10-261-1/+2
| | | | | | | | | | | | | | | | If the buffer provided to strftime is too small, the buffer contents are indeterminate - it does not guarantee actually null terminating the buffer. Signed-off-by: Martin Storsjö <martin@martin.st>
| * mxfdec: add missing breakVittorio Giovara2014-10-241-0/+1
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732232
* | libavformat/mxfdec: read source timecode from pulldown componentMark Reid2014-10-251-2/+29
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: cleanup if parsing the header metadata failsMichael Niedermayer2014-10-151-1/+2
| | | | | | | | | | | | | | Fixes memleaks Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Fix memleak of packages_refsMichael Niedermayer2014-10-151-0/+3
| | | | | | | | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Fix memleak of primer_packsMichael Niedermayer2014-10-151-0/+4
| | | | | | | | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | avformat/mxfdec: Fix termination of mxf_data_essence_container_ulsMichael Niedermayer2014-10-151-1/+1
| | | | | | | | | | | | Fixes: asan_static-oob_87d116_10_201.mxf Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status