external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

support all sample rate in aac

Browse source
This commit is contained in:
runner365 2020-03-12 20:30:07 +08:00
parent a2839aacdf
commit b9195122cf
3 changed files with 13 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

19
trunk/src/protocol/srs_raw_avc.cpp
View file

@ -438,7 +438,8 @@ srs_error_t SrsRawAacStream::adts_demux(SrsBuffer* stream, char** pframe, int* p
srs_error_t SrsRawAacStream::mux_sequence_header(SrsRawAacStreamCodec* codec, string& sh) srs_error_t SrsRawAacStream::mux_sequence_header(SrsRawAacStreamCodec* codec, string& sh)
{ {
srs_error_t err = srs_success; srs_error_t err = srs_success;
char samplingFrequencyIndex = codec->sampling_frequency_index;
// only support aac profile 1-4. // only support aac profile 1-4.
if (codec->aac_object == SrsAacObjectTypeReserved) { if (codec->aac_object == SrsAacObjectTypeReserved) {
return srs_error_new(ERROR_AAC_DATA_INVALID, "invalid aac object"); return srs_error_new(ERROR_AAC_DATA_INVALID, "invalid aac object");
@ -446,21 +447,11 @@ srs_error_t SrsRawAacStream::mux_sequence_header(SrsRawAacStreamCodec* codec, st
SrsAacObjectType audioObjectType = codec->aac_object; SrsAacObjectType audioObjectType = codec->aac_object;
char channelConfiguration = codec->channel_configuration; char channelConfiguration = codec->channel_configuration;
char samplingFrequencyIndex = codec->sampling_frequency_index;
// override the aac samplerate by user specified. if (samplingFrequencyIndex >= 16) {
// @see https://github.com/ossrs/srs/issues/212#issuecomment-64146899 samplingFrequencyIndex = 4;//default 44100
switch (codec->sound_rate) {
case SrsAudioSampleRate11025:
samplingFrequencyIndex = 0x0a; break;
case SrsAudioSampleRate22050:
samplingFrequencyIndex = 0x07; break;
case SrsAudioSampleRate44100:
samplingFrequencyIndex = 0x04; break;
default:
break;
} }
char chs[2]; char chs[2];
// @see ISO_IEC_14496-3-AAC-2001.pdf // @see ISO_IEC_14496-3-AAC-2001.pdf
// AudioSpecificConfig (), page 33 // AudioSpecificConfig (), page 33

5
trunk/src/protocol/srs_raw_avc.hpp
View file

@ -30,6 +30,11 @@
#include <srs_kernel_codec.hpp> #include <srs_kernel_codec.hpp>
static const int mpeg4audio_sample_rates[16] = {
96000, 88200, 64000, 48000, 44100, 32000,
24000, 22050, 16000, 12000, 11025, 8000, 7350
};
class SrsBuffer; class SrsBuffer;
// The raw h.264 stream, in annexb. // The raw h.264 stream, in annexb.

20
trunk/src/srt/srt_to_rtmp.cpp
View file

@ -516,25 +516,11 @@ srs_error_t rtmp_client::on_ts_video(std::shared_ptr<SrsBuffer> avs_ptr, uint64_
return err; return err;
} }
int rtmp_client::get_sample_rate(char sound_rate) { int rtmp_client::get_sample_rate(char sample_index) {
int sample_rate = 44100; int sample_rate = 44100;
switch (sound_rate) if ((sample_index >= 0) && (sample_index < 16)) {
{ sample_rate = mpeg4audio_sample_rates[sample_index];
case SrsAudioSampleRate44100:
sample_rate = 44100;
break;
case SrsAudioSampleRate22050:
sample_rate = 22050;
break;
case SrsAudioSampleRate11025:
sample_rate = 11025;
break;
case SrsAudioSampleRate5512:
sample_rate = 5512;
break;
default:
break;
} }
return sample_rate; return sample_rate;
} }