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

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Isaac Connor 2019-04-05 15:18:39 -04:00
parent 381f526d66 9ae6acf532
commit 9faaba9300
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/zm_ffmpeg.cpp
View File

@ -437,6 +437,7 @@ unsigned int zm_av_packet_ref( AVPacket *dst, AVPacket *src ) {
dst->pts = src->pts; dst->pts = src->pts;
dst->dts = src->dts; dst->dts = src->dts;
dst->duration = src->duration; dst->duration = src->duration;
dst->stream_index = src->stream_index;
return 0; return 0;
} }
#endif #endif

18
src/zm_ffmpeg_camera.cpp
View File

@ -565,15 +565,23 @@ int FfmpegCamera::OpenFfmpeg() {
Debug(1, "HWACCEL not in use"); Debug(1, "HWACCEL not in use");
} }
if ( mAudioStreamId >= 0 ) { if ( mAudioStreamId >= 0 ) {
if ( (mAudioCodec = avcodec_find_decoder(
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0) #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
mAudioCodecContext = avcodec_alloc_context3( NULL ); mFormatContext->streams[mAudioStreamId]->codecpar->codec_id
avcodec_parameters_to_context( mAudioCodecContext, mFormatContext->streams[mAudioStreamId]->codecpar );
#else #else
mAudioCodecContext = mFormatContext->streams[mAudioStreamId]->codec; mFormatContext->streams[mAudioStreamId]->codec->codec_id
#endif #endif
if ( (mAudioCodec = avcodec_find_decoder(mAudioCodecContext->codec_id)) == NULL ) { )) == NULL ) {
Debug(1, "Can't find codec for audio stream from %s", mPath.c_str()); Debug(1, "Can't find codec for audio stream from %s", mPath.c_str());
} else { } else {
#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
mAudioCodecContext = avcodec_alloc_context3(mAudioCodec);
avcodec_parameters_to_context( mAudioCodecContext, mFormatContext->streams[mAudioStreamId]->codecpar );
#else
mAudioCodecContext = mFormatContext->streams[mAudioStreamId]->codec;
// = avcodec_alloc_context3(mAudioCodec);
#endif
Debug(1, "Audio Found decoder"); Debug(1, "Audio Found decoder");
zm_dump_stream_format(mFormatContext, mAudioStreamId, 0, 0); zm_dump_stream_format(mFormatContext, mAudioStreamId, 0, 0);
// Open the codec // Open the codec
@ -584,7 +592,7 @@ int FfmpegCamera::OpenFfmpeg() {
Debug ( 1, "Calling avcodec_open2" ); Debug ( 1, "Calling avcodec_open2" );
if ( avcodec_open2(mAudioCodecContext, mAudioCodec, 0) < 0 ) { if ( avcodec_open2(mAudioCodecContext, mAudioCodec, 0) < 0 ) {
#endif #endif
Error( "Unable to open codec for video stream from %s", mPath.c_str() ); Error( "Unable to open codec for audio stream from %s", mPath.c_str() );
return -1; return -1;
} }
Debug(2, "Opened audio codec"); Debug(2, "Opened audio codec");