diff --git a/po/POTFILES.in b/po/POTFILES.in index 8fb90f30..a1e94c90 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -3,7 +3,7 @@ src/alg.c src/conf.c src/draw.c src/event.c -src/ffmpeg.c +src/movie.c src/jpegutils.c src/logger.c src/mmalcam.c diff --git a/po/da.po b/po/da.po index 2baa6005..dc2e4f47 100644 --- a/po/da.po +++ b/po/da.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 11:59-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/de.po b/po/de.po index 8a8edab1..63201e23 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 11:59-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -912,249 +912,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/es.po b/po/es.po index 7c82e67d..13b7dd1e 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:00-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -912,249 +912,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/fi.po b/po/fi.po index 59b57a72..1380cd62 100644 --- a/po/fi.po +++ b/po/fi.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:00-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/fr.po b/po/fr.po index 41d20b1b..14e0dad8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:01-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -915,251 +915,251 @@ msgstr "erreur ffopen_open lors de la création du fichier (timelapse) [%s]" msgid "Error encoding image" msgstr "Erreur lors de l'encodage de l'image" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "Impossible d'allouer de la mémoire pour le nom du codec" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" "Choisissez un conteneur ffmpeg différent ou une fréquence d'image plus basse." -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, fuzzy msgid "Error setting file name" msgstr "Erreur lors de l'encodage de l'image" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "la valeur %s pour l'option codec n'est pas supportée" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "Impossible de récupérer le codec" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, fuzzy, c-format msgid "could not alloc buffers %s" msgstr "ne peut pas ouvrir le fichier de configuration %s" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/it.po b/po/it.po index 6fa4bc48..88ec32ad 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/ja.po b/po/ja.po index ecb1d8db..e579854f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/ko.po b/po/ko.po index 72979f68..d064e630 100644 --- a/po/ko.po +++ b/po/ko.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/li.po b/po/li.po index fd934280..b878574a 100644 --- a/po/li.po +++ b/po/li.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:02-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -912,249 +912,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/nl.po b/po/nl.po index 496828f5..b09c18af 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:03-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/no.po b/po/no.po index a7814a58..3d6cb9ef 100644 --- a/po/no.po +++ b/po/no.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:03-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/pt.po b/po/pt.po index b8045fbf..5f846d22 100644 --- a/po/pt.po +++ b/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:03-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/sv.po b/po/sv.po index 83894300..5c8253ae 100644 --- a/po/sv.po +++ b/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:04-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/po/zh.po b/po/zh.po index fe2ce582..1330ca22 100644 --- a/po/zh.po +++ b/po/zh.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: 4.x\n" "Report-Msgid-Bugs-To: https://motion-project.github.io\n" -"POT-Creation-Date: 2019-09-25 21:50-0600\n" +"POT-Creation-Date: 2019-09-25 22:05-0600\n" "PO-Revision-Date: 2018-10-13 12:04-0600\n" "Last-Translator: MrDave \n" "Language-Team: MrDave \n" @@ -911,249 +911,249 @@ msgstr "" msgid "Error encoding image" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate memory for codec name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "" "The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting base file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error setting timelapse append for codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error setting file name" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "codec option value %s is not supported" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get the codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error sending frame for encoding:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Receive packet threw EAGAIN returning -2 code :%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error receiving encoded packet video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error encoding video:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error encoding video" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "PTS % Base PTS % ms interval % timebase %d-%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "BAD TIMING!! Frame skipped." msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "" "PTS % Base PTS % ms interval % timebase %d-%d Change " "%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "%s codec vbr/crf/bit_rate: %d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s has been blacklisted: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Preferred codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Codec %s not found" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Using codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not alloc stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate decoder!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Unable to set quality" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Reported FPS Supported %d/%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not open codec %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Failed to copy decoder parameters!: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "could not alloc frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "could not alloc buffers %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Permission denied. %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error opening file %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Could not write ffmpeg header %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error entering draining mode:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error draining codec:%s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error writing draining video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while encoding picture" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error while writing video frame" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "Error while writing video frame: %s" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "RTSP context not available." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "rtsp camera not ready for pass-through." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "pass-through mode enabled. Changing to MP4 container." msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not get codec!" msgstr "" -#: src/ffmpeg.c src/netcam_rtsp.c +#: src/movie.c src/netcam_rtsp.c msgid "Unable to copy codec parameters" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Pass-through disabled. ffmpeg too old" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "ffmpeg libavcodec version %d.%d.%d libavformat version %d.%d.%d" msgstr "" -#: src/ffmpeg.c +#: src/movie.c #, c-format msgid "av_lockmgr_register failed (%d)" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "av_lockmgr_register reset failed on cleanup" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not allocate output context" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not setup passthru!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Failed to allocate codec!" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Could not set the stream" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Error flushing codec" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Excessive attempts to clear buffered packet" msgstr "" -#: src/ffmpeg.c +#: src/movie.c msgid "Buffered packet" msgstr "" diff --git a/src/Makefile.am b/src/Makefile.am index 403db77b..147bd54b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -11,6 +11,6 @@ bin_PROGRAMS = motion motion_SOURCES = motion.c logger.c conf.c draw.c jpegutils.c video_loopback.c \ video_v4l2.c video_common.c \ netcam_rtsp.c track.c alg.c event.c picture.c \ - rotate.c translate.c ffmpeg.c \ + rotate.c translate.c movie.c \ webu.c webu_html.c webu_stream.c webu_text.c mmalcam.c $(MMAL_SRC) diff --git a/src/event.c b/src/event.c index 85b1e4cc..67cb8fdc 100644 --- a/src/event.c +++ b/src/event.c @@ -10,7 +10,7 @@ #include "picture.h" /* already includes motion.h */ #include "translate.h" #include "netcam_rtsp.h" -#include "ffmpeg.h" +#include "movie.h" #include "event.h" #include "video_loopback.h" #include "video_common.h" @@ -49,7 +49,7 @@ const char *eventList[] = { "EVENT_AREA_DETECTED", "EVENT_CAMERA_LOST", "EVENT_CAMERA_FOUND", - "EVENT_FFMPEG_PUT", + "EVENT_MOVIE_PUT", "EVENT_LAST" }; @@ -677,7 +677,7 @@ static void event_image_preview(struct context *cnt, /* Use filename of movie i.o. jpeg_filename when set to 'preview'. */ use_imagepath = strcmp(cnt->conf.picture_filename, "preview"); - if ((cnt->ffmpeg_output || (cnt->conf.movie_extpipe_use && cnt->extpipe)) && !use_imagepath) { + if ((cnt->movie_output || (cnt->conf.movie_extpipe_use && cnt->extpipe)) && !use_imagepath) { if (cnt->conf.movie_extpipe_use && cnt->extpipe) { retcd = snprintf(previewname, PATH_MAX,"%s.%s" @@ -924,7 +924,7 @@ static void event_new_video(struct context *cnt, } -static void event_ffmpeg_newfile(struct context *cnt, +static void event_movie_newfile(struct context *cnt, motion_event type ATTRIBUTE_UNUSED, struct image_data *dummy0 ATTRIBUTE_UNUSED, char *dummy1 ATTRIBUTE_UNUSED, @@ -1028,87 +1028,87 @@ static void event_ffmpeg_newfile(struct context *cnt, , stamp); } if (cnt->conf.movie_output) { - cnt->ffmpeg_output = mymalloc(sizeof(struct ffmpeg)); + cnt->movie_output = mymalloc(sizeof(struct ffmpeg)); if (cnt->imgs.size_high > 0){ - cnt->ffmpeg_output->width = cnt->imgs.width_high; - cnt->ffmpeg_output->height = cnt->imgs.height_high; - cnt->ffmpeg_output->high_resolution = TRUE; - cnt->ffmpeg_output->rtsp_data = cnt->rtsp_high; + cnt->movie_output->width = cnt->imgs.width_high; + cnt->movie_output->height = cnt->imgs.height_high; + cnt->movie_output->high_resolution = TRUE; + cnt->movie_output->rtsp_data = cnt->rtsp_high; } else { - cnt->ffmpeg_output->width = cnt->imgs.width; - cnt->ffmpeg_output->height = cnt->imgs.height; - cnt->ffmpeg_output->high_resolution = FALSE; - cnt->ffmpeg_output->rtsp_data = cnt->rtsp; + cnt->movie_output->width = cnt->imgs.width; + cnt->movie_output->height = cnt->imgs.height; + cnt->movie_output->high_resolution = FALSE; + cnt->movie_output->rtsp_data = cnt->rtsp; } - cnt->ffmpeg_output->tlapse = TIMELAPSE_NONE; - cnt->ffmpeg_output->fps = cnt->movie_fps; - cnt->ffmpeg_output->bps = cnt->conf.movie_bps; - cnt->ffmpeg_output->filename = cnt->newfilename; - cnt->ffmpeg_output->quality = cnt->conf.movie_quality; - cnt->ffmpeg_output->start_time.tv_sec = currenttime_tv->tv_sec; - cnt->ffmpeg_output->start_time.tv_usec = currenttime_tv->tv_usec; - cnt->ffmpeg_output->last_pts = -1; - cnt->ffmpeg_output->base_pts = 0; - cnt->ffmpeg_output->gop_cnt = 0; - cnt->ffmpeg_output->codec_name = codec; + cnt->movie_output->tlapse = TIMELAPSE_NONE; + cnt->movie_output->fps = cnt->movie_fps; + cnt->movie_output->bps = cnt->conf.movie_bps; + cnt->movie_output->filename = cnt->newfilename; + cnt->movie_output->quality = cnt->conf.movie_quality; + cnt->movie_output->start_time.tv_sec = currenttime_tv->tv_sec; + cnt->movie_output->start_time.tv_usec = currenttime_tv->tv_usec; + cnt->movie_output->last_pts = -1; + cnt->movie_output->base_pts = 0; + cnt->movie_output->gop_cnt = 0; + cnt->movie_output->codec_name = codec; if (strcmp(cnt->conf.movie_codec, "test") == 0) { - cnt->ffmpeg_output->test_mode = 1; + cnt->movie_output->test_mode = 1; } else { - cnt->ffmpeg_output->test_mode = 0; + cnt->movie_output->test_mode = 0; } - cnt->ffmpeg_output->motion_images = 0; - cnt->ffmpeg_output->passthrough =util_check_passthrough(cnt); + cnt->movie_output->motion_images = 0; + cnt->movie_output->passthrough =util_check_passthrough(cnt); - retcd = ffmpeg_open(cnt->ffmpeg_output); + retcd = movie_open(cnt->movie_output); if (retcd < 0){ MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("Error opening context for movie output.")); - free(cnt->ffmpeg_output); - cnt->ffmpeg_output=NULL; + free(cnt->movie_output); + cnt->movie_output=NULL; return; } event(cnt, EVENT_FILECREATE, NULL, cnt->newfilename, (void *)FTYPE_MPEG, currenttime_tv); } if (cnt->conf.movie_output_motion) { - cnt->ffmpeg_output_motion = mymalloc(sizeof(struct ffmpeg)); - cnt->ffmpeg_output_motion->width = cnt->imgs.width; - cnt->ffmpeg_output_motion->height = cnt->imgs.height; - cnt->ffmpeg_output_motion->rtsp_data = NULL; - cnt->ffmpeg_output_motion->tlapse = TIMELAPSE_NONE; - cnt->ffmpeg_output_motion->fps = cnt->movie_fps; - cnt->ffmpeg_output_motion->bps = cnt->conf.movie_bps; - cnt->ffmpeg_output_motion->filename = cnt->motionfilename; - cnt->ffmpeg_output_motion->quality = cnt->conf.movie_quality; - cnt->ffmpeg_output_motion->start_time.tv_sec = currenttime_tv->tv_sec; - cnt->ffmpeg_output_motion->start_time.tv_usec = currenttime_tv->tv_usec; - cnt->ffmpeg_output_motion->last_pts = -1; - cnt->ffmpeg_output_motion->base_pts = 0; - cnt->ffmpeg_output_motion->gop_cnt = 0; - cnt->ffmpeg_output_motion->codec_name = codec; + cnt->movie_output_motion = mymalloc(sizeof(struct ffmpeg)); + cnt->movie_output_motion->width = cnt->imgs.width; + cnt->movie_output_motion->height = cnt->imgs.height; + cnt->movie_output_motion->rtsp_data = NULL; + cnt->movie_output_motion->tlapse = TIMELAPSE_NONE; + cnt->movie_output_motion->fps = cnt->movie_fps; + cnt->movie_output_motion->bps = cnt->conf.movie_bps; + cnt->movie_output_motion->filename = cnt->motionfilename; + cnt->movie_output_motion->quality = cnt->conf.movie_quality; + cnt->movie_output_motion->start_time.tv_sec = currenttime_tv->tv_sec; + cnt->movie_output_motion->start_time.tv_usec = currenttime_tv->tv_usec; + cnt->movie_output_motion->last_pts = -1; + cnt->movie_output_motion->base_pts = 0; + cnt->movie_output_motion->gop_cnt = 0; + cnt->movie_output_motion->codec_name = codec; if (strcmp(cnt->conf.movie_codec, "test") == 0) { - cnt->ffmpeg_output_motion->test_mode = TRUE; + cnt->movie_output_motion->test_mode = TRUE; } else { - cnt->ffmpeg_output_motion->test_mode = FALSE; + cnt->movie_output_motion->test_mode = FALSE; } - cnt->ffmpeg_output_motion->motion_images = TRUE; - cnt->ffmpeg_output_motion->passthrough = FALSE; - cnt->ffmpeg_output_motion->high_resolution = FALSE; - cnt->ffmpeg_output_motion->rtsp_data = NULL; + cnt->movie_output_motion->motion_images = TRUE; + cnt->movie_output_motion->passthrough = FALSE; + cnt->movie_output_motion->high_resolution = FALSE; + cnt->movie_output_motion->rtsp_data = NULL; - retcd = ffmpeg_open(cnt->ffmpeg_output_motion); + retcd = movie_open(cnt->movie_output_motion); if (retcd < 0){ MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("ffopen_open error creating (motion) file [%s]"), cnt->motionfilename); - free(cnt->ffmpeg_output_motion); - cnt->ffmpeg_output_motion = NULL; + free(cnt->movie_output_motion); + cnt->movie_output_motion = NULL; return; } } } -static void event_ffmpeg_timelapse(struct context *cnt, +static void event_movie_timelapse(struct context *cnt, motion_event type ATTRIBUTE_UNUSED, struct image_data *img_data, char *dummy1 ATTRIBUTE_UNUSED, void *dummy2 ATTRIBUTE_UNUSED, struct timeval *currenttime_tv) @@ -1116,7 +1116,7 @@ static void event_ffmpeg_timelapse(struct context *cnt, int retcd; int passthrough; - if (!cnt->ffmpeg_timelapse) { + if (!cnt->movie_timelapse) { char tmp[PATH_MAX]; const char *timepath; const char *codec_mpg = "mpg"; @@ -1140,29 +1140,29 @@ static void event_ffmpeg_timelapse(struct context *cnt, , (int)(PATH_MAX-5-strlen(cnt->conf.target_dir)) , tmp); passthrough = util_check_passthrough(cnt); - cnt->ffmpeg_timelapse = mymalloc(sizeof(struct ffmpeg)); + cnt->movie_timelapse = mymalloc(sizeof(struct ffmpeg)); if ((cnt->imgs.size_high > 0) && (!passthrough)){ - cnt->ffmpeg_timelapse->width = cnt->imgs.width_high; - cnt->ffmpeg_timelapse->height = cnt->imgs.height_high; - cnt->ffmpeg_timelapse->high_resolution = TRUE; + cnt->movie_timelapse->width = cnt->imgs.width_high; + cnt->movie_timelapse->height = cnt->imgs.height_high; + cnt->movie_timelapse->high_resolution = TRUE; } else { - cnt->ffmpeg_timelapse->width = cnt->imgs.width; - cnt->ffmpeg_timelapse->height = cnt->imgs.height; - cnt->ffmpeg_timelapse->high_resolution = FALSE; + cnt->movie_timelapse->width = cnt->imgs.width; + cnt->movie_timelapse->height = cnt->imgs.height; + cnt->movie_timelapse->high_resolution = FALSE; } - cnt->ffmpeg_timelapse->fps = cnt->conf.timelapse_fps; - cnt->ffmpeg_timelapse->bps = cnt->conf.movie_bps; - cnt->ffmpeg_timelapse->filename = cnt->timelapsefilename; - cnt->ffmpeg_timelapse->quality = cnt->conf.movie_quality; - cnt->ffmpeg_timelapse->start_time.tv_sec = currenttime_tv->tv_sec; - cnt->ffmpeg_timelapse->start_time.tv_usec = currenttime_tv->tv_usec; - cnt->ffmpeg_timelapse->last_pts = -1; - cnt->ffmpeg_timelapse->base_pts = 0; - cnt->ffmpeg_timelapse->test_mode = FALSE; - cnt->ffmpeg_timelapse->gop_cnt = 0; - cnt->ffmpeg_timelapse->motion_images = FALSE; - cnt->ffmpeg_timelapse->passthrough = FALSE; - cnt->ffmpeg_timelapse->rtsp_data = NULL; + cnt->movie_timelapse->fps = cnt->conf.timelapse_fps; + cnt->movie_timelapse->bps = cnt->conf.movie_bps; + cnt->movie_timelapse->filename = cnt->timelapsefilename; + cnt->movie_timelapse->quality = cnt->conf.movie_quality; + cnt->movie_timelapse->start_time.tv_sec = currenttime_tv->tv_sec; + cnt->movie_timelapse->start_time.tv_usec = currenttime_tv->tv_usec; + cnt->movie_timelapse->last_pts = -1; + cnt->movie_timelapse->base_pts = 0; + cnt->movie_timelapse->test_mode = FALSE; + cnt->movie_timelapse->gop_cnt = 0; + cnt->movie_timelapse->motion_images = FALSE; + cnt->movie_timelapse->passthrough = FALSE; + cnt->movie_timelapse->rtsp_data = NULL; if ((strcmp(cnt->conf.timelapse_codec,"mpg") == 0) || (strcmp(cnt->conf.timelapse_codec,"swf") == 0) ){ @@ -1175,84 +1175,84 @@ static void event_ffmpeg_timelapse(struct context *cnt, MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Timelapse using mpg codec.")); MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Events will be appended to file")); - cnt->ffmpeg_timelapse->tlapse = TIMELAPSE_APPEND; - cnt->ffmpeg_timelapse->codec_name = codec_mpg; - retcd = ffmpeg_open(cnt->ffmpeg_timelapse); + cnt->movie_timelapse->tlapse = TIMELAPSE_APPEND; + cnt->movie_timelapse->codec_name = codec_mpg; + retcd = movie_open(cnt->movie_timelapse); } else { MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Timelapse using mpeg4 codec.")); MOTION_LOG(NTC, TYPE_EVENTS, NO_ERRNO, _("Events will be trigger new files")); - cnt->ffmpeg_timelapse->tlapse = TIMELAPSE_NEW; - cnt->ffmpeg_timelapse->codec_name = codec_mpeg; - retcd = ffmpeg_open(cnt->ffmpeg_timelapse); + cnt->movie_timelapse->tlapse = TIMELAPSE_NEW; + cnt->movie_timelapse->codec_name = codec_mpeg; + retcd = movie_open(cnt->movie_timelapse); } if (retcd < 0){ MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO ,_("ffopen_open error creating (timelapse) file [%s]"), cnt->timelapsefilename); - free(cnt->ffmpeg_timelapse); - cnt->ffmpeg_timelapse = NULL; + free(cnt->movie_timelapse); + cnt->movie_timelapse = NULL; return; } event(cnt, EVENT_FILECREATE, NULL, cnt->timelapsefilename, (void *)FTYPE_MPEG_TIMELAPSE, currenttime_tv); } - if (ffmpeg_put_image(cnt->ffmpeg_timelapse, img_data, currenttime_tv) == -1) { + if (movie_put_image(cnt->movie_timelapse, img_data, currenttime_tv) == -1) { MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); } } -static void event_ffmpeg_put(struct context *cnt, +static void event_movie_put(struct context *cnt, motion_event type ATTRIBUTE_UNUSED, struct image_data *img_data, char *dummy1 ATTRIBUTE_UNUSED, void *dummy2 ATTRIBUTE_UNUSED, struct timeval *currenttime_tv) { - if (cnt->ffmpeg_output) { - if (ffmpeg_put_image(cnt->ffmpeg_output, img_data, currenttime_tv) == -1){ + if (cnt->movie_output) { + if (movie_put_image(cnt->movie_output, img_data, currenttime_tv) == -1){ MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); } } - if (cnt->ffmpeg_output_motion) { - if (ffmpeg_put_image(cnt->ffmpeg_output_motion, &cnt->imgs.img_motion, currenttime_tv) == -1) { + if (cnt->movie_output_motion) { + if (movie_put_image(cnt->movie_output_motion, &cnt->imgs.img_motion, currenttime_tv) == -1) { MOTION_LOG(ERR, TYPE_EVENTS, NO_ERRNO, _("Error encoding image")); } } } -static void event_ffmpeg_closefile(struct context *cnt, +static void event_movie_closefile(struct context *cnt, motion_event type ATTRIBUTE_UNUSED, struct image_data *dummy1 ATTRIBUTE_UNUSED, char *dummy2 ATTRIBUTE_UNUSED, void *dummy3 ATTRIBUTE_UNUSED, struct timeval *currenttime_tv) { - if (cnt->ffmpeg_output) { - ffmpeg_close(cnt->ffmpeg_output); - free(cnt->ffmpeg_output); - cnt->ffmpeg_output = NULL; + if (cnt->movie_output) { + movie_close(cnt->movie_output); + free(cnt->movie_output); + cnt->movie_output = NULL; event(cnt, EVENT_FILECLOSE, NULL, cnt->newfilename, (void *)FTYPE_MPEG, currenttime_tv); } - if (cnt->ffmpeg_output_motion) { - ffmpeg_close(cnt->ffmpeg_output_motion); - free(cnt->ffmpeg_output_motion); - cnt->ffmpeg_output_motion = NULL; + if (cnt->movie_output_motion) { + movie_close(cnt->movie_output_motion); + free(cnt->movie_output_motion); + cnt->movie_output_motion = NULL; event(cnt, EVENT_FILECLOSE, NULL, cnt->motionfilename, (void *)FTYPE_MPEG_MOTION, currenttime_tv); } } -static void event_ffmpeg_timelapseend(struct context *cnt, +static void event_movie_timelapseend(struct context *cnt, motion_event type ATTRIBUTE_UNUSED, struct image_data *dummy1 ATTRIBUTE_UNUSED, char *dummy2 ATTRIBUTE_UNUSED, void *dummy3 ATTRIBUTE_UNUSED, struct timeval *currenttime_tv) { - if (cnt->ffmpeg_timelapse) { - ffmpeg_close(cnt->ffmpeg_timelapse); - free(cnt->ffmpeg_timelapse); - cnt->ffmpeg_timelapse = NULL; + if (cnt->movie_timelapse) { + movie_close(cnt->movie_timelapse); + free(cnt->movie_timelapse); + cnt->movie_timelapse = NULL; event(cnt, EVENT_FILECLOSE, NULL, cnt->timelapsefilename, (void *)FTYPE_MPEG_TIMELAPSE, currenttime_tv); } } @@ -1345,27 +1345,27 @@ struct event_handlers event_handlers[] = { }, { EVENT_FIRSTMOTION, - event_ffmpeg_newfile + event_movie_newfile }, { EVENT_IMAGE_DETECTED, - event_ffmpeg_put + event_movie_put }, { - EVENT_FFMPEG_PUT, - event_ffmpeg_put + EVENT_MOVIE_PUT, + event_movie_put }, { EVENT_ENDMOTION, - event_ffmpeg_closefile + event_movie_closefile }, { EVENT_TIMELAPSE, - event_ffmpeg_timelapse + event_movie_timelapse }, { EVENT_TIMELAPSEEND, - event_ffmpeg_timelapseend + event_movie_timelapseend }, #if defined(HAVE_MYSQL) || defined(HAVE_PGSQL) || defined(HAVE_SQLITE3) || defined(HAVE_MARIADB) { @@ -1386,7 +1386,7 @@ struct event_handlers event_handlers[] = { event_extpipe_put }, { - EVENT_FFMPEG_PUT, + EVENT_MOVIE_PUT, event_extpipe_put }, { diff --git a/src/event.h b/src/event.h index bc6082ff..6413aeff 100644 --- a/src/event.h +++ b/src/event.h @@ -31,7 +31,7 @@ typedef enum { EVENT_AREA_DETECTED, EVENT_CAMERA_LOST, EVENT_CAMERA_FOUND, - EVENT_FFMPEG_PUT, + EVENT_MOVIE_PUT, EVENT_LAST, } motion_event; diff --git a/src/motion.c b/src/motion.c index b9ffae58..79b10736 100644 --- a/src/motion.c +++ b/src/motion.c @@ -8,7 +8,7 @@ */ #include "translate.h" #include "motion.h" -#include "ffmpeg.h" +#include "movie.h" #include "video_common.h" #include "video_v4l2.h" #include "video_loopback.h" @@ -534,7 +534,7 @@ static void motion_detected(struct context *cnt, int dev, struct image_data *img mystrftime(cnt, cnt->text_event_string, sizeof(cnt->text_event_string), cnt->conf.text_event, &img->timestamp_tv, NULL, 0); - /* EVENT_FIRSTMOTION triggers on_event_start_command and event_ffmpeg_newfile */ + /* EVENT_FIRSTMOTION triggers on_event_start_command and event_movie_newfile */ event(cnt, EVENT_FIRSTMOTION, img, NULL, NULL, &cnt->imgs.image_ring[cnt->imgs.image_ring_out].timestamp_tv); @@ -647,7 +647,7 @@ static void process_image_ring(struct context *cnt, unsigned int max_images) if (!cnt->conf.movie_duplicate_frames) { /* don't duplicate frames */ } else if ((cnt->imgs.image_ring[cnt->imgs.image_ring_out].shot == 0) && - (cnt->ffmpeg_output || (cnt->conf.movie_extpipe_use && cnt->extpipe))) { + (cnt->movie_output || (cnt->conf.movie_extpipe_use && cnt->extpipe))) { /* * movie_last_shoot is -1 when file is created, * we don't know how many frames there is in first sec @@ -667,7 +667,7 @@ static void process_image_ring(struct context *cnt, unsigned int max_images) /* Check how many frames it was last sec */ while ((cnt->movie_last_shot + 1) < cnt->movie_fps) { /* Add a filler frame into encoder */ - event(cnt, EVENT_FFMPEG_PUT, + event(cnt, EVENT_MOVIE_PUT, &cnt->imgs.image_ring[cnt->imgs.image_ring_out], NULL, NULL, &cnt->imgs.image_ring[cnt->imgs.image_ring_out].timestamp_tv); @@ -2431,8 +2431,8 @@ static void mlp_actions(struct context *cnt){ * no motion then we reset the start movie time so that we do not * get a pause in the movie. */ - if ( (cnt->detecting_motion == 0) && (cnt->ffmpeg_output != NULL) ) - ffmpeg_reset_movie_start_time(cnt->ffmpeg_output, &cnt->current_image->timestamp_tv); + if ( (cnt->detecting_motion == 0) && (cnt->movie_output != NULL) ) + movie_reset_movie_start_time(cnt->movie_output, &cnt->current_image->timestamp_tv); cnt->detecting_motion = 1; if (cnt->conf.post_capture > 0) { /* Setup the postcap counter */ @@ -2474,8 +2474,8 @@ static void mlp_actions(struct context *cnt){ * no motion then we reset the start movie time so that we do not * get a pause in the movie. */ - if ( (cnt->detecting_motion == 0) && (cnt->ffmpeg_output != NULL) ) - ffmpeg_reset_movie_start_time(cnt->ffmpeg_output, &cnt->current_image->timestamp_tv); + if ( (cnt->detecting_motion == 0) && (cnt->movie_output != NULL) ) + movie_reset_movie_start_time(cnt->movie_output, &cnt->current_image->timestamp_tv); cnt->detecting_motion = 1; @@ -2687,12 +2687,12 @@ static void mlp_timelapse(struct context *cnt){ ,_("Invalid timelapse_mode argument '%s'"), cnt->conf.timelapse_mode); MOTION_LOG(WRN, TYPE_ALL, NO_ERRNO ,_("%:s Defaulting to manual timelapse mode")); - conf_cmdparse(&cnt, (char *)"ffmpeg_timelapse_mode",(char *)"manual"); + conf_cmdparse(&cnt, (char *)"movie_timelapse_mode",(char *)"manual"); } } /* - * If ffmpeg timelapse is enabled and time since epoch MOD ffmpeg_timelaps = 0 + * If ffmpeg timelapse is enabled and time since epoch MOD movie_timelaps = 0 * add a timelapse frame to the timelapse movie. */ if (cnt->shots == 0 && cnt->time_current_frame % cnt->conf.timelapse_interval <= @@ -2700,7 +2700,7 @@ static void mlp_timelapse(struct context *cnt){ event(cnt, EVENT_TIMELAPSE, cnt->current_image, NULL, NULL, &cnt->current_image->timestamp_tv); } - } else if (cnt->ffmpeg_timelapse) { + } else if (cnt->movie_timelapse) { /* * If timelapse movie is in progress but conf.timelapse_interval is zero then close timelapse file * This is an important feature that allows manual roll-over of timelapse file using the http @@ -3545,7 +3545,7 @@ int main (int argc, char **argv) motion_startup(1, argc, argv); - ffmpeg_global_init(); + movie_global_init(); dbse_global_init(); @@ -3590,7 +3590,7 @@ int main (int argc, char **argv) MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, _("Motion terminating")); - ffmpeg_global_deinit(); + movie_global_deinit(); dbse_global_deinit(); diff --git a/src/motion.h b/src/motion.h index 82561454..455cd893 100644 --- a/src/motion.h +++ b/src/motion.h @@ -62,7 +62,7 @@ struct image_data; #include "track.h" #include "netcam_rtsp.h" -#include "ffmpeg.h" +#include "movie.h" #ifdef HAVE_MMAL #include "mmalcam.h" @@ -470,9 +470,9 @@ struct context { char extpipecmdline[PATH_MAX]; int movie_last_shot; - struct ffmpeg *ffmpeg_output; - struct ffmpeg *ffmpeg_output_motion; - struct ffmpeg *ffmpeg_timelapse; + struct ffmpeg *movie_output; + struct ffmpeg *movie_output_motion; + struct ffmpeg *movie_timelapse; int movie_passthrough; char timelapsefilename[PATH_MAX]; diff --git a/src/ffmpeg.c b/src/movie.c similarity index 91% rename from src/ffmpeg.c rename to src/movie.c index 1d27a0b2..ab693c6a 100644 --- a/src/ffmpeg.c +++ b/src/movie.c @@ -1,6 +1,6 @@ /* * - * ffmpeg.c + * movie.c * * This software is distributed under the GNU Public License version 2 * See also the file 'COPYING'. @@ -182,7 +182,7 @@ int my_copy_packet(AVPacket *dest_pkt, AVPacket *src_pkt){ **************************************************************************** ****************************************************************************/ /*********************************************/ -static void ffmpeg_free_nal(struct ffmpeg *ffmpeg){ +static void movie_free_nal(struct ffmpeg *ffmpeg){ if (ffmpeg->nal_info) { free(ffmpeg->nal_info); ffmpeg->nal_info = NULL; @@ -190,11 +190,11 @@ static void ffmpeg_free_nal(struct ffmpeg *ffmpeg){ } } -static void ffmpeg_encode_nal(struct ffmpeg *ffmpeg){ +static void movie_encode_nal(struct ffmpeg *ffmpeg){ // h264_v4l2m2m has NAL units separated from the first frame, which makes // some players very unhappy. if ((ffmpeg->pkt.pts == 0) && (!(ffmpeg->pkt.flags & AV_PKT_FLAG_KEY))) { - ffmpeg_free_nal(ffmpeg); + movie_free_nal(ffmpeg); ffmpeg->nal_info_len = ffmpeg->pkt.size; ffmpeg->nal_info = malloc(ffmpeg->nal_info_len); if (ffmpeg->nal_info) @@ -206,11 +206,11 @@ static void ffmpeg_encode_nal(struct ffmpeg *ffmpeg){ av_grow_packet(&ffmpeg->pkt, ffmpeg->nal_info_len); memmove(&ffmpeg->pkt.data[ffmpeg->nal_info_len], &ffmpeg->pkt.data[0], old_size); memcpy(&ffmpeg->pkt.data[0], ffmpeg->nal_info, ffmpeg->nal_info_len); - ffmpeg_free_nal(ffmpeg); + movie_free_nal(ffmpeg); } } -static int ffmpeg_timelapse_exists(const char *fname){ +static int movie_timelapse_exists(const char *fname){ FILE *file; file = fopen(fname, "r"); if (file) @@ -221,7 +221,7 @@ static int ffmpeg_timelapse_exists(const char *fname){ return 0; } -static int ffmpeg_timelapse_append(struct ffmpeg *ffmpeg, AVPacket pkt){ +static int movie_timelapse_append(struct ffmpeg *ffmpeg, AVPacket pkt){ FILE *file; file = fopen(ffmpeg->filename, "a"); @@ -238,7 +238,7 @@ static int ffmpeg_timelapse_append(struct ffmpeg *ffmpeg, AVPacket pkt){ /* TODO Determine if this is even needed for old versions. Per * documentation for version 58, 'av_lockmgr_register This function does nothing' */ -static int ffmpeg_lockmgr_cb(void **arg, enum AVLockOp op){ +static int movie_lockmgr_cb(void **arg, enum AVLockOp op){ pthread_mutex_t *mutex = *arg; int err; @@ -274,7 +274,7 @@ static int ffmpeg_lockmgr_cb(void **arg, enum AVLockOp op){ } #endif -static void ffmpeg_free_context(struct ffmpeg *ffmpeg){ +static void movie_free_context(struct ffmpeg *ffmpeg){ if (ffmpeg->picture != NULL){ my_frame_free(ffmpeg->picture); @@ -293,7 +293,7 @@ static void ffmpeg_free_context(struct ffmpeg *ffmpeg){ } -static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ +static int movie_get_oformat(struct ffmpeg *ffmpeg){ size_t codec_name_len = strcspn(ffmpeg->codec_name, ":"); char *codec_name = malloc(codec_name_len + 1); @@ -307,7 +307,7 @@ static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ if (codec_name == NULL) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Failed to allocate memory for codec name")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } memcpy(codec_name, ffmpeg->codec_name, codec_name_len); @@ -320,7 +320,7 @@ static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("The frame rate specified is too high for the ffmpeg movie type specified. " "Choose a different ffmpeg container or lower framerate.")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); free(codec_name); return -1; } @@ -329,7 +329,7 @@ static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ if ((retcd < 0) || (retcd >= PATH_MAX)){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error setting base file name")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); free(codec_name); return -1; } @@ -342,7 +342,7 @@ static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ (retcd < 0) || (retcd >= PATH_MAX)){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error setting timelapse append for codec %s"), codec_name); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); free(codec_name); return -1; } @@ -405,7 +405,7 @@ static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ if ((retcd < 0) || (retcd >= PATH_MAX)){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Error setting file name")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); free(codec_name); return -1; } @@ -413,14 +413,14 @@ static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ if (!ffmpeg->oc->oformat) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("codec option value %s is not supported"), codec_name); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); free(codec_name); return -1; } if (ffmpeg->oc->oformat->video_codec == MY_CODEC_ID_NONE) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get the codec")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); free(codec_name); return -1; } @@ -429,7 +429,7 @@ static int ffmpeg_get_oformat(struct ffmpeg *ffmpeg){ return 0; } -static int ffmpeg_encode_video(struct ffmpeg *ffmpeg){ +static int movie_encode_video(struct ffmpeg *ffmpeg){ #if (LIBAVFORMAT_VERSION_MAJOR >= 58) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR >= 41)) //ffmpeg version 3.1 and after @@ -461,7 +461,7 @@ static int ffmpeg_encode_video(struct ffmpeg *ffmpeg){ } if (ffmpeg->preferred_codec == USER_CODEC_V4L2M2M){ - ffmpeg_encode_nal(ffmpeg); + movie_encode_nal(ffmpeg); } return 0; @@ -487,7 +487,7 @@ static int ffmpeg_encode_video(struct ffmpeg *ffmpeg){ /* This kills compiler warnings. Nal setting is only for recent ffmpeg versions*/ if (ffmpeg->preferred_codec == USER_CODEC_V4L2M2M){ - ffmpeg_encode_nal(ffmpeg); + movie_encode_nal(ffmpeg); } return 0; @@ -527,7 +527,7 @@ static int ffmpeg_encode_video(struct ffmpeg *ffmpeg){ /* This kills compiler warnings. Nal setting is only for recent ffmpeg versions*/ if (ffmpeg->preferred_codec == USER_CODEC_V4L2M2M){ - ffmpeg_encode_nal(ffmpeg); + movie_encode_nal(ffmpeg); } return 0; @@ -536,7 +536,7 @@ static int ffmpeg_encode_video(struct ffmpeg *ffmpeg){ } -static int ffmpeg_set_pts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ +static int movie_set_pts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ int64_t pts_interval; @@ -547,7 +547,7 @@ static int ffmpeg_set_pts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ pts_interval = ((1000000L * (tv1->tv_sec - ffmpeg->start_time.tv_sec)) + tv1->tv_usec - ffmpeg->start_time.tv_usec); if (pts_interval < 0){ /* This can occur when we have pre-capture frames. Reset start time of video. */ - ffmpeg_reset_movie_start_time(ffmpeg, tv1); + movie_reset_movie_start_time(ffmpeg, tv1); pts_interval = 0; } if (ffmpeg->last_pts < 0) { @@ -575,7 +575,7 @@ static int ffmpeg_set_pts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ return 0; } -static int ffmpeg_set_pktpts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ +static int movie_set_pktpts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ int64_t pts_interval; @@ -586,7 +586,7 @@ static int ffmpeg_set_pktpts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ pts_interval = ((1000000L * (tv1->tv_sec - ffmpeg->start_time.tv_sec)) + tv1->tv_usec - ffmpeg->start_time.tv_usec); if (pts_interval < 0){ /* This can occur when we have pre-capture frames. Reset start time of video. */ - ffmpeg_reset_movie_start_time(ffmpeg, tv1); + movie_reset_movie_start_time(ffmpeg, tv1); pts_interval = 0; } ffmpeg->pkt.pts = av_rescale_q(pts_interval,(AVRational){1, 1000000L},ffmpeg->video_st->time_base) + ffmpeg->base_pts; @@ -614,7 +614,7 @@ static int ffmpeg_set_pktpts(struct ffmpeg *ffmpeg, const struct timeval *tv1){ return 0; } -static int ffmpeg_set_quality(struct ffmpeg *ffmpeg){ +static int movie_set_quality(struct ffmpeg *ffmpeg){ ffmpeg->opts = 0; if (ffmpeg->quality > 100) ffmpeg->quality = 100; @@ -665,7 +665,7 @@ struct blacklist_t const char *reason; }; -static const char *ffmpeg_codec_is_blacklisted(const char *codec_name){ +static const char *movie_codec_is_blacklisted(const char *codec_name){ static struct blacklist_t blacklisted_codec[] = { @@ -693,12 +693,12 @@ static const char *ffmpeg_codec_is_blacklisted(const char *codec_name){ return NULL; } -static int ffmpeg_set_codec_preferred(struct ffmpeg *ffmpeg){ +static int movie_set_codec_preferred(struct ffmpeg *ffmpeg){ size_t codec_name_len = strcspn(ffmpeg->codec_name, ":"); ffmpeg->codec = NULL; if (ffmpeg->codec_name[codec_name_len]) { - const char *blacklist_reason = ffmpeg_codec_is_blacklisted(&ffmpeg->codec_name[codec_name_len+1]); + const char *blacklist_reason = movie_codec_is_blacklisted(&ffmpeg->codec_name[codec_name_len+1]); if (blacklist_reason) { MOTION_LOG(WRN, TYPE_ENCODER, NO_ERRNO ,_("Preferred codec %s has been blacklisted: %s") @@ -719,7 +719,7 @@ static int ffmpeg_set_codec_preferred(struct ffmpeg *ffmpeg){ if (!ffmpeg->codec) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Codec %s not found"), ffmpeg->codec_name); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } @@ -740,13 +740,13 @@ static int ffmpeg_set_codec_preferred(struct ffmpeg *ffmpeg){ } -static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ +static int movie_set_codec(struct ffmpeg *ffmpeg){ int retcd; char errstr[128]; int chkrate; - retcd = ffmpeg_set_codec_preferred(ffmpeg); + retcd = movie_set_codec_preferred(ffmpeg); if (retcd != 0) return retcd; #if (LIBAVFORMAT_VERSION_MAJOR >= 58) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR >= 41)) @@ -754,20 +754,20 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ ffmpeg->video_st = avformat_new_stream(ffmpeg->oc, NULL); if (!ffmpeg->video_st) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } ffmpeg->ctx_codec = avcodec_alloc_context3(ffmpeg->codec); if (ffmpeg->ctx_codec == NULL) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Failed to allocate decoder!")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } #else ffmpeg->video_st = avformat_new_stream(ffmpeg->oc, ffmpeg->codec); if (!ffmpeg->video_st) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not alloc stream")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } ffmpeg->ctx_codec = ffmpeg->video_st->codec; @@ -831,7 +831,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ av_dict_set(&ffmpeg->opts, "zerocopy", "0", 0); } - retcd = ffmpeg_set_quality(ffmpeg); + retcd = movie_set_quality(ffmpeg); if (retcd < 0){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Unable to set quality")); return -1; @@ -857,7 +857,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ av_strerror(retcd, errstr, sizeof(errstr)); MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not open codec %s"),errstr); av_dict_free(&ffmpeg->opts); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } @@ -867,7 +867,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ return 0; } -static int ffmpeg_set_stream(struct ffmpeg *ffmpeg){ +static int movie_set_stream(struct ffmpeg *ffmpeg){ #if (LIBAVFORMAT_VERSION_MAJOR >= 58) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR >= 41)) int retcd; @@ -878,7 +878,7 @@ static int ffmpeg_set_stream(struct ffmpeg *ffmpeg){ av_strerror(retcd, errstr, sizeof(errstr)); MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Failed to copy decoder parameters!: %s"), errstr); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } #endif @@ -890,7 +890,7 @@ static int ffmpeg_set_stream(struct ffmpeg *ffmpeg){ } /*Special allocation of video buffer for v4l2m2m codec*/ -static int ffmpeg_alloc_video_buffer(AVFrame *frame, int align) +static int movie_alloc_video_buffer(AVFrame *frame, int align) { const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(frame->format); int ret, i, padded_height; @@ -947,7 +947,7 @@ static int ffmpeg_alloc_video_buffer(AVFrame *frame, int align) } -static int ffmpeg_set_picture(struct ffmpeg *ffmpeg){ +static int movie_set_picture(struct ffmpeg *ffmpeg){ int retcd; char errstr[128]; @@ -955,7 +955,7 @@ static int ffmpeg_set_picture(struct ffmpeg *ffmpeg){ ffmpeg->picture = my_frame_alloc(); if (!ffmpeg->picture) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("could not alloc frame")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } @@ -972,11 +972,11 @@ static int ffmpeg_set_picture(struct ffmpeg *ffmpeg){ ffmpeg->picture->height = ffmpeg->ctx_codec->height; if (ffmpeg->preferred_codec == USER_CODEC_V4L2M2M) { - retcd = ffmpeg_alloc_video_buffer(ffmpeg->picture, 32); + retcd = movie_alloc_video_buffer(ffmpeg->picture, 32); if (retcd) { av_strerror(retcd, errstr, sizeof(errstr)); MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("could not alloc buffers %s"), errstr); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } } @@ -985,7 +985,7 @@ static int ffmpeg_set_picture(struct ffmpeg *ffmpeg){ } -static int ffmpeg_set_outputfile(struct ffmpeg *ffmpeg){ +static int movie_set_outputfile(struct ffmpeg *ffmpeg){ int retcd; char errstr[128]; @@ -995,30 +995,30 @@ static int ffmpeg_set_outputfile(struct ffmpeg *ffmpeg){ #endif /* Open the output file, if needed. */ - if ((ffmpeg_timelapse_exists(ffmpeg->filename) == 0) || (ffmpeg->tlapse != TIMELAPSE_APPEND)) { + if ((movie_timelapse_exists(ffmpeg->filename) == 0) || (ffmpeg->tlapse != TIMELAPSE_APPEND)) { if (!(ffmpeg->oc->oformat->flags & AVFMT_NOFILE)) { if (avio_open(&ffmpeg->oc->pb, ffmpeg->filename, MY_FLAG_WRITE) < 0) { if (errno == ENOENT) { if (create_path(ffmpeg->filename) == -1) { - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } if (avio_open(&ffmpeg->oc->pb, ffmpeg->filename, MY_FLAG_WRITE) < 0) { MOTION_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO ,_("error opening file %s"), ffmpeg->filename); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } /* Permission denied */ } else if (errno == EACCES) { MOTION_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO ,_("Permission denied. %s"),ffmpeg->filename); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } else { MOTION_LOG(ERR, TYPE_ENCODER, SHOW_ERRNO ,_("Error opening file %s"), ffmpeg->filename); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } } @@ -1033,7 +1033,7 @@ static int ffmpeg_set_outputfile(struct ffmpeg *ffmpeg){ av_strerror(retcd, errstr, sizeof(errstr)); MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO ,_("Could not write ffmpeg header %s"),errstr); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } if (ffmpeg->tlapse == TIMELAPSE_APPEND) { @@ -1047,7 +1047,7 @@ static int ffmpeg_set_outputfile(struct ffmpeg *ffmpeg){ } -static int ffmpeg_flush_codec(struct ffmpeg *ffmpeg){ +static int movie_flush_codec(struct ffmpeg *ffmpeg){ #if (LIBAVFORMAT_VERSION_MAJOR >= 58) || ((LIBAVFORMAT_VERSION_MAJOR == 57) && (LIBAVFORMAT_VERSION_MINOR >= 41)) //ffmpeg version 3.1 and after @@ -1111,21 +1111,21 @@ static int ffmpeg_flush_codec(struct ffmpeg *ffmpeg){ } -static int ffmpeg_put_frame(struct ffmpeg *ffmpeg, const struct timeval *tv1){ +static int movie_put_frame(struct ffmpeg *ffmpeg, const struct timeval *tv1){ int retcd; av_init_packet(&ffmpeg->pkt); ffmpeg->pkt.data = NULL; ffmpeg->pkt.size = 0; - retcd = ffmpeg_set_pts(ffmpeg, tv1); + retcd = movie_set_pts(ffmpeg, tv1); if (retcd < 0) { //If there is an error, it has already been reported. my_packet_unref(ffmpeg->pkt); return 0; } - retcd = ffmpeg_encode_video(ffmpeg); + retcd = movie_encode_video(ffmpeg); if (retcd != 0){ if (retcd != -2){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error while encoding picture")); @@ -1135,7 +1135,7 @@ static int ffmpeg_put_frame(struct ffmpeg *ffmpeg, const struct timeval *tv1){ } if (ffmpeg->tlapse == TIMELAPSE_APPEND) { - retcd = ffmpeg_timelapse_append(ffmpeg, ffmpeg->pkt); + retcd = movie_timelapse_append(ffmpeg, ffmpeg->pkt); } else { retcd = av_write_frame(ffmpeg->oc, &ffmpeg->pkt); } @@ -1149,7 +1149,7 @@ static int ffmpeg_put_frame(struct ffmpeg *ffmpeg, const struct timeval *tv1){ } -static void ffmpeg_passthru_reset(struct ffmpeg *ffmpeg){ +static void movie_passthru_reset(struct ffmpeg *ffmpeg){ /* Reset the written flag at start of each event */ int indx; @@ -1161,7 +1161,7 @@ static void ffmpeg_passthru_reset(struct ffmpeg *ffmpeg){ } -static void ffmpeg_passthru_write(struct ffmpeg *ffmpeg, int indx){ +static void movie_passthru_write(struct ffmpeg *ffmpeg, int indx){ /* Write the packet in the buffer at indx to file */ char errstr[128]; int retcd; @@ -1181,7 +1181,7 @@ static void ffmpeg_passthru_write(struct ffmpeg *ffmpeg, int indx){ return; } - retcd = ffmpeg_set_pktpts(ffmpeg, &ffmpeg->rtsp_data->pktarray[indx].timestamp_tv); + retcd = movie_set_pktpts(ffmpeg, &ffmpeg->rtsp_data->pktarray[indx].timestamp_tv); if (retcd < 0) { my_packet_unref(ffmpeg->pkt); return; @@ -1200,7 +1200,7 @@ static void ffmpeg_passthru_write(struct ffmpeg *ffmpeg, int indx){ } -static int ffmpeg_passthru_put(struct ffmpeg *ffmpeg, struct image_data *img_data){ +static int movie_passthru_put(struct ffmpeg *ffmpeg, struct image_data *img_data){ int idnbr_image, idnbr_lastwritten, idnbr_stop, idnbr_firstkey; int indx, indx_lastwritten, indx_firstkey; @@ -1260,7 +1260,7 @@ static int ffmpeg_passthru_put(struct ffmpeg *ffmpeg, struct image_data *img_dat (ffmpeg->rtsp_data->pktarray[indx].packet.size > 0) && (ffmpeg->rtsp_data->pktarray[indx].idnbr > idnbr_lastwritten) && (ffmpeg->rtsp_data->pktarray[indx].idnbr <= idnbr_image)) { - ffmpeg_passthru_write(ffmpeg, indx); + movie_passthru_write(ffmpeg, indx); } if (ffmpeg->rtsp_data->pktarray[indx].idnbr == idnbr_stop) break; indx++; @@ -1270,7 +1270,7 @@ static int ffmpeg_passthru_put(struct ffmpeg *ffmpeg, struct image_data *img_dat return 0; } -static int ffmpeg_passthru_codec(struct ffmpeg *ffmpeg){ +static int movie_passthru_codec(struct ffmpeg *ffmpeg){ int retcd; AVStream *stream_in; @@ -1296,7 +1296,7 @@ static int ffmpeg_passthru_codec(struct ffmpeg *ffmpeg){ ffmpeg->codec_name = "mp4"; } - retcd = ffmpeg_get_oformat(ffmpeg); + retcd = movie_get_oformat(ffmpeg); if (retcd < 0 ) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get codec!")); pthread_mutex_unlock(&ffmpeg->rtsp_data->mutex_transfer); @@ -1355,7 +1355,7 @@ static int ffmpeg_passthru_codec(struct ffmpeg *ffmpeg){ } -void ffmpeg_avcodec_log(void *ignoreme ATTRIBUTE_UNUSED, int errno_flag ATTRIBUTE_UNUSED, const char *fmt, va_list vl){ +void movie_avcodec_log(void *ignoreme ATTRIBUTE_UNUSED, int errno_flag ATTRIBUTE_UNUSED, const char *fmt, va_list vl){ char buf[1024]; char *end; @@ -1379,7 +1379,7 @@ void ffmpeg_avcodec_log(void *ignoreme ATTRIBUTE_UNUSED, int errno_flag ATTRIBUT } } -static void ffmpeg_put_pix_nv21(struct ffmpeg *ffmpeg, struct image_data *img_data){ +static void movie_put_pix_nv21(struct ffmpeg *ffmpeg, struct image_data *img_data){ unsigned char *image,*imagecr, *imagecb; int cr_len, x, y; @@ -1405,7 +1405,7 @@ static void ffmpeg_put_pix_nv21(struct ffmpeg *ffmpeg, struct image_data *img_da } -static void ffmpeg_put_pix_yuv420(struct ffmpeg *ffmpeg, struct image_data *img_data){ +static void movie_put_pix_yuv420(struct ffmpeg *ffmpeg, struct image_data *img_data){ unsigned char *image; if (ffmpeg->high_resolution){ @@ -1426,7 +1426,7 @@ static void ffmpeg_put_pix_yuv420(struct ffmpeg *ffmpeg, struct image_data *img_ **************************************************************************** ****************************************************************************/ -void ffmpeg_global_init(void){ +void movie_global_init(void){ MOTION_LOG(NTC, TYPE_ENCODER, NO_ERRNO ,_("ffmpeg libavcodec version %d.%d.%d" @@ -1443,12 +1443,12 @@ void ffmpeg_global_init(void){ avformat_network_init(); avdevice_register_all(); - av_log_set_callback((void *)ffmpeg_avcodec_log); + av_log_set_callback((void *)movie_avcodec_log); #if (LIBAVFORMAT_VERSION_MAJOR < 58) /* TODO: Determine if this is even needed for older versions */ int ret; - ret = av_lockmgr_register(ffmpeg_lockmgr_cb); + ret = av_lockmgr_register(movie_lockmgr_cb); if (ret < 0) { MOTION_LOG(EMG, TYPE_ALL, SHOW_ERRNO, _("av_lockmgr_register failed (%d)"), ret); @@ -1458,7 +1458,7 @@ void ffmpeg_global_init(void){ } -void ffmpeg_global_deinit(void) { +void movie_global_deinit(void) { avformat_network_deinit(); @@ -1474,48 +1474,48 @@ void ffmpeg_global_deinit(void) { } -int ffmpeg_open(struct ffmpeg *ffmpeg){ +int movie_open(struct ffmpeg *ffmpeg){ int retcd; ffmpeg->oc = avformat_alloc_context(); if (!ffmpeg->oc) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not allocate output context")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } if (ffmpeg->passthrough) { - retcd = ffmpeg_passthru_codec(ffmpeg); + retcd = movie_passthru_codec(ffmpeg); if (retcd < 0 ) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not setup passthru!")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } - ffmpeg_passthru_reset(ffmpeg); + movie_passthru_reset(ffmpeg); } else { - retcd = ffmpeg_get_oformat(ffmpeg); + retcd = movie_get_oformat(ffmpeg); if (retcd < 0 ) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not get codec!")); - ffmpeg_free_context(ffmpeg); + movie_free_context(ffmpeg); return -1; } - retcd = ffmpeg_set_codec(ffmpeg); + retcd = movie_set_codec(ffmpeg); if (retcd < 0 ) { MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Failed to allocate codec!")); return -1; } - retcd = ffmpeg_set_stream(ffmpeg); + retcd = movie_set_stream(ffmpeg); if (retcd < 0){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); return -1; } - retcd = ffmpeg_set_picture(ffmpeg); + retcd = movie_set_picture(ffmpeg); if (retcd < 0){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); return -1; @@ -1524,7 +1524,7 @@ int ffmpeg_open(struct ffmpeg *ffmpeg){ - retcd = ffmpeg_set_outputfile(ffmpeg); + retcd = movie_set_outputfile(ffmpeg); if (retcd < 0){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Could not set the stream")); return -1; @@ -1534,11 +1534,11 @@ int ffmpeg_open(struct ffmpeg *ffmpeg){ } -void ffmpeg_close(struct ffmpeg *ffmpeg){ +void movie_close(struct ffmpeg *ffmpeg){ if (ffmpeg != NULL) { - if (ffmpeg_flush_codec(ffmpeg) < 0){ + if (movie_flush_codec(ffmpeg) < 0){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO, _("Error flushing codec")); } if (ffmpeg->oc->pb != NULL){ @@ -1551,30 +1551,30 @@ void ffmpeg_close(struct ffmpeg *ffmpeg){ } } } - ffmpeg_free_context(ffmpeg); - ffmpeg_free_nal(ffmpeg); + movie_free_context(ffmpeg); + movie_free_nal(ffmpeg); } } -int ffmpeg_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const struct timeval *tv1){ +int movie_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const struct timeval *tv1){ int retcd = 0; int cnt = 0; if (ffmpeg->passthrough) { - retcd = ffmpeg_passthru_put(ffmpeg, img_data); + retcd = movie_passthru_put(ffmpeg, img_data); return retcd; } if (ffmpeg->picture) { if (ffmpeg->preferred_codec == USER_CODEC_V4L2M2M) { - ffmpeg_put_pix_nv21(ffmpeg, img_data); + movie_put_pix_nv21(ffmpeg, img_data); } else { - ffmpeg_put_pix_yuv420(ffmpeg, img_data); + movie_put_pix_yuv420(ffmpeg, img_data); } ffmpeg->gop_cnt ++; @@ -1592,9 +1592,9 @@ int ffmpeg_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const s * never want a frame buffered so we keep sending back the * the same pic until it flushes or fails in a different way */ - retcd = ffmpeg_put_frame(ffmpeg, tv1); + retcd = movie_put_frame(ffmpeg, tv1); while ((retcd == -2) && (ffmpeg->tlapse != TIMELAPSE_NONE)) { - retcd = ffmpeg_put_frame(ffmpeg, tv1); + retcd = movie_put_frame(ffmpeg, tv1); cnt++; if (cnt > 50){ MOTION_LOG(ERR, TYPE_ENCODER, NO_ERRNO @@ -1613,7 +1613,7 @@ int ffmpeg_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const s } -void ffmpeg_reset_movie_start_time(struct ffmpeg *ffmpeg, const struct timeval *tv1){ +void movie_reset_movie_start_time(struct ffmpeg *ffmpeg, const struct timeval *tv1){ int64_t one_frame_interval = av_rescale_q(1,(AVRational){1, ffmpeg->fps},ffmpeg->video_st->time_base); if (one_frame_interval <= 0) one_frame_interval = 1; diff --git a/src/ffmpeg.h b/src/movie.h similarity index 83% rename from src/ffmpeg.h rename to src/movie.h index 5cc9e91c..dcecdcc4 100644 --- a/src/ffmpeg.h +++ b/src/movie.h @@ -1,5 +1,5 @@ -#ifndef _INCLUDE_FFMPEG_H_ -#define _INCLUDE_FFMPEG_H_ +#ifndef _INCLUDE_MOVIE_H_ +#define _INCLUDE_MOVIE_H_ #include #include @@ -79,13 +79,13 @@ int my_image_copy_to_buffer(AVFrame *frame,uint8_t *buffer_ptr,enum MyPixelForma int my_image_fill_arrays(AVFrame *frame,uint8_t *buffer_ptr,enum MyPixelFormat pix_fmt,int width,int height); int my_copy_packet(AVPacket *dest_pkt, AVPacket *src_pkt); -void ffmpeg_global_init(void); -void ffmpeg_global_deinit(void); -void ffmpeg_avcodec_log(void *, int, const char *, va_list); +void movie_global_init(void); +void movie_global_deinit(void); +void movie_avcodec_log(void *, int, const char *, va_list); -int ffmpeg_open(struct ffmpeg *ffmpeg); -int ffmpeg_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const struct timeval *tv1); -void ffmpeg_close(struct ffmpeg *ffmpeg); -void ffmpeg_reset_movie_start_time(struct ffmpeg *ffmpeg, const struct timeval *tv1); +int movie_open(struct ffmpeg *ffmpeg); +int movie_put_image(struct ffmpeg *ffmpeg, struct image_data *img_data, const struct timeval *tv1); +void movie_close(struct ffmpeg *ffmpeg); +void movie_reset_movie_start_time(struct ffmpeg *ffmpeg, const struct timeval *tv1); -#endif /* _INCLUDE_FFMPEG_H_ */ +#endif /* _INCLUDE_MOVIE_H_ */ diff --git a/src/netcam_rtsp.c b/src/netcam_rtsp.c index 8e75425a..5447cca2 100644 --- a/src/netcam_rtsp.c +++ b/src/netcam_rtsp.c @@ -20,7 +20,7 @@ #include "rotate.h" /* already includes motion.h */ #include "netcam_rtsp.h" #include "video_v4l2.h" /* Needed to validate palette for v4l2 via netcam */ -#include "ffmpeg.h" +#include "movie.h" void netcam_check_buffsize(netcam_buff_ptr buff, size_t numbytes) {