6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
1
2
3
|
#include "DvppDecoder.h"
#include "DvppSourceManager.h"
|
4061a3c3
Hu Chunming
更换decoder
|
4
5
|
#include "VpcUtils.h"
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
6
7
8
9
10
11
12
13
14
15
16
17
|
#define CHECK_AND_RETURN(ret, message) \
if(ret != 0) {LOG_ERROR("[{}]- {}", m_dec_name, message); return ret;}
#define CHECK_NOT_RETURN(ret, message) \
if(ret != 0) {LOG_ERROR("[{}]- {}", m_dec_name, message);}
#define CHECK_AND_RETURN_NOVALUE(ret, message) \
if(ret != 0) {LOG_ERROR("[{}]- {}", m_dec_name, message); return;}
#define CHECK_AND_BREAK(ret, message) \
if(ret != 0) {LOG_ERROR("[{}]- {}", m_dec_name, message); break;}
|
4061a3c3
Hu Chunming
更换decoder
|
18
|
constexpr int MAX_QUEUE_LENGTH = 3;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
struct Vdec_CallBack_UserData {
uint64_t frameId;
uint64_t frame_nb;
long startTime;
long sendTime;
DvppDecoder* self;
Vdec_CallBack_UserData() {
frameId = 0;
frame_nb = 0;
}
};
static long get_cur_time_ms() {
chrono::time_point<chrono::system_clock, chrono::milliseconds> tpMicro
= chrono::time_point_cast<chrono::milliseconds>(chrono::system_clock::now());
return tpMicro.time_since_epoch().count();
}
static void *ReportThd(void *arg)
{
DvppDecoder *self = (DvppDecoder *)arg;
if(nullptr != self){
self->doProcessReport();
}
return (void *)0;
}
static void VdecCallback(acldvppStreamDesc *input, acldvppPicDesc *output, void *pUserData)
{
Vdec_CallBack_UserData *userData = (Vdec_CallBack_UserData *) pUserData;
if(nullptr != userData){
DvppDecoder* self = userData->self;
if(self != nullptr){
self->doVdppVdecCallBack(input, output, userData);
}
delete userData;
userData = nullptr;
}
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
|
DvppDecoder::DvppDecoder(){
m_read_thread = nullptr;
fmt_ctx = nullptr;
m_bRunning = false;
video_index = -1;
pix_fmt = AV_PIX_FMT_NONE;
m_dec_name = "";
m_bPause = false;
m_bReal = true;
m_bFinished = false;
m_dec_keyframe = false;
m_fps = 0.0;
|
4061a3c3
Hu Chunming
更换decoder
|
79
80
|
std::queue<DvppDataMemory*>().swap(m_decoded_data_queue);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
81
82
83
84
85
86
87
88
89
90
91
|
}
DvppDecoder::~DvppDecoder(){
close();
LOG_DEBUG("[{}]- ~DvppDecoder() in_count:{} out_count:{}", m_dec_name, m_in_count, m_out_count);
}
bool DvppDecoder::init(FFDecConfig cfg){
m_dec_name = cfg.dec_name;
|
4061a3c3
Hu Chunming
更换decoder
|
92
93
94
95
96
97
98
|
m_cfg = cfg;
decode_finished_cbk = cfg.decode_finished_cbk;
m_finishedDecArg = cfg.finishedDecArg;
post_decoded_cbk = cfg.post_decoded_cbk;
m_postDecArg = cfg.postDecArg;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
99
100
101
102
103
104
105
106
|
AVCodecContext* avctx = init_FFmpeg(cfg);
if(avctx == nullptr){
return false;
}
do
{
|
4061a3c3
Hu Chunming
更换decoder
|
107
|
bool bRet = init_vdpp(cfg, avctx);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
108
109
110
111
|
if(!bRet){
break;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
112
113
114
115
|
m_bFinished = false;
return true;
} while (0);
|
4061a3c3
Hu Chunming
更换decoder
|
116
|
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
117
118
119
120
121
122
123
124
125
|
release_ffmpeg();
return false;
}
AVCodecContext* DvppDecoder::init_FFmpeg(FFDecConfig config){
const char* input_file = config.uri.c_str();
|
4061a3c3
Hu Chunming
更换decoder
|
126
127
|
av_log_set_level(AV_LOG_INFO);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
128
129
130
131
132
|
// 打开输入视频文件
AVDictionary *options = nullptr;
av_dict_set( &options, "bufsize", "655360", 0 );
av_dict_set( &options, "rtsp_transport", config.force_tcp ? "tcp" : "udp", 0 );
av_dict_set( &options, "stimeout", "30000000", 0 ); // 单位为 百万分之一秒
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
133
134
135
|
do{
fmt_ctx = avformat_alloc_context();
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
136
137
138
139
|
if (avformat_open_input(&fmt_ctx, input_file, nullptr, &options) != 0) {
LOG_ERROR("[{}]- Cannot open input file: {}", m_dec_name, input_file);
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
140
|
// av_dump_format(fmt_ctx, 0, input_file, 0);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
141
142
143
144
145
146
147
148
149
150
151
152
153
|
FILE* infile = fopen(input_file, "r");
if(nullptr != infile) {
// 可以作为本地文件打开,那必然是文件
m_bReal = false;
fclose(infile);
infile = nullptr;
} else {
// http://xxxx/xxx.mp4 也与文件同
if (fmt_ctx->iformat && fmt_ctx->iformat->extensions) {
m_bReal = false;
} else {
m_bReal = true;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
}
}
// 查找流信息
if (avformat_find_stream_info(fmt_ctx, nullptr) < 0) {
LOG_ERROR("[{}]- Cannot find input stream information!", m_dec_name);
break;
}
// 查找视频流信息
AVCodec *decoder = nullptr;
video_index = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, &decoder, 0);
if (video_index < 0) {
LOG_ERROR("[{}]- Cannot find a video stream in the input file!", m_dec_name);
break;
}
avctx = avcodec_alloc_context3(decoder);
if(avctx == nullptr){
LOG_ERROR("[{}]- alloc AVCodecContext failed!", m_dec_name);
break;
}
// 得到视频流对象
AVStream* stream = fmt_ctx->streams[video_index];
AVCodecParameters *codecpar = stream->codecpar;
if (avcodec_parameters_to_context(avctx, codecpar) < 0)
break;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
183
184
185
186
187
188
189
190
191
192
|
const AVBitStreamFilter * filter = nullptr;
if(codecpar->codec_id == AV_CODEC_ID_H264){
filter = av_bsf_get_by_name("h264_mp4toannexb");
}else if(codecpar->codec_id == AV_CODEC_ID_HEVC){
filter = av_bsf_get_by_name("hevc_mp4toannexb");
}else {
LOG_ERROR("[{}]- codec_id is not supported!", m_dec_name);
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
193
194
195
196
197
198
|
int enType = getVdecType(codecpar->codec_id, codecpar->profile);
if(-1 == enType) {
break;
}
m_enType = static_cast<acldvppStreamFormat>(enType);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
|
int ret = av_bsf_alloc(filter, &h264bsfc);
if (ret < 0){
break;
}
avcodec_parameters_copy(h264bsfc->par_in, codecpar);
av_bsf_init(h264bsfc);
frame_width = codecpar->width;
frame_height = codecpar->height;
pix_fmt = (AVPixelFormat)codecpar->format;
m_bResize = config.resize;
calcOutResolution(frame_width, frame_height);
if (stream->avg_frame_rate.den) {
m_fps = av_q2d(stream ->avg_frame_rate);
} else {
m_fps = 0.0;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
220
|
#ifdef USE_VILLAGE
|
4061a3c3
Hu Chunming
更换decoder
|
221
|
bool bRet = m_recoderTask.init(frame_width, frame_height, m_fps, avctx->bit_rate,m_dec_name);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
222
|
if (!bRet){
|
4061a3c3
Hu Chunming
更换decoder
|
223
|
LOG_ERROR("[{}]- m_recoderTask 初始化失败!", m_dec_name);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
|
}
#endif
LOG_INFO("[{}]- init ffmpeg success! input:{} src:({}, {}) out:({}, {}) fps:{} ", m_dec_name, input_file, frame_width, frame_height, out_frame_width, out_frame_height, m_fps);
return avctx;
}while(0);
release_ffmpeg();
LOG_ERROR("[{}]- init ffmpeg failed ! input:{} ", m_dec_name, input_file);
return nullptr;
}
void DvppDecoder::calcOutResolution(int width, int height) {
if(m_bResize) {
float srcRatio = width / (float)height;
float stdRatio = 1920.0 / 1080.0f ;
int outWidth = 1920;
int outHeight = 1080;
if (srcRatio > stdRatio) {
outHeight = static_cast<int>(outWidth * (float)height / width) ;
if (outHeight % 2 == 1) {
outHeight += 1;
}
} else if (srcRatio < stdRatio) {
outWidth = static_cast<int>(outHeight * (float)width / height) ;
if (outWidth % 2 == 1) {
outWidth += 1;
}
}
out_frame_width = outWidth;
out_frame_height = outHeight;
} else {
out_frame_width = width;
out_frame_height = height;
}
|
4061a3c3
Hu Chunming
更换decoder
|
263
|
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
|
}
int DvppDecoder::getVdecType(int videoType, int profile)
{
int streamFormat = H264_MAIN_LEVEL;
// VDEC only support H265 main level,264 baseline level,main level,high level
if (videoType == AV_CODEC_ID_HEVC) {
streamFormat = H265_MAIN_LEVEL;
} else if (videoType == AV_CODEC_ID_H264) {
switch (profile) {
case FF_PROFILE_H264_BASELINE:
streamFormat = H264_BASELINE_LEVEL;
break;
case FF_PROFILE_H264_MAIN:
streamFormat = H264_MAIN_LEVEL;
break;
case FF_PROFILE_H264_HIGH:
case FF_PROFILE_H264_HIGH_10:
case FF_PROFILE_H264_HIGH_10_INTRA:
case FF_PROFILE_H264_MULTIVIEW_HIGH:
case FF_PROFILE_H264_HIGH_422:
case FF_PROFILE_H264_HIGH_422_INTRA:
case FF_PROFILE_H264_STEREO_HIGH:
case FF_PROFILE_H264_HIGH_444:
case FF_PROFILE_H264_HIGH_444_PREDICTIVE:
case FF_PROFILE_H264_HIGH_444_INTRA:
streamFormat = H264_HIGH_LEVEL;
break;
default:
LOG_INFO("Not support h264 profile {}, use as mp", profile);
streamFormat = H264_MAIN_LEVEL;
break;
}
} else {
streamFormat = -1;
LOG_ERROR("Not support stream, type {}, profile {}", videoType, profile);
}
return streamFormat;
}
|
4061a3c3
Hu Chunming
更换decoder
|
306
|
bool DvppDecoder::init_vdpp(FFDecConfig cfg, AVCodecContext* avctx) {
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
307
308
309
310
311
|
LOG_INFO("[{}]- Init device start...", m_dec_name);
m_dvpp_deviceId = atoi(cfg.gpuid.c_str());
|
4061a3c3
Hu Chunming
更换decoder
|
312
|
VpcUtils::getInstance(m_dvpp_deviceId); // 初始化工具类
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
313
314
|
do{
|
4061a3c3
Hu Chunming
更换decoder
|
315
316
317
318
319
320
321
|
aclError ret = aclrtSetDevice(m_dvpp_deviceId);
if(ret != ACL_ERROR_NONE){
LOG_ERROR("[{}]-aclrtSetDevice failed !", m_dec_name);
break;
}
ret = aclrtCreateContext(&m_context, m_dvpp_deviceId);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
322
323
324
325
326
327
328
329
330
331
332
333
334
|
if (ret != ACL_ERROR_NONE) {
LOG_ERROR("[{}]-aclrtCreateContext failed !", m_dec_name);
break;
}
// DvppSourceManager 创建时包含 aclInit,析构时包含 aclFinalize
DvppSourceManager* pSrcMgr = DvppSourceManager::getInstance();
m_dvpp_channel = pSrcMgr->getChannel(m_dvpp_deviceId);
if(m_dvpp_channel < 0){
LOG_ERROR("[{}]-该设备channel已经用完了!", m_dec_name);
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
335
|
m_vdec_out_size = frame_width * frame_height * 3;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
|
LOG_INFO("[{}]- init vdpp success! device:{} channel:{}", m_dec_name, m_dvpp_deviceId, m_dvpp_channel);
return true;
}while(0);
release_dvpp();
return false;
}
bool DvppDecoder::isSurport(FFDecConfig& cfg){
return true;
}
bool DvppDecoder::start(){
m_bRunning = true;
m_read_thread = new std::thread([](void* arg)
{
DvppDecoder* a=(DvppDecoder*)arg;
a->read_thread();
return (void*)0;
}, this);
return true;
}
void DvppDecoder::close(){
m_bRunning=false;
if(m_read_thread != nullptr){
m_read_thread->join();
delete m_read_thread;
m_read_thread = nullptr;
}
}
void DvppDecoder::setPostDecArg(const void* postDecArg){
m_postDecArg = postDecArg;
}
void DvppDecoder::setFinishedDecArg(const void* finishedDecArg){
m_finishedDecArg = finishedDecArg;
}
void DvppDecoder::pause(){
m_bPause = true;
}
void DvppDecoder::resume(){
m_bPause = false;
}
void DvppDecoder::setDecKeyframe(bool bKeyframe){
m_dec_keyframe = bKeyframe;
}
bool DvppDecoder::isRunning(){
return m_bRunning;
}
bool DvppDecoder::isFinished(){
return m_bFinished;
}
bool DvppDecoder::isPausing(){
return m_bPause;
}
bool DvppDecoder::getResolution(int &width, int &height){
width = frame_width;
height = frame_height;
return true;
}
bool DvppDecoder::getOutResolution( int &width, int &height ) {
width = out_frame_width;
height = out_frame_height;
return true;
}
float DvppDecoder::fps(){
return m_fps;
}
|
4061a3c3
Hu Chunming
更换decoder
|
421
|
// static int snap_count = 0;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
422
|
|
4061a3c3
Hu Chunming
更换decoder
|
423
|
DvppDataMemory* DvppDecoder::snapshot() {
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
424
|
|
4061a3c3
Hu Chunming
更换decoder
|
425
426
427
428
|
if (!m_bRunning) {
LOG_ERROR("[{}]- task is not running", m_dec_name);
return nullptr;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
429
430
431
432
433
434
435
|
int ret = aclrtSetCurrentContext(m_context);
if(ret != ACL_ERROR_NONE){
LOG_ERROR("[{}]- aclrtSetCurrentContext failed", m_dec_name);
return nullptr;
}
|
4061a3c3
Hu Chunming
更换decoder
|
436
437
|
m_bSnapshot = true;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
438
|
// 注意有锁
|
4061a3c3
Hu Chunming
更换decoder
|
439
|
DvppDataMemory* snapshot_mem = nullptr;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
440
441
|
int loop_times = 0;
while(m_bRunning) {
|
4061a3c3
Hu Chunming
更换decoder
|
442
|
std::this_thread::sleep_for(std::chrono::milliseconds(3));
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
443
444
445
446
|
m_decoded_data_queue_mtx.lock();
if(m_decoded_data_queue.size() <= 0) {
m_decoded_data_queue_mtx.unlock();
loop_times++;
|
4061a3c3
Hu Chunming
更换decoder
|
447
448
|
if(loop_times > 10000) {
// 10s都没截取到图,退出
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
449
450
|
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
451
|
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
452
453
454
|
continue;
}
|
4061a3c3
Hu Chunming
更换decoder
|
455
456
|
auto mem = m_decoded_data_queue.front();
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
457
|
snapshot_mem = new DvppDataMemory(mem);
|
4061a3c3
Hu Chunming
更换decoder
|
458
|
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
459
460
461
462
463
464
465
|
m_decoded_data_queue_mtx.unlock();
// snap_count++;
// LOG_INFO("[{}]- snap_count:{} ", m_dec_name, snap_count);
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
466
467
|
m_bSnapshot = false;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
|
return snapshot_mem;
}
int DvppDecoder::getCachedQueueLength(){
return 0;
}
void DvppDecoder::release_ffmpeg() {
m_dec_keyframe = false;
if(h264bsfc){
av_bsf_free(&h264bsfc);
h264bsfc = nullptr;
}
if(avctx){
avcodec_free_context(&avctx);
avctx = nullptr;
}
if (fmt_ctx){
avformat_close_input(&fmt_ctx);
fmt_ctx = nullptr;
}
LOG_DEBUG("[{}]- release_ffmpeg", m_dec_name);
}
void DvppDecoder::read_thread() {
int ret = -1;
m_bExitReportThd = false;
pthread_t report_thread;
ret = pthread_create(&report_thread, nullptr, ReportThd, (void *)this);
if(ret != 0){
LOG_ERROR("[{}]- pthread_create failed", m_dec_name);
return;
}
m_bExitDisplayThd = false;
|
4061a3c3
Hu Chunming
更换decoder
|
506
|
std::thread display_thread = std::thread(
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
507
508
509
510
511
512
513
514
515
|
[](void* arg)
{
DvppDecoder* a=(DvppDecoder*)arg;
a->display_thread();
return (void*)0;
},
this
);
|
4061a3c3
Hu Chunming
更换decoder
|
516
517
|
aclrtContext ctx = nullptr;
aclrtStream stream = nullptr;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
518
519
520
|
aclvdecChannelDesc *vdecChannelDesc = nullptr;
do {
|
4061a3c3
Hu Chunming
更换decoder
|
521
522
523
|
CHECK_AND_BREAK(aclrtSetDevice(m_dvpp_deviceId), "aclrtSetDevice failed");
CHECK_AND_BREAK(aclrtCreateContext(&ctx, m_dvpp_deviceId), "aclrtCreateContext failed");
CHECK_AND_BREAK(aclrtCreateStream(&stream), "aclrtCreateStream failed");
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
524
525
526
527
528
529
530
531
532
533
534
535
536
|
vdecChannelDesc = aclvdecCreateChannelDesc();
if (vdecChannelDesc == nullptr) {
LOG_ERROR("[{}]- aclvdecCreateChannelDesc failed", m_dec_name);
break;
}
// 创建 channel dec结构体
// 通道ID在dvpp层面为0~31
CHECK_AND_BREAK(aclvdecSetChannelDescChannelId(vdecChannelDesc, m_dvpp_channel), "aclvdecSetChannelDescChannelId failed");
CHECK_AND_BREAK(aclvdecSetChannelDescThreadId(vdecChannelDesc, report_thread), "aclvdecSetChannelDescThreadId failed");
CHECK_AND_BREAK(aclvdecSetChannelDescCallback(vdecChannelDesc, VdecCallback), "aclvdecSetChannelDescCallback failed");
CHECK_AND_BREAK(aclvdecSetChannelDescEnType(vdecChannelDesc, m_enType), "aclvdecSetChannelDescEnType failed");
|
881ac79d
Hu Chunming
代码调通,结果正常输出
|
537
538
|
CHECK_AND_BREAK(aclvdecSetChannelDescOutPicFormat(vdecChannelDesc, PIXEL_FORMAT_YUV_SEMIPLANAR_420), "aclvdecSetChannelDescOutPicFormat failed");
// CHECK_AND_BREAK(aclvdecSetChannelDescOutPicFormat(vdecChannelDesc, PIXEL_FORMAT_BGR_888), "aclvdecSetChannelDescOutPicFormat failed");
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
539
540
|
CHECK_AND_BREAK(aclvdecCreateChannel(vdecChannelDesc), "aclvdecCreateChannel failed");
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
541
542
|
AVPacket* pkt = av_packet_alloc();
av_init_packet( pkt );
|
4061a3c3
Hu Chunming
更换decoder
|
543
|
unsigned long long frame_nb = 0;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
544
545
546
547
548
549
550
551
552
553
|
while (m_bRunning){
if (!m_bReal){
if (m_bPause){
std::this_thread::sleep_for(std::chrono::milliseconds(10));
continue;
}
// 非实时流,即为文件情形,因为不存在花屏问题,为保证不丢帧,这里做个循环等待
m_decoded_data_queue_mtx.lock();
|
4061a3c3
Hu Chunming
更换decoder
|
554
|
if(m_decoded_data_queue.size() > MAX_QUEUE_LENGTH){
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
555
556
557
558
559
560
|
m_decoded_data_queue_mtx.unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(5));
continue;
}
m_decoded_data_queue_mtx.unlock();
|
4061a3c3
Hu Chunming
更换decoder
|
561
|
if(m_DvppCacheCounter.load() > 20) {
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
562
563
564
565
|
// 解码器解码不过来
std::this_thread::sleep_for(std::chrono::milliseconds(10));
continue;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
566
567
568
569
570
571
572
573
574
|
}
int result = av_read_frame(fmt_ctx, pkt);
if (result == AVERROR_EOF || result < 0){
av_packet_unref(pkt);
LOG_WARN("[{}]- Failed to read frame!", m_dec_name);
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
575
|
if (m_bReal && m_DvppCacheCounter.load() > 20){
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
576
577
|
// 解码器解码不过来。实时流在此处的处理会导致花屏,这是由于解码器性能问题导致,无法避免
// 实时流在这里处理是为了避免长时间不读取数据导致数据中断
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
|
std::this_thread::sleep_for(std::chrono::milliseconds(10));
continue;
}
if (m_dec_keyframe && !(pkt->flags & AV_PKT_FLAG_KEY)) {
av_packet_unref(pkt);
continue;
}
if (video_index == pkt->stream_index){
ret = av_bsf_send_packet(h264bsfc, pkt);
if(ret < 0) {
LOG_ERROR("[{}]- av_bsf_send_packet error!", m_dec_name);
av_packet_unref(pkt);
continue;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
596
597
|
int nSended = -1;
while ((ret = av_bsf_receive_packet(h264bsfc, pkt)) == 0) {
|
4061a3c3
Hu Chunming
更换decoder
|
598
|
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
599
600
601
|
if(!m_bRunning){
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
602
603
604
605
|
#ifdef USE_VILLAGE
m_recoderTask.cache_pkt(pkt, frame_nb);
#endif
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
606
|
nSended = sendPkt(vdecChannelDesc, pkt, frame_nb);
|
4061a3c3
Hu Chunming
更换decoder
|
607
608
609
|
frame_nb++;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
610
611
612
613
614
615
616
|
}
if(nSended < 0) {
// 执行出错,强行结束整个任务
m_bRunning=false;
break;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
617
|
}
|
4061a3c3
Hu Chunming
更换decoder
|
618
619
|
// 音频等其他分量的情形
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
620
621
622
623
624
625
|
av_packet_unref(pkt);
}
av_packet_free(&pkt);
pkt = nullptr;
|
4061a3c3
Hu Chunming
更换decoder
|
626
627
628
629
630
631
632
633
|
if (vdecChannelDesc) {
sendVdecEos(vdecChannelDesc);
}
while(m_bRunning && m_decoded_data_queue.size() > 0) {
std::this_thread::sleep_for(std::chrono::milliseconds(5));
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
634
635
636
|
} while (0);
if (vdecChannelDesc) {
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
637
638
639
640
641
|
CHECK_NOT_RETURN(aclvdecDestroyChannel(vdecChannelDesc), "aclvdecDestroyChannel failed");
CHECK_NOT_RETURN(aclvdecDestroyChannelDesc(vdecChannelDesc), "aclvdecDestroyChannelDesc failed");
vdecChannelDesc = nullptr;
}
|
4061a3c3
Hu Chunming
更换decoder
|
642
643
|
m_bRunning=false;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
644
645
646
|
m_bExitReportThd = true;
CHECK_NOT_RETURN(pthread_join(report_thread, nullptr), "report_thread join failed");
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
647
648
649
|
m_bExitDisplayThd = true;
display_thread.join();
|
4061a3c3
Hu Chunming
更换decoder
|
650
651
652
653
654
655
656
657
658
659
660
|
if(stream){
CHECK_NOT_RETURN(aclrtDestroyStream(stream), "aclrtDestroyStream failed");
}
if (ctx){
CHECK_NOT_RETURN(aclrtDestroyContext(ctx), "aclrtDestroyContext failed");
}
#ifdef USE_VILLAGE
m_recoderTask.close();
#endif
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
|
release_ffmpeg();
release_dvpp();
m_bFinished = true;
LOG_INFO("[{}]- read thread exit.", m_dec_name);
if(decode_finished_cbk) {
decode_finished_cbk(m_finishedDecArg);
}
}
int DvppDecoder::sendPkt(aclvdecChannelDesc *vdecChannelDesc, AVPacket* pkt, unsigned long long frame_nb){
void *vdecInputbuf = nullptr;
void *vdecOutputBuf = nullptr;
acldvppStreamDesc *input_stream_desc = nullptr;
acldvppPicDesc *output_pic_desc = nullptr;
do{
int ret = acldvppMalloc((void **)&vdecInputbuf, pkt->size);
if(ACL_ERROR_NONE != ret){
LOG_ERROR("[{}]- acldvppMalloc failed!, ret:{}", m_dec_name, ret);
break;
}
ret = aclrtMemcpy(vdecInputbuf, pkt->size, pkt->data, pkt->size, ACL_MEMCPY_HOST_TO_DEVICE);
if(ACL_ERROR_NONE != ret){
LOG_ERROR("[{}]- aclrtMemcpy failed", m_dec_name);
break;
}
ret = acldvppMalloc((void **)&vdecOutputBuf, m_vdec_out_size);
if(ret != ACL_ERROR_NONE){
LOG_ERROR("[{}]- acldvppMalloc failed", m_dec_name);
break;
}
input_stream_desc = acldvppCreateStreamDesc();
if (input_stream_desc == nullptr) {
LOG_ERROR("[{}]- acldvppCreateStreamDesc failed", m_dec_name);
break;
}
output_pic_desc = acldvppCreatePicDesc();
if (output_pic_desc == nullptr) {
LOG_ERROR("[{}]- acldvppCreatePicDesc failed", m_dec_name);
break;
}
CHECK_AND_BREAK(acldvppSetStreamDescData(input_stream_desc, vdecInputbuf), "acldvppSetStreamDescData failed");
CHECK_AND_BREAK(acldvppSetStreamDescSize(input_stream_desc, pkt->size), "acldvppSetStreamDescSize failed");
CHECK_AND_BREAK(acldvppSetPicDescData(output_pic_desc, vdecOutputBuf), "acldvppSetPicDescData failed");
CHECK_AND_BREAK(acldvppSetPicDescSize(output_pic_desc, m_vdec_out_size), "acldvppSetPicDescSize failed");
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
|
Vdec_CallBack_UserData *user_data = NULL;
user_data = new Vdec_CallBack_UserData;
user_data->frameId = frame_nb;
user_data->frame_nb = frame_nb;
// user_data->startTime = startTime;
user_data->sendTime = UtilTools::get_cur_time_ms();
user_data->self = this;
m_in_count++;
// 内部缓存计数加1
m_DvppCacheCounter++;
ret = aclvdecSendFrame(vdecChannelDesc, input_stream_desc, output_pic_desc, nullptr, reinterpret_cast<void *>(user_data));
if(ret != ACL_ERROR_NONE){
LOG_ERROR("[{}]- aclvdecSendFrame failed", m_dec_name);
delete user_data;
user_data = nullptr;
return -2;
}
return 0;
}while (0);
if (vdecInputbuf){
acldvppFree(vdecInputbuf);
vdecInputbuf = nullptr;
}
// 报错情形
if(input_stream_desc){
CHECK_NOT_RETURN(acldvppDestroyStreamDesc(input_stream_desc), "acldvppDestroyStreamDesc failed");
}
if (vdecOutputBuf){
acldvppFree(vdecOutputBuf);
vdecOutputBuf = nullptr;
}
if(output_pic_desc){
CHECK_NOT_RETURN(acldvppDestroyPicDesc(output_pic_desc), "acldvppDestroyPicDesc failed");
}
return -1;
}
void DvppDecoder::doProcessReport(){
aclError ret = aclrtSetDevice(m_dvpp_deviceId);
if(ret != ACL_ERROR_NONE){
|
4061a3c3
Hu Chunming
更换decoder
|
763
764
765
766
767
768
769
770
771
772
773
|
// cout << "aclrtSetDevice failed" << endl;
LOG_ERROR("aclrtSetDevice failed !");
return ;
}
aclrtContext ctx;
ret = aclrtCreateContext(&ctx, m_dvpp_deviceId);
if (ret != ACL_ERROR_NONE) {
// cout << "aclrtCreateContext failed " << endl;
LOG_ERROR("aclrtCreateContext failed !");
return ;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
774
775
776
777
778
779
|
}
while (!m_bExitReportThd) {
aclrtProcessReport(1000);
}
|
4061a3c3
Hu Chunming
更换decoder
|
780
|
ret = aclrtDestroyContext(ctx);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
781
782
783
784
785
786
787
788
789
790
791
|
if(ret != ACL_ERROR_NONE){
LOG_ERROR("aclrtDestroyContext failed !");
}
LOG_INFO("doProcessReport exit.");
}
void DvppDecoder::doVdppVdecCallBack(acldvppStreamDesc *input, acldvppPicDesc *output, void *pUserData){
// 内部缓存计数减1
m_DvppCacheCounter--;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
792
793
794
795
796
797
798
799
800
|
if(nullptr == pUserData){
return;
}
Vdec_CallBack_UserData *userData = (Vdec_CallBack_UserData *) pUserData;
uint64_t frame_nb = userData->frame_nb;
m_out_count++;
|
4061a3c3
Hu Chunming
更换decoder
|
801
802
803
804
805
806
|
CHECK_AND_RETURN_NOVALUE(aclrtSetCurrentContext(m_context), "aclrtSetCurrentContext failed");
void *inputDataDev = acldvppGetStreamDescData(input);
acldvppFree(inputDataDev);
inputDataDev = nullptr;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
807
808
809
810
811
812
813
|
void *outputDataDev = acldvppGetPicDescData(output);
uint32_t outputSize = acldvppGetPicDescSize(output);
uint32_t width = acldvppGetPicDescWidth(output);
uint32_t width_stride = acldvppGetPicDescWidthStride(output);
uint32_t height = acldvppGetPicDescHeight(output);
uint32_t height_stride = acldvppGetPicDescHeightStride(output);
|
4061a3c3
Hu Chunming
更换decoder
|
814
|
bool bCached = false;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
815
816
817
|
do{
int ret = acldvppGetPicDescRetCode(output);
if(ret != ACL_ERROR_NONE){
|
4061a3c3
Hu Chunming
更换decoder
|
818
|
LOG_ERROR("[{}]- decode result error, frame_nb:{}, retCode:{} ", m_dec_name, frame_nb, ret);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
819
820
821
822
823
|
acldvppFree(outputDataDev);
outputDataDev = nullptr;
break;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
824
825
826
827
828
829
|
if(width > 0 && height > 0 && outputSize > 0){
if (!m_bReal) {
while(!m_bExitReportThd) {
// 非实时流,即为文件情形,因为不存在花屏问题,为保证不丢帧,这里做个循环等待
m_decoded_data_queue_mtx.lock();
|
4061a3c3
Hu Chunming
更换decoder
|
830
|
if(m_decoded_data_queue.size() >= MAX_QUEUE_LENGTH){
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
831
832
833
834
835
836
837
|
m_decoded_data_queue_mtx.unlock();
std::this_thread::sleep_for(std::chrono::milliseconds(5));
continue;
}
m_decoded_data_queue_mtx.unlock();
break;
}
|
4061a3c3
Hu Chunming
更换decoder
|
838
839
840
841
842
843
844
845
|
} else {
// 实时流情形,限制队列的最大长度为20
m_decoded_data_queue_mtx.lock();
if(m_decoded_data_queue.size() >= 20){
m_decoded_data_queue_mtx.unlock();
break;
}
m_decoded_data_queue_mtx.unlock();
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
846
847
848
849
850
851
|
}
// cout << m_dec_name << " 解码时间间隔: " << get_cur_time_ms() - last_ts << endl;
// last_ts = get_cur_time_ms();
// 换成解码后数据, 这里这样做的是为了保证解码一直持续进行,避免后续操作阻碍文件读取和解码从而导致花屏
|
4061a3c3
Hu Chunming
更换decoder
|
852
|
DvppDataMemory* mem = nullptr;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
853
|
if (m_bResize && (width > 1920 || height > 1080)) {
|
4061a3c3
Hu Chunming
更换decoder
|
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
|
float srcRatio = width / (float)height;
float stdRatio = 1920.0 / 1080.0f ;
int outWidth = 1920;
int outHeight = 1080;
if (srcRatio > stdRatio) {
outHeight = static_cast<int>(outWidth * (float)height / width) ;
if (outHeight % 2 == 1)
{
outHeight += 1;
}
} else if (srcRatio < stdRatio) {
outWidth = static_cast<int>(outHeight * (float)width / height) ;
if (outWidth % 2 == 1)
{
outWidth += 1;
}
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
871
|
|
4061a3c3
Hu Chunming
更换decoder
|
872
873
|
VpcUtils* pUtils = VpcUtils::getInstance(m_dvpp_deviceId);
mem = pUtils->resize(output, outWidth, outHeight);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
874
875
876
877
878
879
880
881
882
|
if (mem) {
acldvppFree(outputDataDev);
outputDataDev = nullptr;
mem->setDeviceId(to_string(m_dvpp_deviceId));
mem->setId(m_dec_name);
mem->setFrameNb(frame_nb);
}
} else {
|
881ac79d
Hu Chunming
代码调通,结果正常输出
|
883
|
mem = new DvppDataMemory(width, width_stride, height, height_stride, outputSize, m_dec_name, to_string(m_dvpp_deviceId), false, frame_nb, (unsigned char *)outputDataDev);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
884
885
|
}
|
4061a3c3
Hu Chunming
更换decoder
|
886
|
if(mem != nullptr){
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
887
888
889
|
m_decoded_data_queue.push(mem);
bCached = true;
} else {
|
4061a3c3
Hu Chunming
更换decoder
|
890
|
LOG_WARN("[{}]- decode result warning, width:{} width_stride:{} height:{} height_stride:{} size:{}", m_dec_name, width, width_stride, height, height_stride, outputSize);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
891
892
893
|
}
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
894
895
|
}while(0);
|
4061a3c3
Hu Chunming
更换decoder
|
896
897
898
899
900
|
if(!bCached) {
acldvppFree(outputDataDev);
outputDataDev = nullptr;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
|
CHECK_AND_RETURN_NOVALUE(acldvppDestroyStreamDesc(input), "acldvppDestroyStreamDesc failed");
CHECK_AND_RETURN_NOVALUE(acldvppDestroyPicDesc(output), "acldvppDestroyPicDesc failed");
}
bool DvppDecoder::sendVdecEos(aclvdecChannelDesc *vdecChannelDesc) {
// create stream desc
acldvppStreamDesc *streamInputDesc = acldvppCreateStreamDesc();
if (streamInputDesc == nullptr) {
LOG_ERROR("[{}]- fail to create input stream desc", m_dec_name);
return false;
}
aclError ret = acldvppSetStreamDescEos(streamInputDesc, 1);
if (ret != ACL_SUCCESS) {
LOG_ERROR("[{}]- fail to set eos for stream desc, errorCode = {}", m_dec_name, static_cast<int32_t>(ret));
(void)acldvppDestroyStreamDesc(streamInputDesc);
return false;
}
// send vdec eos frame. when all vdec callback are completed, aclvdecSendFrame can be returned.
LOG_INFO("[{}]- send eos", m_dec_name);
ret = aclvdecSendFrame(vdecChannelDesc, streamInputDesc, nullptr, nullptr, nullptr);
(void)acldvppDestroyStreamDesc(streamInputDesc);
if (ret != ACL_SUCCESS) {
LOG_ERROR("[{}]- fail to send eos frame, ret={}", m_dec_name, ret);
return false;
}
return true;
}
|
4061a3c3
Hu Chunming
更换decoder
|
931
|
void DvppDecoder::display_thread(){
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
932
|
LOG_INFO("[{}]- display_thread start...", m_dec_name);
|
4061a3c3
Hu Chunming
更换decoder
|
933
934
935
936
937
938
939
940
941
942
|
int skip_frame = m_cfg.skip_frame;
if (skip_frame <= 0){
skip_frame = 1;
}
long long index = 0;
bool bDisplay = false;
aclrtSetCurrentContext(m_context);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
943
|
while(!m_bExitDisplayThd) {
|
4061a3c3
Hu Chunming
更换decoder
|
944
945
946
947
948
|
std::this_thread::sleep_for(std::chrono::milliseconds(10));
if (m_bSnapshot) {
continue;
}
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
949
950
951
|
m_decoded_data_queue_mtx.lock();
if(m_decoded_data_queue.size() <= 0) {
m_decoded_data_queue_mtx.unlock();
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
952
953
954
|
continue;
}
|
4061a3c3
Hu Chunming
更换decoder
|
955
|
DvppDataMemory* memPtr = m_decoded_data_queue.front();
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
956
957
958
|
m_decoded_data_queue.pop();
m_decoded_data_queue_mtx.unlock();
|
4061a3c3
Hu Chunming
更换decoder
|
959
960
961
962
963
|
bDisplay = false;
if (skip_frame == 1 || index % skip_frame == 0){
if(post_decoded_cbk) {
post_decoded_cbk(m_postDecArg, memPtr);
bDisplay = true;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
964
965
966
|
}
}
|
4061a3c3
Hu Chunming
更换decoder
|
967
968
969
|
if (!bDisplay) {
delete memPtr;
memPtr = nullptr;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
970
|
}
|
4061a3c3
Hu Chunming
更换decoder
|
971
972
|
index++;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
973
974
975
|
}
m_decoded_data_queue_mtx.lock();
|
4061a3c3
Hu Chunming
更换decoder
|
976
977
|
while (!m_decoded_data_queue.empty()) {
DvppDataMemory* memPtr = m_decoded_data_queue.front();
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
978
|
m_decoded_data_queue.pop();
|
4061a3c3
Hu Chunming
更换decoder
|
979
980
|
delete memPtr;
memPtr = nullptr;
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
981
|
}
|
4061a3c3
Hu Chunming
更换decoder
|
982
|
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
|
m_decoded_data_queue_mtx.unlock();
LOG_INFO("[{}]- display_thread exit.", m_dec_name);
}
void DvppDecoder::release_dvpp(){
if(m_context){
aclError ret = aclrtDestroyContext(m_context);
if(ret != ACL_ERROR_NONE){
LOG_ERROR("[{}]- aclrtDestroyContext failed !", m_dec_name);
}
m_context = nullptr;
}
if(m_dvpp_channel >= 0){
DvppSourceManager* pSrcMgr = DvppSourceManager::getInstance();
pSrcMgr->releaseChannel(m_dvpp_deviceId, m_dvpp_channel);
|
4061a3c3
Hu Chunming
更换decoder
|
1000
1001
1002
|
LOG_INFO("[{}]- release channel:{}.", m_dec_name, m_dvpp_channel);
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
1003
1004
1005
1006
1007
|
m_dvpp_channel = -1;
}
}
void DvppDecoder::doRecode(RecoderInfo& recoderInfo) {
|
4061a3c3
Hu Chunming
更换decoder
|
1008
1009
1010
|
#ifdef USE_VILLAGE
m_recoderTask.create_recode_task(recoderInfo);
#endif
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
1011
1012
1013
|
}
void DvppDecoder::set_mq_callback(mq_callback_t cb) {
|
4061a3c3
Hu Chunming
更换decoder
|
1014
1015
1016
|
#ifdef USE_VILLAGE
m_recoderTask.set_mq_callback(cb);
#endif
|
6fdcb6a5
Hu Chunming
初次提交,代码大体完成编写,完善中
|
1017
|
}
|