Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avcodec/aptxenc: Process data in complete blocks of four samples only

Browse source 
Do this by setting AVCodecInternal.pad_samples.
This prevents reading into the frame's padding and writing
into the packet's padding.

This actually happened in our FATE tests (where the number of samples
is 2 mod 4), which therefore needed to be updated.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-08-29 22:44:36 +02:00
parent 017d976629
commit 129cbbd7be
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libavcodec/aptxenc.c
View file

@ -27,6 +27,7 @@
#include "audio_frame_queue.h"
#include "codec_internal.h"
#include "encode.h"
#include "internal.h"
typedef struct AptXEncContext {
AptXContext common;
@ -259,6 +260,7 @@ static av_cold int aptx_encode_init(AVCodecContext *avctx)
if (!avctx->frame_size || avctx->frame_size % 4)
avctx->frame_size = 1024;
avctx->internal->pad_samples = 4;
return ff_aptx_init(avctx);
}
@ -269,7 +271,7 @@ const FFCodec ff_aptx_encoder = {
CODEC_LONG_NAME("aptX (Audio Processing Technology for Bluetooth)"),
.p.type = AVMEDIA_TYPE_AUDIO,
.p.id = AV_CODEC_ID_APTX,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME,
.p.capabilities = AV_CODEC_CAP_DR1,
.priv_data_size = sizeof(AptXEncContext),
.init = aptx_encode_init,
FF_CODEC_ENCODE_CB(aptx_encode_frame),
@ -290,7 +292,7 @@ const FFCodec ff_aptx_hd_encoder = {
CODEC_LONG_NAME("aptX HD (Audio Processing Technology for Bluetooth)"),
.p.type = AVMEDIA_TYPE_AUDIO,
.p.id = AV_CODEC_ID_APTX_HD,
.p.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_SMALL_LAST_FRAME,
.p.capabilities = AV_CODEC_CAP_DR1,
.priv_data_size = sizeof(AptXEncContext),
.init = aptx_encode_init,
FF_CODEC_ENCODE_CB(aptx_encode_frame),

4
tests/ref/fate/aptx
View file

@ -1,5 +1,5 @@
b5d8a297c0e8d9854f19d9d3e8b82859 *tests/data/fate/aptx.aptx
418950 tests/data/fate/aptx.aptx
97dfd7f32d34fb74337c0f6c66e26e2d *tests/data/fate/aptx.aptx
418952 tests/data/fate/aptx.aptx
#tb 0: 1/44100
#media_type 0: audio
#codec_id 0: pcm_s16le

4
tests/ref/fate/aptx-hd
View file

@ -1,5 +1,5 @@
48ecaa81ee5adaaa62ed3ff6574b6666 *tests/data/fate/aptx-hd.aptx_hd
628425 tests/data/fate/aptx-hd.aptx_hd
6126e414af1acb193e24fdf33c7cac2e *tests/data/fate/aptx-hd.aptx_hd
628428 tests/data/fate/aptx-hd.aptx_hd
#tb 0: 1/44100
#media_type 0: audio
#codec_id 0: pcm_s32le