优化编解码相关代码

9736badc · ziyue · 0739b1dd · 9736badc · 9736badc · 9736badc
Commit 9736badc authored May 25, 2022 by ziyue
--- a/player/test_player.cpp
+++ b/player/test_player.cpp
@@ -84,7 +84,7 @@ int main(int argc, char *argv[]) {
                });
            });
            auto delegate = std::make_shared<FrameWriterInterfaceHelper>([decoder](const Frame::Ptr &frame) {
-                return decoder->inputFrame(frame, false);
+                return decoder->inputFrame(frame, false, true);
            });
            videoTrack->addDelegate(delegate);
        }
@@ -106,7 +106,7 @@ int main(int argc, char *argv[]) {
                audio_player->playPCM((const char *) (pcm->get()->data[0]), MIN(len, frame->get()->linesize[0]));
            });
            auto audio_delegate = std::make_shared<FrameWriterInterfaceHelper>( [decoder](const Frame::Ptr &frame) {
-                return decoder->inputFrame(frame, false);
+                return decoder->inputFrame(frame, false, true);
            });
            audioTrack->addDelegate(audio_delegate);
        }

--- a/src/Codec/H264Encoder.cpp
+++ b/src/Codec/H264Encoder.cpp
@@ -9,17 +9,14 @@
 */
 #ifdef ENABLE_X264
-#include "H264Encoder.h"
+#include "H264Encoder.h"
 #include "Util/TimeTicker.h"
 using namespace toolkit;
 namespace mediakit {
-H264Encoder::H264Encoder() {
+H264Encoder::H264Encoder() {}
-}
 H264Encoder::~H264Encoder() {
    //* 清除图像区域
@@ -39,7 +36,6 @@ H264Encoder::~H264Encoder() {
    }
 }
 /*typedef struct x264_param_t
 {
   CPU 标志位
@@ -212,7 +208,7 @@ Value的值就是fps。
  void (*param_free)( void* );
 } x264_param_t;*/
-bool H264Encoder::init(int iWidth, int iHeight, int iFps) {
+bool H264Encoder::init(int iWidth, int iHeight, int iFps, int iBitRate) {
    if (_pX264Handle) {
        return true;
    }
@@ -222,7 +218,7 @@ bool H264Encoder::init(int iWidth, int iHeight, int iFps) {
    x264_param_default_preset(pX264Param, "ultrafast", "zerolatency");
    //* cpuFlags
-    pX264Param->i_threads = X264_SYNC_LOOKAHEAD_AUTO;		//* 取空缓冲区继续使用不死锁的保证.
+    pX264Param->i_threads = X264_SYNC_LOOKAHEAD_AUTO;        //* 取空缓冲区继续使用不死锁的保证.
    //* video Properties
    pX264Param->i_width = iWidth; //* 宽度.
    pX264Param->i_height = iHeight; //* 高度
@@ -230,21 +226,21 @@ bool H264Encoder::init(int iWidth, int iHeight, int iFps) {
    pX264Param->i_keyint_max = iFps * 3; //ffmpeg:gop_size 关键帧最大间隔
    pX264Param->i_keyint_min = iFps * 1; //ffmpeg:keyint_min 关键帧最小间隔
    //* Rate control Parameters
-    pX264Param->rc.i_bitrate = 5000;		//* 码率(比特率,单位Kbps)
+    pX264Param->rc.i_bitrate = iBitRate / 1000;        //* 码率(比特率,单位Kbps)
-    pX264Param->rc.i_qp_step = 1;	//最大的在帧与帧之间进行切变的量化因子的变化量。ffmpeg:max_qdiff
+    pX264Param->rc.i_qp_step = 1;    //最大的在帧与帧之间进行切变的量化因子的变化量。ffmpeg:max_qdiff
-    pX264Param->rc.i_qp_min = 10;	//ffmpeg:qmin;最小的量化因子。取值范围1-51。建议在10-30之间。
+    pX264Param->rc.i_qp_min = 10;    //ffmpeg:qmin;最小的量化因子。取值范围1-51。建议在10-30之间。
-    pX264Param->rc.i_qp_max = 41;	//ffmpeg:qmax;最大的量化因子。取值范围1-51。建议在10-30之间。
+    pX264Param->rc.i_qp_max = 41;    //ffmpeg:qmax;最大的量化因子。取值范围1-51。建议在10-30之间。
    pX264Param->rc.f_qcompress = 0.6;//ffmpeg:qcompress 量化器压缩比率0-1.越小则比特率越区域固定，但是越高越使量化器参数越固定
-    pX264Param->analyse.i_me_range = 16;		//ffmpeg:me_range 运动侦测的半径
+    pX264Param->analyse.i_me_range = 16;        //ffmpeg:me_range 运动侦测的半径
-    pX264Param->i_frame_reference = 3;		//ffmpeg:refsB和P帧向前预测参考的帧数。取值范围1-16。
+    pX264Param->i_frame_reference = 3;        //ffmpeg:refsB和P帧向前预测参考的帧数。取值范围1-16。
-                                            //该值不影响解码的速度，但是越大解码
+    //该值不影响解码的速度，但是越大解码
-                                            //所需的内存越大。这个值在一般情况下
+    //所需的内存越大。这个值在一般情况下
-                                            //越大效果越好，但是超过6以后效果就
+    //越大效果越好，但是超过6以后效果就
-                                            //不明显了。
+    //不明显了。
-    pX264Param->analyse.i_trellis = 1;							//ffmpeg:trellis
+    pX264Param->analyse.i_trellis = 1;                            //ffmpeg:trellis
    //pX264Param->analyse.i_me_method=X264_ME_DIA;//ffmpeg:me_method ME_ZERO 运动侦测的方式
-    pX264Param->rc.f_qblur = 0.5;		//ffmpeg:qblur
+    pX264Param->rc.f_qblur = 0.5;        //ffmpeg:qblur
    //* bitstream parameters
    /*open-GOP
@@ -268,7 +264,7 @@ bool H264Encoder::init(int iWidth, int iHeight, int iFps) {
     由于B帧压缩性能好于P帧，因此open-GOP在编码性能上稍微优于close-GOP，
     但为了兼容性和少一些麻烦，还是把opne-GOP关闭的好。*/
    pX264Param->b_open_gop = 0;
-    pX264Param->i_bframe = 0;		//最大B帧数.
+    pX264Param->i_bframe = 0;        //最大B帧数.
    pX264Param->i_bframe_pyramid = 0;
    pX264Param->i_bframe_adaptive = X264_B_ADAPT_TRELLIS;
    //* Log
@@ -304,20 +300,19 @@ bool H264Encoder::init(int iWidth, int iHeight, int iFps) {
    return true;
 }
-int H264Encoder::inputData(char* apcYuv[3], int aiYuvLen[3], int64_t i64Pts, H264Frame** ppFrame) {
+int H264Encoder::inputData(char *yuv[3], int linesize[3], int64_t cts, H264Frame **out_frame) {
    //TimeTicker1(5);
-    _pPicIn->img.i_stride[0] = aiYuvLen[0];
+    _pPicIn->img.i_stride[0] = linesize[0];
-    _pPicIn->img.i_stride[1] = aiYuvLen[1];
+    _pPicIn->img.i_stride[1] = linesize[1];
-    _pPicIn->img.i_stride[2] = aiYuvLen[2];
+    _pPicIn->img.i_stride[2] = linesize[2];
-    _pPicIn->img.plane[0] = (uint8_t *) apcYuv[0];
+    _pPicIn->img.plane[0] = (uint8_t *) yuv[0];
-    _pPicIn->img.plane[1] = (uint8_t *) apcYuv[1];
+    _pPicIn->img.plane[1] = (uint8_t *) yuv[1];
-    _pPicIn->img.plane[2] = (uint8_t *) apcYuv[2];
+    _pPicIn->img.plane[2] = (uint8_t *) yuv[2];
-    _pPicIn->i_pts = i64Pts;
+    _pPicIn->i_pts = cts;
    int iNal;
-    x264_nal_t* pNals;
+    x264_nal_t *pNals;
-    int iResult = x264_encoder_encode(_pX264Handle, &pNals, &iNal, _pPicIn,
+    int iResult = x264_encoder_encode(_pX264Handle, &pNals, &iNal, _pPicIn, _pPicOut);
-            _pPicOut);
    if (iResult <= 0) {
        return 0;
    }
@@ -327,7 +322,7 @@ int H264Encoder::inputData(char* apcYuv[3], int aiYuvLen[3], int64_t i64Pts, H26
        _aFrames[i].iLength = pNal.i_payload;
        _aFrames[i].pucData = pNal.p_payload;
    }
-    *ppFrame = _aFrames;
+    *out_frame = _aFrames;
    return iNal;
 }

--- a/src/Codec/H264Encoder.h
+++ b/src/Codec/H264Encoder.h
@@ -7,13 +7,10 @@
 * LICENSE file in the root of the source tree. All contributing project authors
 * may be found in the AUTHORS file in the root of the source tree.
 */
 #ifndef CODEC_H264ENCODER_H_
 #define CODEC_H264ENCODER_H_
 #include <cstdint>
 #ifdef __cplusplus
 extern "C" {
 #endif //__cplusplus
@@ -32,14 +29,16 @@ public:
        uint8_t *pucData;
    } H264Frame;
-    H264Encoder(void);
+    H264Encoder();
-    virtual ~H264Encoder(void);
+    ~H264Encoder();
-    bool init(int iWidth, int iHeight, int iFps);
-    int inputData(char *apcYuv[3], int aiYuvLen[3], int64_t i64Pts, H264Frame **ppFrame);
+    bool init(int iWidth, int iHeight, int iFps, int iBitRate);
+    int inputData(char *yuv[3], int linesize[3], int64_t cts, H264Frame **out_frame);
 private:
-    x264_t* _pX264Handle = nullptr;
+    x264_t *_pX264Handle = nullptr;
-    x264_picture_t* _pPicIn = nullptr;
+    x264_picture_t *_pPicIn = nullptr;
-    x264_picture_t* _pPicOut = nullptr;
+    x264_picture_t *_pPicOut = nullptr;
    H264Frame _aFrames[10];
 };

--- a/src/Codec/Transcode.cpp
+++ b/src/Codec/Transcode.cpp
--- a/src/Codec/Transcode.h
+++ b/src/Codec/Transcode.h
@@ -8,23 +8,29 @@
 * may be found in the AUTHORS file in the root of the source tree.
 */
-#ifndef FFMpegDecoder_H_
+#ifndef ZLMEDIAKIT_TRANSCODE_H
-#define FFMpegDecoder_H_
+#define ZLMEDIAKIT_TRANSCODE_H
+#if defined(ENABLE_FFMPEG)
 #include "Util/TimeTicker.h"
 #include "Common/MediaSink.h"
-#if defined(ENABLE_FFMPEG)
 #ifdef __cplusplus
 extern "C" {
 #endif
+#include "libswscale/swscale.h"
+#include "libavutil/avutil.h"
+#include "libavutil/pixdesc.h"
 #include "libavcodec/avcodec.h"
 #include "libswresample/swresample.h"
+#include "libavutil/audio_fifo.h"
 #ifdef __cplusplus
 }
 #endif
+namespace mediakit {
 class FFmpegFrame {
 public:
    using Ptr = std::shared_ptr<FFmpegFrame>;
@@ -33,6 +39,7 @@ public:
    ~FFmpegFrame();
    AVFrame *get() const;
+    void fillPicture(AVPixelFormat target_format, int target_width, int target_height);
 private:
    char *_data = nullptr;
@@ -45,7 +52,6 @@ public:
    FFmpegSwr(AVSampleFormat output, int channel, int channel_layout, int samplerate);
    ~FFmpegSwr();
    FFmpegFrame::Ptr inputFrame(const FFmpegFrame::Ptr &frame);
 private:
@@ -59,19 +65,19 @@ private:
 class TaskManager {
 public:
    TaskManager() = default;
-    ~TaskManager();
+    virtual ~TaskManager();
+    void setMaxTaskSize(size_t size);
+    void stopThread(bool drop_task);
 protected:
    void startThread(const std::string &name);
-    void stopThread();
+    bool addEncodeTask(std::function<void()> task);
+    bool addDecodeTask(bool key_frame, std::function<void()> task);
-    void addEncodeTask(std::function<void()> task);
-    void addDecodeTask(bool key_frame, std::function<void()> task);
    bool isEnabled() const;
 private:
    void onThreadRun(const std::string &name);
-    void pushExit();
 private:
    class ThreadExitException : public std::runtime_error {
@@ -83,39 +89,55 @@ private:
 private:
    bool _decode_drop_start = false;
    bool _exit = false;
+    size_t _max_task = 30;
    std::mutex _task_mtx;
    toolkit::semaphore _sem;
    toolkit::List<std::function<void()> > _task;
    std::shared_ptr<std::thread> _thread;
 };
-class FFmpegDecoder : private TaskManager {
+class FFmpegDecoder : public TaskManager {
 public:
    using Ptr = std::shared_ptr<FFmpegDecoder>;
    using onDec = std::function<void(const FFmpegFrame::Ptr &)>;
-    FFmpegDecoder(const mediakit::Track::Ptr &track);
+    FFmpegDecoder(const Track::Ptr &track, int thread_num = 2);
-    ~FFmpegDecoder();
+    ~FFmpegDecoder() override;
-    bool inputFrame(const mediakit::Frame::Ptr &frame, bool may_async = true);
+    bool inputFrame(const Frame::Ptr &frame, bool live, bool async, bool enable_merge = true);
    void setOnDecode(onDec cb);
    void flush();
    const AVCodecContext *getContext() const;
 private:
    void onDecode(const FFmpegFrame::Ptr &frame);
-    bool inputFrame_l(const mediakit::Frame::Ptr &frame);
+    bool inputFrame_l(const Frame::Ptr &frame, bool live, bool enable_merge);
-    bool decodeFrame(const char *data, size_t size, uint32_t dts, uint32_t pts);
+    bool decodeFrame(const char *data, size_t size, uint32_t dts, uint32_t pts, bool live);
 private:
    bool _do_merger = false;
    toolkit::Ticker _ticker;
    onDec _cb;
    std::shared_ptr<AVCodecContext> _context;
-    mediakit::FrameMerger _merger { mediakit::FrameMerger::h264_prefix };
+    FrameMerger _merger{FrameMerger::h264_prefix};
 };
-#endif// ENABLE_FFMPEG
+class FFmpegSws {
-#endif /* FFMpegDecoder_H_ */
+public:
+    using Ptr = std::shared_ptr<FFmpegSws>;
+    FFmpegSws(AVPixelFormat output, int width, int height);
+    ~FFmpegSws();
+    FFmpegFrame::Ptr inputFrame(const FFmpegFrame::Ptr &frame);
+    int inputFrame(const FFmpegFrame::Ptr &frame, uint8_t *data);
+private:
+    int _target_width;
+    int _target_height;
+    SwsContext *_ctx = nullptr;
+    AVPixelFormat _target_format;
+};
+}//namespace mediakit
+#endif// ENABLE_FFMPEG
+#endif //ZLMEDIAKIT_TRANSCODE_H
--- a/src/Common/Device.cpp
+++ b/src/Common/Device.cpp
@@ -28,22 +28,22 @@ using namespace std;
 namespace mediakit {
-bool DevChannel::inputYUV(char* apcYuv[3], int aiYuvLen[3], uint32_t uiStamp) {
+bool DevChannel::inputYUV(char *yuv[3], int linesize[3], uint32_t cts) {
 #ifdef ENABLE_X264
    //TimeTicker1(50);
    if (!_pH264Enc) {
        _pH264Enc.reset(new H264Encoder());
-        if (!_pH264Enc->init(_video->iWidth, _video->iHeight, _video->iFrameRate)) {
+        if (!_pH264Enc->init(_video->iWidth, _video->iHeight, _video->iFrameRate, _video->iBitRate)) {
            _pH264Enc.reset();
            WarnL << "H264Encoder init failed!";
        }
    }
    if (_pH264Enc) {
-        H264Encoder::H264Frame *pOut;
+        H264Encoder::H264Frame *out_frames;
-        int iFrames = _pH264Enc->inputData(apcYuv, aiYuvLen, uiStamp, &pOut);
+        int frames = _pH264Enc->inputData(yuv, linesize, cts, &out_frames);
        bool ret = false;
-        for (int i = 0; i < iFrames; i++) {
+        for (int i = 0; i < frames; i++) {
-            ret = inputH264((char *) pOut[i].pucData, pOut[i].iLength, uiStamp) ? true : ret;
+            ret = inputH264((char *) out_frames[i].pucData, out_frames[i].iLength, cts) ? true : ret;
        }
        return ret;
    }

--- a/src/Common/Device.h
+++ b/src/Common/Device.h
@@ -29,6 +29,7 @@ public:
    int iWidth;
    int iHeight;
    float iFrameRate;
+    int iBitRate = 2 * 1024 * 1024;
 };
 class AudioInfo {
@@ -104,19 +105,19 @@ public:
    /**
     * 输入yuv420p视频帧，内部会完成编码并调用inputH264方法
-     * @param apcYuv
+     * @param yuv yuv420p数据指针
-     * @param aiYuvLen
+     * @param linesize yuv420p数据linesize
-     * @param uiStamp
+     * @param cts 采集时间戳，单位毫秒
     */
-    bool inputYUV(char *apcYuv[3], int aiYuvLen[3], uint32_t uiStamp);
+    bool inputYUV(char *yuv[3], int linesize[3], uint32_t cts);
    /**
     * 输入pcm数据，内部会完成编码并调用inputAAC方法
-     * @param pcData
+     * @param data pcm数据指针，int16整形
-     * @param iDataLen
+     * @param len pcm数据长度
-     * @param uiStamp
+     * @param cts 采集时间戳，单位毫秒
     */
-    bool inputPCM(char *pcData, int iDataLen, uint32_t uiStamp);
+    bool inputPCM(char *data, int len, uint32_t cts);
 private:
    MediaOriginType getOriginType(MediaSource &sender) const override;

--- a/src/Common/config.cpp
+++ b/src/Common/config.cpp
@@ -42,7 +42,7 @@ bool loadIniConfig(const char *ini_path){
 namespace Broadcast {
 const string kBroadcastMediaChanged = "kBroadcastMediaChanged";
 const string kBroadcastRecordMP4 = "kBroadcastRecordMP4";
-const string kBroadcastRecordTs = "kBroadcastRecoredTs";
+const string kBroadcastRecordTs = "kBroadcastRecordTs";
 const string kBroadcastHttpRequest = "kBroadcastHttpRequest";
 const string kBroadcastHttpAccess = "kBroadcastHttpAccess";
 const string kBroadcastOnGetRtspRealm = "kBroadcastOnGetRtspRealm";
@@ -77,6 +77,8 @@ const string kRtmpDemand = GENERAL_FIELD"rtmp_demand";
 const string kTSDemand = GENERAL_FIELD"ts_demand";
 const string kFMP4Demand = GENERAL_FIELD"fmp4_demand";
 const string kEnableAudio = GENERAL_FIELD"enable_audio";
+const string kCheckNvidiaDev = GENERAL_FIELD"check_nvidia_dev";
+const string kEnableFFmpegLog = GENERAL_FIELD"enable_ffmpeg_log";
 const string kWaitTrackReadyMS = GENERAL_FIELD"wait_track_ready_ms";
 const string kWaitAddTrackMS = GENERAL_FIELD"wait_add_track_ms";
 const string kUnreadyFrameCache = GENERAL_FIELD"unready_frame_cache";
@@ -100,6 +102,8 @@ static onceToken token([](){
    mINI::Instance()[kTSDemand] = 0;
    mINI::Instance()[kFMP4Demand] = 0;
    mINI::Instance()[kEnableAudio] = 1;
+    mINI::Instance()[kCheckNvidiaDev] = 1;
+    mINI::Instance()[kEnableFFmpegLog] = 0;
    mINI::Instance()[kWaitTrackReadyMS] = 10000;
    mINI::Instance()[kWaitAddTrackMS] = 3000;
    mINI::Instance()[kUnreadyFrameCache] = 100;

--- a/src/Common/config.h
+++ b/src/Common/config.h
@@ -183,6 +183,10 @@ extern const std::string kTSDemand;
 extern const std::string kFMP4Demand;
 //转协议是否全局开启或忽略音频
 extern const std::string kEnableAudio;
+//在docker环境下，不能通过英伟达驱动是否存在来判断是否支持硬件转码
+extern const std::string kCheckNvidiaDev;
+//是否开启ffmpeg日志
+extern const std::string kEnableFFmpegLog;
 //最多等待未初始化的Track 10秒，超时之后会忽略未初始化的Track
 extern const std::string kWaitTrackReadyMS;
 //如果直播流只有单Track，最多等待3秒，超时后未收到其他Track的数据，则认为是单Track