完善异常处理逻辑

src/Common/Factory.cpp

@@ -15,6 +15,11 @@ Sdp::Ptr Factory::getSdpByTrack(const Track::Ptr &track) {
         case CodecH264:{
         case CodecH264:{
             H264Track::Ptr h264Track = dynamic_pointer_cast<H264Track>(track);
             H264Track::Ptr h264Track = dynamic_pointer_cast<H264Track>(track);
             if(!h264Track){
             if(!h264Track){
+                WarnL << "该Track不是H264Track类型";
+                return nullptr;
+            }
+            if(!h264Track->ready()){
+                WarnL << "该Track未准备好";
                 return nullptr;
                 return nullptr;
             }
             }
             return std::make_shared<H264Sdp>(h264Track->getSps(),h264Track->getPps());
             return std::make_shared<H264Sdp>(h264Track->getSps(),h264Track->getPps());
@@ -23,12 +28,17 @@ Sdp::Ptr Factory::getSdpByTrack(const Track::Ptr &track) {
         case CodecAAC:{
         case CodecAAC:{
             AACTrack::Ptr aacTrack = dynamic_pointer_cast<AACTrack>(track);
             AACTrack::Ptr aacTrack = dynamic_pointer_cast<AACTrack>(track);
             if(!aacTrack){
             if(!aacTrack){
+                WarnL << "该Track不是AACTrack类型";
+                return nullptr;
+            }
+            if(!aacTrack->ready()){
+                WarnL << "该Track未准备好";
                 return nullptr;
                 return nullptr;
             }
             }
             return std::make_shared<AACSdp>(aacTrack->getAacCfg(),aacTrack->getAudioSampleRate());
             return std::make_shared<AACSdp>(aacTrack->getAacCfg(),aacTrack->getAudioSampleRate());
         }
         }
-
         default:
         default:
+            WarnL << "暂不支持的CodecId:" << track->getCodecId();
             return nullptr;
             return nullptr;
     }
     }
 }
 }
@@ -41,7 +51,8 @@ Track::Ptr Factory::getTrackBySdp(const string &sdp) {
             aac_cfg_str = FindField(sdp.c_str(), "config=", ";");
             aac_cfg_str = FindField(sdp.c_str(), "config=", ";");
         }
         }
         if (aac_cfg_str.size() != 4) {
         if (aac_cfg_str.size() != 4) {
-            return nullptr;
+            //延后获取adts头
+            return std::make_shared<AACTrack>();
         }
         }
         string aac_cfg;
         string aac_cfg;
 
 
@@ -74,7 +85,7 @@ Track::Ptr Factory::getTrackBySdp(const string &sdp) {
         return std::make_shared<H264Track>(sps,pps,0,0);
         return std::make_shared<H264Track>(sps,pps,0,0);
     }
     }
 
 
-
+    WarnL << "暂不支持该sdp:" << sdp;
     return nullptr;
     return nullptr;
 }
 }
 
 
@@ -116,6 +127,7 @@ Track::Ptr Factory::getTrackByCodecId(CodecId codecId) {
             return std::make_shared<AACTrack>();
             return std::make_shared<AACTrack>();
         }
         }
         default:
         default:
+            WarnL << "暂不支持该CodecId:" << codecId;
             return nullptr;
             return nullptr;
     }
     }
 }
 }
@@ -124,6 +136,7 @@ Track::Ptr Factory::getTrackByCodecId(CodecId codecId) {
 Track::Ptr Factory::getTrackByAmf(const AMFValue &amf) {
 Track::Ptr Factory::getTrackByAmf(const AMFValue &amf) {
     CodecId codecId = getCodecIdByAmf(amf);
     CodecId codecId = getCodecIdByAmf(amf);
     if(codecId == CodecInvalid){
     if(codecId == CodecInvalid){
+        WarnL << "暂不支持该Amf:" << amf.type();
         return nullptr;
         return nullptr;
     }
     }
     return getTrackByCodecId(codecId);
     return getTrackByCodecId(codecId);
@@ -142,6 +155,7 @@ RtpCodec::Ptr Factory::getRtpEncoderById(CodecId codecId,
         case CodecAAC:
         case CodecAAC:
             return std::make_shared<AACRtpEncoder>(ui32Ssrc,ui32MtuSize,ui32SampleRate,ui8PlayloadType,ui8Interleaved);
             return std::make_shared<AACRtpEncoder>(ui32Ssrc,ui32MtuSize,ui32SampleRate,ui8PlayloadType,ui8Interleaved);
         default:
         default:
+            WarnL << "暂不支持该CodecId:" << codecId;
             return nullptr;
             return nullptr;
     }
     }
 }
 }
@@ -153,6 +167,7 @@ RtpCodec::Ptr Factory::getRtpDecoderById(CodecId codecId, uint32_t ui32SampleRat
         case CodecAAC:
         case CodecAAC:
             return std::make_shared<AACRtpDecoder>(ui32SampleRate);
             return std::make_shared<AACRtpDecoder>(ui32SampleRate);
         default:
         default:
+            WarnL << "暂不支持该CodecId:" << codecId;
             return nullptr;
             return nullptr;
     }
     }
 }
 }
@@ -164,6 +179,7 @@ RtmpCodec::Ptr Factory::getRtmpCodecById(CodecId codecId) {
         case CodecAAC:
         case CodecAAC:
             return std::make_shared<AACRtmpEncoder>();
             return std::make_shared<AACRtmpEncoder>();
         default:
         default:
+            WarnL << "暂不支持该CodecId:" << codecId;
             return nullptr;
             return nullptr;
     }
     }
 }
 }