* [FFmpeg-devel] [PATCH v3 0/2] fix HE-AAC profile probing and simplify
@ 2025-07-11 9:54 Nicolas Gaullier
2025-07-11 9:54 ` [FFmpeg-devel] [PATCH v3 1/2] avcodec/aac_ac3_parser: simplify Nicolas Gaullier
2025-07-11 9:54 ` [FFmpeg-devel] [PATCH v3 2/2] avcodec/aac_ac3_parser: do not override the profile set by the decoder Nicolas Gaullier
0 siblings, 2 replies; 3+ messages in thread
From: Nicolas Gaullier @ 2025-07-11 9:54 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Nicolas Gaullier
v3: complete overhaul of the commit message of the first patch
Code is unchanged. Second patch is unchanged ("should be ok" by James).
Nicolas Gaullier (2):
avcodec/aac_ac3_parser: simplify
avcodec/aac_ac3_parser: do not override the profile set by the decoder
libavcodec/aac_ac3_parser.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
--
2.47.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* [FFmpeg-devel] [PATCH v3 1/2] avcodec/aac_ac3_parser: simplify
2025-07-11 9:54 [FFmpeg-devel] [PATCH v3 0/2] fix HE-AAC profile probing and simplify Nicolas Gaullier
@ 2025-07-11 9:54 ` Nicolas Gaullier
2025-07-11 9:54 ` [FFmpeg-devel] [PATCH v3 2/2] avcodec/aac_ac3_parser: do not override the profile set by the decoder Nicolas Gaullier
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Gaullier @ 2025-07-11 9:54 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Nicolas Gaullier
Remove unused USAC/ADTS code: ff_adts_header_parse() parse the
object_type from a 2 bits field.
See also 696ea1c2236842572df88d573e24a39be3f19c98.
Use ff_adts_header_parse_buf() wrapper to simplify as GetBitContext is
no longer needed (it was introduced for USAC).
Partially reverts 64bb91fd3b5a00a8849531c7e8dd207f2a626096.
Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris>
---
libavcodec/aac_ac3_parser.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index e10ce13a3b..b49ce0277c 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -147,15 +147,14 @@ get_next:
} else {
#if CONFIG_AAC_PARSER
AACADTSHeaderInfo hdr;
- GetBitContext gb;
- init_get_bits8(&gb, buf, buf_size);
if (buf_size < AV_AAC_ADTS_HEADER_SIZE ||
- ff_adts_header_parse(&gb, &hdr) < 0)
+ ff_adts_header_parse_buf(buf, &hdr) < 0)
return i;
avctx->profile = hdr.object_type - 1;
- s1->key_frame = (avctx->profile == AV_PROFILE_AAC_USAC) ? get_bits1(&gb) : 1;
+ /* ADTS does not support USAC */
+ s1->key_frame = 1;
bit_rate = hdr.bit_rate;
#endif
}
--
2.47.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
* [FFmpeg-devel] [PATCH v3 2/2] avcodec/aac_ac3_parser: do not override the profile set by the decoder
2025-07-11 9:54 [FFmpeg-devel] [PATCH v3 0/2] fix HE-AAC profile probing and simplify Nicolas Gaullier
2025-07-11 9:54 ` [FFmpeg-devel] [PATCH v3 1/2] avcodec/aac_ac3_parser: simplify Nicolas Gaullier
@ 2025-07-11 9:54 ` Nicolas Gaullier
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Gaullier @ 2025-07-11 9:54 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Nicolas Gaullier
Parsing the ADTS header is not enough to detect HE-AAC v1/v2.
Regression since 64bb91fd3b5a00a8849531c7e8dd207f2a626096.
Fixes #11600
Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris>
---
libavcodec/aac_ac3_parser.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/libavcodec/aac_ac3_parser.c b/libavcodec/aac_ac3_parser.c
index b49ce0277c..51c801214c 100644
--- a/libavcodec/aac_ac3_parser.c
+++ b/libavcodec/aac_ac3_parser.c
@@ -152,7 +152,8 @@ get_next:
ff_adts_header_parse_buf(buf, &hdr) < 0)
return i;
- avctx->profile = hdr.object_type - 1;
+ if (avctx->profile == AV_PROFILE_UNKNOWN)
+ avctx->profile = hdr.object_type - 1;
/* ADTS does not support USAC */
s1->key_frame = 1;
bit_rate = hdr.bit_rate;
--
2.47.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-07-11 9:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-07-11 9:54 [FFmpeg-devel] [PATCH v3 0/2] fix HE-AAC profile probing and simplify Nicolas Gaullier
2025-07-11 9:54 ` [FFmpeg-devel] [PATCH v3 1/2] avcodec/aac_ac3_parser: simplify Nicolas Gaullier
2025-07-11 9:54 ` [FFmpeg-devel] [PATCH v3 2/2] avcodec/aac_ac3_parser: do not override the profile set by the decoder Nicolas Gaullier
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git