bug fix

zhangmeng

2019-09-25 1d2e7ce97e33c74a949d443a226df531fbf5c7dd

 csrc/buz/recorder.hpp

@@ -13,19 +13,17 @@

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

#include "../common.hpp"

struct AVPacket;

namespace ffwrapper{
    class FormatIn;
    class FormatOut;

    class CodedData;
}

namespace cffmpeg_wrap{
    namespace buz{
        struct avpacket{
            std::shared_ptr<ffwrapper::CodedData> data;
            int64_t id;
        };

        class Recorder{
            public:
@@ -33,19 +31,22 @@
                ~Recorder();

            public: 
                int Run(const char* output, const int mind, const int maxd);
                int CachePacket(const avpacket &pkt);
                int Run(const char* output, const int mind, const int maxd, const bool audio);
                int PushPacket(const CPacket &pkt);
                int PushPackets(std::list<CPacket> &lst);
                int FireRecorder(const int64_t &id);

                void SetCallback(FUNC_REC_INFO cb){
                    func_rec_info_ = cb;
                }

                const bool ErrorOcurred(){return error_occured_;}
                const std::string& RecID()const{return id_;}
            private:
                void run_thread();

                int init_writer();
                void start_writer();
                int write_correctly(const avpacket &pkt);
                int init_writer(const bool audio);
                int write_correctly(const CPacket &pkt);
                void end_writer();

                void maybe_dump_gop();
@@ -58,7 +59,7 @@
                int     end_frame;
                int     cur_frame;

                std::list<avpacket>     list_pkt_;
                std::list<CPacket>     list_pkt_;

                std::atomic_bool        stop_recorder_;
                std::mutex              mutex_pkt_;
@@ -70,9 +71,13 @@
                std::string             id_;

                int64_t                 id_frame_;
                int                     file_frame_index_;
                int                     id_frame_in_file_;
                std::string             file_path_;
                FUNC_REC_INFO           func_rec_info_;

                bool                    error_occured_;

                bool                    audio_;
        };
    }
}