Re: [FFmpeg-devel] [PATCH] avcodec/aacdec: print a log message when treating mono HE-AAC as stereo

2022-08-02 Thread Anton Khirnov
Quoting James Almer (2022-07-28 19:22:47)
> Since this behavior is intentional, use the VERBOSE level instead of WARNING 
> as
> it's nothing the user should worry about.
> 
> Signed-off-by: James Almer 
> ---
>  libavcodec/aac.h | 1 +
>  libavcodec/aacdec_template.c | 4 
>  libavcodec/aacsbr_template.c | 2 ++
>  3 files changed, 7 insertions(+)
> 
> diff --git a/libavcodec/aac.h b/libavcodec/aac.h
> index 53be546857..c8d6b17710 100644
> --- a/libavcodec/aac.h
> +++ b/libavcodec/aac.h
> @@ -366,6 +366,7 @@ struct AACContext {
>  int warned_960_sbr;
>  unsigned warned_71_wide;
>  int warned_gain_control;
> +int warned_he_aac_mono;

I now count 6 warned_foo vars in the context, which is quite wasteful.
We might want to change those into flags.

-- 
Anton Khirnov
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".


[FFmpeg-devel] [PATCH] avcodec/aacdec: print a log message when treating mono HE-AAC as stereo

2022-07-28 Thread James Almer
Since this behavior is intentional, use the VERBOSE level instead of WARNING as
it's nothing the user should worry about.

Signed-off-by: James Almer 
---
 libavcodec/aac.h | 1 +
 libavcodec/aacdec_template.c | 4 
 libavcodec/aacsbr_template.c | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/libavcodec/aac.h b/libavcodec/aac.h
index 53be546857..c8d6b17710 100644
--- a/libavcodec/aac.h
+++ b/libavcodec/aac.h
@@ -366,6 +366,7 @@ struct AACContext {
 int warned_960_sbr;
 unsigned warned_71_wide;
 int warned_gain_control;
+int warned_he_aac_mono;
 
 /* aacdec functions pointers */
 void (*imdct_and_windowing)(AACContext *ac, SingleChannelElement *sce);
diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 119976aa19..4266d89c6d 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -2584,6 +2584,10 @@ static int decode_extension_payload(AACContext *ac, 
GetBitContext *gb, int cnt,
 ac->avctx->profile = FF_PROFILE_AAC_HE;
 }
 res = AAC_RENAME(ff_decode_sbr_extension)(ac, &che->sbr, gb, crc_flag, 
cnt, elem_type);
+if (ac->oc[1].m4ac.ps == 1 && !ac->warned_he_aac_mono) {
+av_log(ac->avctx, AV_LOG_VERBOSE, "Treating HE-AAC mono as 
stereo.\n");
+ac->warned_he_aac_mono = 1;
+}
 break;
 case EXT_DYNAMIC_RANGE:
 res = decode_dynamic_range(&ac->che_drc, gb);
diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c
index b72c94b76d..dccae0526e 100644
--- a/libavcodec/aacsbr_template.c
+++ b/libavcodec/aacsbr_template.c
@@ -955,6 +955,8 @@ static void read_sbr_extension(AACContext *ac, 
SpectralBandReplication *sbr,
 } else {
 *num_bits_left -= ff_ps_read_data(ac->avctx, gb, &sbr->ps.common, 
*num_bits_left);
 ac->avctx->profile = FF_PROFILE_AAC_HE_V2;
+// ensure the warning is not printed if PS extension is present
+ac->warned_he_aac_mono = 1;
 }
 break;
 default:
-- 
2.37.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".