update ffmpeg

zhangmeng

2019-10-21 c60d61c48c7a1e7b693d4c3f6427e3b616d1f471

 csrc/buz/recorder.hpp

@@ -13,21 +13,17 @@

#include "../common/callback.hpp"

#include "../common.hpp"

struct AVPacket;

namespace ffwrapper{
    class FormatIn;
    class FormatOut;

    class CodedData;
}

namespace cffmpeg_wrap{
    namespace buz{
        // 缓存的视频帧,等待fire触发开始录像
        typedef struct _cache_pkt{
            std::shared_ptr<ffwrapper::CodedData> data;
            int64_t id;
        }CPacket;


        class Recorder{
            public:
@@ -54,6 +50,15 @@
                void end_writer();

                void maybe_dump_gop();

                int init_write_h264(const bool audio);
                int write_h264(const CPacket &pkt);
                int end_write_h264();

                int init_write_hevc(const bool audio);
                int write_hevc(const CPacket &pkt);
                int end_write_hevc();
                int mux_hevc(FILE *fp, const char *outfile);
            private: 
                ffwrapper::FormatIn     *in_;
                ffwrapper::FormatOut    *out_;
@@ -62,6 +67,7 @@
                int     minduration;
                int     end_frame;
                int     cur_frame;
                int     cur_frame_a;

                std::list<CPacket>     list_pkt_;

@@ -82,6 +88,8 @@
                bool                    error_occured_;

                bool                    audio_;

                FILE                    *fp_;
        };
    }
}