har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/pcm-dvd: Avoid allocation of buffer

Browse Source 
In this case, it also allows to remove the decoder's close function.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2020-09-12 23:47:28 +02:00
parent fe63b3eedc
commit 7a84ee84ec
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/pcm-dvd.c
View File

@ -34,8 +34,9 @@ typedef struct PCMDVDContext {
int last_block_size; // Size of the last block of samples in bytes int last_block_size; // Size of the last block of samples in bytes
int samples_per_block; // Number of samples per channel per block int samples_per_block; // Number of samples per channel per block
int groups_per_block; // Number of 20/24-bit sample groups per block int groups_per_block; // Number of 20/24-bit sample groups per block
uint8_t *extra_samples; // Pointer to leftover samples from a frame
int extra_sample_count; // Number of leftover samples in the buffer int extra_sample_count; // Number of leftover samples in the buffer
uint8_t extra_samples[8 * 3 * 4]; // Space for leftover samples from a frame
// (8 channels, 3B/sample, 4 samples/block)
} PCMDVDContext; } PCMDVDContext;
static av_cold int pcm_dvd_decode_init(AVCodecContext *avctx) static av_cold int pcm_dvd_decode_init(AVCodecContext *avctx)
@ -44,18 +45,6 @@ static av_cold int pcm_dvd_decode_init(AVCodecContext *avctx)
/* Invalid header to force parsing of the first header */ /* Invalid header to force parsing of the first header */
s->last_header = -1; s->last_header = -1;
/* reserve space for 8 channels, 3 bytes/sample, 4 samples/block */
if (!(s->extra_samples = av_malloc(8 * 3 * 4)))
return AVERROR(ENOMEM);
return 0;
}
static av_cold int pcm_dvd_decode_uninit(AVCodecContext *avctx)
{
PCMDVDContext *s = avctx->priv_data;
av_freep(&s->extra_samples);
return 0; return 0;
} }
@ -310,7 +299,6 @@ AVCodec ff_pcm_dvd_decoder = {
.priv_data_size = sizeof(PCMDVDContext), .priv_data_size = sizeof(PCMDVDContext),
.init = pcm_dvd_decode_init, .init = pcm_dvd_decode_init,
.decode = pcm_dvd_decode_frame, .decode = pcm_dvd_decode_frame,
.close = pcm_dvd_decode_uninit,
.capabilities = AV_CODEC_CAP_DR1, .capabilities = AV_CODEC_CAP_DR1,
.sample_fmts = (const enum AVSampleFormat[]) { .sample_fmts = (const enum AVSampleFormat[]) {
AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_S32, AV_SAMPLE_FMT_NONE