ver 2.05

1. fix a major bug causing memory leak.
2. update the ffmpeg to 4.0 version.

Author: cainmagi

MpegCoder/MpegBase.h

@@ -9,6 +9,7 @@
 #endif
 
 #define FFMPG3_4
+#define FFMPG4_0
 
 extern "C"
 {
@@ -26,7 +27,7 @@ extern "C"
 #include "libswresample/swresample.h"
 }
 
-#define MPEGCODER_CURRENT_VERSION "2.0"
+#define MPEGCODER_CURRENT_VERSION "2.05"
 
 #define STREAM_PIX_FMT    AV_PIX_FMT_YUV420P /* default pix_fmt */
 

MpegCoder/MpegCoder.cpp

@@ -495,6 +495,7 @@ PyObject *cmpc::CMpegDecoder::_SaveFrame_castToPyFrameArray(uint8_t *data[], int
     auto newdata = new uint8_t[fHeight*fWidth * 3];
     memcpy(newdata, data[0], fHeight*fWidth * 3);
     PyObject *PyFrame = PyArray_SimpleNewFromData(3, dims, NPY_UINT8, reinterpret_cast<void *>(newdata));
+    PyArray_ENABLEFLAGS((PyArrayObject*)PyFrame, NPY_ARRAY_OWNDATA);
     return PyFrame;
 }
 

MpegCoder/MpegPyd.h

@@ -165,6 +165,11 @@ Yuchen's Mpeg Coder - Readme
         >>> d.clear() # Disconnect with the stream.
     For more instructions, you could tap help(mpegCoder). 
 ================================================================================
+V2.05 update report:
+    1. Fix a severe bug that causes the memory leak when using MpegClient.
+    This bug also exists in MpegDecoder, but it seems that the bug would not cause
+    memory leak in that case. (Although we have also fixed it now.)
+    2. Upgrade to FFMpeg 4.0 Version.
 V2.01 update report:
     Fix a bug that occurs when the first received frame may has a PTS larger than 
     zero.

MpegCoder/MpegStreamer.cpp

@@ -195,8 +195,9 @@ bool cmpc::CMpegClient::FFmpegSetup() {
     #ifndef FFMPG3_4
         av_register_all();
     #endif
-    avformat_network_init();
-
+    #ifndef FFMPG4_0
+        avformat_network_init();
+    #endif
     /* open RTSP: register all formats and codecs */
     if (avformat_open_input(&PFormatCtx, videoPath.c_str(), nullptr, nullptr) < 0) {
         cerr << "Could not open source address " << videoPath << endl;
@@ -794,7 +795,7 @@ PyObject * cmpc::Buffer_List::read() {
     if (_Buffer_rpos < 0) {
         return nullptr;
     }
-    else if (PyArray_API == nullptr) {
+    else if (PyArray_API == NULL) {
         import_array();
     }
     auto _Buffer_rend = (_Buffer_rpos + __Read_size) % _Buffer_size;
@@ -803,10 +804,12 @@ PyObject * cmpc::Buffer_List::read() {
     auto p = newdata;
     for (auto i = _Buffer_rpos; i != _Buffer_rend; i = (i + 1) % _Buffer_size) {
         memcpy(p, _Buffer_List[i], _Buffer_capacity * sizeof(uint8_t));
-        p += _Buffer_capacity;
+        p += _Buffer_capacity; 
     }
     PyObject *PyFrame = PyArray_SimpleNewFromData(4, dims, NPY_UINT8, reinterpret_cast<void *>(newdata));
+    PyArray_ENABLEFLAGS((PyArrayObject*)PyFrame, NPY_ARRAY_OWNDATA);
     _Buffer_rpos = -1;
     __Read_size = 0;
-    return PyFrame;
+    return PyArray_Return((PyArrayObject*)PyFrame);
+    //Py_RETURN_NONE;
 }

MpegCoder/ReadMe.txt

@@ -200,9 +200,6 @@ bool cmpc::CMpegDecoder::FFmpegSetup() { //打开指定路径的视频文件，
     meta_protected_clear();
     int ret = 0;
 
-    // Register all formats and codecs.
-    av_register_all();
-
     /* register all formats and codecs */
     if (avformat_open_input(&PFormatCtx, videoPath.c_str(), nullptr, nullptr) < 0) {
         cerr << "Could not open source file " << videoPath << endl;
@@ -493,6 +490,7 @@ PyObject *cmpc::CMpegDecoder::_SaveFrame_castToPyFrameArray(uint8_t *data[], int
     auto newdata = new uint8_t[fHeight*fWidth * 3];
     memcpy(newdata, data[0], fHeight*fWidth * 3);
     PyObject *PyFrame = PyArray_SimpleNewFromData(3, dims, NPY_UINT8, reinterpret_cast<void *>(newdata));
+    PyArray_ENABLEFLAGS((PyArrayObject*)PyFrame, NPY_ARRAY_OWNDATA);
     return PyFrame;
 }
 
@@ -1376,9 +1374,6 @@ bool cmpc::CMpegEncoder::FFmpegSetup() {
     AVCodec *video_codec = nullptr;
     int ret;
 
-    /* Initialize libavcodec, and register all codecs and formats. */
-    av_register_all();
-
     Ppacket = av_packet_alloc();
     if (!Ppacket)
         return false;

MpegCoder_LinuxVer/MpegCoder/MpegCoder.cpp

@@ -164,6 +164,14 @@ Yuchen's Mpeg Coder - Readme
         >>> d.clear() # Disconnect with the stream.
     For more instructions, you could tap help(mpegCoder). 
 ================================================================================
+V2.05 update report:
+    1. Fix a severe bug that causes the memory leak when using MpegClient.
+    This bug also exists in MpegDecoder, but it seems that the bug would not cause
+    memory leak in that case. (Although we have also fixed it now.)
+    2. Upgrade to FFMpeg 4.0 Version.
+V2.01 update report:
+    Fix a bug that occurs when the first received frame may has a PTS larger than 
+    zero.
 V2.0 update report:
     1. Revise the bug of the encoder which may cause the stream duration is shorter
        than the real duration of the video in some not advanced media players.

MpegCoder_LinuxVer/MpegCoder/MpegPyd.h

@@ -191,10 +191,6 @@ bool cmpc::CMpegClient::FFmpegSetup() {
     PFormatCtx = avformat_alloc_context();
     PCodecCtx = nullptr;
 
-    // Register everything
-    av_register_all();
-    avformat_network_init();
-
     /* open RTSP: register all formats and codecs */
     if (avformat_open_input(&PFormatCtx, videoPath.c_str(), nullptr, nullptr) < 0) {
         cerr << "Could not open source address " << videoPath << endl;
@@ -764,10 +760,20 @@ void cmpc::Buffer_List::freezeWrite(int64_t read_size) {
     __Read_size = read_size;
 }
 bool cmpc::Buffer_List::write(SwsContext *PswsCtx, AVFrame *frame) {
-    if (frame->pts < next_pts)
-        return false;
-    else
-        next_pts += interval_pts;
+    if (frame->pts < next_pts) {
+        if (frame->pts > (next_pts - 2 * interval_pts)) {
+            return false;
+        }
+        else {
+            next_pts = frame->pts + interval_pts;
+        }
+    }
+    else {
+        if (next_pts > 0)
+            next_pts += interval_pts;
+        else
+            next_pts = frame->pts;
+    }
     if (_Buffer_pos == _Buffer_rpos) {
         return false;
     }
@@ -782,7 +788,7 @@ PyObject * cmpc::Buffer_List::read() {
     if (_Buffer_rpos < 0) {
         return nullptr;
     }
-    else if (PyArray_API == nullptr) {
+    else if (PyArray_API == NULL) {
         import_array();
     }
     auto _Buffer_rend = (_Buffer_rpos + __Read_size) % _Buffer_size;
@@ -791,10 +797,12 @@ PyObject * cmpc::Buffer_List::read() {
     auto p = newdata;
     for (auto i = _Buffer_rpos; i != _Buffer_rend; i = (i + 1) % _Buffer_size) {
         memcpy(p, _Buffer_List[i], _Buffer_capacity * sizeof(uint8_t));
-        p += _Buffer_capacity;
+        p += _Buffer_capacity; 
     }
     PyObject *PyFrame = PyArray_SimpleNewFromData(4, dims, NPY_UINT8, reinterpret_cast<void *>(newdata));
+    PyArray_ENABLEFLAGS((PyArrayObject*)PyFrame, NPY_ARRAY_OWNDATA);
     _Buffer_rpos = -1;
     __Read_size = 0;
-    return PyFrame;
+    return PyArray_Return((PyArrayObject*)PyFrame);
+    //Py_RETURN_NONE;
 }

MpegCoder_LinuxVer/MpegCoder/MpegStreamer.cpp

@@ -6,10 +6,12 @@
 *****************************************************************************/
 PyMODINIT_FUNC           // == __decslpec(dllexport) PyObject*, 定义导出函数.
 PyInit_mpegCoder(void) {       //模块外部名称为--CppClass
-    PyObject* pReturn = 0;
+    PyObject* pReturn = nullptr;
+    cout << "create begin" << endl;
     C_MPDC_ClassInfo.tp_new = PyType_GenericNew; //此类的new内置函数—建立对象.
     C_MPEC_ClassInfo.tp_new = PyType_GenericNew;
     C_MPCT_ClassInfo.tp_new = PyType_GenericNew;
+    cout << "create classinfo" << endl;
 
                                                   /// 完成对象类型的初始化—包括添加其继承特性等等。
                                                   /// 如果成功，则返回0，否则返回-1并抛出异常.
@@ -19,15 +21,20 @@ PyInit_mpegCoder(void) {       //模块外部名称为--CppClass
         return nullptr;
     if (PyType_Ready(&C_MPCT_ClassInfo) < 0)
         return nullptr;
+    
+    cout << "check ready" << endl;
 
     pReturn = PyModule_Create(&ModuleInfo); //根据模块信息创建模块，注意该步骤没有注册模块到计数器，所以需要调用Py_INCREF
     if (pReturn == 0)
         return nullptr;
+    
+    cout << "create module" << endl;
 
     Py_INCREF(&ModuleInfo);
     PyModule_AddFunctions(pReturn, C_MPC_MethodMembers); //将这个函数加入到模块的Dictionary中.
     PyModule_AddObject(pReturn, "MpegDecoder", (PyObject*)&C_MPDC_ClassInfo); //将这个类加入到模块的Dictionary中.
     PyModule_AddObject(pReturn, "MpegEncoder", (PyObject*)&C_MPEC_ClassInfo);
     PyModule_AddObject(pReturn, "MpegClient", (PyObject*)&C_MPCT_ClassInfo);
+    cout << "add objects" << endl;
     return pReturn;
 }

MpegCoder_LinuxVer/MpegCoder/dllmain.cpp

@@ -14,8 +14,8 @@
                                      ('MINOR_VERSION', '0')],
                     extra_compile_args = ['-std=c++11','-pthread'],
                     include_dirs = [PYTHON_INC_DIR, np.get_include(), '{0}/include'.format(FFMPEG_DIR), BASE_SRC_DIR],
-                    #libraries = ['python3.5', 'avcodec', 'avdevice', 'avfilter', 'avformat', 'avutil', 'postproc', 'swresample', 'swscale', 'npymath'],
-                    libraries = ['python3.5', 'avcodec', 'avformat', 'avutil', 'swscale', 'npymath'],
+                    libraries = ['python3.5', 'avcodec', 'avdevice', 'avfilter', 'avformat', 'avutil', 'postproc', 'swresample', 'swscale', 'npymath'],
+                    #libraries = ['python3.5', 'avcodec', 'avformat', 'avutil', 'swscale', 'npymath'],
                     library_dirs = [PYTHON_LIB_DIR, '{0}/lib'.format(NUMPY_DIR), '{0}/lib'.format(FFMPEG_DIR)],
                     sources = ['{0}/MpegCoder.cpp'.format(BASE_SRC_DIR), '{0}/dllmain.cpp'.format(BASE_SRC_DIR)])
 

MpegCoder_LinuxVer/setup.py

@@ -70,6 +70,12 @@ For more instructions, you could tap `help(mpegCoder)`.
 
 ## Update Report
 
+### V2.05 update report:
+
+1. Fix a severe bug that causes the memory leak when using MpegClient.This bug also exists in MpegDecoder, but it seems that the bug would not cause memory leak in that case. (Although we have also fixed it now.)
+
+2. Upgrade to FFMpeg 4.0 Version.
+
 ### V2.01 update report:
 
 1. Fix a bug that occurs when the first received frame may has a PTS larger than zero.
@@ -156,11 +162,11 @@ If you want, you could install `ffmpeg` on Linux: Here are some instructions
 1. Provide the decoder which could decode videos in arbitrary formats and arbitrary coding.
 
 ## Version of currently used FFmpeg library
-* libavcodec.so.58.6.103
-* libavformat.so.58.3.100
-* libavutil.so.56.5.100
-* libswresample.so.3.0.101
-* libswscale.so.5.0.101
+* libavcodec.so.58.19.100
+* libavformat.so.58.13.100
+* libavutil.so.56.18.100
+* libswresample.so.3.2.100
+* libswscale.so.5.2.100
 
 [exp1]:https://github.com/cainmagi/FFmpeg-Encoder-Decoder-for-Python/tree/example-client-check "check the client"
 [exp2]:https://github.com/cainmagi/FFmpeg-Encoder-Decoder-for-Python/tree/example-client-player "client with player"

README.md

@@ -21,6 +21,8 @@ Getting your versions here! You could also visit the [release page](https://gith
 
 | Version  | Platform | Python Ver. | Numpy Ver. | FFmpeg Ver. |
 | ---------- | ----------- | ----------- | ----------- | ----------- |
+| [2.05][down201w] | Windows   | 3.6   | 1.14   | 4.0  |
+| [2.05][down201w35] | Windows   | 3.5   | 1.13   | 4.0  |
 | [2.01][down201w] | Windows   | 3.6   | 1.14   | 3.4.2  |
 | [2.0][down20l]   | Linux   | 3.5   | 1.13   | 3.3   |
 | [2.0][down20w]   | Windows   | 3.5   | 1.13   | 3.3   |
@@ -90,6 +92,12 @@ For more instructions, you could tap `help(mpegCoder)`.
 
 ## Update Report
 
+### V2.05 update report:
+
+1. Fix a severe bug that causes the memory leak when using MpegClient.This bug also exists in MpegDecoder, but it seems that the bug would not cause memory leak in that case. (Although we have also fixed it now.)
+
+2. Upgrade to FFMpeg 4.0 Version.
+
 ### V2.01 update report:
 
 1. Fix a bug that occurs when the first received frame may has a PTS larger than zero.