mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed redundant logs

Browse source
This commit is contained in:
raghu447 2020-06-03 18:11:41 +05:30 • committed by Wim Taymans
parent af263187ea
commit d93870fdeb
2 changed files with 0 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/examples/media-session/libcamera-monitor.c
View file

@ -228,12 +228,10 @@ static struct device *libcamera_find_device(struct impl *impl, uint32_t id)
{ {
struct device *dev; struct device *dev;
pw_log_info("In %s:: Invoking spa_list_for_each for id = %d", __FUNCTION__, id);
spa_list_for_each(dev, &impl->device_list, link) { spa_list_for_each(dev, &impl->device_list, link) {
if (dev->id == id) if (dev->id == id)
return dev; return dev;
} }
pw_log_info("In %s:: spa_list_for_each returns NULL for id = %d", __FUNCTION__, id);
return NULL; return NULL;
} }
@ -420,7 +418,6 @@ static void libcamera_udev_object_info(void *data, uint32_t id,
struct impl *impl = data; struct impl *impl = data;
struct device *dev = NULL; struct device *dev = NULL;
pw_log_info("In %s:: Invoking libcamera_find_device for id = %d", __FUNCTION__, id);
dev = libcamera_find_device(impl, id); dev = libcamera_find_device(impl, id);
if (info == NULL) { if (info == NULL) {
@ -467,7 +464,6 @@ int sm_libcamera_monitor_start(struct sm_media_session *sess)
return -errno; return -errno;
impl->session = sess; impl->session = sess;
pw_log_info("%s:: Loading spa handle: %s", __FUNCTION__, SPA_NAME_API_LIBCAMERA_DEVICE);
impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_LIBCAMERA_ENUM_CLIENT, NULL); impl->handle = pw_context_load_spa_handle(context, SPA_NAME_API_LIBCAMERA_ENUM_CLIENT, NULL);
if (impl->handle == NULL) { if (impl->handle == NULL) {

24
src/examples/media-session/v4l2-endpoint.c
View file

@ -160,15 +160,12 @@ static int client_endpoint_create_link(void *object, const struct spa_dict *prop
res = -EINVAL; res = -EINVAL;
goto exit; goto exit;
} }
pw_log_info(NAME " %s. Got %s from PW_KEY_ENDPOINT_LINK_INPUT_ENDPOINT", __FUNCTION__, str);
obj = sm_media_session_find_object(impl->session, atoi(str)); obj = sm_media_session_find_object(impl->session, atoi(str));
if (obj == NULL || strcmp(obj->type, PW_TYPE_INTERFACE_Endpoint) != 0) { if (obj == NULL || strcmp(obj->type, PW_TYPE_INTERFACE_Endpoint) != 0) {
pw_log_warn(NAME" %p: could not find endpoint %s (%p)", impl, str, obj); pw_log_warn(NAME" %p: could not find endpoint %s (%p)", impl, str, obj);
res = -EINVAL; res = -EINVAL;
goto exit; goto exit;
} else {
pw_log_info(NAME " %s: comparing obj->type[%s] with %s.", __FUNCTION__, obj->type, PW_TYPE_INTERFACE_Endpoint);
} }
pw_properties_setf(p, PW_KEY_LINK_OUTPUT_NODE, "%d", endpoint->node->node->info->id); pw_properties_setf(p, PW_KEY_LINK_OUTPUT_NODE, "%d", endpoint->node->node->info->id);
@ -202,7 +199,6 @@ static struct stream *endpoint_add_stream(struct endpoint *endpoint)
struct stream *s; struct stream *s;
const char *str; const char *str;
pw_log_info(NAME " %s. ", __FUNCTION__);
s = calloc(1, sizeof(*s)); s = calloc(1, sizeof(*s));
if (s == NULL) if (s == NULL)
return NULL; return NULL;
@ -227,7 +223,6 @@ static struct stream *endpoint_add_stream(struct endpoint *endpoint)
s->info.change_mask = PW_ENDPOINT_STREAM_CHANGE_MASK_PROPS; s->info.change_mask = PW_ENDPOINT_STREAM_CHANGE_MASK_PROPS;
s->info.props = &s->props->dict; s->info.props = &s->props->dict;
pw_log_info("%s:: stream %s %d", __FUNCTION__, s->info.name, s->info.id);
pw_client_endpoint_stream_update(endpoint->client_endpoint, pw_client_endpoint_stream_update(endpoint->client_endpoint,
s->info.id, s->info.id,
PW_CLIENT_ENDPOINT_STREAM_UPDATE_INFO, PW_CLIENT_ENDPOINT_STREAM_UPDATE_INFO,
@ -244,7 +239,6 @@ static void destroy_stream(struct stream *stream)
{ {
struct endpoint *endpoint = stream->endpoint; struct endpoint *endpoint = stream->endpoint;
pw_log_info(NAME " %s. ", __FUNCTION__);
pw_client_endpoint_stream_update(endpoint->client_endpoint, pw_client_endpoint_stream_update(endpoint->client_endpoint,
stream->info.id, stream->info.id,
PW_CLIENT_ENDPOINT_STREAM_UPDATE_DESTROYED, PW_CLIENT_ENDPOINT_STREAM_UPDATE_DESTROYED,
@ -266,7 +260,6 @@ static void update_params(void *data)
struct sm_node *node = endpoint->node->node; struct sm_node *node = endpoint->node->node;
struct sm_param *p; struct sm_param *p;
pw_log_info(NAME " %s. ", __FUNCTION__);
pw_log_debug(NAME" %p: endpoint", endpoint); pw_log_debug(NAME" %p: endpoint", endpoint);
params = alloca(sizeof(struct spa_pod *) * node->n_params); params = alloca(sizeof(struct spa_pod *) * node->n_params);
@ -314,7 +307,6 @@ static void complete_endpoint(void *data)
struct stream *stream; struct stream *stream;
struct sm_param *p; struct sm_param *p;
pw_log_info(NAME " %s. ", __FUNCTION__);
pw_log_debug("endpoint %p: complete", endpoint); pw_log_debug("endpoint %p: complete", endpoint);
spa_list_for_each(p, &endpoint->node->node->param_list, link) { spa_list_for_each(p, &endpoint->node->node->param_list, link) {
@ -354,7 +346,6 @@ static void proxy_destroy(void *data)
struct endpoint *endpoint = data; struct endpoint *endpoint = data;
struct stream *s; struct stream *s;
pw_log_info(NAME " %s. ", __FUNCTION__);
pw_log_debug("endpoint %p: destroy", endpoint); pw_log_debug("endpoint %p: destroy", endpoint);
spa_list_consume(s, &endpoint->stream_list, link) spa_list_consume(s, &endpoint->stream_list, link)
@ -370,7 +361,6 @@ static void proxy_destroy(void *data)
static void proxy_bound(void *data, uint32_t id) static void proxy_bound(void *data, uint32_t id)
{ {
struct endpoint *endpoint = data; struct endpoint *endpoint = data;
pw_log_info(NAME " %s. ", __FUNCTION__);
endpoint->info.id = id; endpoint->info.id = id;
} }
@ -392,7 +382,6 @@ static struct endpoint *create_endpoint(struct node *node)
struct pw_properties *pr = node->node->obj.props; struct pw_properties *pr = node->node->obj.props;
enum pw_direction direction; enum pw_direction direction;
pw_log_info(NAME " %s. ", __FUNCTION__);
if (pr == NULL) { if (pr == NULL) {
errno = EINVAL; errno = EINVAL;
return NULL; return NULL;
@ -426,7 +415,6 @@ static struct endpoint *create_endpoint(struct node *node)
if ((str = pw_properties_get(pr, PW_KEY_DEVICE_ICON_NAME)) != NULL) if ((str = pw_properties_get(pr, PW_KEY_DEVICE_ICON_NAME)) != NULL)
pw_properties_set(props, PW_KEY_ENDPOINT_ICON_NAME, str); pw_properties_set(props, PW_KEY_ENDPOINT_ICON_NAME, str);
pw_log_info(NAME " %s. Invoking sm_media_session_create_object", __FUNCTION__);
proxy = sm_media_session_create_object(impl->session, proxy = sm_media_session_create_object(impl->session,
"client-endpoint", "client-endpoint",
PW_TYPE_INTERFACE_ClientEndpoint, PW_TYPE_INTERFACE_ClientEndpoint,
@ -501,7 +489,6 @@ static int setup_v4l2_endpoint(struct device *device)
struct sm_node *n; struct sm_node *n;
struct sm_device *d = device->device; struct sm_device *d = device->device;
pw_log_info(NAME " %s. ", __FUNCTION__);
pw_log_debug(NAME" %p: device %p setup", impl, d); pw_log_debug(NAME" %p: device %p setup", impl, d);
spa_list_for_each(n, &d->node_list, link) { spa_list_for_each(n, &d->node_list, link) {
@ -513,7 +500,6 @@ static int setup_v4l2_endpoint(struct device *device)
node->device = device; node->device = device;
node->node = n; node->node = n;
node->impl = impl; node->impl = impl;
pw_log_info(NAME " %s. Invoking create_endpoint", __FUNCTION__);
node->endpoint = create_endpoint(node); node->endpoint = create_endpoint(node);
if (node->endpoint == NULL) if (node->endpoint == NULL)
return -errno; return -errno;
@ -523,8 +509,6 @@ static int setup_v4l2_endpoint(struct device *device)
static int activate_device(struct device *device) static int activate_device(struct device *device)
{ {
pw_log_info(NAME " In %s. Activating....", __FUNCTION__);
pw_log_info(NAME " In %s. Invoking setup_libcamera_endpoint", __FUNCTION__);
return setup_v4l2_endpoint(device); return setup_v4l2_endpoint(device);
} }
@ -533,7 +517,6 @@ static int deactivate_device(struct device *device)
struct impl *impl = device->impl; struct impl *impl = device->impl;
struct endpoint *e; struct endpoint *e;
pw_log_info(NAME " %s. ", __FUNCTION__);
pw_log_debug(NAME" %p: device %p deactivate", impl, device->device); pw_log_debug(NAME" %p: device %p deactivate", impl, device->device);
spa_list_consume(e, &device->endpoint_list, link) spa_list_consume(e, &device->endpoint_list, link)
destroy_endpoint(impl, e); destroy_endpoint(impl, e);
@ -546,7 +529,6 @@ static void device_update(void *data)
struct device *device = data; struct device *device = data;
struct impl *impl = device->impl; struct impl *impl = device->impl;
pw_log_info(NAME " %s. ", __FUNCTION__);
pw_log_info(NAME" %p: device %p %08x %08x", impl, device, pw_log_info(NAME" %p: device %p %08x %08x", impl, device,
device->device->obj.avail, device->device->obj.changed); device->device->obj.avail, device->device->obj.changed);
@ -572,7 +554,6 @@ handle_device(struct impl *impl, struct sm_object *obj)
const char *media_class, *str; const char *media_class, *str;
struct device *device; struct device *device;
pw_log_info(NAME " In %s. ", __FUNCTION__);
if (obj->props == NULL) if (obj->props == NULL)
return 0; return 0;
@ -600,7 +581,6 @@ handle_device(struct impl *impl, struct sm_object *obj)
static void destroy_device(struct impl *impl, struct device *device) static void destroy_device(struct impl *impl, struct device *device)
{ {
pw_log_info(NAME " In %s. Deactivating...", __FUNCTION__);
deactivate_device(device); deactivate_device(device);
spa_hook_remove(&device->listener); spa_hook_remove(&device->listener);
sm_object_remove_data((struct sm_object*)device->device, SESSION_KEY); sm_object_remove_data((struct sm_object*)device->device, SESSION_KEY);
@ -611,7 +591,6 @@ static void session_create(void *data, struct sm_object *object)
struct impl *impl = data; struct impl *impl = data;
int res; int res;
pw_log_info(NAME " In %s. comparing object->type[%s] with %s", __FUNCTION__, object->type, PW_TYPE_INTERFACE_Device);
if (strcmp(object->type, PW_TYPE_INTERFACE_Device) == 0) if (strcmp(object->type, PW_TYPE_INTERFACE_Device) == 0)
res = handle_device(impl, object); res = handle_device(impl, object);
else else
@ -627,7 +606,6 @@ static void session_remove(void *data, struct sm_object *object)
{ {
struct impl *impl = data; struct impl *impl = data;
pw_log_info(NAME " In %s. ", __FUNCTION__);
if (strcmp(object->type, PW_TYPE_INTERFACE_Device) == 0) { if (strcmp(object->type, PW_TYPE_INTERFACE_Device) == 0) {
struct device *device; struct device *device;
if ((device = sm_object_get_data(object, SESSION_KEY)) != NULL) if ((device = sm_object_get_data(object, SESSION_KEY)) != NULL)
@ -653,13 +631,11 @@ int sm_v4l2_endpoint_start(struct sm_media_session *session)
{ {
struct impl *impl; struct impl *impl;
pw_log_info(NAME " In %s. ", __FUNCTION__);
impl = calloc(1, sizeof(struct impl)); impl = calloc(1, sizeof(struct impl));
if (impl == NULL) if (impl == NULL)
return -errno; return -errno;
impl->session = session; impl->session = session;
pw_log_info(NAME " In %s. Invoking sm_media_session_add_listener", __FUNCTION__);
sm_media_session_add_listener(session, &impl->listener, &session_events, impl); sm_media_session_add_listener(session, &impl->listener, &session_events, impl);
return 0; return 0;