|
|
|
@ -76,7 +76,7 @@ void GDDCdlg::initWindow() {
|
|
|
|
|
|
|
|
|
|
m_DlgGDDCSet = new GDDCSet(this);
|
|
|
|
|
m_DlgGDDCSet->setWindowFlags(Qt::Dialog);
|
|
|
|
|
m_DlgGDDCSet->setWindowModality(Qt::WindowModal);//设置为模态对话框
|
|
|
|
|
m_DlgGDDCSet->setWindowModality(Qt::WindowModal); // 设置为模态对话框
|
|
|
|
|
m_GDDCCmdDlg = new GDDCCmdDlg(this);
|
|
|
|
|
m_GDDCStateDlg = new GDDCStateInfo(this);
|
|
|
|
|
ui->pushButShowStatePage->setIcon(QIcon(":/res/right.png"));
|
|
|
|
@ -341,7 +341,7 @@ void GDDCdlg::resizeUI() {
|
|
|
|
|
|
|
|
|
|
// 定时器处理
|
|
|
|
|
void GDDCdlg::GDDCControlTimeOut() {
|
|
|
|
|
if (m_GDDCCmdDlg->sendTimes > 0) { // 优先发送次数指令
|
|
|
|
|
if (m_GDDCCmdDlg->sendTimes > 0) { // 优先发送次数指令
|
|
|
|
|
m_GDDCCmdDlg->sendTimes -= 1;
|
|
|
|
|
|
|
|
|
|
// UDP控制
|
|
|
|
@ -357,7 +357,7 @@ void GDDCdlg::GDDCControlTimeOut() {
|
|
|
|
|
if (m_GDDCCmdDlg->sendTimes == 0) {
|
|
|
|
|
m_GDDCCmdDlg->clearTJDCCmdBuffer();
|
|
|
|
|
}
|
|
|
|
|
} else { // 发送常发帧或长按指令
|
|
|
|
|
} else { // 发送常发帧或长按指令
|
|
|
|
|
m_GDDCCmdDlg->UpdateDataTJDC();
|
|
|
|
|
// UDP控制
|
|
|
|
|
if (connectFlag[3]) {
|
|
|
|
@ -379,6 +379,7 @@ void GDDCdlg::startConnectURL1() {
|
|
|
|
|
|
|
|
|
|
// 开始拉流
|
|
|
|
|
ui->WgtffmpegVideo->m_flowType = m_DlgGDDCSet->m_FlowType;
|
|
|
|
|
// ui->WgtffmpegVideo->setPushStreamIP(m_DlgGDDCSet->m_pushURL);
|
|
|
|
|
ui->WgtffmpegVideo->play(m_DlgGDDCSet->m_playURL1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
@ -472,7 +473,8 @@ void GDDCdlg::startPushURL() {
|
|
|
|
|
|
|
|
|
|
// //方式1:命令行推流
|
|
|
|
|
// process = new QProcess();
|
|
|
|
|
// connect(process, &QProcess::readyReadStandardOutput, this, [=]() mutable {
|
|
|
|
|
// connect(process, &QProcess::readyReadStandardOutput, this, [=]() mutable
|
|
|
|
|
// {
|
|
|
|
|
// QString Output = process->readAllStandardOutput();
|
|
|
|
|
// qDebug() << "Output:" << Output;
|
|
|
|
|
// });
|
|
|
|
@ -482,14 +484,16 @@ void GDDCdlg::startPushURL() {
|
|
|
|
|
// });
|
|
|
|
|
|
|
|
|
|
// // process->start("cmd",QStringList()<<"/c"<<"ffmpeg -i
|
|
|
|
|
// // rtmp://liteavapp.qcloud.com/live/liteavdemoplayerstreamid -c copy -f flv
|
|
|
|
|
// // rtmp://liteavapp.qcloud.com/live/liteavdemoplayerstreamid -c copy -f
|
|
|
|
|
// flv
|
|
|
|
|
// // rtmp://182.92.130.23/app/test");
|
|
|
|
|
|
|
|
|
|
// QStringList m_cmd;
|
|
|
|
|
// QString str;
|
|
|
|
|
// // str = "ffmpeg -i " + m_DlgGDDCSet->m_playURL1 + " -c copy -f flv " +
|
|
|
|
|
// // m_DlgGDDCSet->m_pushURL;
|
|
|
|
|
// str = "ffmpeg -rtsp_transport tcp -i " + m_DlgGDDCSet->m_playURL1 + " -c:v libx264 -c:a copy -f flv " +
|
|
|
|
|
// str = "ffmpeg -rtsp_transport tcp -i " + m_DlgGDDCSet->m_playURL1 + "
|
|
|
|
|
// -c:v libx264 -c:a copy -f flv " +
|
|
|
|
|
// m_DlgGDDCSet->m_pushURL;
|
|
|
|
|
// m_cmd << "/c" << str;
|
|
|
|
|
// process->start("cmd", m_cmd);
|
|
|
|
@ -497,9 +501,8 @@ void GDDCdlg::startPushURL() {
|
|
|
|
|
// //方式2:代码推流
|
|
|
|
|
// if(!connectFlag[0])
|
|
|
|
|
// {
|
|
|
|
|
// QMessageBox::information(NULL, tr("提示"), "请先开始连接", QMessageBox::Ok);
|
|
|
|
|
// m_DlgGDDCSet->setPushStreamText("推送");
|
|
|
|
|
// return;
|
|
|
|
|
// QMessageBox::information(NULL, tr("提示"), "请先开始连接",
|
|
|
|
|
// QMessageBox::Ok); m_DlgGDDCSet->setPushStreamText("推送"); return;
|
|
|
|
|
// }
|
|
|
|
|
ui->WgtffmpegVideo->setPushStreamIP(m_DlgGDDCSet->m_pushURL);
|
|
|
|
|
m_DlgGDDCSet->setPushStreamText("停止推送");
|
|
|
|
@ -535,8 +538,7 @@ void GDDCdlg::stopPushURL() {
|
|
|
|
|
// }
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
//方式2:代码推流
|
|
|
|
|
// 方式2:代码推流
|
|
|
|
|
ui->WgtffmpegVideo->setPushStreamIP("");
|
|
|
|
|
m_DlgGDDCSet->setPushStreamText("推送");
|
|
|
|
|
|
|
|
|
|