avcodec/ac3dec: add a flush callback for the ac3 and eac3 decoders

Fixes ticket #10732

James Almer committed 1 year ago

Commit 045a8b11 parent a9e85864 files · +14 −0Browse files

Showing the changes to libavcodec (4 of 4 files). Show all

Unified · Split

4 files

@@ -252,6 +252,16 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) · 251 unmodified lines
252	return 0;	252	return 0;
253	}	253	}
254		254
		255	static av_cold void ac3_decode_flush(AVCodecContext *avctx)
		256	{
		257	AC3DecodeContext *s = avctx->priv_data;
		258
		259	memset(&s->frame_type, 0, sizeof(*s) - offsetof(AC3DecodeContext, frame_type));
		260
		261	AC3_RENAME(ff_kbd_window_init)(s->window, 5.0, 256);
		262	av_lfg_init(&s->dith_state, 0);
		263	}
		264
255	/**	265	/**
256	* Parse the 'sync info' and 'bit stream info' from the AC-3 bitstream.	266	* Parse the 'sync info' and 'bit stream info' from the AC-3 bitstream.
257	* GetBitContext within AC3DecodeContext must point to	267	* GetBitContext within AC3DecodeContext must point to

@@ -96,6 +96,7 @@ typedef struct AC3DecodeContext { · 95 unmodified lines
96	SHORTFLOAT *downmix_coeffs[2]; ///< stereo downmix coefficients	96	SHORTFLOAT *downmix_coeffs[2]; ///< stereo downmix coefficients
97		97
98	// Start of flushable fields.	98	// Start of flushable fields.
		99	// frame_type must be the flushable field, or the offset changed in ac3_decode_flush().
99		100
100	///@name Bit stream information	101	///@name Bit stream information
101	///@{	102	///@{

@@ -181,6 +181,7 @@ const FFCodec ff_ac3_fixed_decoder = { · 180 unmodified lines
181	.p.priv_class = &ac3_decoder_class,	181	.p.priv_class = &ac3_decoder_class,
182	.priv_data_size = sizeof (AC3DecodeContext),	182	.priv_data_size = sizeof (AC3DecodeContext),
183	.init = ac3_decode_init,	183	.init = ac3_decode_init,
		184	.flush = ac3_decode_flush,
184	.close = ac3_decode_end,	185	.close = ac3_decode_end,
185	FF_CODEC_DECODE_CB(ac3_decode_frame),	186	FF_CODEC_DECODE_CB(ac3_decode_frame),
186	.p.capabilities = AV_CODEC_CAP_CHANNEL_CONF \|	187	.p.capabilities = AV_CODEC_CAP_CHANNEL_CONF \|

     .p.id           = AV_CODEC_ID_AC3,
     .priv_data_size = sizeof (AC3DecodeContext),
     .init           = ac3_decode_init,
+    .flush          = ac3_decode_flush,
     .close          = ac3_decode_end,
     FF_CODEC_DECODE_CB(ac3_decode_frame),
     .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF |
     .p.id           = AV_CODEC_ID_EAC3,
     .priv_data_size = sizeof (AC3DecodeContext),
     .init           = ac3_decode_init,
+    .flush          = ac3_decode_flush,
     .close          = ac3_decode_end,
     FF_CODEC_DECODE_CB(ac3_decode_frame),
     .p.capabilities = AV_CODEC_CAP_CHANNEL_CONF |

Keyboard shortcuts