Merge branch 'master' of github.com:ZoneMinder/zoneminder
This commit is contained in:
commit
17e01cb58f
|
@ -1 +1 @@
|
|||
Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878
|
||||
Subproject commit 1b40f1661f93f50fd5805f239d1e466a3bcf888f
|
|
@ -245,6 +245,7 @@ class Socket : public CommsBase {
|
|||
}
|
||||
|
||||
virtual ssize_t recv(std::string &msg) const {
|
||||
msg.reserve(ZM_NETWORK_BUFSIZ);
|
||||
std::vector<char> buffer(msg.capacity());
|
||||
ssize_t nBytes;
|
||||
if ((nBytes = ::recv(mSd, buffer.data(), buffer.size(), 0)) < 0) {
|
||||
|
|
|
@ -168,8 +168,10 @@ int RemoteCameraRtsp::PrimeCapture() {
|
|||
}
|
||||
} // end foreach stream
|
||||
|
||||
if ( mVideoStreamId == -1 )
|
||||
Fatal("Unable to locate video stream");
|
||||
if ( mVideoStreamId == -1 ) {
|
||||
Error("Unable to locate video stream");
|
||||
return -1;
|
||||
}
|
||||
if ( mAudioStreamId == -1 )
|
||||
Debug(3, "Unable to locate audio stream");
|
||||
|
||||
|
@ -179,17 +181,22 @@ int RemoteCameraRtsp::PrimeCapture() {
|
|||
|
||||
// Find the decoder for the video stream
|
||||
AVCodec *codec = avcodec_find_decoder(mVideoCodecContext->codec_id);
|
||||
if ( codec == nullptr )
|
||||
Panic("Unable to locate codec %d decoder", mVideoCodecContext->codec_id);
|
||||
if ( codec == nullptr ) {
|
||||
Error("Unable to locate codec %d decoder", mVideoCodecContext->codec_id);
|
||||
return -1;
|
||||
}
|
||||
|
||||
// Open codec
|
||||
if ( avcodec_open2(mVideoCodecContext, codec, nullptr) < 0 )
|
||||
Panic("Can't open codec");
|
||||
if ( avcodec_open2(mVideoCodecContext, codec, nullptr) < 0 ) {
|
||||
Error("Can't open codec");
|
||||
return -1;
|
||||
}
|
||||
|
||||
int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1);
|
||||
|
||||
if ( (unsigned int)pSize != imagesize ) {
|
||||
Fatal("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
|
||||
Error("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 1;
|
||||
|
@ -208,11 +215,6 @@ int RemoteCameraRtsp::PreCapture() {
|
|||
int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
|
||||
int frameComplete = false;
|
||||
AVPacket *packet = &zm_packet->packet;
|
||||
if ( !zm_packet->image ) {
|
||||
Debug(1, "Allocating image %dx%d %d colours %d", width, height, colours, subpixelorder);
|
||||
zm_packet->image = new Image(width, height, colours, subpixelorder);
|
||||
}
|
||||
|
||||
|
||||
while (!frameComplete) {
|
||||
buffer.clear();
|
||||
|
@ -254,36 +256,20 @@ int RemoteCameraRtsp::Capture(std::shared_ptr<ZMPacket> &zm_packet) {
|
|||
|
||||
//while ( (!frameComplete) && (buffer.size() > 0) ) {
|
||||
if ( buffer.size() > 0 ) {
|
||||
packet->data = buffer.head();
|
||||
packet->data = (uint8_t*)av_malloc(buffer.size());
|
||||
memcpy(packet->data, buffer.head(), buffer.size());
|
||||
//packet->data = buffer.head();
|
||||
packet->size = buffer.size();
|
||||
bytes += packet->size;
|
||||
buffer -= packet->size;
|
||||
|
||||
struct timeval now;
|
||||
gettimeofday(&now, NULL);
|
||||
gettimeofday(&now, nullptr);
|
||||
packet->pts = packet->dts = now.tv_sec*1000000+now.tv_usec;
|
||||
|
||||
int bytes_consumed = zm_packet->decode(mVideoCodecContext);
|
||||
if ( bytes_consumed < 0 ) {
|
||||
Error("Error while decoding frame %d", frameCount);
|
||||
//Hexdump(Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size());
|
||||
}
|
||||
buffer -= packet->size;
|
||||
if ( bytes_consumed ) {
|
||||
zm_dump_video_frame(zm_packet->in_frame, "remote_rtsp_decode");
|
||||
if (!mVideoStream->codecpar->width) {
|
||||
zm_dump_codec(mVideoCodecContext);
|
||||
zm_dump_codecpar(mVideoStream->codecpar);
|
||||
mVideoStream->codecpar->width = zm_packet->in_frame->width;
|
||||
mVideoStream->codecpar->height = zm_packet->in_frame->height;
|
||||
zm_dump_codecpar(mVideoStream->codecpar);
|
||||
}
|
||||
zm_packet->codec_type = mVideoCodecContext->codec_type;
|
||||
zm_packet->stream = mVideoStream;
|
||||
frameComplete = true;
|
||||
Debug(2, "Frame: %d - %d/%d", frameCount, bytes_consumed, buffer.size());
|
||||
packet->data = nullptr;
|
||||
packet->size = 0;
|
||||
}
|
||||
Debug(2, "Frame: %d - %d/%d", frameCount, packet->size, buffer.size());
|
||||
}
|
||||
} /* getFrame() */
|
||||
} // end while true
|
||||
|
|
|
@ -277,7 +277,7 @@ void RtpCtrlThread::Run() {
|
|||
TimePoint last_receive = std::chrono::steady_clock::now();
|
||||
bool timeout = false; // used as a flag that we had a timeout, and then sent an RR to see if we wake back up. Real timeout will happen when this is true.
|
||||
|
||||
while (!mTerminate && select.wait() >= 0) {
|
||||
while (!mTerminate && (select.wait() >= 0)) {
|
||||
TimePoint now = std::chrono::steady_clock::now();
|
||||
zm::Select::CommsList readable = select.getReadable();
|
||||
if ( readable.size() == 0 ) {
|
||||
|
|
|
@ -45,8 +45,10 @@ RtpSource::RtpSource(
|
|||
mFrame(65536),
|
||||
mFrameCount(0),
|
||||
mFrameGood(true),
|
||||
prevM(false),
|
||||
mFrameReady(false),
|
||||
mFrameProcessed(false)
|
||||
mFrameProcessed(false),
|
||||
mTerminate(false)
|
||||
{
|
||||
char hostname[256] = "";
|
||||
gethostname(hostname, sizeof(hostname));
|
||||
|
|
|
@ -91,8 +91,6 @@ private:
|
|||
bool mFrameGood;
|
||||
bool prevM;
|
||||
|
||||
bool mTerminate;
|
||||
|
||||
bool mFrameReady;
|
||||
std::condition_variable mFrameReadyCv;
|
||||
std::mutex mFrameReadyMutex;
|
||||
|
@ -100,6 +98,7 @@ private:
|
|||
bool mFrameProcessed;
|
||||
std::condition_variable mFrameProcessedCv;
|
||||
std::mutex mFrameProcessedMutex;
|
||||
bool mTerminate;
|
||||
|
||||
private:
|
||||
void init(uint16_t seq);
|
||||
|
|
Loading…
Reference in New Issue