diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-10 22:10:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-09-12 19:24:25 +0200 |
| commit | 4c88087f934b24caa1dc3a333501223438eb462a (patch) | |
| tree | 249b8e24e6e34e2bc08e5e62f2fffbdb2dcb0aad | |
| parent | 183216b21870f21c86c904a7530d53682d7db46d (diff) | |
| download | ffmpeg-4c88087f934b24caa1dc3a333501223438eb462a.tar.gz | |
avformat/mxfenc: Replace more literal magic numbers by enum values.
This also moves the enum table up as it is needed earlier
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mxfenc.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index cc9ec8c93a..893ab13ac7 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -100,27 +100,7 @@ typedef struct MXFContainerEssenceEntry { void (*write_desc)(AVFormatContext *, AVStream *); } MXFContainerEssenceEntry; -static const struct { - enum AVCodecID id; - int index; -} mxf_essence_mappings[] = { - { AV_CODEC_ID_MPEG2VIDEO, 0 }, - { AV_CODEC_ID_PCM_S24LE, 1 }, - { AV_CODEC_ID_PCM_S16LE, 1 }, - { AV_CODEC_ID_DVVIDEO, 15 }, - { AV_CODEC_ID_DNXHD, 24 }, - { AV_CODEC_ID_JPEG2000, 34 }, - { AV_CODEC_ID_H264, 35 }, - { AV_CODEC_ID_NONE } -}; - -static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st); -static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st); - -enum { +enum ULIndex { INDEX_MPEG2 = 0, INDEX_AES3, INDEX_WAV, @@ -159,6 +139,26 @@ enum { INDEX_H264, }; +static const struct { + enum AVCodecID id; + enum ULIndex index; +} mxf_essence_mappings[] = { + { AV_CODEC_ID_MPEG2VIDEO, INDEX_MPEG2 }, + { AV_CODEC_ID_PCM_S24LE, INDEX_AES3 }, + { AV_CODEC_ID_PCM_S16LE, INDEX_AES3 }, + { AV_CODEC_ID_DVVIDEO, INDEX_DV }, + { AV_CODEC_ID_DNXHD, INDEX_DNXHD_1080p_10bit_HIGH }, + { AV_CODEC_ID_JPEG2000, INDEX_JPEG2000 }, + { AV_CODEC_ID_H264, INDEX_H264 }, + { AV_CODEC_ID_NONE } +}; + +static void mxf_write_wav_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_aes3_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_mpegvideo_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_cdci_desc(AVFormatContext *s, AVStream *st); +static void mxf_write_generic_sound_desc(AVFormatContext *s, AVStream *st); + static const MXFContainerEssenceEntry mxf_essence_container_uls[] = { { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x02,0x0D,0x01,0x03,0x01,0x02,0x04,0x60,0x01 }, { 0x06,0x0E,0x2B,0x34,0x01,0x02,0x01,0x01,0x0D,0x01,0x03,0x01,0x15,0x01,0x05,0x00 }, |