添加注释，完善接口

src/Player/Track.h

@@ -10,11 +10,12 @@
 #include "Frame.h"
 #include "Util/RingBuffer.h"
 #include "Rtsp/Rtsp.h"
+#include "Player.h"
 
 using namespace std;
 using namespace ZL::Util;
 
-class Track : public FrameRingInterface , public CodecInfo{
+class Track : public FrameRing , public CodecInfo{
 public:
     typedef std::shared_ptr<Track> Ptr;
     Track(){}
@@ -24,52 +25,231 @@ public:
 class VideoTrack : public Track {
 public:
     TrackType getTrackType() const override { return TrackVideo;};
+
+    /**
+     * 返回视频高度
+     * @return
+     */
     virtual int getVideoHeight() const = 0;
+
+    /**
+     * 返回视频宽度
+     * @return
+     */
     virtual int getVideoWidth() const  = 0;
+
+    /**
+     * 返回视频fps
+     * @return
+     */
     virtual float getVideoFps() const = 0;
 };
 
 class AudioTrack : public Track {
 public:
     TrackType getTrackType() const override { return TrackAudio;};
+
+    /**
+     * 返回音频采样率
+     * @return
+     */
     virtual int getAudioSampleRate() const  = 0;
+
+    /**
+     * 返回音频采样位数，一般为16或8
+     * @return
+     */
     virtual int getAudioSampleBit() const = 0;
+
+    /**
+     * 返回音频通道数
+     * @return
+     */
     virtual int getAudioChannel() const = 0;
 };
 
 class H264Track : public VideoTrack{
 public:
-    H264Track(const string &sps,const string &pps){
-        _sps = sps;
-        _pps = pps;
+
+    /**
+     * 构造h264类型的媒体
+     * @param sps sps帧数据
+     * @param pps pps帧数据
+     * @param sps_prefix_len 264头长度，可以为3个或4个字节，一般为0x00 00 00 01
+     * @param pps_prefix_len 264头长度，可以为3个或4个字节，一般为0x00 00 00 01
+     */
+    H264Track(const string &sps,const string &pps,int sps_prefix_len = 4,int pps_prefix_len = 4){
+        _sps = sps.substr(sps_prefix_len);
+        _pps = pps.substr(pps_prefix_len);
+        parseSps(_sps);
     }
+
+    /**
+     * 构造h264类型的媒体
+     * @param sps sps帧
+     * @param pps pps帧
+     */
+    H264Track(const Frame::Ptr &sps,const Frame::Ptr &pps){
+        if(sps->getCodecId() != CodecH264 || pps->getCodecId() != CodecH264 ){
+            throw std::invalid_argument("必须输入H264类型的帧");
+        }
+        _sps = string(sps->data() + sps->prefixSize(),sps->size() - sps->prefixSize());
+        _pps = string(pps->data() + pps->prefixSize(),pps->size() - pps->prefixSize());
+        parseSps(_sps);
+    }
+
+
+    /**
+     * 返回不带0x00 00 00 01头的sps
+     * @return
+     */
     const string &getSps() const{
         return _sps;
     }
+
+    /**
+     * 返回不带0x00 00 00 01头的pps
+     * @return
+     */
     const string &getPps() const{
         return _pps;
     }
-    CodecId getCodecId() const override{
+
+    CodecId getCodecId() const override {
         return CodecH264;
     }
+
+    /**
+     * 返回视频高度
+     * @return
+     */
+    int getVideoHeight() const override{
+        return _width;
+    }
+
+    /**
+     * 返回视频宽度
+     * @return
+     */
+    int getVideoWidth() const override{
+        return _height;
+    }
+
+    /**
+     * 返回视频fps
+     * @return
+     */
+    float getVideoFps() const override{
+        return _fps;
+    }
+private:
+    /**
+     * 解析sps获取宽高fps
+     * @param sps sps不含头数据
+     */
+    void parseSps(const string &sps){
+        getAVCInfo(sps,_width,_height,_fps);
+    }
 private:
     string _sps;
     string _pps;
+    int _width = 0;
+    int _height = 0;
+    float _fps = 0;
 };
 
 class AACTrack : public AudioTrack{
 public:
+    /**
+     * 构造aac类型的媒体
+     * @param aac_cfg aac两个字节的配置信息
+     */
     AACTrack(const string &aac_cfg){
+        if(aac_cfg.size() != 2){
+            throw std::invalid_argument("adts配置必须为2个字节");
+        }
         _cfg = aac_cfg;
+        parseAacCfg(_cfg);
     }
+
+    /**
+     * 构造aac类型的媒体
+     * @param adts_header adts头，7个字节
+     * @param adts_header_len adts头长度，不少于7个字节
+     */
+    AACTrack(const char *adts_header,int adts_header_len = 7){
+        if(adts_header_len < 7){
+            throw std::invalid_argument("adts头必须不少于7个字节");
+        }
+        _cfg = makeAdtsConfig((uint8_t*)adts_header);
+        parseAacCfg(_cfg);
+    }
+
+    /**
+     * 构造aac类型的媒体
+     * @param aac_frame_with_adts 带adts头的aac帧
+     */
+    AACTrack(const Frame::Ptr &aac_frame_with_adts){
+        if(aac_frame_with_adts->getCodecId() != CodecAAC || aac_frame_with_adts->prefixSize() < 7){
+            throw std::invalid_argument("必须输入带adts头的aac帧");
+        }
+        _cfg = makeAdtsConfig((uint8_t*)aac_frame_with_adts->data());
+        parseAacCfg(_cfg);
+    }
+
+    /**
+     * 获取aac两个字节的配置
+     * @return
+     */
     const string &getAacCfg() const{
         return _cfg;
     }
+
+    /**
+     * 返回编码类型
+     * @return
+     */
     CodecId getCodecId() const override{
         return CodecAAC;
     }
+
+    /**
+    * 返回音频采样率
+    * @return
+    */
+    int getAudioSampleRate() const override{
+        return _sampleRate;
+    }
+    /**
+     * 返回音频采样位数，一般为16或8
+     * @return
+     */
+    int getAudioSampleBit() const override{
+        return _sampleBit;
+    }
+    /**
+     * 返回音频通道数
+     * @return
+     */
+    int getAudioChannel() const override{
+        return _channel;
+    }
+
+private:
+    /**
+     * 解析2个字节的aac配置
+     * @param aac_cfg
+     */
+    void parseAacCfg(const string &aac_cfg){
+        AACFrame aacFrame;
+        makeAdtsHeader(aac_cfg,aacFrame);
+        getAACInfo(aacFrame,_sampleRate,_channel);
+    }
 private:
     string _cfg;
+    int _sampleRate = 0;
+    int _sampleBit = 16;
+    int _channel = 0;
 };