aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
AgeCommit message (Collapse)AuthorFilesLines
2016-06-30Remove Makefile.common filesJoão Valverde2-37/+10
Now that nmake build system has been removed they are not needed anymore. Change-Id: I88075f955bb4349185859c1af4be22e53de5850f Reviewed-on: https://code.wireshark.org/review/16050 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-06-21libcodecs and libwsutil are DLLs, not static librariesPascal Quantin1-1/+1
Change-Id: I4486f35e07c72d4ca35d5649de25d0c9abd2a964 Reviewed-on: https://code.wireshark.org/review/16057 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2016-06-15Remove Nmake build systemPascal Quantin2-88/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-05-22speex: Fix unknown option after ‘#pragma GCC diagnostic’ kind ↵João Valverde1-3/+1
[-Werror=pragmas] Change-Id: Ia6c5d2c19d991ee3ca3b1525b93121ee7cf15b1e Reviewed-on: https://code.wireshark.org/review/13919 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-16autotools: Check for SpeexDSP system libraryJoão Valverde2-2/+5
Change-Id: Ie07f49ec5a563f3b43a2442e05646c6a0b51ca41 Reviewed-on: https://code.wireshark.org/review/15349 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-05-12codecs: Move noinst_HEADERS to Makefile.amJoão Valverde2-13/+14
It's not common code and because it is only required for make dist placing it in Makefile.am provides better automake readability. Also noinst_HEADERS is not necessary in _SOURCES. Change-Id: I5269b79b62141efbc3151e69c5584643e5ebec47 Reviewed-on: https://code.wireshark.org/review/15399 Reviewed-by: João Valverde <j@v6e.pt>
2016-05-02Add checkAPI calls to CMake.Graham Bloice1-0/+9
This generates a top level target, checkAPI, that is excluded from the ALL build target, so must be run separately. On Windows using a Visual Studio generator, call msbuild /p:Configuration=RelWithDebInfo checkAPI.vcxproj Change-Id: I44a57c564dcfc75499463b942436f4b920a82478 Reviewed-on: https://code.wireshark.org/review/14873 Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2016-04-04Include ws_diag_control.h in config.hJoão Valverde1-3/+1
Change-Id: Ia394071710ecda3b0e6686a51fbca45a8ff20317 Reviewed-on: https://code.wireshark.org/review/14749 Petri-Dish: João Valverde <j@v6e.pt> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-21autotools: Use pkg-config autoconf macros for GLib/GTKJoão Valverde1-4/+3
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add dependency flags explicitly instead of using WS_CPPFLAGS. Some minor improvements and fixes for missing/unnecessary variables (no impact on our test builds). Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671 Reviewed-on: https://code.wireshark.org/review/14005 Reviewed-by: João Valverde <j@v6e.pt>
2016-02-18Don't add the wiretap directory to the list of include directories.Guy Harris1-1/+1
If you include something from the wiretap directory, always precede it with wiretap/. Fix some includes of files in the top-level directory to use a path relative to the current directory, not relative to the wiretap directory. This makes it a bit clearer what's being included. Change-Id: Ib99655a13c6006cf6c3112e9d4db6f47df9aff54 Reviewed-on: https://code.wireshark.org/review/13990 Petri-Dish: Guy Harris <guy@alum.mit.edu> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-02-07autotools: Move SBC dependency to libwscodecsJoão Valverde3-20/+25
Change-Id: I931961033798613b78f846c9176dffdb8385bf43 Reviewed-on: https://code.wireshark.org/review/13782 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-02-06CMake: Avoid unnecessary link dependency with SBC and fix debian warningsJoão Valverde1-0/+2
Fixes dpkg warnings: dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/wireshark-qt/usr/bin/wireshark was not linked against libsbc.so.1 (it uses none of the library's symbols) dpkg-shlibdeps: warning: package could avoid a useless dependency if debian/wireshark-gtk/usr/bin/wireshark-gtk was not linked against libsbc.so.1 (it uses none of the library's symbols) dpkg-shlibdeps: warning: symbol sbc_decode used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol sbc_init used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol sin used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol floorf used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol floor used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries dpkg-shlibdeps: warning: symbol sbc_finish used by debian/libwscodecs0/usr/lib/x86_64-linux-gnu/libwscodecs.so.0.0.0 found in none of the libraries Change-Id: I71911513c348edd336cdc82ea358b6a05760b4b9 Reviewed-on: https://code.wireshark.org/review/13784 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-01-28autotools: Don't use "user variables" to set build flagsJoão Valverde1-9/+2
GNU coding standards recommend against it and automake is designed around it. This allows overriding the global build flags using AM_CFLAGS, etc., or per object flags, something that is difficult or impossible currently because of automake precedence rules. Change-Id: I3f1ea12e560af5a46b2f04b342b1882bbf123f12 Reviewed-on: https://code.wireshark.org/review/13455 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: João Valverde <j@v6e.pt>
2016-01-28codecs: add deregister_codec APIPascal Quantin2-0/+15
Change-Id: I83ecc7e4f8c827c83c2f6b62918f042d023daee4 Reviewed-on: https://code.wireshark.org/review/13575 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-04codecs: fix libary name when compiling with CMakePascal Quantin1-1/+1
Change-Id: I0ef328ac9a1fd7281267dbb7f9d1ace97ab41071 Reviewed-on: https://code.wireshark.org/review/12422 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-12-04More libcodecs -> libwscodecs.Guy Harris4-21/+21
Change-Id: Ieb0bb131b6d141bf85997c9a0127e0eb11ea3a3b Reviewed-on: https://code.wireshark.org/review/12420 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-03Change codecs from static to dynamic libraryPascal Quantin6-97/+151
This allows to properly register codecs plugins. See https://www.wireshark.org/lists/wireshark-dev/201511/msg00202.html for details. Change-Id: Ibc13a19936abb7a2e81b86582a75fa424351565b Reviewed-on: https://code.wireshark.org/review/12385 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-01SpeexDSP: Work around self assignments.Gerald Combs1-0/+6
Disable -Wself-assign in speex/resample.c. Many macros (particularly SATURATE32PSHR) simply return the first argument. Change-Id: I3a8557833343e7b213031359e94af90d32d9f082 Reviewed-on: https://code.wireshark.org/review/12315 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-05Fix warnings introduced by "Qt: Initial RTP playback"Peter Wu2-4/+6
Change-Id: I28ae077be535f32ef81ac370d6782033f219017d Reviewed-on: https://code.wireshark.org/review/10777 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-10-02Add another speex cast.Gerald Combs1-2/+2
Change-Id: Ic46823788fa240ebadd44ec2c6d332980af597be Reviewed-on: https://code.wireshark.org/review/10755 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02Add casts to the speex resampler.Gerald Combs2-9/+9
Try to fix speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:294: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:324: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:419: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:536: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:632: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:638: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:645: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:697: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:699: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:817: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:818: warning: implicit conversion shortens 64-bit value into a 32-bit value speex/resample.c:819: warning: implicit conversion shortens 64-bit value into a 32-bit value on the 64-bit OS X builder. Change-Id: Ifad32f5cd6ffe1186c8f9db593cc1c34e67357ce Reviewed-on: https://code.wireshark.org/review/10752 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02Distcheck fixes.Gerald Combs1-0/+1
Add more speex files to the distribution. Comment out a for-now-unused variable. Change-Id: Iea3a0fad81e2cb599209e1c30ecbdbdb153d1328 Reviewed-on: https://code.wireshark.org/review/10749 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-10-02Qt: Initial RTP playback.Gerald Combs8-2/+1923
Note the "initial". This is woefully incomplete. See the "to do" lists below and in the code. This differs a bit from the GTK+ version in that you specify one or more streams to be decoded. Instead of showing waveforms in individual widgets, add them all to a single QCustomPlot. This conserves screen real estate and lets us more easily take advantage of the QCP API. It also looks better IMHO. Change a bunch of checks for QtMultimediaWidgets to QtMultimedia. We probably won't use the widgets until we make 5.0 our minimum Qt version and plain old QtMultimedia lets us support Qt 4 more easily (in theory at least). Add resampling code from libspeex. I initially used this to resample each packet to match the preferred rate of our output device, but this resulted in poorer audio quality than expected. Leave it in and use to create visual samples for QCP and to match rates any time the rate changes. The latter is currently untested. Add some debugging macros. Note that both the RTP player and RTP analysis dialogs decode audio data using different code. Note that voip_calls_packet and voip_calls_init_tap appear to be dead code. To do: - Add silence frames where needed. - Implement the jitter buffer. - Implement the playback timing controls. - Tapping / scanning streams might be too slow. Change-Id: I20dd3b66d3df53c9b1f3501262dc01458849f6b4 Bug: 9007 Reviewed-on: https://code.wireshark.org/review/10458 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-09codecs/gtk: fix int to size_tDario Lombardo8-42/+43
Change-Id: I8f467f09375c8227c4b70aef47ff3a590a0c00d7 Reviewed-on: https://code.wireshark.org/review/10413 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-05Minor CMake updates to better group build artefactsGraham Bloice1-2/+3
Move capchild, caputils, codecs and wsutil into a Libs group Move gtkui into UI group Move update-sminmpec into tools group Change-Id: Iaf2bfe4697265af2c3ed9c9d7de2d5d1ef3cafee Reviewed-on: https://code.wireshark.org/review/6332 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-04Fix out-of-tree build includes of config.hGraham Bloice1-1/+1
If a file in the same directory as config.h, e.g. wireshark-qt.cpp has a #include "config.h", or another header it includes also has a #include "config.h", then an out-of-tree build, e.g. CMake will pick up any in-tree config.h and odd things may happen. The correct form is #include <config.h> which will pick up the out-of-tree version. To find this, introduce a deliberate error and then make an out-of-tree build, noting where it fails and fix that file. If that file includes other files that still cause the build to fail, set the compiler to emit the pre-processed version so you can locate the include with the next errant "config.h". Repeat ad nauseum. Possibly all includes of "config.h" should be changed to <config.h> Revert "CMake: Clobber the top-level config.h before we build." This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71. Ping-Bug: 10301 Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341 Reviewed-on: https://code.wireshark.org/review/6285 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier1-1/+1
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-28Removed duplicated #include linesDario Lombardo1-1/+0
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c Reviewed-on: https://code.wireshark.org/review/6065 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-09Fix ranlib "has no symbols" errors in the codecs directory.Gerald Combs1-3/+8
Don't build the G.722 or G.726 codecs for now. Each are wrapped in "#ifdef HAVE_SPANDSP", which we don't define. Conditionally compile the SBC codec. Change-Id: I5f09ff66514f967d4f0611c943b4e6a975b8994b Reviewed-on: https://code.wireshark.org/review/5690 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-19SBC: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I6ac8e0eed88e78521f7d5623b9afdb6a42900ede Reviewed-on: https://code.wireshark.org/review/5402 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-25Support out-of-source checkapiStig Bjørlykke1-1/+2
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte4-7/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte14-28/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-02-25Remove trailing whitespaceBill Meier1-3/+3
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-12Fix nmake buildEvan Huus1-1/+1
Change-Id: I5583e3c01aa40e07d153f57d72eff92766a755df Reviewed-on: https://code.wireshark.org/review/185 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-12RTP: Add support for SBC codec in RTP PlayerMichal Labedzki15-154/+506
Add optional dependancy to libsbc to play Bluetooth SBC in A2DP payload. Also simplify RTP Player and extent codec interface. Change-Id: I52e1fce9c82e2885736354fe73c6c37168a4fda3 Reviewed-on: https://code.wireshark.org/review/19 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-08Have HAVE_SPANDSP just go over entire file rather than individual functions.Michael Mann2-26/+6
svn path=/trunk/; revision=54645
2013-12-13(Trivial) remove some trailing whitespace.Bill Meier1-3/+3
svn path=/trunk/; revision=54046
2013-12-08check licence: fix FSF address.Jakub Zawadzki4-4/+4
svn path=/trunk/; revision=53866
2013-12-02Do something less catastrophic than crashing if the same name is used inGuy Harris2-6/+6
two codec registrations. svn path=/trunk/; revision=53711
2013-12-02Move most of the plugin code from epan to wsutil and remove allGuy Harris5-35/+167
knowledge of particular types of plugins. Instead, let particular types of plugins register with the common plugin code, giving a name and a routine to recognize that type of plugin. In particular applications, only process the relevant plugin types. Add a Makefile.common to the codecs directory. svn path=/trunk/; revision=53710
2013-12-01If we're including "config.h" when compiling a codec, then /I.. must be ↵Bill Meier1-1/+1
part of CFLAGS. svn path=/trunk/; revision=53699
2013-12-01SBC -> sbcJörg Mayer5-7/+7
On Unix case is relevant, so fix it. Please try to avoid filenames starting with Upper case, it makes completion so much easier as I only need to remember the name and not the case. svn path=/trunk/; revision=53689
2013-12-01Move codecs.[ch] out of epan and into codecs directory.Michael Mann5-0/+137
This may break easy_codec plugins, but it appears a better/more consistent way is needed to register codecs. See Guy's comments in bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893) svn path=/trunk/; revision=53686
2013-11-30The HAVE_xxx definitions come from config.h; include it.Guy Harris1-0/+2
svn path=/trunk/; revision=53681
2013-11-30Tag arguments to decodeXXX routines as unused iff we don't support theGuy Harris2-2/+18
codec. svn path=/trunk/; revision=53680
2013-11-30Add G.722, G.726 and SBC codecs. G.722 and G.726 are from bug 5619 ↵Michael Mann9-4/+381
(https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5619) and SBC is from bug 7893 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893). Codecs are added, but (intentionally) not hooked to the RTP player as a "more generic architecture" is desired. There are some discussions in bug 7893 on how to do this. One thing to add would be how to handle codecs that may not be supported on all platforms. Should the codec not be "registered" at all (with a #define over the whole module) or should it's register functions be stubbed (with a #define in each function that requires a non-supported library) svn path=/trunk/; revision=53676
2013-10-13Add CMake properties to targets so that they are logically organised when ↵Graham Bloice1-0/+1
using a Visual Studio solution. Add CMake properties to group the source files in epan into logical blocks when using a Visual Studio solution. svn path=/trunk/; revision=52580
2013-06-25makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.Chris Maynard1-2/+2
svn path=/trunk/; revision=50140
2012-06-28Update Free Software Foundation address.Jakub Zawadzki8-8/+8
(COPYING will be updated in next commit) svn path=/trunk/; revision=43536