summaryrefslogtreecommitdiff
path: root/libavformat/mxfdec.c
Commit message (Collapse)AuthorAge
* 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>
* | libavformat/mxfdec.c: support demuxing opatom audio without indexMark Reid2015-01-18
| | | | | | | | | | 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-13
| | | | | | | | | | | | Previous version reviewed-by: tim nicholson Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | libavformat/mxfdec.c: read project_name metadataMark Reid2015-01-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-15
| | | | | | | | | | | | Fixes ticket #4173. Reviewed-by: Tomas Härdin
* | lavf/mxfdec: Factorize mxf_read_close().Carl Eugen Hoyos2014-12-15
| | | | | | | | This will allow to fix leaks in a subsequent commit.
* | libavformat/mxfdec.c refactor resolving MultiDescriptor and remove essence ↵Mark Reid2014-12-04
| | | | | | | | | | | | | | | | | | | | 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-30
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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/mxfdec: dont ask for samples with field dominance 0 anymoreMichael Niedermayer2014-11-26
| | | | | | | | | | | | | | 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-22
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | libavformat/mxfdec.c: export source package uids and names as metadataMark Reid2014-11-22
| | | | | | | | | | | | | | | | 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-17
| | | | | | | | Fixes ticket #4107.
* | libavformat/mxfdec.c: refactored resolving timecode componentMark Reid2014-11-15
| | | | | | | | | | 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-29
| | | | | | | | | | | | 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-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: Merge last_partition and footer_partitionTomas Härdin2014-10-28
| | | | | | | | | | | | | | | | 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-28
| | | | | | | | | | | | 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-28
| | | | | | | | | | | | | | | | | | | | 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-28
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge commit '9dcf2397219ca796f0fafce2a703770d6fd09920'Michael Niedermayer2014-10-26
|\| | | | | | | | | | | | | | | | | | | * 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-26
| | | | | | | | | | | | | | | | 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-24
| | | | | | | | | | CC: libav-stable@libav.org Bug-Id: CID 732232
* | libavformat/mxfdec: read source timecode from pulldown componentMark Reid2014-10-25
| | | | | | | | | | 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-15
| | | | | | | | | | | | | | 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-15
| | | | | | | | | | | | 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-15
| | | | | | | | | | | | 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-15
| | | | | | | | | | | | 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: read reel_name and source timecode from physical source packageMark Reid2014-10-07
| | | | | | | | | | Reviewed-by: Tomas Härdin <tomas.hardin@codemill.se> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | 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 '747cd9560c2248ff2834f29cd2190646330e4676'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '747cd9560c2248ff2834f29cd2190646330e4676': mxf: Add the UL for the MPEG2VideoDescriptor Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add the UL for the MPEG2VideoDescriptorLuca Barbato2014-08-17
| |
* | Merge commit '304089aca7d238ae184e09993b5c737aa22e2c2c'Michael Niedermayer2014-08-17
|\| | | | | | | | | | | | | * commit '304089aca7d238ae184e09993b5c737aa22e2c2c': mxf: Add UID print helpers Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * mxf: Add UID print helpersLuca Barbato2014-08-17
| | | | | | | | And use it to print non-parsed ULs.
* | Use new av_dict_set_int helper function.Reimar Döffinger2014-08-16
| | | | | | | | | | | | | | Get rid of the many, slightly differing, implementations of basically the same thing. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | replace calls to url_feof() with avio_feof()James Almer2014-08-08
| | | | | | | | | | Signed-off-by: James Almer <jamrial@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | mxfdec: add missing "const" to array declaration.Reimar Döffinger2014-07-30
| | | | | | | | Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
* | Merge commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8'Michael Niedermayer2014-07-29
|\| | | | | | | | | | | | | * commit '259fe7280d0b63dc7a8ff017d44f26d3a84cfde8': mxf: Extract origin information from material and source track Merged-by: Michael Niedermayer <michaelni@gmx.at>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-21 17:39:22 +0000