APTX decodes four bytes of input to four stereo samples; APTX HD
does the same with six bytes of input. So it can be easily supported
in av_get_audio_frame_duration().
This fixes invalid durations and (derived) timestamps of demuxed
APTX HD packets and therefore fixed the timestamp in the aptx-hd
FATE test.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com>
---
libavcodec/utils.c | 4 ++++
tests/ref/fate/aptx-hd | 17 ++++++++++-------
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 2f57418ff7..ba64aaf32d 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -682,6 +682,10 @@ static int get_audio_frame_duration(enum AVCodecID id, int
sr, int ch, int ba,
return 256 * (frame_bytes / 64);
if (id == AV_CODEC_ID_RA_144)
return 160 * (frame_bytes / 20);
+ if (id == AV_CODEC_ID_APTX)
+ return 4 * (frame_bytes / 4);
+ if (id == AV_CODEC_ID_APTX_HD)
+ return 4 * (frame_bytes / 6);
if (bps > 0) {
/* calc from frame_bytes and bits_per_coded_sample */
diff --git a/tests/ref/fate/aptx-hd b/tests/ref/fate/aptx-hd
index 0691f33c86..498b9131a6 100644
--- a/tests/ref/fate/aptx-hd
+++ b/tests/ref/fate/aptx-hd
@@ -6,10 +6,13 @@
#sample_rate 0: 44100
#channel_layout_name 0: 2 channels
0, 0, 0, 1024, 8192, 0xa99888c6
-0, 1536, 1536, 1024, 8192, 0xc3e03a3c
-0, 3072, 3072, 1024, 8192, 0x3f06e090
-0, 4608, 4608, 1024, 8192, 0x92fb18f3
-0, 6144, 6144, 1024, 8192, 0x3d5603a2
-0, 7680, 7680, 1024, 8192, 0xcc3d3101
-0, 9216, 9216, 1024, 8192, 0xbcc022ef
-0, 10752, 10752, 273, 2184, 0x9873af57
+0, 1024, 1024, 1024, 8192, 0xc3e03a3c
+0, 2048, 2048, 1024, 8192, 0x3f06e090
+0, 3072, 3072, 1024, 8192, 0x92fb18f3
+0, 4096, 4096, 1024, 8192, 0x3d5603a2
+0, 5120, 5120, 1024, 8192, 0xcc3d3101
+0, 6144, 6144, 1024, 8192, 0xbcc022ef
+0, 7168, 7168, 1024, 8192, 0x600cbb73
+0, 8192, 8192, 1024, 8192, 0xdc938cbb
+0, 9216, 9216, 1024, 8192, 0x37d968bc
+0, 10240, 10240, 785, 6280, 0x48243144
--
2.34.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".
