external/miraclecast
1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00
Code Issues Releases Wiki Activity

miracle-*ctl: fix and enhance wfd_subelement parser

Browse source
This commit is contained in:
Derek Dai 2017-02-18 18:28:16 +08:00
parent 495675cdd4
commit 750ff77929
No known key found for this signature in database
GPG key ID: E109CC97553EF009
3 changed files with 34 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

5
res/miracle-wfdctl-demo
View file

@ -16,9 +16,8 @@ if [[ ${#2} != 17 ]]; then
exit 1 exit 1
fi fi
# since this wfd subelement is used for device info, so no wfd subelemnt # this wfd_subelems has no ID (00, device info)
# id needed (eg. 000600101b4400c8 vs 00000600101b4400c8) wfd_subelems=000600111c4400c8
wfd_subelems=000600101c4400c8
link_index="_3${1:0:1}${1:1}" link_index="_3${1:0:1}${1:1}"
peer_id="${2//:/_3a}_40$1" peer_id="${2//:/_3a}_40$1"

45
src/ctl/wfd.c
View file

@ -27,6 +27,12 @@
typedef int (*wfd_sube_parse_func)(const char *in, union wfd_sube *out); typedef int (*wfd_sube_parse_func)(const char *in, union wfd_sube *out);
struct wfd_sube_info
{
wfd_sube_parse_func parser;
uint8_t len;
};
static int wfd_sube_parse_device_info(const char *in, union wfd_sube *out); static int wfd_sube_parse_device_info(const char *in, union wfd_sube *out);
static int wfd_sube_parse_audio_formats(const char *in, union wfd_sube *out); static int wfd_sube_parse_audio_formats(const char *in, union wfd_sube *out);
static int wfd_sube_parse_video_formats(const char *in, union wfd_sube *out); static int wfd_sube_parse_video_formats(const char *in, union wfd_sube *out);
@ -103,11 +109,11 @@ static const struct wfd_resolution resolutions_hh[] = {
{11, 848, 480, 60, 1}, /* p60 */ {11, 848, 480, 60, 1}, /* p60 */
}; };
static const wfd_sube_parse_func parse_func_tbl[WFD_SUBE_ID_RESERVED] = { static const struct wfd_sube_info parser_tbl[WFD_SUBE_ID_RESERVED] = {
[WFD_SUBE_ID_DEVICE_INFO] = wfd_sube_parse_device_info, [WFD_SUBE_ID_DEVICE_INFO] = { .parser = wfd_sube_parse_device_info, .len = 6 },
[WFD_SUBE_ID_AUDIO_FORMATS] = wfd_sube_parse_audio_formats, [WFD_SUBE_ID_AUDIO_FORMATS] = { .parser = wfd_sube_parse_audio_formats, .len = 15 },
[WFD_SUBE_ID_VIDEO_FORMATS] = wfd_sube_parse_video_formats, [WFD_SUBE_ID_VIDEO_FORMATS] = { .parser = wfd_sube_parse_video_formats, .len = 21 },
[WFD_SUBE_ID_WFD_EXT_CAPS] = wfd_sube_parse_ext_caps, [WFD_SUBE_ID_WFD_EXT_CAPS] = { .parser = wfd_sube_parse_ext_caps, .len = 2 },
}; };
int wfd_get_resolutions(enum wfd_resolution_standard std, int wfd_get_resolutions(enum wfd_resolution_standard std,
@ -306,13 +312,8 @@ static int wfd_sube_parse_ext_caps(const char *in, union wfd_sube *out)
int wfd_sube_parse(const char *in, union wfd_sube *out) int wfd_sube_parse(const char *in, union wfd_sube *out)
{ {
uint8_t id; uint8_t id;
const char *eoi = in + strlen(in);
int r; int r;
if((in + 2) >= eoi) {
return -EINVAL;
}
r = sscanf(in, "%2hhx", &id); r = sscanf(in, "%2hhx", &id);
if(1 > r) { if(1 > r) {
return -EINVAL; return -EINVAL;
@ -326,25 +327,37 @@ int wfd_sube_parse_with_id(enum wfd_sube_id id,
union wfd_sube *out) union wfd_sube *out)
{ {
uint16_t len; uint16_t len;
int r = sscanf(in, "%4hx", &len); union wfd_sube sube;
int r;
if(SHL_ARRAY_LENGTH(parser_tbl) <= id) {
return -EINVAL;
}
r = sscanf(in, "%4hx", &len);
if(1 > r) { if(1 > r) {
return -EINVAL; return -EINVAL;
} }
if(SHL_ARRAY_LENGTH(parse_func_tbl) <= id) { if(parser_tbl[id].len != len) {
return -EINVAL; return -EINVAL;
} }
if(!parse_func_tbl[id]) { if(!parser_tbl[id].parser) {
return 0; return -ENOTSUP;
} }
r = (*parse_func_tbl[id])(in + 4, out); r = (*parser_tbl[id].parser)(in + 4, &sube);
if(0 > r) { if(0 > r) {
return r; return r;
} }
out->id = id; sube.id = id;
if(out) {
*out = sube;
}
return r; return r;
} }

6
src/ctl/wfdctl.c
View file

@ -320,9 +320,9 @@ void ctl_fn_peer_new(struct ctl_peer *p)
{ {
struct wfd_sink *s; struct wfd_sink *s;
union wfd_sube sube; union wfd_sube sube;
int r = wfd_sube_parse_with_id(WFD_SUBE_ID_DEVICE_INFO, int r;
p->wfd_subelements,
&sube); r = wfd_sube_parse(p->wfd_subelements, &sube);
if(0 > r) { if(0 > r) {
log_debug("invalid subelement: '%s'", p->wfd_subelements); log_debug("invalid subelement: '%s'", p->wfd_subelements);
return; return;