整理和精简代码

src/Extension/H265.h

@@ -23,9 +23,9 @@ namespace mediakit {
 bool getHEVCInfo(const string &strVps, const string &strSps, int &iVideoWidth, int &iVideoHeight, float &iVideoFps);
 
 /**
-* 265帧类
-*/
-class H265Frame : public Frame {
+ * 265帧类
+ */
+class H265Frame : public FrameImp {
 public:
     typedef std::shared_ptr<H265Frame> Ptr;
 
@@ -60,32 +60,8 @@ public:
         NAL_SEI_SUFFIX = 40,
     } NaleType;
 
-    char *data() const override {
-        return (char *) _buffer.data();
-    }
-
-    uint32_t size() const override {
-        return _buffer.size();
-    }
-
-    uint32_t dts() const override {
-        return _dts;
-    }
-
-    uint32_t pts() const override {
-        return _pts ? _pts : _dts;
-    }
-
-    uint32_t prefixSize() const override {
-        return _prefix_size;
-    }
-
-    TrackType getTrackType() const override {
-        return TrackVideo;
-    }
-
-    CodecId getCodecId() const override {
-        return CodecH265;
+    H265Frame(){
+        _codecid = CodecH265;
     }
 
     bool keyFrame() const override {
@@ -96,39 +72,26 @@ public:
         switch(H265_TYPE(_buffer[_prefix_size])){
             case H265Frame::NAL_VPS:
             case H265Frame::NAL_SPS:
-            case H265Frame::NAL_PPS:
-                return true;
-            default:
-                return false;
+            case H265Frame::NAL_PPS : return true;
+            default : return false;
         }
     }
 
     static bool isKeyFrame(int type) {
         return type >= NAL_BLA_W_LP && type <= NAL_RSV_IRAP_VCL23;
     }
-
-public:
-    uint32_t _dts = 0;
-    uint32_t _pts = 0;
-    uint32_t _prefix_size = 4;
-    string _buffer;
 };
 
-
-class H265FrameNoCacheAble : public FrameNoCacheAble {
+class H265FrameNoCacheAble : public FrameFromPtr {
 public:
     typedef std::shared_ptr<H265FrameNoCacheAble> Ptr;
 
-    H265FrameNoCacheAble(char *ptr, uint32_t size, uint32_t dts,uint32_t pts, int prefixeSize = 4) {
+    H265FrameNoCacheAble(char *ptr, uint32_t size, uint32_t dts,uint32_t pts, int prefix_size = 4) {
         _ptr = ptr;
         _size = size;
         _dts = dts;
         _pts = pts;
-        _prefixSize = prefixeSize;
-    }
-
-    TrackType getTrackType() const override {
-        return TrackVideo;
+        _prefix_size = prefix_size;
     }
 
     CodecId getCodecId() const override {
@@ -136,17 +99,15 @@ public:
     }
 
     bool keyFrame() const override {
-        return H265Frame::isKeyFrame(H265_TYPE(((uint8_t *) _ptr)[_prefixSize]));
+        return H265Frame::isKeyFrame(H265_TYPE(((uint8_t *) _ptr)[_prefix_size]));
     }
 
     bool configFrame() const override{
-        switch(H265_TYPE(((uint8_t *) _ptr)[_prefixSize])){
+        switch(H265_TYPE(((uint8_t *) _ptr)[_prefix_size])){
             case H265Frame::NAL_VPS:
             case H265Frame::NAL_SPS:
-            case H265Frame::NAL_PPS:
-                return true;
-            default:
-                return false;
+            case H265Frame::NAL_PPS:return true;
+            default:return false;
         }
     }
 };
@@ -184,7 +145,6 @@ public:
 
     /**
      * 返回不带0x00 00 00 01头的vps
-     * @return
      */
     const string &getVps() const {
         return _vps;
@@ -192,7 +152,6 @@ public:
 
     /**
      * 返回不带0x00 00 00 01头的sps
-     * @return
      */
     const string &getSps() const {
         return _sps;
@@ -200,7 +159,6 @@ public:
 
     /**
      * 返回不带0x00 00 00 01头的pps
-     * @return
      */
     const string &getPps() const {
         return _pps;
@@ -212,7 +170,6 @@ public:
 
     /**
      * 返回视频高度
-     * @return
      */
     int getVideoHeight() const override{
         return _height ;
@@ -220,7 +177,6 @@ public:
 
     /**
      * 返回视频宽度
-     * @return
      */
     int getVideoWidth() const override{
         return _width;
@@ -228,7 +184,6 @@ public:
 
     /**
      * 返回视频fps
-     * @return
      */
     float getVideoFps() const override{
         return _fps;
@@ -238,11 +193,10 @@ public:
         return !_vps.empty() && !_sps.empty() && !_pps.empty();
     }
 
-
     /**
-    * 输入数据帧,并获取sps pps
-    * @param frame 数据帧
-    */
+     * 输入数据帧,并获取sps pps
+     * @param frame 数据帧
+     */
     void inputFrame(const Frame::Ptr &frame) override{
         int type = H265_TYPE(*((uint8_t *)frame->data() + frame->prefixSize()));
         if(frame->configFrame()){
@@ -352,15 +306,13 @@ private:
     bool _last_frame_is_idr = false;
 };
 
-
 /**
 * h265类型sdp
 */
 class H265Sdp : public Sdp {
 public:
-
     /**
-     *
+     * 构造函数
      * @param sps 265 sps,不带0x00000001头
      * @param pps 265 pps,不带0x00000001头
      * @param playload_type  rtp playload type 默认96
@@ -382,17 +334,13 @@ public:
         _printer << encodeBase64(strSPS) << "; ";
         _printer << "sprop-pps=";
         _printer << encodeBase64(strPPS) << "\r\n";
-        _printer << "a=control:trackID=" << getTrackType() << "\r\n";
+        _printer << "a=control:trackID=" << (int)TrackVideo << "\r\n";
     }
 
     string getSdp() const override {
         return _printer;
     }
 
-    TrackType getTrackType() const override {
-        return TrackVideo;
-    }
-
     CodecId getCodecId() const override {
         return CodecH265;
     }
@@ -400,9 +348,5 @@ private:
     _StrPrinter _printer;
 };
 
-
-    
 }//namespace mediakit
-
-
-#endif //ZLMEDIAKIT_H265_H
+#endif //ZLMEDIAKIT_H265_H