[FFmpeg-cvslog] aacenc: partially revert previous commits to set options via a profile
Rostislav Pehlivanov
git at videolan.org
Sat Oct 17 04:17:38 CEST 2015
ffmpeg | branch: master | Rostislav Pehlivanov <atomnuker at gmail.com> | Sat Oct 17 03:15:44 2015 +0100| [e9299df7a6dfb03464c121c945af5e8ea07be035] | committer: Rostislav Pehlivanov
aacenc: partially revert previous commits to set options via a profile
It didn't work out because of the exceptions that needed to be made
for the "-1" cases and was overall more confusing that just manually
checking and setting options for each profile.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e9299df7a6dfb03464c121c945af5e8ea07be035
---
libavcodec/aacenc.c | 110 ++++++++++++++++-----------------------------
libavcodec/aacenc_utils.h | 39 ----------------
libavcodec/aacenctab.h | 14 +++---
3 files changed, 45 insertions(+), 118 deletions(-)
diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 9454a94..2627331 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -46,57 +46,6 @@
#include "psymodel.h"
-struct AACProfileOptions {
- int profile;
- struct AACEncOptions opts;
-};
-
- /**
- * List of currently supported profiles, anything not listed isn't supported.
- */
-static const struct AACProfileOptions aacenc_profiles[] = {
- {FF_PROFILE_AAC_MAIN,
- { /* Main profile, all advanced encoding abilities enabled */
- .mid_side = 0,
- .pns = 1,
- .tns = 0,
- .ltp = OPT_BANNED,
- .pred = OPT_REQUIRED,
- .intensity_stereo = 1,
- },
- },
- {FF_PROFILE_AAC_LOW,
- { /* Default profile, these are the settings that get set by default */
- .mid_side = 0,
- .pns = 1,
- .tns = 0,
- .ltp = OPT_NEEDS_LTP,
- .pred = OPT_NEEDS_MAIN,
- .intensity_stereo = 1,
- },
- },
- {FF_PROFILE_MPEG2_AAC_LOW,
- { /* Strict MPEG 2 Part 7 compliance profile */
- .mid_side = 0,
- .pns = OPT_BANNED,
- .tns = 0,
- .ltp = OPT_BANNED,
- .pred = OPT_BANNED,
- .intensity_stereo = 1,
- },
- },
- {FF_PROFILE_AAC_LTP,
- { /* Long term prediction profile */
- .mid_side = 0,
- .pns = 1,
- .tns = 0,
- .ltp = OPT_REQUIRED,
- .pred = OPT_BANNED,
- .intensity_stereo = 1,
- },
- },
-};
-
/**
* Make AAC audio config object.
* @see 1.6.2.1 "Syntax - AudioSpecificConfig"
@@ -933,7 +882,6 @@ alloc_fail:
static av_cold int aac_encode_init(AVCodecContext *avctx)
{
AACEncContext *s = avctx->priv_data;
- const AACEncOptions *p_opt = NULL;
int i, ret = 0;
const uint8_t *sizes[2];
uint8_t grouping[AAC_MAX_CHANNELS];
@@ -966,24 +914,42 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
WARN_IF(1024.0 * avctx->bit_rate / avctx->sample_rate > 6144 * s->channels,
"Too many bits per frame requested, clamping to max\n");
- for (i = 0; i < FF_ARRAY_ELEMS(aacenc_profiles); i++) {
- if (avctx->profile == aacenc_profiles[i].profile) {
- p_opt = &aacenc_profiles[i].opts;
+ for (i = 0; i < FF_ARRAY_ELEMS(aacenc_profiles); i++)
+ if (avctx->profile == aacenc_profiles[i])
break;
- }
+ ERROR_IF(i == FF_ARRAY_ELEMS(aacenc_profiles),
+ "Unsupported encoding profile: %d\n", avctx->profile);
+ if (avctx->profile == FF_PROFILE_MPEG2_AAC_LOW) {
+ avctx->profile = FF_PROFILE_AAC_LOW;
+ ERROR_IF(s->options.pred,
+ "Main prediction unavailable in the \"mpeg2_aac_low\" profile\n");
+ ERROR_IF(s->options.ltp,
+ "LTP prediction unavailable in the \"mpeg2_aac_low\" profile\n");
+ WARN_IF(s->options.pns,
+ "PNS unavailable in the \"mpeg2_aac_low\" profile, turning off\n");
+ s->options.pns = 0;
+ } else if (avctx->profile == FF_PROFILE_AAC_LTP) {
+ s->options.ltp = 1;
+ ERROR_IF(s->options.pred,
+ "Main prediction unavailable in the \"aac_ltp\" profile\n");
+ } else if (avctx->profile == FF_PROFILE_AAC_MAIN) {
+ s->options.pred = 1;
+ ERROR_IF(s->options.ltp,
+ "LTP prediction unavailable in the \"aac_main\" profile\n");
+ } else if (s->options.ltp) {
+ avctx->profile = FF_PROFILE_AAC_LTP;
+ WARN_IF(1,
+ "Chainging profile to \"aac_ltp\"\n");
+ ERROR_IF(s->options.pred,
+ "Main prediction unavailable in the \"aac_ltp\" profile\n");
+ } else if (s->options.pred) {
+ avctx->profile = FF_PROFILE_AAC_MAIN;
+ WARN_IF(1,
+ "Chainging profile to \"aac_main\"\n");
+ ERROR_IF(s->options.pred,
+ "LTP prediction unavailable in the \"aac_main\" profile\n");
}
- ERROR_IF(!p_opt, "Unsupported encoding profile: %d\n", avctx->profile);
- AAC_OPT_SET(&s->options, p_opt, 1, coder);
- AAC_OPT_SET(&s->options, p_opt, 0, pns);
- AAC_OPT_SET(&s->options, p_opt, 1, tns);
- AAC_OPT_SET(&s->options, p_opt, 0, ltp);
- AAC_OPT_SET(&s->options, p_opt, 0, pred);
- AAC_OPT_SET(&s->options, p_opt, 1, mid_side);
- AAC_OPT_SET(&s->options, p_opt, 0, intensity_stereo);
- if (avctx->profile == FF_PROFILE_MPEG2_AAC_LOW)
- s->profile = FF_PROFILE_AAC_LOW;
- else
- s->profile = avctx->profile;
+ s->profile = avctx->profile;
s->coder = &ff_aac_coders[s->options.coder];
if (s->options.coder != AAC_CODER_TWOLOOP) {
@@ -1032,11 +998,11 @@ static const AVOption aacenc_options[] = {
{"twoloop", "Two loop searching method", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_TWOLOOP}, INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
{"fast", "Constant quantizer", 0, AV_OPT_TYPE_CONST, {.i64 = AAC_CODER_FAST}, INT_MIN, INT_MAX, AACENC_FLAGS, "coder"},
{"aac_ms", "Force M/S stereo coding", offsetof(AACEncContext, options.mid_side), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AACENC_FLAGS},
- {"aac_is", "Intensity stereo coding", offsetof(AACEncContext, options.intensity_stereo), AV_OPT_TYPE_BOOL, {.i64 = OPT_AUTO}, -1, 1, AACENC_FLAGS},
- {"aac_pns", "Perceptual noise substitution", offsetof(AACEncContext, options.pns), AV_OPT_TYPE_BOOL, {.i64 = OPT_AUTO}, -1, 1, AACENC_FLAGS},
+ {"aac_is", "Intensity stereo coding", offsetof(AACEncContext, options.intensity_stereo), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
+ {"aac_pns", "Perceptual noise substitution", offsetof(AACEncContext, options.pns), AV_OPT_TYPE_BOOL, {.i64 = 1}, -1, 1, AACENC_FLAGS},
{"aac_tns", "Temporal noise shaping", offsetof(AACEncContext, options.tns), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS},
- {"aac_ltp", "Long term prediction", offsetof(AACEncContext, options.ltp), AV_OPT_TYPE_BOOL, {.i64 = OPT_AUTO}, -1, 1, AACENC_FLAGS},
- {"aac_pred", "AAC-Main prediction", offsetof(AACEncContext, options.pred), AV_OPT_TYPE_BOOL, {.i64 = OPT_AUTO}, -1, 1, AACENC_FLAGS},
+ {"aac_ltp", "Long term prediction", offsetof(AACEncContext, options.ltp), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS},
+ {"aac_pred", "AAC-Main prediction", offsetof(AACEncContext, options.pred), AV_OPT_TYPE_BOOL, {.i64 = 0}, -1, 1, AACENC_FLAGS},
{NULL}
};
diff --git a/libavcodec/aacenc_utils.h b/libavcodec/aacenc_utils.h
index ea3152a..12ff797 100644
--- a/libavcodec/aacenc_utils.h
+++ b/libavcodec/aacenc_utils.h
@@ -202,43 +202,4 @@ static inline int lcg_random(unsigned previous_val)
av_log(avctx, AV_LOG_WARNING, __VA_ARGS__); \
}
-#define AAC_OPT_SET(e_opt, p_opt, bypass, name) \
- ERROR_IF ((e_opt)->name == 1 && (p_opt)->name == OPT_BANNED, \
- "Profile %i does not allow %s\n", avctx->profile, #name); \
- ERROR_IF ((e_opt)->name == 0 && (p_opt)->name == OPT_REQUIRED, \
- "Option %s is a requirement for this profile (%i)\n", \
- #name, avctx->profile); \
- if ((e_opt)->name == 1 && (p_opt)->name == OPT_NEEDS_MAIN && \
- avctx->profile == FF_PROFILE_AAC_LOW) { \
- WARN_IF(1, "Profile %i does not allow for %s, setting profile to " \
- "\"aac_main\"(%i)\n", avctx->profile, #name, \
- FF_PROFILE_AAC_MAIN); \
- avctx->profile = FF_PROFILE_AAC_MAIN; \
- p_opt = &aacenc_profiles[FF_PROFILE_AAC_MAIN].opts; \
- } \
- if ((e_opt)->name == 1 && (p_opt)->name == OPT_NEEDS_LTP && \
- avctx->profile == FF_PROFILE_AAC_LOW) { \
- WARN_IF(1, "Profile %i does not allow for %s, setting profile to " \
- "\"aac_ltp\"(%i)\n", avctx->profile, #name, \
- FF_PROFILE_AAC_LTP); \
- avctx->profile = FF_PROFILE_AAC_LTP; \
- p_opt = &aacenc_profiles[FF_PROFILE_AAC_LTP].opts; \
- } \
- if ((e_opt)->name == OPT_AUTO) { \
- if ((p_opt)->name == OPT_BANNED) { \
- (e_opt)->name = 0; \
- } else if ((p_opt)->name == OPT_NEEDS_LTP) { \
- (e_opt)->name = 0; \
- } else if ((p_opt)->name == OPT_NEEDS_MAIN) { \
- (e_opt)->name = 0; \
- } else if ((p_opt)->name == OPT_REQUIRED) { \
- (e_opt)->name = 1; \
- } else if (bypass) { \
- (e_opt)->name = (e_opt)->name; \
- } else { \
- (e_opt)->name = (p_opt)->name; \
- } \
- } \
- av_log(avctx, AV_LOG_VERBOSE, "Option %s set to %i\n", #name, (e_opt)->name);
-
#endif /* AVCODEC_AACENC_UTILS_H */
diff --git a/libavcodec/aacenctab.h b/libavcodec/aacenctab.h
index c6658a4..5fc9411 100644
--- a/libavcodec/aacenctab.h
+++ b/libavcodec/aacenctab.h
@@ -36,13 +36,6 @@
/** Total number of codebooks, including special ones **/
#define CB_TOT_ALL 15
-/** Profile option settings **/
-#define OPT_AUTO -1
-#define OPT_BANNED -256
-#define OPT_NEEDS_LTP -384
-#define OPT_NEEDS_MAIN -512
-#define OPT_REQUIRED -768
-
#define AAC_MAX_CHANNELS 8
extern const uint8_t *ff_aac_swb_size_1024[];
@@ -125,4 +118,11 @@ static const unsigned char aac_maxval_cb[] = {
0, 1, 3, 5, 5, 7, 7, 7, 9, 9, 9, 9, 9, 11
};
+static const int aacenc_profiles[] = {
+ FF_PROFILE_AAC_MAIN,
+ FF_PROFILE_AAC_LOW,
+ FF_PROFILE_AAC_LTP,
+ FF_PROFILE_MPEG2_AAC_LOW,
+};
+
#endif /* AVCODEC_AACENCTAB_H */
More information about the ffmpeg-cvslog
mailing list