Add MPEG FORMAT to SF_COMMAND_*FORMAT, program common.

This commit is contained in:
Arthur Taylor 2021-01-23 11:04:32 -08:00
parent 163f725631
commit fe2ed77134
2 changed files with 16 additions and 0 deletions

View File

@ -344,6 +344,7 @@ static OUTPUT_FORMAT_MAP format_map [] =
{ "opus", 0, SF_FORMAT_OGG | SF_FORMAT_OPUS },
{ "mpc", 0, SF_FORMAT_MPC2K },
{ "rf64", 0, SF_FORMAT_RF64 },
{ "mp3", 0, SF_FORMAT_MPEG | SF_FORMAT_MPEG_LAYER_III },
} ; /* format_map */
int

View File

@ -61,6 +61,12 @@ static SF_FORMAT_INFO const simple_formats [] =
},
#endif
#if HAVE_MPEG
{ SF_FORMAT_MPEG | SF_FORMAT_MPEG_LAYER_III,
"MPEG Layer 3", "mp3"
},
#endif
{ SF_FORMAT_RAW | SF_FORMAT_VOX_ADPCM,
"OKI Dialogic VOX ADPCM", "vox"
},
@ -133,6 +139,9 @@ static SF_FORMAT_INFO const major_formats [] =
{ SF_FORMAT_MAT4, "MAT4 (GNU Octave 2.0 / Matlab 4.2)", "mat" },
{ SF_FORMAT_MAT5, "MAT5 (GNU Octave 2.1 / Matlab 5.0)", "mat" },
{ SF_FORMAT_MPC2K, "MPC (Akai MPC 2k)", "mpc" },
#if HAVE_MPEG
{ SF_FORMAT_MPEG, "MPEG-1/2 Audio", "m1a" },
#endif
#if HAVE_EXTERNAL_XIPH_LIBS
{ SF_FORMAT_OGG, "OGG (OGG Container format)", "oga" },
#endif
@ -215,6 +224,12 @@ static SF_FORMAT_INFO subtype_formats [] =
{ SF_FORMAT_OPUS, "Opus", NULL },
#endif
#if HAVE_MPEG
{ SF_FORMAT_MPEG_LAYER_I, "MPEG Layer I", "mp1" },
{ SF_FORMAT_MPEG_LAYER_II, "MPEG Layer II", "mp2" },
{ SF_FORMAT_MPEG_LAYER_III, "MPEG Layer III", "mp3" },
#endif
{ SF_FORMAT_ALAC_16, "16 bit ALAC", NULL },
{ SF_FORMAT_ALAC_20, "20 bit ALAC", NULL },
{ SF_FORMAT_ALAC_24, "24 bit ALAC", NULL },