云台短视频录制

app/src/main/cpp/PhoneDevice.cpp

@@ -2386,6 +2386,8 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
     }
     else if (mPhotoInfo.mediaType == 1 && (mPhotoInfo.cameraType == CAM_TYPE_PLZ))
     {
+        m_ptzController->AddPhotoCommand(mPhotoInfo, mPath, mOsds);
+#if 0
         uint64_t wid_serial = RequestWakelock(0);
         CPhoneDevice* pThis = this;
         IDevice::PHOTO_INFO localPhotoInfo = mPhotoInfo;
@@ -2393,7 +2395,6 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
         GetPhotoSerialsParamCb(param);
         vector<IDevice::OSD_INFO> osds;
         osds.swap(mOsds);
-
         std::thread t([localPhotoInfo, param, pThis, path, osds, wid_serial, powerCtrlPtr]() mutable
               {
                   uint32_t waitTime = localPhotoInfo.selfTestingTime;
@@ -2420,6 +2421,7 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector<
               });
 
         t.detach();
+#endif
     }
     else if (mPhotoInfo.mediaType == 1 && (mPhotoInfo.cameraType == CAM_TYPE_NET))
     {

app/src/main/cpp/PtzController.cpp

@@ -351,7 +351,10 @@ void PtzController::PtzProc()
                         photo_move_preset_time = time(NULL);
                     }
                 }
-                m_pPhoneDevice->TakePhotoWithNetCamera(cmd.photoParams->mPhotoInfo, cmd.photoParams->mPath, cmd.photoParams->mOsds, powerCtrl);
+                if(cmd.photoParams->mPhotoInfo.mediaType == 1)
+                    m_pPhoneDevice->TakeVideoWithNetCamera(cmd.photoParams->mPhotoInfo, cmd.photoParams->mPath, cmd.photoParams->mOsds, powerCtrl);
+                else
+                    m_pPhoneDevice->TakePhotoWithNetCamera(cmd.photoParams->mPhotoInfo, cmd.photoParams->mPath, cmd.photoParams->mOsds, powerCtrl);
                 state = PTZS_IDLE;
             }