Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 3f8e0f2

Browse files
committed
3.0.0
1. Fix a bug caused by using `MpegClient.terminate()` when a video is closed by the server. 2. Fix dependency issues and cpp standard issues. 3. Add a quick script for fetching the `FFMpeg` dependencies.
1 parent 21a2a66 commit 3f8e0f2

File tree

9 files changed

+396
-48
lines changed

9 files changed

+396
-48
lines changed

‎MpegCoder/MpegBase.h

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,31 +12,14 @@
1212
#define FFMPG4_0
1313
#define FFMPG4_4
1414

15-
namespace cmpc {
16-
extern "C"
17-
{
18-
#include "libavcodec/avcodec.h"
19-
#include "libavformat/avformat.h"
20-
#include "libswscale/swscale.h"
21-
#include "libavutil/imgutils.h"
22-
#include "libavutil/samplefmt.h"
23-
#include "libavutil/timestamp.h"
24-
#include "libavutil/opt.h"
25-
#include "libavutil/avassert.h"
26-
#include "libavutil/channel_layout.h"
27-
#include "libavutil/mathematics.h"
28-
#include "libavutil/time.h"
29-
#include "libswresample/swresample.h"
30-
}
31-
}
32-
3315
#define MPEGCODER_CURRENT_VERSION "3.0.0"
3416

3517
#define STREAM_PIX_FMT AVPixelFormat::AV_PIX_FMT_YUV420P /* default pix_fmt */
3618

3719
#define SCALE_FLAGS SWS_BICUBIC
3820
//SWS_BILINEAR
3921

22+
#include <cstdint>
4023
#include <iostream>
4124
//#include <memory>
4225
#include <string>
@@ -53,6 +36,24 @@ using std::cout;
5336
using std::endl;
5437
using std::ostream;
5538

39+
namespace cmpc {
40+
extern "C"
41+
{
42+
#include "libavcodec/avcodec.h"
43+
#include "libavformat/avformat.h"
44+
#include "libswscale/swscale.h"
45+
#include "libavutil/imgutils.h"
46+
#include "libavutil/samplefmt.h"
47+
#include "libavutil/timestamp.h"
48+
#include "libavutil/opt.h"
49+
#include "libavutil/avassert.h"
50+
#include "libavutil/channel_layout.h"
51+
#include "libavutil/mathematics.h"
52+
#include "libavutil/time.h"
53+
#include "libswresample/swresample.h"
54+
}
55+
}
56+
5657
#ifdef __cplusplus
5758
namespace cmpc {
5859
static const string av_make_error_string2(int errnum) {

‎MpegCoder/MpegCoder.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,5 +126,8 @@ namespace cmpc {
126126
int __avcodec_encode_video2_flush(AVCodecContext *enc_ctx, AVPacket *pkt);
127127
void __copyMetaData(const CMpegEncoder &ref);
128128
};
129+
130+
ostream& operator<<(ostream& out, CMpegDecoder& self_class);
131+
ostream& operator<<(ostream& out, CMpegEncoder& self_class);
129132
}
130133
#endif

‎MpegCoder/MpegCoder.vcxproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@
181181
</ClCompile>
182182
</ItemGroup>
183183
<ItemGroup>
184+
<None Include="..\.gitattributes" />
185+
<None Include="..\.gitignore" />
184186
<None Include="..\LICENSE" />
185187
<None Include="..\README.md" />
186188
</ItemGroup>

‎MpegCoder/MpegCoder.vcxproj.filters

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,7 @@
5454
<ItemGroup>
5555
<None Include="..\README.md" />
5656
<None Include="..\LICENSE" />
57+
<None Include="..\.gitignore" />
58+
<None Include="..\.gitattributes" />
5759
</ItemGroup>
5860
</Project>

‎MpegCoder/MpegPyd.h

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#define PY_ARRAY_UNIQUE_SYMBOL MPEGARRAY_API
55

6+
#include <cstdint>
67
#include <iostream>
78
#include <Python.h>
89
#include <numpy/arrayobject.h>
@@ -176,13 +177,17 @@ Yuchen's Mpeg Coder - Readme
176177
================================================================================
177178
V3.0.0 update report:
178179
1. Fix a severe memory leaking bugs when using AVPacket.
179-
2. Support the MpegServer. This class is used for serving the online video
180+
2. Fix a bug caused by using `MpegClient.terminate()` when a video is closed
181+
by the server.
182+
3. Support the MpegServer. This class is used for serving the online video
180183
streams.
181-
3. Refactor the implementation of the loggings.
182-
4. Add getParameter() and setParameter(configDict) APIs to MpegEncoder and
184+
4. Refactor the implementation of the loggings.
185+
5. Add getParameter() and setParameter(configDict) APIs to MpegEncoder and
183186
MpegServer.
184-
5. Move FFMpeg depedencies and the OutputStream class to the cmpc space.
185-
6. Upgrade to FFMpeg 4.4 Version.
187+
6. Move FFMpeg depedencies and the OutputStream class to the cmpc space.
188+
7. Fix dependency issues and cpp standard issues.
189+
8. Upgrade to `FFMpeg 4.4` Version.
190+
9. Add a quick script for fetching the `FFMpeg` dependencies.
186191
V2.05 update report:
187192
1. Fix a severe bug that causes the memory leak when using MpegClient.
188193
This bug also exists in MpegDecoder, but it seems that the bug would not cause
@@ -1306,7 +1311,7 @@ static PyMethodDef C_MPEC_MethodMembers[] = // Register the member methods
13061311
{ nullptr, nullptr, 0, nullptr }
13071312
};
13081313

1309-
static PyMethodDef C_MPCT_MethodMembers[] = //注册类的所有成员函数结构列表.
1314+
static PyMethodDef C_MPCT_MethodMembers[] = // Register the member methods of Encoder.
13101315
{ // This step add the methods to the C-API of the class.
13111316
{ "FFmpegSetup", (PyCFunction)C_MPCT_Setup, METH_VARARGS | METH_KEYWORDS, \
13121317
"Reset the decoder and the video format.\n - videoAddress: [bytes] the path of decoded video file." },

‎MpegCoder/MpegStreamer.cpp

Lines changed: 33 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,9 @@ void cmpc::CMpegClient::clear(void) {
8585
//std::terminate();
8686
read_handle = std::move(std::thread());
8787
}
88+
else {
89+
read_handle = std::move(std::thread());
90+
}
8891
width = height = 0;
8992
widthDst = heightDst = 0;
9093
PPixelFormat = AVPixelFormat::AV_PIX_FMT_NONE;
@@ -259,7 +262,9 @@ bool cmpc::CMpegClient::FFmpegSetup() {
259262
return false;
260263
}
261264

265+
read_check.lock();
262266
reading = true;
267+
read_check.unlock();
263268
return true;
264269
}
265270

@@ -339,18 +344,19 @@ int cmpc::CMpegClient::__save_frame(AVFrame *&frame, AVPacket *&pkt, bool &got_f
339344
return decoded;
340345
}
341346

342-
bool cmpc::CMpegClient::__client_holder() {
347+
void cmpc::CMpegClient::__client_holder() {
343348
int ret;
344349
bool got_frame;
345350
if (frame) {
346351
cerr << "Current frame is occupied, could not start a new client." << endl;
352+
return;
347353
}
348354
frame = av_frame_alloc();
349355
auto pkt = av_packet_alloc();
350356
if (!frame) {
351357
cerr << "Could not allocate frame" << endl;
352358
ret = AVERROR(ENOMEM);
353-
returnfalse;
359+
return;
354360
}
355361
/* initialize packet, set data to NULL, let the demuxer fill it */
356362
if (PVideoStream && (__dumpControl > 0)) {
@@ -385,14 +391,13 @@ bool cmpc::CMpegClient::__client_holder() {
385391
/* flush cached frames */
386392
av_packet_unref(pkt);
387393
av_packet_unref(temp_pkt);
388-
if (read_check.try_lock()) {
389-
if (!reading) {
390-
read_check.unlock();
391-
break;
392-
}
393-
else {
394-
read_check.unlock();
395-
}
394+
read_check.lock();
395+
if (!reading) {
396+
read_check.unlock();
397+
break;
398+
}
399+
else {
400+
read_check.unlock();
396401
}
397402
}
398403
av_packet_free(&temp_pkt);
@@ -417,7 +422,10 @@ bool cmpc::CMpegClient::__client_holder() {
417422
if (pkt) {
418423
av_packet_free(&pkt);
419424
}
420-
return true;
425+
426+
read_check.lock();
427+
reading = false;
428+
read_check.unlock();
421429
}
422430

423431
int cmpc::CMpegClient::__avcodec_decode_video2(AVCodecContext *avctx, AVFrame *frame, bool &got_frame, AVPacket *pkt) {
@@ -520,6 +528,9 @@ PyObject * cmpc::CMpegClient::getParameter(string keyword) {
520528
return Py_BuildValue("L", _predictFrameNum);
521529
}
522530
else if (keyword.compare("srcFrameRate") == 0) {
531+
if (!PVideoStream) {
532+
return Py_BuildValue("d", 0.0);
533+
}
523534
auto frame_base = PVideoStream->avg_frame_rate;
524535
double srcFrameRate = static_cast<double>(frame_base.num) / static_cast<double>(frame_base.den);
525536
return Py_BuildValue("d", srcFrameRate);
@@ -587,14 +598,16 @@ PyObject* cmpc::CMpegClient::getParameter() {
587598
}
588599

589600
bool cmpc::CMpegClient::start() {
590-
if (reading || (frame!=nullptr)) {
601+
if (reading && (frame == nullptr)) {
591602
read_handle = std::move(std::thread(std::mem_fn(&CMpegClient::__client_holder), std::ref(*this)));
592603
return true;
593604
}
594605
return false;
595606
}
596607
void cmpc::CMpegClient::terminate() {
597-
auto protectReading = true;
608+
read_check.lock();
609+
auto protectReading = reading;
610+
read_check.unlock();
598611
if (read_handle.joinable()) {
599612
read_check.lock();
600613
reading = false;
@@ -603,11 +616,14 @@ void cmpc::CMpegClient::terminate() {
603616
//std::terminate();
604617
read_handle = std::move(std::thread());
605618
}
606-
read_check.lock();
607-
read_check.unlock();
619+
else {
620+
read_handle = std::move(std::thread());
621+
}
608622
info_lock.lock();
609623
info_lock.unlock();
624+
read_check.lock();
610625
reading = protectReading;
626+
read_check.unlock();
611627
if (frame) {
612628
av_frame_free(&frame);
613629
}
@@ -1426,9 +1442,9 @@ int cmpc::CMpegServer::__avcodec_encode_video2_flush(AVCodecContext* enc_ctx, AV
14261442

14271443
int cmpc::CMpegServer::ServeFrameBlock(PyArrayObject* PyFrame) {
14281444
if (__start_time > 0) {
1429-
auto cur_time = av_gettime() - __start_time;
1445+
auto cur_time = static_cast<int64_t>(av_gettime() - __start_time);
14301446
if (cur_time < __cur_time) {
1431-
av_usleep((__cur_time - cur_time) / 2);
1447+
av_usleep(static_cast<unsignedint>((__cur_time - cur_time) / 2));
14321448
}
14331449
ServeFrame(PyFrame);
14341450
}

‎MpegCoder/MpegStreamer.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ namespace cmpc {
104104
int refcount; // Reference count of the video frame.
105105
bool __setup_check() const;
106106
int _open_codec_context(int &stream_idx, AVCodecContext *&dec_ctx, AVFormatContext *PFormatCtx, enum AVMediaType type);
107-
bool __client_holder();
107+
void __client_holder();
108108
AVRational _setAVRational(int num, int den);
109109
int __save_frame(AVFrame *&frame, AVPacket *&pkt, bool &got_frame, int cached);
110110
int __avcodec_decode_video2(AVCodecContext *avctx, AVFrame *frame, bool &got_frame, AVPacket *pkt);
@@ -167,5 +167,8 @@ namespace cmpc {
167167
int __avcodec_encode_video2_flush(AVCodecContext* enc_ctx, AVPacket* pkt);
168168
void __copyMetaData(const CMpegServer& ref);
169169
};
170+
171+
ostream& operator<<(ostream& out, CMpegClient& self_class);
172+
ostream& operator<<(ostream& out, CMpegServer& self_class);
170173
}
171174
#endif

‎README.md

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,13 @@ The following instructions are used for building the project on Windows with Vis
2323
git clone --single-branch -b master https://github.com/cainmagi/FFmpeg-Encoder-Decoder-for-Python.git
2424
```
2525

26-
2. Download the FFMpeg dependencies, including `include` and `lib`.
26+
2. Download the FFMpeg dependencies, including `include` and `lib`. Users could download dependencies manually by checking [the release page :link:](https://github.com/cainmagi/FFmpeg-Encoder-Decoder-for-Python/releases/tag/deps-3.0.0). However, we recommend users to use the following script to get the dependencies quickly:
27+
28+
```bash
29+
python webtools.py
30+
```
31+
32+
This script requires users to install `urllib3`. The `tqdm` is also recommended to be installed.
2733

2834
3. The following configurations should be set for `All` (both debug and release) and `x64`. Open the project by `MpegCoder.sln`. Then configure the following paths of the include directories and the library directories. In both configurations, the first item is required to be modified according to your python path, the second item is required to be modified according to your numpy path.
2935
| Path | Screenshot |
@@ -51,15 +57,21 @@ The following instructions are used for building the project on Windows with Vis
5157

5258
1. Fix a severe memory leaking bugs when using `AVPacket`.
5359

54-
2. Support the `MpegServer`. This class is used for serving the online video streams.
60+
2. Fix a bug caused by using `MpegClient.terminate()` when a video is closed by the server.
61+
62+
3. Support the `MpegServer`. This class is used for serving the online video streams.
63+
64+
4. Refactor the implementation of the loggings.
65+
66+
5. Add `getParameter()` and `setParameter(configDict)` APIs to `MpegEncoder` and `MpegServer`.
5567
56-
3. Refactor the implementation of the loggings.
68+
6. Move `FFMpeg` depedencies and the `OutputStream` class to the `cmpc` space.
5769
58-
4. Add `getParameter()`and `setParameter(configDict)` APIs to `MpegEncoder` and `MpegServer`.
70+
7. Fix dependency issues and cpp standard issues.
5971
60-
5. Move `FFMpeg` depedencies and the `OutputStream` class to the `cmpc` space.
72+
8. Upgrade to `FFMpeg 4.4` Version.
6173
62-
6. Upgrade to `FFMpeg 4.4` Version.
74+
9. Add a quick script for fetching the `FFMpeg` dependencies.
6375
6476
### V2.05 update report:
6577

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /