Skip to content

Commit 650d3ad

Browse files
cainmagicainmagi
committed
ver 2.01
use Python 3.6 now.
1 parent 172c234 commit 650d3ad

File tree

7 files changed

+41
-13
lines changed

7 files changed

+41
-13
lines changed

Diff for: ‎MpegCoder/MpegBase.h

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#define MPEGCODER_API __declspec(dllimport)
99
#endif
1010

11+
#define FFMPG3_4
12+
1113
extern "C"
1214
{
1315
#include "libavcodec/avcodec.h"

Diff for: ‎MpegCoder/MpegCoder.cpp

+6-2
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,9 @@ bool cmpc::CMpegDecoder::FFmpegSetup() { //打开指定路径的视频文件，
201201
int ret = 0;
202202

203203
// Register all formats and codecs.
204-
av_register_all();
204+
#ifndef FFMPG3_4
205+
av_register_all();
206+
#endif
205207

206208
/* register all formats and codecs */
207209
if (avformat_open_input(&PFormatCtx, videoPath.c_str(), nullptr, nullptr) < 0) {
@@ -1377,7 +1379,9 @@ bool cmpc::CMpegEncoder::FFmpegSetup() {
13771379
int ret;
13781380

13791381
/* Initialize libavcodec, and register all codecs and formats. */
1380-
av_register_all();
1382+
#ifndef FFMPG3_4
1383+
av_register_all();
1384+
#endif
13811385

13821386
Ppacket = av_packet_alloc();
13831387
if (!Ppacket)

Diff for: ‎MpegCoder/MpegCoder.vcxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@
7777
</PropertyGroup>
7878
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7979
<LinkIncremental>true</LinkIncremental>
80-
<IncludePath>../include;D:\ProgramData\Anaconda3\envs\py35\include;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
81-
<LibraryPath>../lib;D:\ProgramData\Anaconda3\envs\py35\libs;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
80+
<IncludePath>../include;D:\ProgramData\Anaconda3\include;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
81+
<LibraryPath>../lib;D:\ProgramData\Anaconda3\libs;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8484
<LinkIncremental>false</LinkIncremental>
@@ -87,8 +87,8 @@
8787
</PropertyGroup>
8888
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8989
<LinkIncremental>false</LinkIncremental>
90-
<IncludePath>../include;D:\ProgramData\Anaconda3\envs\py35\include;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
91-
<LibraryPath>../lib;D:\ProgramData\Anaconda3\envs\py35\libs;D:\ProgramData\Anaconda3\envs\py35\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
90+
<IncludePath>../include;D:\ProgramData\Anaconda3\include;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\include;$(IncludePath)</IncludePath>
91+
<LibraryPath>../lib;D:\ProgramData\Anaconda3\libs;D:\ProgramData\Anaconda3\Lib\site-packages\numpy\core\lib;$(LibraryPath)</LibraryPath>
9292
</PropertyGroup>
9393
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9494
<ClCompile>
@@ -115,7 +115,7 @@
115115
<Link>
116116
<SubSystem>Windows</SubSystem>
117117
<GenerateDebugInformation>true</GenerateDebugInformation>
118-
<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>
118+
<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>
119119
<OutputFile>$(OutDir)mpegCoder.pyd</OutputFile>
120120
</Link>
121121
</ItemDefinitionGroup>
@@ -152,7 +152,7 @@
152152
<EnableCOMDATFolding>true</EnableCOMDATFolding>
153153
<OptimizeReferences>true</OptimizeReferences>
154154
<GenerateDebugInformation>true</GenerateDebugInformation>
155-
<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>
155+
<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>
156156
<OutputFile>$(OutDir)mpegCoder.pyd</OutputFile>
157157
</Link>
158158
</ItemDefinitionGroup>

Diff for: ‎MpegCoder/MpegPyd.h

+3
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,9 @@ Yuchen's Mpeg Coder - Readme
165165
>>> d.clear() # Disconnect with the stream.
166166
For more instructions, you could tap help(mpegCoder).
167167
================================================================================
168+
V2.01 update report:
169+
Fix a bug that occurs when the first received frame may has a PTS larger than
170+
zero.
168171
V2.0 update report:
169172
1. Revise the bug of the encoder which may cause the stream duration is shorter
170173
than the real duration of the video in some not advanced media players.

Diff for: ‎MpegCoder/MpegStreamer.cpp

+17-5
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,9 @@ bool cmpc::CMpegClient::FFmpegSetup() {
192192
PCodecCtx = nullptr;
193193

194194
// Register everything
195-
av_register_all();
195+
#ifndef FFMPG3_4
196+
av_register_all();
197+
#endif
196198
avformat_network_init();
197199

198200
/* open RTSP: register all formats and codecs */
@@ -764,10 +766,20 @@ void cmpc::Buffer_List::freezeWrite(int64_t read_size) {
764766
__Read_size = read_size;
765767
}
766768
bool cmpc::Buffer_List::write(SwsContext *PswsCtx, AVFrame *frame) {
767-
if (frame->pts < next_pts)
768-
return false;
769-
else
770-
next_pts += interval_pts;
769+
if (frame->pts < next_pts) {
770+
if (frame->pts > (next_pts - 2 * interval_pts)) {
771+
return false;
772+
}
773+
else {
774+
next_pts = frame->pts + interval_pts;
775+
}
776+
}
777+
else {
778+
if (next_pts > 0)
779+
next_pts += interval_pts;
780+
else
781+
next_pts = frame->pts;
782+
}
771783
if (_Buffer_pos == _Buffer_rpos) {
772784
return false;
773785
}

Diff for: ‎MpegCoder/stdafx.h

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#define WIN32_LEAN_AND_MEAN // 从 Windows 头中排除极少使用的资料
1111
// Windows 头文件:
12+
#define _CRT_SECURE_NO_WARNINGS
1213
#include <windows.h>
1314

1415

Diff for: ‎README.md

+6
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,12 @@ For more instructions, you could tap `help(mpegCoder)`.
7070

7171
## Update Report
7272

73+
### V2.01 update report:
74+
75+
1. Fix a bug that occurs when the first received frame may has a PTS larger than zero.
76+
77+
2. Enable the project produce the newest ffmpeg 3.4.2 version and use Python 3.6.4, numpy 1.14.
78+
7379
### V2.0 update report:
7480

7581
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.

0 commit comments

Comments
 (0)