On 04/07/14 12:35, Martin Storsjö wrote: > On Fri, 4 Jul 2014, Omer Osman wrote: > >> The default error concealment method is set in >> CConcealment_InitCommonData, >> and is set to Energy Interpolation. This method requires one frame delay >> to the output. To reduce the default decoder output delay and avoid >> missing >> the last frame in file based decoding, use Noise Substitution as the >> default >> concealment method. >> >> Signed-off-by: Omer Osman <[email protected]> >> --- >> libavcodec/libfdk-aacdec.c | 6 +----- >> libavcodec/version.h | 2 +- >> 2 files changed, 2 insertions(+), 6 deletions(-) >> >> diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c >> index 5b2b094..698949c 100644 >> --- a/libavcodec/libfdk-aacdec.c >> +++ b/libavcodec/libfdk-aacdec.c >> @@ -26,7 +26,6 @@ >> #include "internal.h" >> >> enum ConcealMethod { >> - CONCEAL_METHOD_DEFAULT = -1, >> CONCEAL_METHOD_SPECTRAL_MUTING = 0, >> CONCEAL_METHOD_NOISE_SUBSTITUTION = 1, >> CONCEAL_METHOD_ENERGY_INTERPOLATION = 2, >> @@ -43,8 +42,7 @@ typedef struct FDKAACDecContext { >> #define OFFSET(x) offsetof(FDKAACDecContext, x) >> #define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM >> static const AVOption fdk_aac_dec_options[] = { >> - { "conceal", "Error concealment method", OFFSET(conceal_method), >> AV_OPT_TYPE_INT, { .i64 = CONCEAL_METHOD_DEFAULT }, >> CONCEAL_METHOD_DEFAULT, CONCEAL_METHOD_NB - 1, AD, "conceal" }, >> - { "default", "Default", 0, AV_OPT_TYPE_CONST, { >> .i64 = CONCEAL_METHOD_DEFAULT }, INT_MIN, INT_MAX, AD, >> "conceal" }, >> + { "conceal", "Error concealment method", OFFSET(conceal_method), >> AV_OPT_TYPE_INT, { .i64 = CONCEAL_METHOD_NOISE_SUBSTITUTION }, >> CONCEAL_METHOD_SPECTRAL_MUTING, CONCEAL_METHOD_NB - 1, AD, "conceal" }, >> { "spectral", "Spectral muting", 0, AV_OPT_TYPE_CONST, { .i64 >> = CONCEAL_METHOD_SPECTRAL_MUTING }, INT_MIN, INT_MAX, AD, >> "conceal" }, >> { "noise", "Noise Substitution", 0, AV_OPT_TYPE_CONST, { .i64 >> = CONCEAL_METHOD_NOISE_SUBSTITUTION }, INT_MIN, INT_MAX, AD, >> "conceal" }, >> { "energy", "Energy Interpolation", 0, AV_OPT_TYPE_CONST, { .i64 >> = CONCEAL_METHOD_ENERGY_INTERPOLATION }, INT_MIN, INT_MAX, AD, >> "conceal" }, >> @@ -195,13 +193,11 @@ static av_cold int >> fdk_aac_decode_init(AVCodecContext *avctx) >> } >> } >> >> - if (s->conceal_method != CONCEAL_METHOD_DEFAULT) { >> if ((err = aacDecoder_SetParam(s->handle, AAC_CONCEAL_METHOD, >> s->conceal_method)) != >> AAC_DEC_OK) { >> av_log(avctx, AV_LOG_ERROR, "Unable to set error >> concealment method\n"); >> return AVERROR_UNKNOWN; >> } >> - } > > We mostly do the reindenting in the same patch nowadays, unless it's a > really large section of code (perhaps we should update the coding > guidelines if this practice still is recommended). > >> >> avctx->sample_fmt = AV_SAMPLE_FMT_S16; >> >> diff --git a/libavcodec/version.h b/libavcodec/version.h >> index dee6615..05a2250 100644 >> --- a/libavcodec/version.h >> +++ b/libavcodec/version.h >> @@ -30,7 +30,7 @@ >> >> #define LIBAVCODEC_VERSION_MAJOR 55 >> #define LIBAVCODEC_VERSION_MINOR 55 >> -#define LIBAVCODEC_VERSION_MICRO 0 >> +#define LIBAVCODEC_VERSION_MICRO 1 >> >> #define LIBAVCODEC_VERSION_INT >> AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ >> >> LIBAVCODEC_VERSION_MINOR, \ >> -- >> 1.7.10.4 > > The patch looks good to me, I can amend with the reindenting before > pushing, unless there's objections. >
Push anytime. lu _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
