Commit fa6dce4c authored by Martin Storsjö's avatar Martin Storsjö

rtpdec: Interpret the different G726 names as bits_per_coded_sample

For the standardized 8 kHz sample rate, this works exactly the same.
For nonstandard sample rates, the different predefined G726
names (G726-16, G726-24, G726-32, G726-40) are interpreted as an
indication of the bits per coded sample, even though their
actual bitrates aren't what the name specifies.

This feels more sane than using free-form names for nonstandard
sample rate/bitrate combinations, e.g like G726-22, G726-33
for 11025 Hz.
Signed-off-by: 's avatarMartin Storsjö <martin@martin.st>
parent 77e0c758
...@@ -27,10 +27,8 @@ static int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, PayloadCon ...@@ -27,10 +27,8 @@ static int g726_ ## bitrate ##_init(AVFormatContext *s, int st_index, PayloadCon
AVStream *stream = s->streams[st_index]; \ AVStream *stream = s->streams[st_index]; \
AVCodecContext *codec = stream->codec; \ AVCodecContext *codec = stream->codec; \
\ \
codec->bit_rate = bitrate*1000; \ codec->bits_per_coded_sample = bitrate/8; \
if (codec->sample_rate) \ codec->bit_rate = codec->bits_per_coded_sample * codec->sample_rate; \
codec->bits_per_coded_sample = \
av_clip((codec->bit_rate + codec->sample_rate/2) / codec->sample_rate, 2, 5); \
\ \
return 0; \ return 0; \
} \ } \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment