Revision 1182cf0f plugins/janus_videoroom.c

View differences:

plugins/janus_videoroom.c
2462 2462
					packet.ubit = ubit;
2463 2463
					packet.bbit = bbit;
2464 2464
					packet.ebit = ebit;
2465
					JANUS_LOG(LOG_WARN, "sl=%d, tl=%d, p=%u, d=%u, u=%u, b=%u, e=%u\n",
2466
						packet.spatial_layer, packet.temporal_layer,
2467
						packet.pbit, packet.dbit, packet.ubit, packet.bbit, packet.ebit);
2468 2465
				}
2469 2466
			}
2470 2467
		}
......
4130 4127
			int temporal_layer = listener->temporal_layer;
4131 4128
			if(listener->target_temporal_layer > listener->temporal_layer) {
4132 4129
				/* We need to upscale */
4133
				JANUS_LOG(LOG_WARN, "We need to upscale temporally:\n");
4130
				JANUS_LOG(LOG_HUGE, "We need to upscale temporally:\n");
4134 4131
				if(packet->ubit && packet->bbit && packet->temporal_layer <= listener->target_temporal_layer) {
4135
					JANUS_LOG(LOG_WARN, "  -- Upscaling temporal layer: %u --> %u\n",
4132
					JANUS_LOG(LOG_HUGE, "  -- Upscaling temporal layer: %u --> %u\n",
4136 4133
						packet->temporal_layer, listener->target_temporal_layer);
4137 4134
					listener->temporal_layer = packet->temporal_layer;
4138 4135
					temporal_layer = listener->temporal_layer;
4139 4136
				}
4140 4137
			} else if(listener->target_temporal_layer < listener->temporal_layer) {
4141 4138
				/* We need to downscale */
4142
				JANUS_LOG(LOG_WARN, "We need to downscale temporally:\n");
4139
				JANUS_LOG(LOG_HUGE, "We need to downscale temporally:\n");
4143 4140
				if(packet->ebit) {
4144
					JANUS_LOG(LOG_WARN, "  -- Downscaling temporal layer: %u --> %u\n",
4141
					JANUS_LOG(LOG_HUGE, "  -- Downscaling temporal layer: %u --> %u\n",
4145 4142
						listener->temporal_layer, listener->target_temporal_layer);
4146 4143
					listener->temporal_layer = listener->target_temporal_layer;
4147 4144
				}
4148 4145
			}
4149 4146
			if(temporal_layer < packet->temporal_layer) {
4150 4147
				/* Drop the packet: update the context to make sure sequence number is increased normally later */
4151
				JANUS_LOG(LOG_WARN, "Dropping packet (temporal layer %d < %d)\n", temporal_layer, packet->temporal_layer);
4148
				JANUS_LOG(LOG_HUGE, "Dropping packet (temporal layer %d < %d)\n", temporal_layer, packet->temporal_layer);
4152 4149
				listener->context.v_base_seq++;
4153 4150
				return;
4154 4151
			}
4155 4152
			int spatial_layer = listener->spatial_layer;
4156 4153
			if(listener->target_spatial_layer > listener->spatial_layer) {
4157
				JANUS_LOG(LOG_WARN, "We need to upscale spatially:\n");
4154
				JANUS_LOG(LOG_HUGE, "We need to upscale spatially:\n");
4158 4155
				/* We need to upscale */
4159 4156
				if(packet->pbit == 0 && packet->bbit && packet->spatial_layer == listener->spatial_layer+1) {
4160
					JANUS_LOG(LOG_WARN, "  -- Upscaling spatial layer: %u --> %u\n",
4157
					JANUS_LOG(LOG_HUGE, "  -- Upscaling spatial layer: %u --> %u\n",
4161 4158
						packet->spatial_layer, listener->target_spatial_layer);
4162 4159
					listener->spatial_layer = packet->spatial_layer;
4163 4160
					spatial_layer = listener->spatial_layer;
4164 4161
				}
4165 4162
			} else if(listener->target_spatial_layer < listener->spatial_layer) {
4166 4163
				/* We need to downscale */
4167
				JANUS_LOG(LOG_WARN, "We need to downscale spatially:\n");
4164
				JANUS_LOG(LOG_HUGE, "We need to downscale spatially:\n");
4168 4165
				if(packet->ebit) {
4169
					JANUS_LOG(LOG_WARN, "  -- Downscaling spatial layer: %u --> %u\n",
4166
					JANUS_LOG(LOG_HUGE, "  -- Downscaling spatial layer: %u --> %u\n",
4170 4167
						listener->spatial_layer, listener->target_spatial_layer);
4171 4168
					listener->spatial_layer = listener->target_spatial_layer;
4172 4169
				}

Also available in: Unified diff