fix RTMP publish single AAC from ffmpeg client.

harlanc · Apr 3, 2024 · 9058e86 · 9058e86
1 parent d3a9bbf
commit 9058e86
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/library/container/flv/src/demuxer.rs b/library/container/flv/src/demuxer.rs
@@ -185,7 +185,10 @@ impl FlvAudioTagDemuxer {
         if tag_header.sound_format == SoundFormat::AAC as u8 {
             match tag_header.aac_packet_type {
                 aac_packet_type::AAC_SEQHDR => {
-                    self.aac_processor.audio_specific_config_load()?;
+                    if self.aac_processor.bytes_reader.len() >= 2 {
+                        self.aac_processor.audio_specific_config_load()?;
+                    }
+
                     return Ok(FlvDemuxerAudioData::new());
                 }
                 aac_packet_type::AAC_RAW => {

diff --git a/protocol/rtmp/src/cache/mod.rs b/protocol/rtmp/src/cache/mod.rs
@@ -33,7 +33,6 @@ pub struct Cache {
 
 impl Cache {
     pub fn new(gop_num: usize, statistic_data_sender: Option<StatisticDataSender>) -> Self {
-
         Cache {
             metadata: metadata::MetaData::new(),
             metadata_timestamp: 0,
@@ -78,7 +77,10 @@ impl Cache {
         let mut reader = BytesReader::new(chunk_body.clone());
         let tag_header = AudioTagHeader::unmarshal(&mut reader)?;
 
-        if tag_header.sound_format == define::SoundFormat::AAC as u8
+        let remain_bytes = reader.extract_remaining_bytes();
+
+        if remain_bytes.len() >= 2
+            && tag_header.sound_format == define::SoundFormat::AAC as u8
             && tag_header.aac_packet_type == define::aac_packet_type::AAC_SEQHDR
         {
             self.audio_seq = chunk_body.clone();
@@ -88,7 +90,7 @@ impl Cache {
                 let mut aac_processor = Mpeg4AacProcessor::default();
 
                 let aac = aac_processor
-                    .extend_data(reader.extract_remaining_bytes())
+                    .extend_data(remain_bytes)
                     .audio_specific_config_load()?;
 
                 let statistic_audio_codec = StatisticData::AudioCodec {