diff options
Diffstat (limited to 'libavformat/mxf.h')
| -rw-r--r-- | libavformat/mxf.h | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/libavformat/mxf.h b/libavformat/mxf.h index 24432071ee..f3db1f939b 100644 --- a/libavformat/mxf.h +++ b/libavformat/mxf.h @@ -2,20 +2,20 @@ * MXF * Copyright (c) 2006 SmartJog S.A., Baptiste Coudurier <baptiste dot coudurier at smartjog dot com> * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef AVFORMAT_MXF_H @@ -33,6 +33,7 @@ enum MXFMetadataSetType { SourcePackage, SourceClip, TimecodeComponent, + PulldownComponent, Sequence, MultipleDescriptor, Descriptor, @@ -45,14 +46,16 @@ enum MXFMetadataSetType { IndexTableSegment, EssenceContainerData, TypeBottom,// add metadata type before this + EssenceGroup, + TaggedValue, }; enum MXFFrameLayout { - FullFrame = 0, - MixedFields, - OneField, - SegmentedFrame, - SeparateFields + FullFrame = 0, + SeparateFields, + OneField, + MixedFields, + SegmentedFrame, }; typedef struct KLVPacket { @@ -67,7 +70,7 @@ typedef struct MXFCodecUL { int id; } MXFCodecUL; -typedef struct MXFSamplesPerFrame { +typedef struct { struct AVRational time_base; int samples_per_frame[6]; } MXFSamplesPerFrame; @@ -75,6 +78,7 @@ typedef struct MXFSamplesPerFrame { extern const MXFCodecUL ff_mxf_data_definition_uls[]; extern const MXFCodecUL ff_mxf_codec_uls[]; extern const MXFCodecUL ff_mxf_pixel_format_uls[]; +extern const MXFCodecUL ff_mxf_codec_tag_uls[]; int ff_mxf_decode_pixel_layout(const char pixel_layout[16], enum AVPixelFormat *pix_fmt); const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRational time_base); @@ -99,24 +103,24 @@ const MXFSamplesPerFrame *ff_mxf_get_samples_per_frame(AVFormatContext *s, AVRat "0x%02x,0x%02x,0x%02x,0x%02x," \ "0x%02x,0x%02x,0x%02x,0x%02x," \ "0x%02x,0x%02x,0x%02x,0x%02x ", \ - s, \ - (x)[0], (x)[1], (x)[2], (x)[3], \ - (x)[4], (x)[5], (x)[6], (x)[7], \ - (x)[8], (x)[9], (x)[10], (x)[11], \ - (x)[12], (x)[13], (x)[14], (x)[15]); \ + s, UID_ARG(x)); \ av_log(pc, AV_LOG_INFO, \ "%s " \ "%02x.%02x.%02x.%02x." \ "%02x.%02x.%02x.%02x." \ "%02x.%02x.%02x.%02x." \ "%02x.%02x.%02x.%02x\n", \ - s, \ - (x)[0], (x)[1], (x)[2], (x)[3], \ - (x)[4], (x)[5], (x)[6], (x)[7], \ - (x)[8], (x)[9], (x)[10], (x)[11], \ - (x)[12], (x)[13], (x)[14], (x)[15]) + s, UID_ARG(x)) #else -#define PRINT_KEY(pc, s, x) +#define PRINT_KEY(pc, s, x) do { if(0) \ + av_log(pc, AV_LOG_VERBOSE, \ + "%s " \ + "0x%02x,0x%02x,0x%02x,0x%02x," \ + "0x%02x,0x%02x,0x%02x,0x%02x," \ + "0x%02x,0x%02x,0x%02x,0x%02x," \ + "0x%02x,0x%02x,0x%02x,0x%02x ", \ + s, UID_ARG(x)); \ + }while(0) #endif #endif /* AVFORMAT_MXF_H */ |