From f5e22a14877922aa7b907d2e434958c86efd6875 Mon Sep 17 00:00:00 2001 From: Peter Wu Date: Thu, 24 Nov 2016 00:27:14 +0100 Subject: codecs: Add support for G.722 and G.726 Integrate the Spandsp library for G.722 and G.726 support. Adds support for G.722 and all eight variants of G.726. Note: this also fixes a crash in Qt (buffer overrun, reading too much data) caused by confusion of the larger output buffer (resample_buff) with the smaller input buffer (decode_buff). It was not triggered before because the sample rate was always 8k, but with the addition of the new codecs, a different sample rate became possible (16k). Fix also a crash which occurs when the RTP_STREAM_DEBUG macro is enabled and the VOIP Calls dialog is opened (the begin frame, start_fd, is not yet known and therfore a NULL dereference could occur). Passes testing (plays normally without bad RTP timing errors) with SampleCaptures files: sip-rtp-g722.pcap and sip-rtp-g726.pcap. Tested with cmake (Qt), autotools (Qt and GTK+) with ASAN enabled. Bug: 5619 Change-Id: I5661908d193927bba50901079119eeff0c04991f Reviewed-on: https://code.wireshark.org/review/18939 Petri-Dish: Peter Wu Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte Reviewed-by: Peter Wu --- packaging/rpm/SPECS/wireshark.spec.in | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'packaging/rpm/SPECS') diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index df4dbf4e8d..c2ffb1f581 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -12,6 +12,7 @@ %global with_lz4_and_snappy 1 %global with_c_ares 1 %global with_portaudio 0 +%global with_spandsp 0 %global with_nghttp2 1 # Set at most one of these two: @@ -234,6 +235,10 @@ BuildRequires: update-desktop-files BuildRequires: portaudio-devel Requires: portaudio %endif +%if %{with_spandsp} +BuildRequires: spandsp-devel +Requires: spandsp +%endif # Uncomment these if you want to be sure you get them... #BuildRequires: GeoIP-devel @@ -268,6 +273,9 @@ This package contains the GTK+ Wireshark GUI and desktop integration files. %if %{with_portaudio} --with-portaudio \ %endif +%if %{with_spandsp} + --with-spandsp \ +%endif %if %{with qt} --with-qt=4 \ %else @@ -462,6 +470,9 @@ fi %endif %changelog +* Mon Dec 5 2016 Jeff Morriss +- Add spandsp (as an option, defaulting to not required). + * Tue Oct 18 2016 Benoit Canet - Add LZ4 and snappy compression support. -- cgit v1.2.3