ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add boost to build depends

This commit is contained in:
Isaac Connor 2016-05-25 20:01:42 -04:00
parent abd43bdc9f
commit b3fd156c11
6 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distros/ubuntu1204/control
View File

@ -6,6 +6,7 @@ Uploaders: Vagrant Cascadian <vagrant@debian.org>
Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
,cmake
,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
,libboost1.55-dev
,libbz2-dev
,libgcrypt-dev
,libcurl4-gnutls-dev

1
distros/ubuntu1604/control
View File

@ -7,6 +7,7 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
,cmake
,libx264-dev, libmp4v2-dev
,libavcodec-dev, libavformat-dev, libswscale-dev, libswresample-dev, libavutil-dev, libavdevice-dev
,libboost1.55-dev
,libbz2-dev
,libgcrypt-dev
,libcurl4-gnutls-dev

6
src/zm_ffmpeg.h
View File

@ -324,9 +324,11 @@ static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, in
void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output);
#if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
#define zm_av_unref_packet( packet ) av_packet_unref( packet )
#define zm_av_packet_unref( packet ) av_packet_unref( packet )
#define zm_av_packet_ref( dst, src ) av_packet_ref( dst, src )
#else
#define zm_av_unref_packet( packet ) av_free_packet( packet )
#define zm_av_packet_unref( packet ) av_free_packet( packet )
#define zm_av_packet_ref( dst, src ) av_copy_packet( dst, src )
#endif
#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
#define zm_avcodec_decode_video( context, rawFrame, frameComplete, packet ) avcodec_decode_video2( context, rawFrame, frameComplete, packet )

14
src/zm_ffmpeg_camera.cpp
View File

@ -222,7 +222,7 @@ int FfmpegCamera::Capture( Image &image )
} else {
Debug( 4, "Different stream_index %d", packet.stream_index );
} // end if packet.stream_index == mVideoStreamId
zm_av_unref_packet( &packet );
zm_av_packet_unref( &packet );
} // end while ! frameComplete
return (0);
} // FfmpegCamera::Capture
@ -657,7 +657,7 @@ Debug(5, "After av_read_frame (%d)", ret );
if ( ret < 0 ) {
//Less than zero and we skipped a frame
}
zm_av_unref_packet( queued_packet );
zm_av_packet_unref( queued_packet );
av_free( queued_packet );
} // end while packets in the packetqueue
Debug(2, "Wrote %d queued packets", packet_count );
@ -697,7 +697,7 @@ Debug(5, "After av_read_frame (%d)", ret );
//Write the packet to our video store
int ret = videoStore->writeVideoFramePacket( &packet );
if ( ret < 0 ) { //Less than zero and we skipped a frame
zm_av_unref_packet( &packet );
zm_av_packet_unref( &packet );
return 0;
}
}
@ -706,7 +706,7 @@ Debug(5, "After av_read_frame (%d)", ret );
if ( ret < 0 ) {
av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
Error( "Unable to decode frame at frame %d: %s, continuing", frameCount, errbuf );
zm_av_unref_packet( &packet );
zm_av_packet_unref( &packet );
continue;
}
@ -721,7 +721,7 @@ Debug(5, "After av_read_frame (%d)", ret );
directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
if ( directbuffer == NULL ) {
Error("Failed requesting writeable buffer for the captured image.");
zm_av_unref_packet( &packet );
zm_av_packet_unref( &packet );
return (-1);
}
avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height);
@ -745,7 +745,7 @@ Debug(5, "After av_read_frame (%d)", ret );
int ret = videoStore->writeAudioFramePacket( &packet );
if ( ret < 0 ) {//Less than zero and we skipped a frame
Warning("Failure to write audio packet.");
zm_av_unref_packet( &packet );
zm_av_packet_unref( &packet );
return 0;
}
} else {
@ -762,7 +762,7 @@ Debug(5, "After av_read_frame (%d)", ret );
//if ( videoStore ) {
// the packet contents are ref counted... when queuing, we allocate another packet and reference it with that one, so we should always need to unref here, which should not affect the queued version.
zm_av_unref_packet( &packet );
zm_av_packet_unref( &packet );
//}
} // end while ! frameComplete
return (frameCount);

4
src/zm_packetqueue.cpp
View File

@ -37,7 +37,7 @@ bool zm_packetqueue::queuePacket( AVPacket* packet ) {
AVPacket *input_ref = (AVPacket *)av_malloc(sizeof(AVPacket));
av_init_packet( input_ref );
if ( av_packet_ref( input_ref, packet ) < 0 ) {
if ( zm_av_packet_ref( input_ref, packet ) < 0 ) {
Error("error refing packet");
av_free(input_ref);
return false;
@ -66,7 +66,7 @@ void zm_packetqueue::clearQueue() {
packet = pktQueue.front();
pktQueue.pop();
// If we clear it, then no freeing gets done, whereas when we pop off, we assume that the packet was freed somewhere else.
zm_av_unref_packet( packet );
zm_av_packet_unref( packet );
av_free( packet );
}
}

16
src/zm_videostore.cpp
View File

@ -485,7 +485,7 @@ Debug(2, "writing flushed packet pts(%d) dts(%d) duration(%d)", pkt.pts, pkt.dts
Debug(2, "writing flushed packet pts(%d) dts(%d) duration(%d)", pkt.pts, pkt.dts, pkt.duration );
pkt.stream_index = audio_output_stream->index;
av_interleaved_write_frame( oc, &pkt );
zm_av_unref_packet( &pkt );
zm_av_packet_unref( &pkt );
} // while 1
}
/* Write the trailer before close */
@ -657,7 +657,7 @@ Debug(4, "Not video and RAWPICTURE");
}
}
zm_av_unref_packet(&opkt);
zm_av_packet_unref(&opkt);
return 0;
@ -781,12 +781,12 @@ av_codec_is_encoder( audio_output_context->codec)
av_make_error_string(ret).c_str());
dumpPacket( ipkt );
av_frame_free(&input_frame);
zm_av_unref_packet(&opkt);
zm_av_packet_unref(&opkt);
return 0;
}
if ( ! data_present ) {
Debug(2, "Not ready to transcode a frame yet.");
zm_av_unref_packet(&opkt);
zm_av_packet_unref(&opkt);
return 0;
}
@ -841,7 +841,7 @@ av_codec_is_encoder( audio_output_context->codec)
Error("Frame: samples(%d) layout (%d) format(%d) rate(%d)", output_frame->nb_samples,
output_frame->channel_layout, output_frame->format , output_frame->sample_rate
);
zm_av_unref_packet(&opkt);
zm_av_packet_unref(&opkt);
return 0;
}
@ -866,12 +866,12 @@ av_frame_get_best_effort_timestamp(output_frame)
output_frame, &data_present )) < 0) {
Error( "Could not encode frame (error '%s')",
av_make_error_string(ret).c_str());
zm_av_unref_packet(&opkt);
zm_av_packet_unref(&opkt);
return 0;
}
if ( ! data_present ) {
Debug(2, "Not ready to output a frame yet.");
zm_av_unref_packet(&opkt);
zm_av_packet_unref(&opkt);
return 0;
}
@ -909,6 +909,6 @@ Debug(2, "opkt dts (%d) pts(%d) duration:(%d) pos(%d) ", opkt.dts, opkt.pts, opk
} else {
Debug(2,"Success writing audio frame" );
}
zm_av_unref_packet(&opkt);
zm_av_packet_unref(&opkt);
return 0;
}