Wireshark-commits: [Wireshark-commits] master aede5c0: [OSC] fix and tidy up MIDI in OSC dissector.
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=aede5c0c412caad92ce4e4982d17f1b2b85d0e59
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
aede5c0 by Hanspeter Portner (dev@xxxxxxxxxxxxxxxxxxxxxxxxx):
[OSC] fix and tidy up MIDI in OSC dissector.
Fix:
* Byte 0 of OSC MIDI argument denotes a 'port', not a 'channel'.
* Byte 1 is either
* 'system' message (0xf0 - 0xff) and handled byte-wise or
* 'non-system' message and handled nibble-wise
* Left nibble denotes 'status'
* Right nibble denotes 'channel'
Tidy up:
* Simplify/shorted format strings for whole MIDI message.
* Add 'port' value.
* Mask 'status' and 'channel' as twin nibbles.
* Change data bytes (Bytes 2, 3) to be reported as decimals by default.
* Mask data bytes (Bytes 2, 3) with 0x7f.
* Add note names for 'noteOn', 'noteOff', 'notePressure' messages.
* Add velocity value for 'noteOn', 'noteOff' messages.
* Add pressure value for 'notePressure', 'channelPressure' messages.
* Add 14-bit (7bit LSB, 7bit MSB) value for 'pitchBend' messages.
Change-Id: I651e76c6d53b01225c3245f10fc555310c7e8c8a
Reviewed-on: https://code.wireshark.org/review/13060
Petri-Dish: Alexis La Goutte <alexis.lagoutte@xxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 3d2cbe6 Adding Color Control and Ballast Configuration(Lighting Chapter) Clusters for Zigbee
adds aede5c0 [OSC] fix and tidy up MIDI in OSC dissector.
Summary of changes:
epan/dissectors/packet-osc.c | 351 +++++++++++++++++++++++++++++++++++-------
1 file changed, 294 insertions(+), 57 deletions(-)