diff --git a/definitions/en_CA.js b/definitions/en_CA.js index d5fce74e..fccfc1c3 100644 --- a/definitions/en_CA.js +++ b/definitions/en_CA.js @@ -3268,6 +3268,28 @@ module.exports = function(s,config,lang){ "form-group-class": "h_buff_input h_buff_libx264 h_buff_h264_vaapi h_buff_hevc_vaapi", "possible": "" }, + { + "name": "detail=event_record_scale_x", + "field": lang.Width, + "description": "Width of the Event-based Recording image that is output after processing.", + "default": "", + "fieldType": "number", + "numberMin": "1", + "example": "640", + "form-group-class": "h_buff_input h_buff_libx264 h_buff_h264_vaapi h_buff_hevc_vaapi", + "possible": "" + }, + { + "name": "detail=event_record_scale_y", + "field": lang.Height, + "description": "Height of the Event-based Recording image that is output after processing.", + "default": "", + "fieldType": "number", + "numberMin": "1", + "example": "480", + "form-group-class": "h_buff_input h_buff_libx264 h_buff_h264_vaapi h_buff_hevc_vaapi", + "possible": "" + }, { "name": "detail=detector_buffer_hls_time", "field": lang['HLS Segment Length'], diff --git a/libs/ffmpeg/builders.js b/libs/ffmpeg/builders.js index 0f419a61..50e33d08 100644 --- a/libs/ffmpeg/builders.js +++ b/libs/ffmpeg/builders.js @@ -670,7 +670,7 @@ module.exports = (s,config,lang) => { const videoCodecisCopy = videoCodec === 'copy' const videoFps = !isNaN(parseFloat(e.details.stream_fps)) && e.details.stream_fps !== '0' ? parseFloat(e.details.stream_fps) : null const inputMap = buildInputMap(e,e.details.input_map_choices.detector_sip_buffer) - const { videoWidth, videoHeight } = validateDimensions(e.details.record_scale_x,e.details.record_scale_y) + const { videoWidth, videoHeight } = validateDimensions(e.details.event_record_scale_x,e.details.event_record_scale_y) const hlsTime = !isNaN(parseInt(e.details.detector_buffer_hls_list_time)) ? `${parseInt(e.details.detector_buffer_hls_list_time)}` : '2' const hlsListSize = !isNaN(parseInt(e.details.detector_buffer_hls_list_size)) ? `${parseInt(e.details.detector_buffer_hls_list_size)}` : '4' if(inputMap)outputFlags.push(inputMap) @@ -735,8 +735,8 @@ module.exports = (s,config,lang) => { const videoFilters = [] const videoFlags = [] const inputMap = buildInputMap(e,e.details.input_map_choices.record_timelapse) - const { videoWidth, videoHeight } = validateDimensions(e.details.record_scale_x,e.details.record_scale_y) - if(videoWidth && videoHeight)streamFlags.push(`-s ${videoWidth}x${videoHeight}`) + const { videoWidth, videoHeight } = validateDimensions(e.details.record_timelapse_scale_x,e.details.record_timelapse_scale_y) + if(videoWidth && videoHeight)videoFlags.push(`-s ${videoWidth}x${videoHeight}`) if(inputMap)videoFlags.push(inputMap) videoFilters.push(`fps=${(1 / (!isNaN(parseFloat(e.details.record_timelapse_fps)) ? parseFloat(e.details.record_timelapse_fps) : 900)).toFixed(3)}`) if(e.details.record_timelapse_vf)videoFilters.push(e.details.record_timelapse_vf)