ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

use zm_dump_stream_format to dump information about the packet to the log

pull/1427/head
Isaac Connor 2016-04-06 10:51:58 -04:00
parent 9dd1c8cb4a
commit 2a6071561d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/zm_ffmpeg_camera.cpp
View File

@ -353,6 +353,7 @@ int FfmpegCamera::OpenFfmpeg() {
Fatal( "Can't find codec for video stream from %s", mPath.c_str() ); Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
Debug ( 1, "Found decoder" ); Debug ( 1, "Found decoder" );
zm_dump_stream_format( mFormatContext, mVideoStreamId, 0, 0 );
// Open the codec // Open the codec
#if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0) #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
@ -553,7 +554,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_fi
} }
Debug( 5, "Got packet from stream %d", packet.stream_index ); Debug( 5, "Got packet from stream %d", packet.stream_index );
if ( packet.stream_index == mVideoStreamId ) { if ( packet.stream_index == mVideoStreamId ) {
Debug( 3, "Video stream index %d", packet.stream_index ); Debug( 4, "Video stream index %d", packet.stream_index );
#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0) #if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 ) if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
#else #else
@ -631,7 +632,7 @@ int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_fi
Debug( 3, "Not framecomplete after av_read_frame" ); Debug( 3, "Not framecomplete after av_read_frame" );
} // end if frameComplete } // end if frameComplete
} else if ( packet.stream_index == mAudioStreamId ) { //FIXME best way to copy all other streams } else if ( packet.stream_index == mAudioStreamId ) { //FIXME best way to copy all other streams
Debug( 3, "Audio stream index %d", packet.stream_index ); Debug( 4, "Audio stream index %d", packet.stream_index );
if ( frameComplete ) { if ( frameComplete ) {
Debug( 3, "Got audio frame with framecomplete %d", frameCount ); Debug( 3, "Got audio frame with framecomplete %d", frameCount );
//} else { //} else {