winlin

add donation. fix bug of adts.

@@ -13,6 +13,7 @@ RMB 500-999 @@ -13,6 +13,7 @@ RMB 500-999
13 * [2015-xx-xx xx:xx] xxx 13 * [2015-xx-xx xx:xx] xxx
14 14
15 RMB 100-499 15 RMB 100-499
  16 +* [2015-03-29 11-07] 姚伟斌
16 * [2015-03-14 20:21] 万伟 17 * [2015-03-14 20:21] 万伟
17 * [2015-03-11 09:44] 叶发养 18 * [2015-03-11 09:44] 叶发养
18 * [2015-02-08 21:10] 韩友洪 19 * [2015-02-08 21:10] 韩友洪
@@ -438,6 +438,7 @@ int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame @@ -438,6 +438,7 @@ int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame
438 codec.frame_length = frame_length; 438 codec.frame_length = frame_length;
439 439
440 // @see srs_audio_write_raw_frame(). 440 // @see srs_audio_write_raw_frame().
  441 + // TODO: FIXME: maybe need to resample audio.
441 codec.sound_format = 10; // AAC 442 codec.sound_format = 10; // AAC
442 if (sampling_frequency_index <= 0x0c && sampling_frequency_index > 0x0a) { 443 if (sampling_frequency_index <= 0x0c && sampling_frequency_index > 0x0a) {
443 codec.sound_rate = SrsCodecAudioSampleRate5512; 444 codec.sound_rate = SrsCodecAudioSampleRate5512;
@@ -451,7 +452,7 @@ int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame @@ -451,7 +452,7 @@ int SrsRawAacStream::adts_demux(SrsStream* stream, char** pframe, int* pnb_frame
451 codec.sound_rate = SrsCodecAudioSampleRate44100; 452 codec.sound_rate = SrsCodecAudioSampleRate44100;
452 srs_warn("adts invalid sample rate for flv, rate=%#x", sampling_frequency_index); 453 srs_warn("adts invalid sample rate for flv, rate=%#x", sampling_frequency_index);
453 } 454 }
454 - codec.sound_size = srs_max(0, srs_min(1, channel_configuration - 1)); 455 + codec.sound_type = srs_max(0, srs_min(1, channel_configuration - 1));
455 // TODO: FIXME: finger it out the sound size by adts. 456 // TODO: FIXME: finger it out the sound size by adts.
456 codec.sound_size = 1; // 0(8bits) or 1(16bits). 457 codec.sound_size = 1; // 0(8bits) or 1(16bits).
457 458