ver 2.01

use Python 3.6 now.

Author: cainmagi

MpegCoder/MpegBase.h

@@ -8,6 +8,8 @@
     #define MPEGCODER_API __declspec(dllimport)
 #endif
 
+#define FFMPG3_4
+
 extern "C"
 {
 #include "libavcodec/avcodec.h"

MpegCoder/MpegCoder.cpp

@@ -201,7 +201,9 @@ bool cmpc::CMpegDecoder::FFmpegSetup() { //打开指定路径的视频文件，
     int ret = 0;
 
     // Register all formats and codecs.
-    av_register_all();
+    #ifndef FFMPG3_4
+        av_register_all();
+    #endif
 
     /* register all formats and codecs */
     if (avformat_open_input(&PFormatCtx, videoPath.c_str(), nullptr, nullptr) < 0) {
@@ -1377,7 +1379,9 @@ bool cmpc::CMpegEncoder::FFmpegSetup() {
     int ret;
 
     /* Initialize libavcodec, and register all codecs and formats. */
-    av_register_all();
+    #ifndef FFMPG3_4
+        av_register_all();
+    #endif
 
     Ppacket = av_packet_alloc();
     if (!Ppacket)

MpegCoder/MpegCoder.vcxproj

@@ -77,8 +77,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>../include;D:\ProgramData\Anaconda3\envs\py35\include;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
-    <LibraryPath>../lib;D:\ProgramData\Anaconda3\envs\py35\libs;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>../include;D:\ProgramData\Anaconda3\include;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
+    <LibraryPath>../lib;D:\ProgramData\Anaconda3\libs;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
@@ -87,8 +87,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <IncludePath>../include;D:\ProgramData\Anaconda3\envs\py35\include;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
-    <LibraryPath>../lib;D:\ProgramData\Anaconda3\envs\py35\libs;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
+    <IncludePath>../include;D:\ProgramData\Anaconda3\include;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
+    <LibraryPath>../lib;D:\ProgramData\Anaconda3\libs;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -115,7 +115,7 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;python35.lib;python3.lib;npymath.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;python36.lib;python3.lib;npymath.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)mpegCoder.pyd</OutputFile>
     </Link>
   </ItemDefinitionGroup>
@@ -152,7 +152,7 @@
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;python35.lib;python3.lib;npymath.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>avcodec.lib;avdevice.lib;avfilter.lib;avformat.lib;avutil.lib;postproc.lib;swresample.lib;swscale.lib;python36.lib;python3.lib;npymath.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)mpegCoder.pyd</OutputFile>
     </Link>
   </ItemDefinitionGroup>

MpegCoder/MpegPyd.h

@@ -165,6 +165,9 @@ Yuchen's Mpeg Coder - Readme
         >>> d.clear() # Disconnect with the stream.
     For more instructions, you could tap help(mpegCoder). 
 ================================================================================
+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/MpegStreamer.cpp

@@ -192,7 +192,9 @@ bool cmpc::CMpegClient::FFmpegSetup() {
     PCodecCtx = nullptr;
 
     // Register everything
-    av_register_all();
+    #ifndef FFMPG3_4
+        av_register_all();
+    #endif
     avformat_network_init();
 
     /* open RTSP: register all formats and codecs */
@@ -764,10 +766,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;
     }

MpegCoder/stdafx.h

@@ -9,6 +9,7 @@
 
 #define WIN32_LEAN_AND_MEAN             // 从 Windows 头中排除极少使用的资料
 // Windows 头文件: 
+#define _CRT_SECURE_NO_WARNINGS
 #include <windows.h>
 
 

README.md

@@ -70,6 +70,12 @@ For more instructions, you could tap `help(mpegCoder)`.
 
 ## Update Report
 
+### V2.01 update report:
+
+1. Fix a bug that occurs when the first received frame may has a PTS larger than zero.
+
+2. Enable the project produce the newest ffmpeg 3.4.2 version and use Python 3.6.4, numpy 1.14. 
+
 ### 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.