diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-04-23 15:30:50 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-02-20 09:18:29 +0100 |
| commit | 0bbe5ac82ef2845efafbf190044f16712db113b2 (patch) | |
| tree | ac8745fba01c8a3e902e886f46f90ad56576559f /src/encoder/flac_encoder.c | |
| parent | c69c8ffa9ec55c94dee7ce69af26b4edbd61647e (diff) | |
Switch to Libav sample formats everywhere.
Drop 24bit format for now. It should be restored later by properly
distinguishing between internal and packed formats.
Diffstat (limited to 'src/encoder/flac_encoder.c')
| -rw-r--r-- | src/encoder/flac_encoder.c | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c index e32588e2..d5b9ae26 100644 --- a/src/encoder/flac_encoder.c +++ b/src/encoder/flac_encoder.c @@ -173,21 +173,17 @@ flac_encoder_open(struct encoder *_encoder, struct audio_format *audio_format, /* FIXME: flac should support 32bit as well */ switch (audio_format->format) { - case SAMPLE_FORMAT_S8: + case AV_SAMPLE_FMT_U8: bits_per_sample = 8; break; - case SAMPLE_FORMAT_S16: + case AV_SAMPLE_FMT_S16: bits_per_sample = 16; break; - case SAMPLE_FORMAT_S24_P32: - bits_per_sample = 24; - break; - default: - bits_per_sample = 24; - audio_format->format = SAMPLE_FORMAT_S24_P32; + bits_per_sample = 16; + audio_format->format = AV_SAMPLE_FMT_S16; } /* allocate the encoder */ @@ -291,24 +287,17 @@ flac_encoder_write(struct encoder *_encoder, num_samples = num_frames * encoder->audio_format.channels; switch (encoder->audio_format.format) { - case SAMPLE_FORMAT_S8: + case AV_SAMPLE_FMT_U8: exbuffer = pcm_buffer_get(&encoder->expand_buffer, length*4); pcm8_to_flac(exbuffer, data, num_samples); buffer = exbuffer; break; - case SAMPLE_FORMAT_S16: + case AV_SAMPLE_FMT_S16: exbuffer = pcm_buffer_get(&encoder->expand_buffer, length*2); pcm16_to_flac(exbuffer, data, num_samples); buffer = exbuffer; break; - - case SAMPLE_FORMAT_S24_P32: - case SAMPLE_FORMAT_S32: - /* nothing need to be done; format is the same for - both mpd and libFLAC */ - buffer = data; - break; } /* feed samples to encoder */ |