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

implement a getFrame function that takes a timestamp and will seek to the appropriate time in the mp4 before getting a frame

This commit is contained in:
Isaac Connor 2018-09-11 13:21:12 -04:00
parent ec6317bd66
commit 0efc45fa93
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/zm_ffmpeg_input.cpp
View File

@ -119,8 +119,9 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, ret, errbuf ); Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, ret, errbuf );
return NULL; return NULL;
} }
dumpPacket(&packet, "Received packet");
if ( (stream_id < 0 ) || ( packet.stream_index == stream_id ) ) { if ( (stream_id < 0) || (packet.stream_index == stream_id) ) {
Debug(3,"Packet is for our stream (%d)", packet.stream_index ); Debug(3,"Packet is for our stream (%d)", packet.stream_index );
AVCodecContext *context = streams[packet.stream_index].context; AVCodecContext *context = streams[packet.stream_index].context;
@ -154,7 +155,7 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
} }
} else { } else {
#endif #endif
Debug(1,"Getting a frame?"); Debug(1,"Getting frame %d", streams[packet.stream_index].frame_count);
ret = avcodec_receive_frame( context, frame ); ret = avcodec_receive_frame( context, frame );
if ( ret < 0 ) { if ( ret < 0 ) {
av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE ); av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
@ -185,3 +186,18 @@ AVFrame *FFmpeg_Input::get_frame( int stream_id ) {
return frame; return frame;
} // end AVFrame *FFmpeg_Input::get_frame } // end AVFrame *FFmpeg_Input::get_frame
AVFrame *FFmpeg_Input::get_frame( int stream_id, double at ) {
Debug(1, "Getting frame from stream %d at %f", stream_id, at);
int64_t seek_target = (int64_t)at * AV_TIME_BASE;
seek_target = av_rescale_q(seek_target, AV_TIME_BASE_Q, input_format_context->streams[stream_id]->time_base);
int ret;
if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target, 0/*FORWARDS*/) < 0 ) ) {
Error("Unable to seek in stream");
return NULL;
}
return get_frame(stream_id);
} // end AVFrame *FFmpeg_Input::get_frame( int stream_id, struct timeval at)

1
src/zm_ffmpeg_input.h
View File

@ -22,6 +22,7 @@ class FFmpeg_Input {
int Open( const char *filename ); int Open( const char *filename );
int Close(); int Close();
AVFrame *get_frame( int stream_id=-1 ); AVFrame *get_frame( int stream_id=-1 );
AVFrame *get_frame( int stream_id, double at );
int get_video_stream_id() { int get_video_stream_id() {
return video_stream_id; return video_stream_id;
} }