From 9515fba1fa0d51a97abd02e0869f42bfc2201c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Valverde?= Date: Tue, 26 Sep 2017 02:47:34 +0100 Subject: Remove "easy_codec" source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's dead, unmaintained and unfinished. Not in a good enough state to live in the tree. Change-Id: I6a5c391503b5237638f8362fb9f0492c4cf36223 Reviewed-on: https://code.wireshark.org/review/23745 Reviewed-by: Pascal Quantin Reviewed-by: Michael Mann Reviewed-by: João Valverde --- plugins/Makefile.am | 1 - plugins/easy_codec/Makefile.am | 48 --------------- plugins/easy_codec/ReadMe.txt | 13 ---- plugins/easy_codec/codec-g722.c | 103 ------------------------------- plugins/easy_codec/codec-g722.h | 39 ------------ plugins/easy_codec/codec-g7231.c | 108 --------------------------------- plugins/easy_codec/codec-g7231.h | 39 ------------ plugins/easy_codec/codec-g729a.c | 94 ---------------------------- plugins/easy_codec/codec-g729a.h | 39 ------------ plugins/easy_codec/easy_codec_plugin.c | 47 -------------- plugins/easy_codec/plugin.rc.in | 34 ----------- 11 files changed, 565 deletions(-) delete mode 100644 plugins/easy_codec/Makefile.am delete mode 100644 plugins/easy_codec/ReadMe.txt delete mode 100644 plugins/easy_codec/codec-g722.c delete mode 100644 plugins/easy_codec/codec-g722.h delete mode 100644 plugins/easy_codec/codec-g7231.c delete mode 100644 plugins/easy_codec/codec-g7231.h delete mode 100644 plugins/easy_codec/codec-g729a.c delete mode 100644 plugins/easy_codec/codec-g729a.h delete mode 100644 plugins/easy_codec/easy_codec_plugin.c delete mode 100644 plugins/easy_codec/plugin.rc.in (limited to 'plugins') diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 2f8f7a0ab6..c3caf41b01 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -23,7 +23,6 @@ SUBDIRS = $(_CUSTOM_SUBDIRS_) \ docsis \ - easy_codec \ ethercat \ gryphon \ irda \ diff --git a/plugins/easy_codec/Makefile.am b/plugins/easy_codec/Makefile.am deleted file mode 100644 index b24f1d3936..0000000000 --- a/plugins/easy_codec/Makefile.am +++ /dev/null @@ -1,48 +0,0 @@ -# Makefile.am -# -# Wireshark - Network traffic analyzer -# By Gerald Combs -# Copyright 1998 Gerald Combs -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -# the name of the plugin -PLUGIN_NAME = easy_codec - -# Non-generated sources -NONGENERATED_C_FILES = \ - easy_codec_plugin.c \ - codec-g729a.c \ - codec-g7231.c \ - codec-g722.c - -# Headers. -CLEAN_HEADER_FILES = \ - codec-g729a.h \ - codec-g7231.h \ - codec-g722.h - -HEADER_FILES = \ - $(FLEX_GENERATED_HEADER_FILES) \ - $(CLEAN_HEADER_FILES) - -EXTRA_DIST = \ - $(NONGENERATED_C_FILES) \ - $(CLEAN_HEADER_FILES) \ - plugin.rc.in \ - ReadMe.txt - -MAINTAINERCLEANFILES = \ - Makefile.in diff --git a/plugins/easy_codec/ReadMe.txt b/plugins/easy_codec/ReadMe.txt deleted file mode 100644 index 0207ed9f94..0000000000 --- a/plugins/easy_codec/ReadMe.txt +++ /dev/null @@ -1,13 +0,0 @@ -Instructions on compiling the Easy Codecs -========================================= - -1. Download the codec files from www.ImTelephone.com and install them in the following subdirectories. - EasyG722 - EasyG7231 - EasyG729A - -2. Build plugin. - Linux: TO DO - CMake: TO DO - - diff --git a/plugins/easy_codec/codec-g722.c b/plugins/easy_codec/codec-g722.c deleted file mode 100644 index 8394f53014..0000000000 --- a/plugins/easy_codec/codec-g722.c +++ /dev/null @@ -1,103 +0,0 @@ -/* codec-g722.c -* Easy codecs stub for EasyG722 -* 2007 Ales Kocourek -* -* Wireshark - Network traffic analyzer -* By Gerald Combs -* Copyright 1998 Gerald Combs -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "config.h" - -#include - -#include - -#include "codec-g722.h" - -#include "EasyG722/EasyG722.h" - -struct g722_context { - CODER_HANDLE handle; - short speach_buffer[L_G722_FRAME]; -}; - -void *codec_g722_init(void) { - struct g722_context *ctx = 0; - - ctx = (struct g722_context*)g_malloc0(sizeof(struct g722_context)); - ctx->handle = EasyG722_init_decoder(); - return ctx; -} - -void codec_g722_release(void *context) { - struct g722_context *ctx = (struct g722_context*)context; - - if (!ctx) return; - EasyG722_release_decoder(ctx->handle); - g_free(ctx); -} - -int codec_g722_decode(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes) { - struct g722_context *ctx = (struct g722_context*)context; - const unsigned char *bitstream = (const unsigned char*)input; - short *speech = (short*)output; - int decodedBytes = 0; - int i; - - if (!ctx) return 0; - - if ((inputSizeBytes % L_G722_FRAME_COMPRESSED) != 0) - return 0; - - if (!output) - return (inputSizeBytes / L_G722_FRAME_COMPRESSED ) * L_G722_FRAME / 2 * sizeof(short) ; - - while ((inputSizeBytes >= L_G722_FRAME_COMPRESSED) && - ((*outputSizeBytes - decodedBytes) >= L_G722_FRAME / 2 * sizeof(short))) { - if (EasyG722_decoder(ctx->handle, (unsigned char*)bitstream, ctx->speach_buffer)) { - int write_index = 0; - - for(i = 0; i < L_G722_FRAME; i+=2) { - ctx->speach_buffer[write_index] = ctx->speach_buffer[i]; - write_index++; - } - memcpy(speech, ctx->speach_buffer, L_G722_FRAME / 2 * sizeof(short)); - - speech += L_G722_FRAME / 2; - decodedBytes += L_G722_FRAME / 2 * sizeof(short); - - } - bitstream += L_G722_FRAME_COMPRESSED; - inputSizeBytes -= L_G722_FRAME_COMPRESSED; - } - - return decodedBytes; -} - -/* - * Editor modelines - http://www.wireshark.org/tools/modelines.html - * - * Local Variables: - * c-basic-offset: 2 - * tab-width: 8 - * indent-tabs-mode: nil - * End: - * - * ex: set shiftwidth=2 tabstop=8 expandtab: - * :indentSize=2:tabSize=8:noTabs=true: - */ diff --git a/plugins/easy_codec/codec-g722.h b/plugins/easy_codec/codec-g722.h deleted file mode 100644 index eccf017dfc..0000000000 --- a/plugins/easy_codec/codec-g722.h +++ /dev/null @@ -1,39 +0,0 @@ -/* codec-g722.h -* Easy codecs stub for EasyG722 -* 2007 Ales Kocourek -* -* Wireshark - Network traffic analyzer -* By Gerald Combs -* Copyright 1998 Gerald Combs -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef _CODEC_G722_H_ -#define _CODEC_G722_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -void *codec_g722_init(void); -void codec_g722_release(void *ctx); -int codec_g722_decode(void *ctx, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _CODEC_G729_H_ */ diff --git a/plugins/easy_codec/codec-g7231.c b/plugins/easy_codec/codec-g7231.c deleted file mode 100644 index d2c65ee31f..0000000000 --- a/plugins/easy_codec/codec-g7231.c +++ /dev/null @@ -1,108 +0,0 @@ -/* codec-g7231.c -* Easy codecs stub for EasyG7231 -* 2007 Ales Kocourek -* -* Wireshark - Network traffic analyzer -* By Gerald Combs -* Copyright 1998 Gerald Combs -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "config.h" - -#include - -#include - -#include "codec-g7231.h" - -#include "EasyG7231/EasyG7231.h" - -struct g7231_context { - CODER_HANDLE handle; - short speach_buffer[L_G7231_FRAME]; - int l_g7231_frame_compressed; -}; - -void *codec_g7231_init(void) { - struct g7231_context *ctx = 0; - - ctx = (struct g7231_context*)g_malloc0(sizeof(struct g7231_context)); - ctx->handle = -1; - return ctx; -} - -void codec_g7231_release(void *context) { - struct g7231_context *ctx = (struct g7231_context*)context; - - if (!ctx) return; - EasyG7231_release_decoder(ctx->handle); - g_free(ctx); -} - -int codec_g7231_decode(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes) { - struct g7231_context *ctx = (struct g7231_context*)context; - const unsigned char *bitstream = (const unsigned char*)input; - short *speech = (short*)output; - int decodedBytes = 0; - - if (!ctx) return 0; - - if ( ctx->handle == -1) { - if ( bitstream[0] & 0x03 ) { - ctx->handle=EasyG7231_init_decoder(FALSE); - ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_53; - } else { - ctx->handle=EasyG7231_init_decoder(TRUE); - ctx->l_g7231_frame_compressed = L_G7231_FRAME_COMPRESSED_63; - } - } - - if ((inputSizeBytes % ctx->l_g7231_frame_compressed) != 0) - return 0; - - if (!output) - return (inputSizeBytes / ctx->l_g7231_frame_compressed) * L_G7231_FRAME * sizeof(short); - - - while ((inputSizeBytes >= ctx->l_g7231_frame_compressed) && - ((*outputSizeBytes - decodedBytes) >= L_G7231_FRAME * sizeof(short))) { - if (EasyG7231_decoder(ctx->handle, (unsigned char*)bitstream, ctx->speach_buffer)) { - - memcpy(speech, ctx->speach_buffer, L_G7231_FRAME * sizeof(short)); - speech += L_G7231_FRAME; - decodedBytes += L_G7231_FRAME * sizeof(short); - - } - bitstream += ctx->l_g7231_frame_compressed; - inputSizeBytes -= ctx->l_g7231_frame_compressed; - } - - return decodedBytes; -} - -/* - * Editor modelines - http://www.wireshark.org/tools/modelines.html - * - * Local Variables: - * c-basic-offset: 2 - * tab-width: 8 - * indent-tabs-mode: nil - * End: - * - * ex: set shiftwidth=2 tabstop=8 expandtab: - * :indentSize=2:tabSize=8:noTabs=true: - */ diff --git a/plugins/easy_codec/codec-g7231.h b/plugins/easy_codec/codec-g7231.h deleted file mode 100644 index 428da7a6a7..0000000000 --- a/plugins/easy_codec/codec-g7231.h +++ /dev/null @@ -1,39 +0,0 @@ -/* codec-g7231.h -* Easy codecs stub for EasyG7231 -* 2007 Ales Kocourek -* -* Wireshark - Network traffic analyzer -* By Gerald Combs -* Copyright 1998 Gerald Combs -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef _CODEC_G7231_H_ -#define _CODEC_G7231_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -void *codec_g7231_init(void); -void codec_g7231_release(void *ctx); -int codec_g7231_decode(void *ctx, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _CODEC_G729_H_ */ diff --git a/plugins/easy_codec/codec-g729a.c b/plugins/easy_codec/codec-g729a.c deleted file mode 100644 index 154c6722fb..0000000000 --- a/plugins/easy_codec/codec-g729a.c +++ /dev/null @@ -1,94 +0,0 @@ -/* codec-g729a.c -* Easy codecs stub for EasyG729A -* 2007 Tomas Kukosa -* -* Wireshark - Network traffic analyzer -* By Gerald Combs -* Copyright 1998 Gerald Combs -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#include "config.h" - -#include - -#include - -#include "codec-g729a.h" - -#include "EasyG729A/EasyG729A.h" - -struct g729a_context { - CODER_HANDLE handle; - short speach_buffer[L_G729A_FRAME]; -}; - -void *codec_g729a_init(void) { - struct g729a_context *ctx = 0; - - ctx = (struct g729a_context*)g_malloc0(sizeof(struct g729a_context)); - ctx->handle = EasyG729A_init_decoder(); - return ctx; -} - -void codec_g729a_release(void *context) { - struct g729a_context *ctx = (struct g729a_context*)context; - - if (!ctx) return; - EasyG729A_release_decoder(ctx->handle); - g_free(ctx); -} - -int codec_g729a_decode(void *context, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes) { - struct g729a_context *ctx = (struct g729a_context*)context; - const unsigned char *bitstream = (const unsigned char*)input; - short *speech = (short*)output; - int decodedBytes = 0; - - if (!ctx) return 0; - - if ((inputSizeBytes % L_G729A_FRAME_COMPRESSED) != 0) - return 0; - - if (!output) - return (inputSizeBytes / L_G729A_FRAME_COMPRESSED) * L_G729A_FRAME * sizeof(short); - - while ((inputSizeBytes >= L_G729A_FRAME_COMPRESSED) && - ((*outputSizeBytes - decodedBytes) >= L_G729A_FRAME * sizeof(short))) { - if (EasyG729A_decoder(ctx->handle, (unsigned char*)bitstream, ctx->speach_buffer)) { - memcpy(speech, ctx->speach_buffer, L_G729A_FRAME * sizeof(short)); - speech += L_G729A_FRAME; - decodedBytes += L_G729A_FRAME * sizeof(short); - } - bitstream += L_G729A_FRAME_COMPRESSED; - inputSizeBytes -= L_G729A_FRAME_COMPRESSED; - } - - return decodedBytes; -} - -/* - * Editor modelines - http://www.wireshark.org/tools/modelines.html - * - * Local Variables: - * c-basic-offset: 2 - * tab-width: 8 - * indent-tabs-mode: nil - * End: - * - * ex: set shiftwidth=2 tabstop=8 expandtab: - * :indentSize=2:tabSize=8:noTabs=true: - */ diff --git a/plugins/easy_codec/codec-g729a.h b/plugins/easy_codec/codec-g729a.h deleted file mode 100644 index fafd79c2c6..0000000000 --- a/plugins/easy_codec/codec-g729a.h +++ /dev/null @@ -1,39 +0,0 @@ -/* codec-g729a.h -* Easy codecs stub for EasyG729A -* 2007 Tomas Kukosa -* -* Wireshark - Network traffic analyzer -* By Gerald Combs -* Copyright 1998 Gerald Combs -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef _CODEC_G729A_H_ -#define _CODEC_G729A_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -void *codec_g729a_init(void); -void codec_g729a_release(void *ctx); -int codec_g729a_decode(void *ctx, const void *input, int inputSizeBytes, void *output, int *outputSizeBytes); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* _CODEC_G729A_H_ */ diff --git a/plugins/easy_codec/easy_codec_plugin.c b/plugins/easy_codec/easy_codec_plugin.c deleted file mode 100644 index dba135cb85..0000000000 --- a/plugins/easy_codec/easy_codec_plugin.c +++ /dev/null @@ -1,47 +0,0 @@ -/* easy_codec_plugin.c -* Easy codecs plugin registration file -* 2007 Tomas Kukosa -* -* Wireshark - Network traffic analyzer -* By Gerald Combs -* Copyright 1998 Gerald Combs -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of the GNU General Public License -* as published by the Free Software Foundation; either version 2 -* of the License, or (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef ENABLE_STATIC -#include "config.h" - -#include -/* plugins are DLLs */ -#define WS_BUILD_DLL -#include "ws_symbol_export.h" - -#include - -#include "codec-g7231.h" -#include "codec-g729a.h" -#include "codec-g722.h" - -WS_DLL_PUBLIC_DEF const gchar version[] = "0.0.1"; - -WS_DLL_PUBLIC_DEF void register_codec_module(void) -{ - register_codec("g723", codec_g7231_init, codec_g7231_release, codec_g7231_decode); - register_codec("g729", codec_g729a_init, codec_g729a_release, codec_g729a_decode); - register_codec("g722", codec_g722_init, codec_g722_release, codec_g722_decode); -} - -#endif diff --git a/plugins/easy_codec/plugin.rc.in b/plugins/easy_codec/plugin.rc.in deleted file mode 100644 index cac1f406ac..0000000000 --- a/plugins/easy_codec/plugin.rc.in +++ /dev/null @@ -1,34 +0,0 @@ -#include "winver.h" - -VS_VERSION_INFO VERSIONINFO - FILEVERSION @RC_MODULE_VERSION@ - PRODUCTVERSION @RC_VERSION@ - FILEFLAGSMASK 0x0L -#ifdef _DEBUG - FILEFLAGS VS_FF_DEBUG -#else - FILEFLAGS 0 -#endif - FILEOS VOS_NT_WINDOWS32 - FILETYPE VFT_DLL -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "CompanyName", "The Wireshark developer community, http://www.wireshark.org/\0" - VALUE "FileDescription", "@PACKAGE@ dissector\0" - VALUE "FileVersion", "@MODULE_VERSION@\0" - VALUE "InternalName", "@PACKAGE@ @MODULE_VERSION@\0" - VALUE "LegalCopyright", "Copyright © 1998 Gerald Combs , Gilbert Ramirez and others\0" - VALUE "OriginalFilename", "@PLUGIN_NAME@.dll\0" - VALUE "ProductName", "Wireshark\0" - VALUE "ProductVersion", "@VERSION@\0" - VALUE "Comments", "Built with @MSVC_VARIANT@\0" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END -- cgit v1.2.3