This patch simply recognizes the AAC audio track during decode -- it does not add functionality to encode AAC in MXF.
Unified · Split
| @@ -78,6 +78,8 @@ const MXFCodecUL ff_mxf_codec_uls[] = { · 77 unmodified lines | ||
| 78 | 78 | { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x01,0x00 }, 15, AV_CODEC_ID_AC3 }, |
| 79 | 79 | { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x05,0x00 }, 15, AV_CODEC_ID_MP2 }, /* MP2 or MP3 */ |
| 80 | 80 | //{ { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x01,0x04,0x02,0x02,0x02,0x03,0x02,0x1C,0x00 }, 15, AV_CODEC_ID_DOLBY_E }, /* Dolby-E */ |
| 81 | + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x02,0x02,0x02,0x04,0x03,0x00,0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG-2 AAC SMPTE 381-4 */ | |
| 82 | + { { 0x06,0x0E,0x2B,0x34,0x04,0x01,0x01,0x0D,0x04,0x02,0x02,0x02,0x04,0x04,0x00,0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG-4 AAC SMPTE 381-4 */ | |
| 81 | 83 | { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, |
| 82 | 84 | }; |
| 83 | 85 | |
| @@ -1628,6 +1628,9 @@ static const MXFCodecUL mxf_sound_essence_container_uls[] = { · 1627 unmodified lines | ||
| 1628 | 1628 | { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x01,0x0d,0x01,0x03,0x01,0x02,0x01,0x01,0x01 }, 14, AV_CODEC_ID_PCM_S16LE, NULL, 13 }, /* D-10 Mapping 50Mbps PAL Extended Template */ |
| 1629 | 1629 | { { 0x06,0x0e,0x2b,0x34,0x01,0x01,0x01,0xff,0x4b,0x46,0x41,0x41,0x00,0x0d,0x4d,0x4F }, 14, AV_CODEC_ID_PCM_S16LE }, /* 0001GL00.MXF.A1.mxf_opatom.mxf */ |
| 1630 | 1630 | { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x03,0x04,0x02,0x02,0x02,0x03,0x03,0x01,0x00 }, 14, AV_CODEC_ID_AAC }, /* MPEG-2 AAC ADTS (legacy) */ |
| 1631 | + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x16,0x00,0x00 }, 14, AV_CODEC_ID_AAC, NULL, 14 }, /* AAC ADIF (SMPTE 381-4) */ | |
| 1632 | + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x17,0x00,0x00 }, 14, AV_CODEC_ID_AAC, NULL, 14 }, /* AAC ADTS (SMPTE 381-4) */ | |
| 1633 | + { { 0x06,0x0e,0x2b,0x34,0x04,0x01,0x01,0x0d,0x0d,0x01,0x03,0x01,0x02,0x18,0x00,0x00 }, 14, AV_CODEC_ID_AAC, NULL, 14 }, /* AAC LATM/LOAS (SMPTE 381-4) */ | |
| 1631 | 1634 | { { 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00 }, 0, AV_CODEC_ID_NONE }, |
| 1632 | 1635 | }; |
| 1633 | 1636 | |
| @@ -3029,6 +3032,8 @@ static int mxf_parse_structural_metadata(MXFContext *mxf) · 1395 unmodified lines | ||
| 3029 | 3032 | st->codecpar->codec_id = AV_CODEC_ID_PCM_S32BE; |
| 3030 | 3033 | } else if (st->codecpar->codec_id == AV_CODEC_ID_MP2) { |
| 3031 | 3034 | sti->need_parsing = AVSTREAM_PARSE_FULL; |
| 3035 | + } else if (st->codecpar->codec_id == AV_CODEC_ID_AAC) { | |
| 3036 | + sti->need_parsing = AVSTREAM_PARSE_FULL; | |
| 3032 | 3037 | } |
| 3033 | 3038 | st->codecpar->bits_per_coded_sample = av_get_bits_per_sample(st->codecpar->codec_id); |
| 3034 | 3039 | |