jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mac-avcapture: Improve logging (less LOG_ERRORs)

Browse Source
This commit is contained in:
Palana 2015-08-14 17:04:41 +02:00
parent 5eb5453fcc
commit f3c33c232d
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/mac-avcapture/av-capture.mm
View File

@ -438,7 +438,7 @@ static void capture_device(av_capture *capture, AVCaptureDevice *dev,
if (obs_data_get_bool(settings, "use_preset")) { if (obs_data_get_bool(settings, "use_preset")) {
NSString *preset = get_string(settings, "preset"); NSString *preset = get_string(settings, "preset");
if (![dev supportsAVCaptureSessionPreset:preset]) { if (![dev supportsAVCaptureSessionPreset:preset]) {
AVLOG(LOG_ERROR, "Preset %s not available", AVLOG(LOG_WARNING, "Preset %s not available",
preset_names(preset).UTF8String); preset_names(preset).UTF8String);
preset = select_preset(dev, preset); preset = select_preset(dev, preset);
} }
@ -472,12 +472,12 @@ static inline void handle_disconnect_capture(av_capture *capture,
return; return;
if (!capture->device) { if (!capture->device) {
AVLOG(LOG_ERROR, "Received disconnect for unused device '%s'", AVLOG(LOG_INFO, "Received disconnect for inactive device '%s'",
capture->uid.UTF8String); capture->uid.UTF8String);
return; return;
} }
AVLOG(LOG_ERROR, "Device with unique ID '%s' disconnected", AVLOG(LOG_WARNING, "Device with unique ID '%s' disconnected",
dev.uniqueID.UTF8String); dev.uniqueID.UTF8String);
remove_device(capture); remove_device(capture);
@ -554,9 +554,9 @@ static bool av_capture_init(av_capture *capture, obs_data_t *settings)
if (!dev) { if (!dev) {
if (capture->uid.length < 1) if (capture->uid.length < 1)
AVLOG(LOG_ERROR, "No device selected"); AVLOG(LOG_INFO, "No device selected");
else else
AVLOG(LOG_ERROR, "Could not initialize device " \ AVLOG(LOG_WARNING, "Could not initialize device " \
"with unique ID '%s'", "with unique ID '%s'",
capture->uid.UTF8String); capture->uid.UTF8String);
return true; return true;
@ -838,9 +838,14 @@ static void switch_device(av_capture *capture, NSString *uid,
capture->uid = uid; capture->uid = uid;
if (!uid.length) {
AVLOG(LOG_INFO, "No device selected, stopping capture");
return;
}
AVCaptureDevice *dev = [AVCaptureDevice deviceWithUniqueID:uid]; AVCaptureDevice *dev = [AVCaptureDevice deviceWithUniqueID:uid];
if (!dev) { if (!dev) {
AVLOG(LOG_ERROR, "Device with unique id '%s' not found", AVLOG(LOG_WARNING, "Device with unique id '%s' not found",
uid.UTF8String); uid.UTF8String);
return; return;
} }
@ -859,7 +864,8 @@ static void av_capture_update(void *data, obs_data_t *settings)
NSString *preset = get_string(settings, "preset"); NSString *preset = get_string(settings, "preset");
if (![capture->device supportsAVCaptureSessionPreset:preset]) { if (![capture->device supportsAVCaptureSessionPreset:preset]) {
AVLOG(LOG_ERROR, "Preset %s not available", preset.UTF8String); AVLOG(LOG_WARNING, "Preset %s not available",
preset.UTF8String);
preset = select_preset(capture->device, preset); preset = select_preset(capture->device, preset);
} }