lavc: Add option to encode MPEG-2 AAC with libfdk-aac

Kieran Kunhya committed 13 years ago

Commit 95d52461 parent ace87c15 files · +9 −1Browse files

Unified · Split

5 files

doc/APIchanges +3 −0
libavcodec/avcodec.h +2 −0
libavcodec/libfdk-aacenc.c +1 −0
libavcodec/options_table.h +2 −0
libavcodec/version.h +1 −1

doc/APIchanges+3−0

@@ -13,6 +13,9 @@ libavutil: 2012-10-22 · 12 unmodified lines
13	13
14	14	API changes, most recent first:
15	15
	16	+2013-06-xx - xxxxxxx - lavc 55.10.0 - avcodec.h
	17	+ Add MPEG-2 AAC profiles
	18	+
16	19	2013-06-xx - xxxxxxx - lavu 52.13.0 - mem.h
17	20	Add av_realloc_array and av_reallocp_array
18	21

libavcodec/avcodec.h+2−0

@@ -2530,6 +2530,8 @@ typedef struct AVCodecContext { · 2529 unmodified lines
2530	2530	#define FF_PROFILE_AAC_HE_V2 28
2531	2531	#define FF_PROFILE_AAC_LD 22
2532	2532	#define FF_PROFILE_AAC_ELD 38
	2533	+#define FF_PROFILE_MPEG2_AAC_LOW 128
	2534	+#define FF_PROFILE_MPEG2_AAC_HE 131
2533	2535
2534	2536	#define FF_PROFILE_DTS 20
2535	2537	#define FF_PROFILE_DTS_ES 30

libavcodec/libfdk-aacenc.c+1−0

@@ -197,6 +197,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) · 196 unmodified lines
197	197	avctx->bit_rate = (96sce + 128cpe) * avctx->sample_rate / 44;
198	198	if (avctx->profile == FF_PROFILE_AAC_HE \|\|
199	199	avctx->profile == FF_PROFILE_AAC_HE_V2 \|\|
	200	+ avctx->profile == FF_PROFILE_MPEG2_AAC_HE \|\|
200	201	s->eld_sbr)
201	202	avctx->bit_rate /= 2;
202	203	}

libavcodec/options_table.h+2−0

@@ -291,6 +291,8 @@ static const AVOption options[]={ · 290 unmodified lines
291	291	{"aac_he_v2", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_HE_V2 }, INT_MIN, INT_MAX, A\|E, "profile"},
292	292	{"aac_ld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_LD }, INT_MIN, INT_MAX, A\|E, "profile"},
293	293	{"aac_eld", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_AAC_ELD }, INT_MIN, INT_MAX, A\|E, "profile"},
	294	+{"mpeg2_aac_low", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_LOW }, INT_MIN, INT_MAX, A\|E, "profile"},
	295	+{"mpeg2_aac_he", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_MPEG2_AAC_HE }, INT_MIN, INT_MAX, A\|E, "profile"},
294	296	{"dts", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS }, INT_MIN, INT_MAX, A\|E, "profile"},
295	297	{"dts_es", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_ES }, INT_MIN, INT_MAX, A\|E, "profile"},
296	298	{"dts_96_24", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_PROFILE_DTS_96_24 }, INT_MIN, INT_MAX, A\|E, "profile"},

libavcodec/version.h+1−1

@@ -27,7 +27,7 @@ · 26 unmodified lines
27	27	*/
28	28
29	29	#define LIBAVCODEC_VERSION_MAJOR 55
30		−#define LIBAVCODEC_VERSION_MINOR 9
	30	+#define LIBAVCODEC_VERSION_MINOR 10
31	31	#define LIBAVCODEC_VERSION_MICRO 0
32	32
33	33	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \