server: Fix encoding selection for sw frames
This fixes encoding selection when not using the --gpu option. Before this change, raw encoding would always be selected. Reported-by: Consolatis Suggested-by: Consolatispull/74/head
parent
c0e1159a53
commit
19538c9435
|
@ -1355,13 +1355,14 @@ static enum rfb_encodings choose_frame_encoding(struct nvnc_client* client,
|
||||||
case RFB_ENCODING_RAW:
|
case RFB_ENCODING_RAW:
|
||||||
case RFB_ENCODING_TIGHT:
|
case RFB_ENCODING_TIGHT:
|
||||||
case RFB_ENCODING_ZRLE:
|
case RFB_ENCODING_ZRLE:
|
||||||
|
return client->encodings[i];
|
||||||
#ifdef ENABLE_OPEN_H264
|
#ifdef ENABLE_OPEN_H264
|
||||||
case RFB_ENCODING_OPEN_H264:
|
case RFB_ENCODING_OPEN_H264:
|
||||||
// h264 is useless for sw frames
|
// h264 is useless for sw frames
|
||||||
if (fb->type != NVNC_FB_GBM_BO)
|
if (fb->type != NVNC_FB_GBM_BO)
|
||||||
break;
|
break;
|
||||||
#endif
|
|
||||||
return client->encodings[i];
|
return client->encodings[i];
|
||||||
|
#endif
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue