fenix
/
fdkaac
mirror of https://github.com/nu774/fdkaac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ticket #23: quit supporting MPEG-2 AOT 

Macro definitions for those AOT have gone from FDK_audio.h
This commit is contained in:
nu774 2016-08-26 21:19:03 +09:00
parent 622e065bd8
commit c8cc3fb57e
4 changed files with 8 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
README
View File

@ -52,15 +52,6 @@ OPTIONS
39 39
: MPEG-4 AAC ELD : MPEG-4 AAC ELD
129
: MPEG-2 AAC LC
132
: MPEG-2 HE-AAC (SBR)
156
: MPEG-2 HE-AAC v2 (SBR+PS)
-b, --bitrate \<n\> -b, --bitrate \<n\>
: Target bitrate (for CBR) : Target bitrate (for CBR)

22
man/fdkaac.1
View File

@ -1,10 +1,13 @@
.TH FDKAAC 1 "November, 2013" .\" Automatically generated by Pandoc 1.17.1
.\"
.TH "FDKAAC" "1" "November, 2013" "" ""
.hy
.SH NAME .SH NAME
.PP .PP
fdkaac \- command line frontend for libfdk\-aac encoder fdkaac \- command line frontend for libfdk\-aac encoder
.SH SYNOPSIS .SH SYNOPSIS
.PP .PP
\f[B]fdkaac\f[] [OPTIONS][FILE] \f[B]fdkaac\f[] [OPTIONS] [FILE]
.SH DESCRIPTION .SH DESCRIPTION
.PP .PP
\f[B]fdkaac\f[] reads linear PCM audio in either WAV, raw PCM, or CAF \f[B]fdkaac\f[] reads linear PCM audio in either WAV, raw PCM, or CAF
@ -56,21 +59,6 @@ MPEG\-4 AAC LD
MPEG\-4 AAC ELD MPEG\-4 AAC ELD
.RS .RS
.RE .RE
.TP
.B 129
MPEG\-2 AAC LC
.RS
.RE
.TP
.B 132
MPEG\-2 HE\-AAC (SBR)
.RS
.RE
.TP
.B 156
MPEG\-2 HE\-AAC v2 (SBR+PS)
.RS
.RE
.RE .RE
.TP .TP
.B \-b, \-\-bitrate <n> .B \-b, \-\-bitrate <n>

7
src/aacenc.c
View File

@ -34,8 +34,7 @@ int aacenc_is_sbr_ratio_available()
int aacenc_is_sbr_active(const aacenc_param_t *params) int aacenc_is_sbr_active(const aacenc_param_t *params)
{ {
switch (params->profile) { switch (params->profile) {
case AOT_SBR: case AOT_PS: case AOT_MP2_SBR: case AOT_MP2_PS: case AOT_SBR: case AOT_PS:
case AOT_DABPLUS_SBR: case AOT_DABPLUS_PS:
case AOT_DRM_SBR: case AOT_DRM_MPEG_PS: case AOT_DRM_SBR: case AOT_DRM_MPEG_PS:
return 1; return 1;
} }
@ -46,9 +45,9 @@ int aacenc_is_sbr_active(const aacenc_param_t *params)
int aacenc_is_dual_rate_sbr(const aacenc_param_t *params) int aacenc_is_dual_rate_sbr(const aacenc_param_t *params)
{ {
if (params->profile == AOT_PS || params->profile == AOT_MP2_PS) if (params->profile == AOT_PS)
return 1; return 1;
else if (params->profile == AOT_SBR || params->profile == AOT_MP2_SBR) else if (params->profile == AOT_SBR)
return params->sbr_ratio == 0 || params->sbr_ratio == 2; return params->sbr_ratio == 0 || params->sbr_ratio == 2;
else if (params->profile == AOT_ER_AAC_ELD && params->lowdelay_sbr) else if (params->profile == AOT_ER_AAC_ELD && params->lowdelay_sbr)
return params->sbr_ratio == 2; return params->sbr_ratio == 2;

3
src/main.c
View File

@ -117,9 +117,6 @@ PROGNAME " %s\n"
" 29: MPEG-4 HE-AAC v2 (SBR+PS)\n" " 29: MPEG-4 HE-AAC v2 (SBR+PS)\n"
" 23: MPEG-4 AAC LD\n" " 23: MPEG-4 AAC LD\n"
" 39: MPEG-4 AAC ELD\n" " 39: MPEG-4 AAC ELD\n"
" 129: MPEG-2 AAC LC\n"
" 132: MPEG-2 HE-AAC (SBR)\n"
" 156: MPEG-2 HE-AAC v2 (SBR+PS)\n"
" -b, --bitrate <n> Bitrate in bits per seconds (for CBR)\n" " -b, --bitrate <n> Bitrate in bits per seconds (for CBR)\n"
" -m, --bitrate-mode <n> Bitrate configuration\n" " -m, --bitrate-mode <n> Bitrate configuration\n"
" 0: CBR (default)\n" " 0: CBR (default)\n"