Skip to content

Commit db31157

Browse files
cainmagicainmagi
committed
3.1.0
Clean up all `gcc` warnings of the source codes.
1 parent 9e01f28 commit db31157

12 files changed

+495
-262
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Others
22
include/*
33
lib/*
4+
/dependencies/*
45
.vs/*
56
.vscode/*
67
*.pdb

‎CHANGELOG.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
4. Fix a bug caused by the constructor `MpegServer()`.
1414

15-
5. Fix typos in docstrings.
15+
5. Clean up all `gcc` warnings of the source codes.
16+
17+
6. Fix typos in docstrings.
1618

1719
### V3.0.0 update report:
1820

‎MpegCoder/MpegBase.cpp

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
#include "MpegBase.h"
2+
3+
// Global functions.
4+
const string cmpc::av_make_error_string2_cpp(int errnum) {
5+
char errbuf[AV_ERROR_MAX_STRING_SIZE];
6+
av_strerror(errnum, errbuf, AV_ERROR_MAX_STRING_SIZE);
7+
string strerrbuf = errbuf;
8+
return strerrbuf;
9+
}
10+
11+
const string cmpc::av_ts_make_string_cpp(int64_t ts) {
12+
char tsstrbuf[AV_TS_MAX_STRING_SIZE];
13+
av_ts_make_string(tsstrbuf, ts);
14+
string strtsstrbuf = tsstrbuf;
15+
return strtsstrbuf;
16+
}
17+
18+
const string cmpc::av_ts_make_time_string_cpp(int64_t ts, AVRational* tb) {
19+
char tsstrbuf[AV_TS_MAX_STRING_SIZE];
20+
av_ts_make_time_string(tsstrbuf, ts, tb);
21+
string strtsstrbuf = tsstrbuf;
22+
return strtsstrbuf;
23+
}
24+
25+
// CharList implementation.
26+
cmpc::CharList::CharList(void) : data() {
27+
}
28+
29+
cmpc::CharList::CharList(const std::vector<string>& args) : data() {
30+
set(args);
31+
}
32+
33+
cmpc::CharList::CharList(const std::vector<string>&& args) noexcept :
34+
data(args) {
35+
}
36+
37+
cmpc::CharList::~CharList(void) {
38+
clear();
39+
}
40+
41+
cmpc::CharList::CharList(const CharList& ref) : data() {
42+
set(ref.data);
43+
}
44+
45+
cmpc::CharList& cmpc::CharList::operator=(const CharList& ref) {
46+
if (this != &ref) {
47+
set(ref.data);
48+
}
49+
return *this;
50+
}
51+
52+
cmpc::CharList::CharList(CharList&& ref) noexcept :
53+
data(std::move(ref.data)) {
54+
}
55+
56+
cmpc::CharList& cmpc::CharList::operator=(CharList&& ref) noexcept {
57+
if (this != &ref) {
58+
set(std::move(ref.data));
59+
}
60+
return *this;
61+
}
62+
63+
cmpc::CharList& cmpc::CharList::operator=(const std::vector<string>& args) {
64+
set(args);
65+
return *this;
66+
}
67+
68+
cmpc::CharList& cmpc::CharList::operator=(std::vector<string>&& args) noexcept {
69+
set(args);
70+
return *this;
71+
}
72+
73+
void cmpc::CharList::set(const std::vector<string>& args) {
74+
data.clear();
75+
for (auto it = args.begin(); it != args.end(); ++it) {
76+
string new_str(*it);
77+
data.push_back(new_str);
78+
}
79+
}
80+
81+
void cmpc::CharList::set(std::vector<string>&& args) noexcept {
82+
data = args;
83+
}
84+
85+
void cmpc::CharList::clear() {
86+
data.clear();
87+
}
88+
89+
std::shared_ptr<const char*> cmpc::CharList::c_str() {
90+
std::shared_ptr<const char*> pointer(new const char* [data.size() + 1], std::default_delete<const char* []>());
91+
auto p_cur = pointer.get();
92+
for (auto it = data.begin(); it != data.end(); ++it) {
93+
*p_cur = it->c_str();
94+
p_cur++;
95+
}
96+
*p_cur = nullptr;
97+
return pointer;
98+
}
99+

‎MpegCoder/MpegBase.h

+30-22
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
#include <iomanip>
2727
#include <sstream>
2828
#include <fstream>
29+
#include <vector>
30+
#include <memory>
2931
#include <thread>
3032
#include <mutex>
3133
#include <Python.h>
@@ -55,30 +57,15 @@ namespace cmpc {
5557

5658
#ifdef __cplusplus
5759
namespace cmpc {
58-
static const string av_make_error_string2(int errnum) {
59-
char errbuf[AV_ERROR_MAX_STRING_SIZE];
60-
av_strerror(errnum, errbuf, AV_ERROR_MAX_STRING_SIZE);
61-
string strerrbuf = errbuf;
62-
return strerrbuf;
63-
}
60+
const string av_make_error_string2_cpp(int errnum);
6461
#undef av_err2str
65-
#define av_err2str(errnum) av_make_error_string2(errnum).c_str()
66-
static const string av_ts_make_string_cpp(int64_t ts) {
67-
char tsstrbuf[AV_TS_MAX_STRING_SIZE];
68-
av_ts_make_string(tsstrbuf, ts);
69-
string strtsstrbuf = tsstrbuf;
70-
return strtsstrbuf;
71-
}
62+
#define av_err2str(errnum) av_make_error_string2_cpp(errnum)
63+
const string av_ts_make_string_cpp(int64_t ts);
7264
#undef av_ts2str
73-
#define av_ts2str(ts) av_ts_make_string_cpp(ts).c_str()
74-
static const string av_ts_make_time_string_cpp(int64_t ts, AVRational* tb) {
75-
char tsstrbuf[AV_TS_MAX_STRING_SIZE];
76-
av_ts_make_time_string(tsstrbuf, ts, tb);
77-
string strtsstrbuf = tsstrbuf;
78-
return strtsstrbuf;
79-
}
65+
#define av_ts2str(ts) av_ts_make_string_cpp(ts)
66+
const string av_ts_make_time_string_cpp(int64_t ts, AVRational* tb);
8067
#undef av_ts2timestr
81-
#define av_ts2timestr(ts, tb) av_ts_make_time_string_cpp(ts, tb).c_str()
68+
#define av_ts2timestr(ts, tb) av_ts_make_time_string_cpp(ts, tb)
8269
}
8370
#endif // __cplusplus
8471

@@ -96,6 +83,27 @@ namespace cmpc {
9683

9784
struct SwsContext* sws_ctx;
9885
} OutputStream;
86+
87+
// A wrapper of the char *[]
88+
class CharList {
89+
public:
90+
CharList(void); // Constructor.
91+
CharList(const std::vector<string>& args); // Copy constructor (string ver).
92+
CharList(const std::vector<string>&& args) noexcept; // Move constructor (string ver).
93+
~CharList(void); // 3-5 law. Destructor.
94+
CharList(const CharList& ref); // Copy constructor.
95+
CharList& operator=(const CharList& ref); // Copy assignment operator.
96+
CharList(CharList&& ref) noexcept; // Move constructor.
97+
CharList& operator=(CharList&& ref) noexcept; // Move assignment operator.
98+
CharList& operator=(const std::vector<string>& args); // Copy assignment operator (string ver).
99+
CharList& operator=(std::vector<string>&& args) noexcept; // Move assignment operator (string ver).
100+
void set(const std::vector<string>& args); // Set strings as data.
101+
void set(std::vector<string>&& args) noexcept; // Set strings as data (move).
102+
void clear(); // clear all data.
103+
std::shared_ptr<const char*> c_str(); // Equivalent conversion for char **
104+
private:
105+
std::vector<string> data;
106+
};
99107
}
100108

101109
// compatibility with newer API
@@ -104,4 +112,4 @@ namespace cmpc {
104112
#define av_frame_free avcodec_free_frame
105113
#endif
106114

107-
#endif
115+
#endif

0 commit comments

Comments
 (0)