Re: [FFmpeg-devel] [PATCH 1/7] avcodec/g729dec: Check for KELVIN && 6k4

2019-12-01 Thread Michael Niedermayer 
On Sat, Nov 09, 2019 at 11:39:01PM +0100, Michael Niedermayer wrote:
> This combination would assume different block sizes throughout the code so its
> better to error out.
> 
> No testcase
> 
> Signed-off-by: Michael Niedermayer 
> ---
>  libavcodec/g729dec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

will apply patchset

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

If you fake or manipulate statistics in a paper in physics you will never
get a job again.
If you fake or manipulate statistics in a paper in medicin you will get
a job for life at the pharma industry.


signature.asc
Description: PGP signature
___
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 1/7] avcodec/g729dec: Check for KELVIN && 6k4

2019-11-09 Thread Michael Niedermayer 
This combination would assume different block sizes throughout the code so its
better to error out.

No testcase

Signed-off-by: Michael Niedermayer 
---
 libavcodec/g729dec.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 67054b71df..ffccbc431b 100644
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -431,7 +431,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, 
int *got_frame_ptr,
 ctx->onset = 0;
 ctx->voice_decision = DECISION_VOICE;
 av_log(avctx, AV_LOG_DEBUG, "Packet type: %s\n", "G.729 @ 8kbit/s");
-} else if (buf_size == G729D_6K4_BLOCK_SIZE * avctx->channels) {
+} else if (buf_size == G729D_6K4_BLOCK_SIZE * avctx->channels && 
avctx->codec_id != AV_CODEC_ID_ACELP_KELVIN) {
 packet_type = FORMAT_G729D_6K4;
 format = _g729d_6k4;
 av_log(avctx, AV_LOG_DEBUG, "Packet type: %s\n", "G.729D @ 6.4kbit/s");
-- 
2.23.0

___
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".