We truncated the diff of some files because they were too big.
If you want to see the full diff for every file, click here.
Changes of Revision 29
faad2.changes
Changed
x
1
2
-------------------------------------------------------------------3
+Sat Nov 28 13:22:22 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>4
+5
+- Update to version 2.10.06
+ * mp4read.c: fix stack-buffer-overflow in stringin()/ftypin()7
+ * fix heap-buffer-overflow in mp4read.c8
+ * Remove non-ASCII characters9
+ * Remove trailing whitespace10
+ * Check return value of ltp_data.11
+ * Restrict SBR frame length to 960 and 1024 samples.12
+ * Support object type 29.13
+ * Support implicit SBR signaling in frontend.14
+ * Fix PNS decoding when only right channel is noise.15
+ * Initialize element_id array with an invalid id.16
+ * Fix NULL pointer dereferences.17
+ * Fix infinite loop in adts_parse.18
+ * Fix infinite loop in huffman_getescape.19
+ * Check for error after each channel decode.20
+ * Check for inconsistent number of channels.21
+- Drop faad2-fix-stack-overflow.patch (merged upstream)22
+- Refresh faad2-PACKAGE_VERSION.patch to make it future-proof23
+24
+-------------------------------------------------------------------25
Tue Aug 25 18:59:46 UTC 2020 - Bjørn Lie <zaitor@opensuse.org>26
27
- Add faad2-fix-stack-overflow.patch: mp4read.c: fix28
faad2.spec
Changed
33
1
2
%define major 23
%define lib libfaad4
%define libname %{lib}%{major}5
-%define _version 2_9_26
+%define _version 2_10_07
%bcond_with xmms8
# mpeg4ip is built without gmp4player, it makes no sense to build the plugin9
%bcond_with mpeg4ip10
Name: faad211
-Version: 2.9.212
+Version: 2.10.013
Release: 014
Summary: C library and frontend for decoding MPEG2/4 AAC15
Summary(de): C Bibliothek und Frontend zum Decodieren von MPEG2/4 AAC16
17
Source0: https://github.com/knik0/faad2/archive/%{_version}/%{name}-%{version}.tar.gz18
Patch0: %{name}-visibility.patch19
Patch1: faad2-PACKAGE_VERSION.patch20
-Patch2: faad2-fix-stack-overflow.patch21
BuildRequires: libtool22
BuildRequires: pkgconfig23
Requires: %{libname} = %{version}24
25
%prep26
%autosetup -p1 -n %{name}-%{_version}27
28
+sed -i 's/__PACKAGE_VERSION__/%{version}/' include/neaacdec.h29
+30
%build31
autoreconf -ifv32
export CFLAGS="%{optflags} -fno-strict-aliasing"33
faad2-PACKAGE_VERSION.patch
Changed
33
1
2
---- a/frontend/main.c3
-+++ b/frontend/main.c4
-@@ -1212,11 +1212,6 @@ static int faad_main(int argc, char *arg5
+Index: faad2-2_10_0/frontend/main.c6
+===================================================================7
+--- faad2-2_10_0.orig/frontend/main.c8
++++ faad2-2_10_0/frontend/main.c9
+@@ -1218,11 +1218,6 @@ static int faad_main(int argc, char *arg10
NeAACDecGetVersion(&faad_id_string, &faad_copyright_string);11
12
faad_fprintf(stderr, " *********** Ahead Software MPEG-4 AAC Decoder V%s ******************\n\n", faad_id_string);13
14
faad_fprintf(stderr, "%s", faad_copyright_string);15
if (cap & FIXED_POINT_CAP)16
faad_fprintf(stderr, " Fixed point version\n");17
---- a/include/neaacdec.h18
-+++ b/include/neaacdec.h19
+Index: faad2-2_10_0/include/neaacdec.h20
+===================================================================21
+--- faad2-2_10_0.orig/include/neaacdec.h22
++++ faad2-2_10_0/include/neaacdec.h23
@@ -69,7 +69,7 @@ extern "C" {24
#define NEAACDECAPI25
#endif26
27
-#define FAAD2_VERSION "unknown"28
-+#define FAAD2_VERSION "2.9.2"29
++#define FAAD2_VERSION "__PACKAGE_VERSION__"30
31
/* object types for AAC */32
#define MAIN 133
faad2-fix-stack-overflow.patch
Deleted
26
1
2
-From 1073aeef823cafd844704389e9a497c257768e2f Mon Sep 17 00:00:00 20013
-From: Fabian Greffrath <fabian@greffrath.com>4
-Date: Mon, 17 Aug 2020 07:37:09 +02005
-Subject: [PATCH] mp4read.c: fix stack-buffer-overflow in stringin()/ftypin()6
-7
-Terminate the string read into the stack buffer,8
-fixes #56.9
----10
- frontend/mp4read.c | 1 +11
- 1 file changed, 1 insertion(+)12
-13
-diff --git a/frontend/mp4read.c b/frontend/mp4read.c14
-index 1b24f18..1414684 10064415
---- a/frontend/mp4read.c16
-+++ b/frontend/mp4read.c17
-@@ -95,6 +95,7 @@ static int stringin(char *txt, int sizemax)18
- if (!txt[size])19
- break;20
- }21
-+ txt[sizemax-1] = '\0';22
- 23
- return size;24
- }25
-26
faad2-2.9.2.tar.gz/ChangeLog -> faad2-2.10.0.tar.gz/ChangeLog
Changed
30
1
2
+2.10.0:3
+ [ tatsuz ]4
+ * updated Visual Studio projects to VS 2019 (#54)5
+6
+ [ Fabian Greffrath ]7
+ * mp4read.c: fix stack-buffer-overflow in stringin()/ftypin()8
+ * fix heap-buffer-overflow in mp4read.c9
+10
+ [ Clayton Smith ]11
+ * Remove non-ASCII characters12
+ * Remove trailing whitespace13
+14
+ [ Andrew Wesie ]15
+ * Check return value of ltp_data.16
+ * Restrict SBR frame length to 960 and 1024 samples.17
+ * Support object type 29.18
+ * Support implicit SBR signaling in frontend.19
+ * Fix PNS decoding when only right channel is noise.20
+ * Initialize element_id array with an invalid id.21
+ * Fix NULL pointer dereferences.22
+ * Fix infinite loop in adts_parse.23
+ * Fix infinite loop in huffman_getescape.24
+ * Check for error after each channel decode.25
+ * Check for inconsistent number of channels.26
+27
2.9.2:28
[ Michał Janiszewski ]29
* Only use x86-assembly when explicitly on x8630
faad2-2.9.2.tar.gz/aacDECdrop/audio.h -> faad2-2.10.0.tar.gz/aacDECdrop/audio.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/aacDECdrop/decthread.c -> faad2-2.10.0.tar.gz/aacDECdrop/decthread.c
Changed
10
1
2
numfiles = 0;3
4
Sleep(500);5
- } 6
+ }7
8
DeleteCriticalSection(&mutex);9
10
faad2-2.9.2.tar.gz/aacDECdrop/main.c -> faad2-2.10.0.tar.gz/aacDECdrop/main.c
Changed
118
1
2
#define CREATEFONT(sz) \3
CreateFont((sz), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, \4
VARIABLE_PITCH | FF_SWISS, "")5
- 6
+7
HANDLE event = NULL;8
int width = 130, height = 130;9
RECT bar1, bar2, vbrBR;10
11
set_outputFormat(iniSettings.outputFormat);12
set_fileType(iniSettings.fileType);13
set_object_type(iniSettings.object_type);14
- 15
+16
for (frame = 0; frame < 8; frame++)17
hbm[frame] = LoadImage(hinst, MAKEINTRESOURCE(IDB_TF01 + frame), IMAGE_BITMAP, 0, 0, LR_CREATEDIBSECTION);18
frame = 0;19
20
DispatchMessage(&msg);21
}22
23
- for (frame = 0; frame < 8; frame++) 24
+ for (frame = 0; frame < 8; frame++)25
DeleteObject(hbm[frame]);26
27
return msg.wParam;28
29
if (animate || frame)30
{31
frame++;32
- if (frame > 7) 33
+ if (frame > 7)34
frame -= 8;35
}36
else37
38
return 0;39
40
case WM_COMMAND:41
- switch (LOWORD(wParam)) 42
+ switch (LOWORD(wParam))43
{44
case IDM_QUIT:45
WriteIniFile(INI_FILE);46
47
break;48
case IDM_ONTOP:49
set_always_on_top(hwnd, ~GetMenuState(menu, LOWORD(wParam), MF_BYCOMMAND) & MF_CHECKED);50
- break; 51
+ break;52
case IDM_LOGERR:53
set_logerr(hwnd, ~GetMenuState(menu, LOWORD(wParam), MF_BYCOMMAND) & MF_CHECKED);54
break;55
56
}57
case IDM_VOLUME:58
{59
- int value = 60
+ int value =61
DialogBox(62
- hinst, 63
- MAKEINTRESOURCE(IDD_VOLUME), 64
+ hinst,65
+ MAKEINTRESOURCE(IDD_VOLUME),66
hwnd, QCProc);67
68
if (value == -2)69
70
hdrop = (HANDLE)wParam;71
HandleDrag(hwnd, hdrop);72
return 0;73
- 74
+75
case WM_DESTROY:76
decoding_done = 1;77
PostQuitMessage(0);78
79
* Encode parameters dialog procedures.80
*/81
82
-BOOL CALLBACK QCProc(HWND hwndDlg, UINT message, 83
- WPARAM wParam, LPARAM lParam) 84
+BOOL CALLBACK QCProc(HWND hwndDlg, UINT message,85
+ WPARAM wParam, LPARAM lParam)86
{87
- switch (message) 88
- { 89
- case WM_INITDIALOG: 90
- 91
+ switch (message)92
+ {93
+ case WM_INITDIALOG:94
+95
if(iniSettings.decode_mode == 0)96
{97
CheckDlgButton(hwndDlg,IDC_PLAYBACK,TRUE);98
99
EndDialog(hwndDlg, -1);100
break;101
102
- case WM_COMMAND: 103
- switch (LOWORD(wParam)) 104
+ case WM_COMMAND:105
+ switch (LOWORD(wParam))106
{107
case IDC_BUTTON1:108
{109
110
break;111
}112
}113
- return FALSE; 114
+ return FALSE;115
}116
117
118
faad2-2.9.2.tar.gz/aacDECdrop/misc.c -> faad2-2.10.0.tar.gz/aacDECdrop/misc.c
Changed
21
1
2
if (strlen(fmt) > 750)3
{4
sprintf(msgbuf, "%s %s", "<buffer overflow> ", fmt);5
- } 6
- else 7
+ }8
+ else9
{10
if (_filename != NULL && strlen(_filename) < 255)11
{12
13
}14
15
va_start(ap, fmt);16
- 17
+18
vsprintf(bufp, fmt, ap);19
20
va_end(ap);21
faad2-2.9.2.tar.gz/aacDECdrop/resource.h -> faad2-2.10.0.tar.gz/aacDECdrop/resource.h
Changed
10
1
2
#define IDM_QUIT 400193
4
// Next default values for new objects5
-// 6
+//7
#ifdef APSTUDIO_INVOKED8
#ifndef APSTUDIO_READONLY_SYMBOLS9
#define _APS_NO_MFC 110
faad2-2.9.2.tar.gz/configure.ac -> faad2-2.10.0.tar.gz/configure.ac
Changed
10
1
2
dnl - mpeg4ip plugin (requires mpeg4ip's libmp4v2 to be installed)3
4
AC_PREREQ(2.50)5
-AC_INIT(faad2, 2.9.2)6
+AC_INIT(faad2, 2.10.0)7
AC_CONFIG_AUX_DIR(.)8
AM_INIT_AUTOMAKE([subdir-objects])9
10
faad2-2.9.2.tar.gz/frontend/audio.c -> faad2-2.10.0.tar.gz/frontend/audio.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/frontend/audio.h -> faad2-2.10.0.tar.gz/frontend/audio.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/frontend/getopt.c -> faad2-2.10.0.tar.gz/frontend/getopt.c
Changed
28
1
2
}3
4
#endif /* GNU C library. */5
-6
+7
/* Handle permutation of arguments. */8
9
/* Describe the part of ARGV that contains non-options that have10
11
temp = *first; *first = *last; *last = temp; first++; last--;12
}13
}14
-15
+16
/* Scan elements of ARGV (whose length is ARGC) for option characters17
given in OPTSTRING.18
19
20
}21
22
#endif /* _LIBC or not __GNU_LIBRARY__. */23
-24
+25
#ifdef TEST26
27
/* Compile with -DTEST to make an executable for use in testing28
faad2-2.9.2.tar.gz/frontend/main.c -> faad2-2.10.0.tar.gz/frontend/main.c
Changed
39
1
2
while ((b->bytes_into_buffer > 0) && (bytes > 0))3
{4
int chunk = min(bytes, b->bytes_into_buffer);5
- 6
+7
bytes -= chunk;8
b->file_offset += chunk;9
b->bytes_consumed = chunk;10
11
12
frame_length = ((((unsigned int)b->buffer[3] & 0x3)) << 11)13
| (((unsigned int)b->buffer[4]) << 3) | (b->buffer[5] >> 5);14
+ if (frame_length == 0)15
+ break;16
17
t_framelength += frame_length;18
19
20
/* update buffer indices */21
advance_buffer(&b, frameInfo.bytesconsumed);22
23
+ /* check if the inconsistent number of channels */24
+ if (aufile != NULL && frameInfo.channels != aufile->channels)25
+ frameInfo.error = 12;26
+27
if (frameInfo.error > 0)28
{29
faad_fprintf(stderr, "Error: %s\n",30
31
if (NeAACDecAudioSpecificConfig(mp4config.asc.buf, mp4config.asc.size, &mp4ASC) >= 0)32
{33
if (mp4ASC.frameLengthFlag == 1) framesize = 960;34
- if (mp4ASC.sbr_present_flag == 1) framesize *= 2;35
+ if (mp4ASC.sbr_present_flag == 1 || mp4ASC.forceUpSampling) framesize *= 2;36
}37
}38
39
faad2-2.9.2.tar.gz/frontend/mp4read.c -> faad2-2.10.0.tar.gz/frontend/mp4read.c
Changed
21
1
2
if (!txt[size])3
break;4
}5
+ txt[sizemax-1] = '\0';6
7
return size;8
}9
10
u32in();11
// Number of entries12
mp4config.frame.ents = u32in();13
- // fixme: check atom size14
+15
+ if (!(mp4config.frame.ents + 1))16
+ return ERR_FAIL;17
+18
mp4config.frame.data = malloc(sizeof(*mp4config.frame.data)19
* (mp4config.frame.ents + 1));20
21
faad2-2.9.2.tar.gz/frontend/unicode_support.c -> faad2-2.10.0.tar.gz/frontend/unicode_support.c
Changed
28
1
2
fprintf(stderr, "\nFATAL: Malloc failed\n\n");3
exit(-1);4
}5
- 6
+7
for(i = 0; i < nArgs; i++)8
{9
(*argv)[i] = utf16_to_utf8(szArglist[i]);10
11
void free_commandline_arguments_utf8(int *argc, char ***argv)12
{13
int i = 0;14
- 15
+16
if(*argv != NULL)17
{18
for(i = 0; i < *argc; i++)19
20
FILE *ret = NULL;21
wchar_t *filename_utf16 = utf8_to_utf16(filename_utf8);22
wchar_t *mode_utf16 = utf8_to_utf16(mode_utf8);23
- 24
+25
if(filename_utf16 && mode_utf16)26
{27
ret = _wfopen(filename_utf16, mode_utf16);28
faad2-2.9.2.tar.gz/include/faad.h -> faad2-2.10.0.tar.gz/include/faad.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/include/neaacdec.h -> faad2-2.10.0.tar.gz/include/neaacdec.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/analysis.h -> faad2-2.10.0.tar.gz/libfaad/analysis.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/bits.c -> faad2-2.10.0.tar.gz/libfaad/bits.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/bits.h -> faad2-2.10.0.tar.gz/libfaad/bits.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/cfft.c -> faad2-2.10.0.tar.gz/libfaad/cfft.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/cfft.h -> faad2-2.10.0.tar.gz/libfaad/cfft.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/cfft_tab.h -> faad2-2.10.0.tar.gz/libfaad/cfft_tab.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_1.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_1.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_10.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_10.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_11.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_11.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_2.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_2.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_3.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_3.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_4.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_4.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_5.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_5.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_6.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_6.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_7.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_7.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_8.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_8.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_9.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_9.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/codebook/hcb_sf.h -> faad2-2.10.0.tar.gz/libfaad/codebook/hcb_sf.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/common.c -> faad2-2.10.0.tar.gz/libfaad/common.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/common.h -> faad2-2.10.0.tar.gz/libfaad/common.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/decoder.c -> faad2-2.10.0.tar.gz/libfaad/decoder.c
Changed
42
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
27
for (i = 0; i < MAX_CHANNELS; i++)28
{29
+ hDecoder->element_id[i] = INVALID_ELEMENT_ID;30
hDecoder->window_shape_prev[i] = 0;31
hDecoder->time_out[i] = NULL;32
hDecoder->fb_intermed[i] = NULL;33
34
#endif35
36
faad_initbits(&ld, buffer, buffer_size);37
- 38
+39
#if 040
memset(l, 0, sizeof(latm_header));41
is_latm = latmCheck(l, &ld);42
faad2-2.9.2.tar.gz/libfaad/drc.c -> faad2-2.10.0.tar.gz/libfaad/drc.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/drc.h -> faad2-2.10.0.tar.gz/libfaad/drc.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/drm_dec.c -> faad2-2.10.0.tar.gz/libfaad/drm_dec.c
Changed
201
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
27
28
/* binary search huffman tables */29
-static const int8_t f_huffman_sa[][2] = 30
+static const int8_t f_huffman_sa[][2] =31
{32
{ /*0*/ -15, 1 }, /* index 0: 1 bits: x */33
{ 2, 3 }, /* index 1: 2 bits: 1x */34
35
{ /*-7*/ -22, /*-6*/ -21 } /* index 13: 7 bits: 111111x */36
};37
38
-static const int8_t t_huffman_sa[][2] = 39
+static const int8_t t_huffman_sa[][2] =40
{41
{ /*0*/ -15, 1 }, /* index 0: 1 bits: x */42
{ 2, 3 }, /* index 1: 2 bits: 1x */43
44
{ /*6*/ -9, /*7*/ -8 } /* index 13: 9 bits: 11111111x */45
};46
47
-static const int8_t f_huffman_pan[][2] = 48
+static const int8_t f_huffman_pan[][2] =49
{50
{ /*0*/ -15, 1 }, /* index 0: 1 bits: x */51
{ /*-1*/ -16, 2 }, /* index 1: 2 bits: 1x */52
53
{ /*12*/ -3, /*14*/ -1 } /* index 27: 16 bits: 111111111111111x */54
};55
56
-static const int8_t t_huffman_pan[][2] = 57
+static const int8_t t_huffman_pan[][2] =58
{59
{ /*0*/ -15, 1 }, /* index 0: 1 bits: x */60
{ /*-1*/ -16, 2 }, /* index 1: 2 bits: 1x */61
62
};63
64
/* There are 3 classes in the standard but the last 2 are identical */65
-static const real_t sa_quant[8][2] = 66
+static const real_t sa_quant[8][2] =67
{68
{ FRAC_CONST(0.0000), FRAC_CONST(0.0000) },69
{ FRAC_CONST(0.0501), FRAC_CONST(0.1778) },70
71
72
/* We don't need the actual quantizer values */73
#if 074
-static const real_t pan_quant[8][5] = 75
+static const real_t pan_quant[8][5] =76
{77
{ COEF_CONST(0.0000), COEF_CONST(0.0000), COEF_CONST(0.0000), COEF_CONST(0.0000), COEF_CONST(0.0000) },78
{ COEF_CONST(0.1661), COEF_CONST(0.1661), COEF_CONST(0.3322), COEF_CONST(0.3322), COEF_CONST(0.3322) },79
80
81
/* 2^(pan_quant[x][y]/30) */82
static const real_t pan_pow_2_30_pos[8][5] = {83
- { COEF_CONST(1), COEF_CONST(1), COEF_CONST(1), COEF_CONST(1), COEF_CONST(1) }, 84
- { COEF_CONST(1.003845098), COEF_CONST(1.003845098), COEF_CONST(1.007704982), COEF_CONST(1.007704982), COEF_CONST(1.007704982) }, 85
- { COEF_CONST(1.007704982), COEF_CONST(1.007704982), COEF_CONST(1.01546933), COEF_CONST(1.019373909), COEF_CONST(1.019373909) }, 86
- { COEF_CONST(1.011579706), COEF_CONST(1.01546933), COEF_CONST(1.023293502), COEF_CONST(1.035142941), COEF_CONST(1.039123167) }, 87
+ { COEF_CONST(1), COEF_CONST(1), COEF_CONST(1), COEF_CONST(1), COEF_CONST(1) },88
+ { COEF_CONST(1.003845098), COEF_CONST(1.003845098), COEF_CONST(1.007704982), COEF_CONST(1.007704982), COEF_CONST(1.007704982) },89
+ { COEF_CONST(1.007704982), COEF_CONST(1.007704982), COEF_CONST(1.01546933), COEF_CONST(1.019373909), COEF_CONST(1.019373909) },90
+ { COEF_CONST(1.011579706), COEF_CONST(1.01546933), COEF_CONST(1.023293502), COEF_CONST(1.035142941), COEF_CONST(1.039123167) },91
{ COEF_CONST(1.01546933), COEF_CONST(1.023293502), COEF_CONST(1.035142941), COEF_CONST(1.051155908), COEF_CONST(1.059252598) },92
- { COEF_CONST(1.019373909), COEF_CONST(1.03117796), COEF_CONST(1.051155908), COEF_CONST(1.071518432), COEF_CONST(1.0839263) }, 93
- { COEF_CONST(1.023293502), COEF_CONST(1.043118698), COEF_CONST(1.067414119), COEF_CONST(1.092277933), COEF_CONST(1.113439626) }, 94
+ { COEF_CONST(1.019373909), COEF_CONST(1.03117796), COEF_CONST(1.051155908), COEF_CONST(1.071518432), COEF_CONST(1.0839263) },95
+ { COEF_CONST(1.023293502), COEF_CONST(1.043118698), COEF_CONST(1.067414119), COEF_CONST(1.092277933), COEF_CONST(1.113439626) },96
{ COEF_CONST(1.03117796), COEF_CONST(1.055195268), COEF_CONST(1.0839263), COEF_CONST(1.113439626), COEF_CONST(1.143756546) }97
};98
99
/* 2^(-pan_quant[x][y]/30) */100
static const real_t pan_pow_2_30_neg[8][5] = {101
{ COEF_CONST(1), COEF_CONST(1), COEF_CONST(1), COEF_CONST(1), COEF_CONST(1) },102
- { COEF_CONST(0.99616963), COEF_CONST(0.99616963), COEF_CONST(0.992353931), COEF_CONST(0.992353931), COEF_CONST(0.99235393) }, 103
- { COEF_CONST(0.992353931), COEF_CONST(0.992353931), COEF_CONST(0.984766325), COEF_CONST(0.980994305), COEF_CONST(0.980994305) }, 104
- { COEF_CONST(0.988552848), COEF_CONST(0.984766325), COEF_CONST(0.977236734), COEF_CONST(0.966050157), COEF_CONST(0.962349827) }, 105
- { COEF_CONST(0.984766325), COEF_CONST(0.977236734), COEF_CONST(0.966050157), COEF_CONST(0.951333663), COEF_CONST(0.944061881) }, 106
- { COEF_CONST(0.980994305), COEF_CONST(0.969764715), COEF_CONST(0.951333663), COEF_CONST(0.933255062), COEF_CONST(0.922571949) }, 107
- { COEF_CONST(0.977236734), COEF_CONST(0.958663671), COEF_CONST(0.936843519), COEF_CONST(0.915517901), COEF_CONST(0.898117847) }, 108
+ { COEF_CONST(0.99616963), COEF_CONST(0.99616963), COEF_CONST(0.992353931), COEF_CONST(0.992353931), COEF_CONST(0.99235393) },109
+ { COEF_CONST(0.992353931), COEF_CONST(0.992353931), COEF_CONST(0.984766325), COEF_CONST(0.980994305), COEF_CONST(0.980994305) },110
+ { COEF_CONST(0.988552848), COEF_CONST(0.984766325), COEF_CONST(0.977236734), COEF_CONST(0.966050157), COEF_CONST(0.962349827) },111
+ { COEF_CONST(0.984766325), COEF_CONST(0.977236734), COEF_CONST(0.966050157), COEF_CONST(0.951333663), COEF_CONST(0.944061881) },112
+ { COEF_CONST(0.980994305), COEF_CONST(0.969764715), COEF_CONST(0.951333663), COEF_CONST(0.933255062), COEF_CONST(0.922571949) },113
+ { COEF_CONST(0.977236734), COEF_CONST(0.958663671), COEF_CONST(0.936843519), COEF_CONST(0.915517901), COEF_CONST(0.898117847) },114
{ COEF_CONST(0.969764715), COEF_CONST(0.947691892), COEF_CONST(0.922571949), COEF_CONST(0.898117847), COEF_CONST(0.874311936) }115
};116
117
static const real_t g_decayslope[MAX_SA_BAND] = {118
- FRAC_CONST(1), FRAC_CONST(1), FRAC_CONST(1), FRAC_CONST(0.95),FRAC_CONST(0.9), FRAC_CONST(0.85), FRAC_CONST(0.8), 119
- FRAC_CONST(0.75),FRAC_CONST(0.7), FRAC_CONST(0.65),FRAC_CONST(0.6), FRAC_CONST(0.55),FRAC_CONST(0.5), FRAC_CONST(0.45), 120
+ FRAC_CONST(1), FRAC_CONST(1), FRAC_CONST(1), FRAC_CONST(0.95),FRAC_CONST(0.9), FRAC_CONST(0.85), FRAC_CONST(0.8),121
+ FRAC_CONST(0.75),FRAC_CONST(0.7), FRAC_CONST(0.65),FRAC_CONST(0.6), FRAC_CONST(0.55),FRAC_CONST(0.5), FRAC_CONST(0.45),122
FRAC_CONST(0.4), FRAC_CONST(0.35),FRAC_CONST(0.3), FRAC_CONST(0.25),FRAC_CONST(0.2), FRAC_CONST(0.15), FRAC_CONST(0.1),123
- FRAC_CONST(0.05),FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), 124
- FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), 125
- FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), 126
+ FRAC_CONST(0.05),FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0),127
+ FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0),128
+ FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0),129
FRAC_CONST(0), FRAC_CONST(0), FRAC_CONST(0)130
};131
132
133
{ FRAC_CONST(0.929071574), FRAC_CONST(0) }134
};135
136
-static const uint8_t sa_freq_scale[9] = 137
+static const uint8_t sa_freq_scale[9] =138
{139
0, 1, 2, 3, 5, 7, 10, 13, 23140
};141
142
-static const uint8_t pan_freq_scale[21] = 143
+static const uint8_t pan_freq_scale[21] =144
{145
0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10,146
11, 12, 13, 14, 15, 18, 22, 26, 32, 64147
};148
149
-static const uint8_t pan_quant_class[20] = 150
+static const uint8_t pan_quant_class[20] =151
{152
0, 1, 1, 1, 1, 1, 1, 1, 1, 1,153
2, 2, 2, 2, 3, 3, 3, 4, 4, 4154
155
156
/* Inverse mapping lookup */157
static const uint8_t pan_inv_freq[64] = {158
- 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 159
- 15, 15, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 160
+ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,161
+ 15, 15, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18,162
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,163
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19164
};165
166
static const uint8_t sa_inv_freq[MAX_SA_BAND] = {167
0, 1, 2, 3, 3, 4, 4, 5, 5, 5, 6, 6, 6,168
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 169
- 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 170
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,171
+ 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,172
7, 7, 7, 7, 7, 7, 7173
};174
175
-static const real_t filter_coeff[] = 176
+static const real_t filter_coeff[] =177
{178
FRAC_CONST(0.65143905754106),179
FRAC_CONST(0.56471812200776),180
FRAC_CONST(0.48954165955695)181
};182
183
-static const uint8_t delay_length[3] = 184
+static const uint8_t delay_length[3] =185
{186
3, 4, 5187
};188
189
-static const real_t delay_fraction[] = 190
+static const real_t delay_fraction[] =191
{192
FRAC_CONST(0.43), FRAC_CONST(0.75), FRAC_CONST(0.347)193
};194
195
}196
197
static int8_t pan_delta_clip(drm_ps_info *ps, int8_t i)198
-{ 199
+{200
if (i < -7) {201
faad2-2.9.2.tar.gz/libfaad/drm_dec.h -> faad2-2.10.0.tar.gz/libfaad/drm_dec.h
Changed
71
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
#define MAX_DELAY 527
28
typedef struct29
-{ 30
+{31
uint8_t drm_ps_data_available;32
uint8_t bs_enable_sa;33
uint8_t bs_enable_pan;34
35
36
int8_t bs_sa_data[DRM_NUM_SA_BANDS];37
int8_t bs_pan_data[DRM_NUM_PAN_BANDS];38
- 39
+40
int8_t g_sa_index[DRM_NUM_SA_BANDS];41
- int8_t g_pan_index[DRM_NUM_PAN_BANDS]; 42
+ int8_t g_pan_index[DRM_NUM_PAN_BANDS];43
int8_t g_prev_sa_index[DRM_NUM_SA_BANDS];44
- int8_t g_prev_pan_index[DRM_NUM_PAN_BANDS]; 45
+ int8_t g_prev_pan_index[DRM_NUM_PAN_BANDS];46
47
int8_t sa_decode_error;48
int8_t pan_decode_error;49
50
int8_t g_last_good_sa_index[DRM_NUM_SA_BANDS];51
int8_t g_last_good_pan_index[DRM_NUM_PAN_BANDS];52
- 53
- qmf_t SA[NUM_OF_SUBSAMPLES][MAX_SA_BAND]; 54
+55
+ qmf_t SA[NUM_OF_SUBSAMPLES][MAX_SA_BAND];56
57
complex_t d_buff[2][MAX_SA_BAND];58
complex_t d2_buff[NUM_OF_LINKS][MAX_DELAY][MAX_SA_BAND];59
60
- uint8_t delay_buf_index_ser[NUM_OF_LINKS]; 61
- 62
+ uint8_t delay_buf_index_ser[NUM_OF_LINKS];63
+64
real_t prev_nrg[MAX_SA_BAND];65
real_t prev_peakdiff[MAX_SA_BAND];66
- real_t peakdecay_fast[MAX_SA_BAND]; 67
+ real_t peakdecay_fast[MAX_SA_BAND];68
} drm_ps_info;69
70
71
faad2-2.9.2.tar.gz/libfaad/error.c -> faad2-2.10.0.tar.gz/libfaad/error.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/error.h -> faad2-2.10.0.tar.gz/libfaad/error.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/filtbank.c -> faad2-2.10.0.tar.gz/libfaad/filtbank.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/filtbank.h -> faad2-2.10.0.tar.gz/libfaad/filtbank.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/fixed.h -> faad2-2.10.0.tar.gz/libfaad/fixed.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/hcr.c -> faad2-2.10.0.tar.gz/libfaad/hcr.c
Changed
201
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
#include "specrec.h"27
#include "huffman.h"28
29
-/* ISO/IEC 14496-3/Amd.1 30
- * 8.5.3.3: Huffman Codeword Reordering for AAC spectral data (HCR) 31
+/* ISO/IEC 14496-3/Amd.132
+ * 8.5.3.3: Huffman Codeword Reordering for AAC spectral data (HCR)33
*34
- * HCR devides the spectral data in known fixed size segments, and 35
- * sorts it by the importance of the data. The importance is firstly 36
- * the (lower) position in the spectrum, and secondly the largest 37
- * value in the used codebook. 38
+ * HCR devides the spectral data in known fixed size segments, and39
+ * sorts it by the importance of the data. The importance is firstly40
+ * the (lower) position in the spectrum, and secondly the largest41
+ * value in the used codebook.42
* The most important data is written at the start of each segment43
- * (at known positions), the remaining data is interleaved inbetween, 44
+ * (at known positions), the remaining data is interleaved inbetween,45
* with the writing direction alternating.46
* Data length is not increased.47
*/48
49
#define VCB11_FIRST 1650
#define VCB11_LAST 3151
52
-static const uint8_t PreSortCB_STD[NUM_CB] = 53
+static const uint8_t PreSortCB_STD[NUM_CB] =54
{ 11, 9, 7, 5, 3, 1};55
56
-static const uint8_t PreSortCB_ER[NUM_CB_ER] = 57
+static const uint8_t PreSortCB_ER[NUM_CB_ER] =58
{ 11, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 9, 7, 5, 3, 1};59
60
/* 8.5.3.3.2 Derivation of segment width */61
62
#define segmentWidth(cb) min(maxCwLen[cb], ics->length_of_longest_codeword)63
64
/* bit-twiddling helpers */65
-static const uint8_t S[] = {1, 2, 4, 8, 16}; 66
+static const uint8_t S[] = {1, 2, 4, 8, 16};67
static const uint32_t B[] = {0x55555555, 0x33333333, 0x0F0F0F0F, 0x00FF00FF, 0x0000FFFF};68
69
typedef struct70
71
/* rewind and reverse */72
/* 32 bit version */73
static uint32_t rewrev_word(uint32_t v, const uint8_t len)74
-{ 75
+{76
/* 32 bit reverse */77
- v = ((v >> S[0]) & B[0]) | ((v << S[0]) & ~B[0]); 78
- v = ((v >> S[1]) & B[1]) | ((v << S[1]) & ~B[1]); 79
- v = ((v >> S[2]) & B[2]) | ((v << S[2]) & ~B[2]); 80
+ v = ((v >> S[0]) & B[0]) | ((v << S[0]) & ~B[0]);81
+ v = ((v >> S[1]) & B[1]) | ((v << S[1]) & ~B[1]);82
+ v = ((v >> S[2]) & B[2]) | ((v << S[2]) & ~B[2]);83
v = ((v >> S[3]) & B[3]) | ((v << S[3]) & ~B[3]);84
v = ((v >> S[4]) & B[4]) | ((v << S[4]) & ~B[4]);85
86
87
88
/* 64 bit version */89
static void rewrev_lword(uint32_t *hi, uint32_t *lo, const uint8_t len)90
-{ 91
+{92
if (len <= 32) {93
*hi = 0;94
*lo = rewrev_word(*lo, len);95
96
uint32_t t = *hi, v = *lo;97
98
/* double 32 bit reverse */99
- v = ((v >> S[0]) & B[0]) | ((v << S[0]) & ~B[0]); 100
- t = ((t >> S[0]) & B[0]) | ((t << S[0]) & ~B[0]); 101
- v = ((v >> S[1]) & B[1]) | ((v << S[1]) & ~B[1]); 102
- t = ((t >> S[1]) & B[1]) | ((t << S[1]) & ~B[1]); 103
- v = ((v >> S[2]) & B[2]) | ((v << S[2]) & ~B[2]); 104
- t = ((t >> S[2]) & B[2]) | ((t << S[2]) & ~B[2]); 105
+ v = ((v >> S[0]) & B[0]) | ((v << S[0]) & ~B[0]);106
+ t = ((t >> S[0]) & B[0]) | ((t << S[0]) & ~B[0]);107
+ v = ((v >> S[1]) & B[1]) | ((v << S[1]) & ~B[1]);108
+ t = ((t >> S[1]) & B[1]) | ((t << S[1]) & ~B[1]);109
+ v = ((v >> S[2]) & B[2]) | ((v << S[2]) & ~B[2]);110
+ t = ((t >> S[2]) & B[2]) | ((t << S[2]) & ~B[2]);111
v = ((v >> S[3]) & B[3]) | ((v << S[3]) & ~B[3]);112
t = ((t >> S[3]) & B[3]) | ((t << S[3]) & ~B[3]);113
- v = ((v >> S[4]) & B[4]) | ((v << S[4]) & ~B[4]); 114
+ v = ((v >> S[4]) & B[4]) | ((v << S[4]) & ~B[4]);115
t = ((t >> S[4]) & B[4]) | ((t << S[4]) & ~B[4]);116
117
/* last 32<>32 bit swap is implicit below */118
- 119
+120
/* shift off low bits (this is really only one 64 bit shift) */121
*lo = (t >> (64 - len)) | (v << (len - 32));122
- *hi = v >> (64 - len); 123
+ *hi = v >> (64 - len);124
}125
}126
127
128
129
al = a->bufa;130
ah = a->bufb;131
- 132
+133
if (b->len > 32)134
{135
/* maskoff superfluous high b bits */136
137
al = 0;138
} else {139
bl = b->bufa & ((1 << (b->len)) - 1);140
- bh = 0; 141
+ bh = 0;142
ah = (ah << (b->len)) | (al >> (32 - b->len));143
al = al << b->len;144
}145
146
147
b->len += a->len;148
}149
- 150
+151
static uint8_t is_good_cb(uint8_t this_CB, uint8_t this_sec_CB)152
{153
/* only want spectral data CB's */154
155
}156
return 0;157
}158
- 159
+160
static void read_segment(bits_t *segment, uint8_t segwidth, bitfile *ld)161
{162
segment->len = segwidth;163
164
if (segwidth > 32)165
{166
- segment->bufb = faad_getbits(ld, segwidth - 32); 167
- segment->bufa = faad_getbits(ld, 32); 168
+ segment->bufb = faad_getbits(ld, segwidth - 32);169
+ segment->bufa = faad_getbits(ld, 32);170
171
} else {172
segment->bufa = faad_getbits(ld, segwidth);173
- segment->bufb = 0; 174
- } 175
+ segment->bufb = 0;176
+ }177
}178
179
static void fill_in_codeword(codeword_t *codeword, uint16_t index, uint16_t sp, uint8_t cb)180
181
codeword[index].bits.len = 0;182
}183
184
-uint8_t reordered_spectral_data(NeAACDecStruct *hDecoder, ic_stream *ics, 185
+uint8_t reordered_spectral_data(NeAACDecStruct *hDecoder, ic_stream *ics,186
bitfile *ld, int16_t *spectral_data)187
-{ 188
+{189
uint16_t PCWs_done;190
- uint16_t numberOfSegments, numberOfSets, numberOfCodewords; 191
+ uint16_t numberOfSegments, numberOfSets, numberOfCodewords;192
193
codeword_t codeword[512];194
bits_t segment[512];195
196
uint16_t sp_offset[8];197
uint16_t g, i, sortloop, set, bitsread;198
/*uint16_t bitsleft, codewordsleft*/;199
- uint8_t w_idx, sfb, this_CB, last_CB, this_sec_CB; 200
- 201
faad2-2.9.2.tar.gz/libfaad/huffman.c -> faad2-2.10.0.tar.gz/libfaad/huffman.c
Changed
163
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
27
/* static function declarations */28
static INLINE void huffman_sign_bits(bitfile *ld, int16_t *sp, uint8_t len);29
-static INLINE int16_t huffman_getescape(bitfile *ld, int16_t sp);30
+static INLINE uint8_t huffman_getescape(bitfile *ld, int16_t *sp);31
static uint8_t huffman_2step_quad(uint8_t cb, bitfile *ld, int16_t *sp);32
static uint8_t huffman_2step_quad_sign(uint8_t cb, bitfile *ld, int16_t *sp);33
static uint8_t huffman_2step_pair(uint8_t cb, bitfile *ld, int16_t *sp);34
35
}36
}37
38
-static INLINE int16_t huffman_getescape(bitfile *ld, int16_t sp)39
+static INLINE uint8_t huffman_getescape(bitfile *ld, int16_t *sp)40
{41
uint8_t neg, i;42
int16_t j;43
int16_t off;44
+ int16_t x = *sp;45
46
- if (sp < 0)47
+ if (x < 0)48
{49
- if (sp != -16)50
- return sp;51
+ if (x != -16)52
+ return 0;53
neg = 1;54
} else {55
- if (sp != 16)56
- return sp;57
+ if (x != 16)58
+ return 0;59
neg = 0;60
}61
62
- for (i = 4; ; i++)63
+ for (i = 4; i < 16; i++)64
{65
if (faad_get1bit(ld66
DEBUGVAR(1,6,"huffman_getescape(): escape size")) == 0)67
68
break;69
}70
}71
+ if (i >= 16)72
+ return 10;73
74
off = (int16_t)faad_getbits(ld, i75
DEBUGVAR(1,9,"huffman_getescape(): escape"));76
77
if (neg)78
j = -j;79
80
- return j;81
+ *sp = j;82
+ return 0;83
}84
85
static uint8_t huffman_2step_quad(uint8_t cb, bitfile *ld, int16_t *sp)86
87
return huffman_2step_pair_sign(cb, ld, sp);88
case 12: {89
uint8_t err = huffman_2step_pair(11, ld, sp);90
- sp[0] = huffman_codebook(0); sp[1] = huffman_codebook(1); 91
+ sp[0] = huffman_codebook(0); sp[1] = huffman_codebook(1);92
return err; }93
case 11:94
{95
uint8_t err = huffman_2step_pair_sign(11, ld, sp);96
- sp[0] = huffman_getescape(ld, sp[0]);97
- sp[1] = huffman_getescape(ld, sp[1]);98
+ if (!err)99
+ err = huffman_getescape(ld, &sp[0]);100
+ if (!err)101
+ err = huffman_getescape(ld, &sp[1]);102
return err;103
}104
#ifdef ERROR_RESILIENCE105
106
case 24: case 25: case 26: case 27: case 28: case 29: case 30: case 31:107
{108
uint8_t err = huffman_2step_pair_sign(11, ld, sp);109
- sp[0] = huffman_getescape(ld, sp[0]);110
- sp[1] = huffman_getescape(ld, sp[1]);111
+ if (!err)112
+ err = huffman_getescape(ld, &sp[0]);113
+ if (!err)114
+ err = huffman_getescape(ld, &sp[1]);115
116
/* check LAV (Largest Absolute Value) */117
/* this finds errors in the ESCAPE signal */118
119
vcb11 = cb;120
cb = 11;121
}122
- 123
+124
cw = showbits_hcr(ld, hcbN[cb]);125
offset = hcb_table[cb][cw].offset;126
extra_bits = hcb_table[cb][cw].extra_bits;127
128
while (!hcb3[offset].is_leaf)129
{130
uint8_t b;131
- 132
+133
if ( get1bit_hcr(ld, &b) ) return -1;134
offset += hcb3[offset].data[b];135
}136
137
while (!hcb_bin_table[cb][offset].is_leaf)138
{139
uint8_t b;140
- 141
+142
if (get1bit_hcr(ld, &b) ) return -1;143
offset += hcb_bin_table[cb][offset].data[b];144
}145
146
int32_t j;147
uint32_t off;148
149
- neg = (sp[k] < 0) ? 1 : 0; 150
+ neg = (sp[k] < 0) ? 1 : 0;151
152
for (i = 4; ; i++)153
{154
155
/* this finds errors in the ESCAPE signal */156
vcb11_check_LAV(vcb11, sp);157
}158
- } 159
+ }160
return ld->len;161
}162
163
faad2-2.9.2.tar.gz/libfaad/huffman.h -> faad2-2.10.0.tar.gz/libfaad/huffman.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ic_predict.c -> faad2-2.10.0.tar.gz/libfaad/ic_predict.c
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
tmp |= (uint32_t)0x00010000; /* insert 1 lsb */27
tmp2 = tmp; /* add 1 lsb and elided one */28
tmp &= (uint32_t)0xff800000; /* extract exponent and sign */29
- 30
+31
*pf = *(float32_t*)&tmp1 + *(float32_t*)&tmp2 - *(float32_t*)&tmp;32
} else {33
*pf = *(float32_t*)&tmp;34
faad2-2.9.2.tar.gz/libfaad/ic_predict.h -> faad2-2.10.0.tar.gz/libfaad/ic_predict.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/iq_table.h -> faad2-2.10.0.tar.gz/libfaad/iq_table.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/is.c -> faad2-2.10.0.tar.gz/libfaad/is.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/is.h -> faad2-2.10.0.tar.gz/libfaad/is.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/kbd_win.h -> faad2-2.10.0.tar.gz/libfaad/kbd_win.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/lt_predict.c -> faad2-2.10.0.tar.gz/libfaad/lt_predict.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/lt_predict.h -> faad2-2.10.0.tar.gz/libfaad/lt_predict.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/mdct.c -> faad2-2.10.0.tar.gz/libfaad/mdct.c
Changed
39
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
* Fast (I)MDCT Implementation using (I)FFT ((Inverse) Fast Fourier Transform)27
* and consists of three steps: pre-(I)FFT complex multiplication, complex28
* (I)FFT, post-(I)FFT complex multiplication,29
- * 30
+ *31
* As described in:32
* P. Duhamel, Y. Mahieux, and J.P. Petit, "A Fast Algorithm for the33
* Implementation of Filter Banks Based on 'Time Domain Aliasing34
- * Cancellation," IEEE Proc. on ICASSP91, 1991, pp. 2209-2212.35
+ * Cancellation'," IEEE Proc. on ICASSP'91, 1991, pp. 2209-2212.36
*37
*38
* As of April 6th 2002 completely rewritten.39
faad2-2.9.2.tar.gz/libfaad/mdct.h -> faad2-2.10.0.tar.gz/libfaad/mdct.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/mdct_tab.h -> faad2-2.10.0.tar.gz/libfaad/mdct_tab.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/mp4.c -> faad2-2.10.0.tar.gz/libfaad/mp4.c
Changed
56
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
0, /* 27 ER Parametric */27
#endif28
0, /* 28 (Reserved) */29
- 0, /* 29 (Reserved) */30
+#ifdef PS_DEC31
+ 1, /* 29 AAC LC + SBR + PS */32
+#else33
+ 0, /* 29 AAC LC + SBR + PS */34
+#endif35
0, /* 30 (Reserved) */36
0 /* 31 (Reserved) */37
};38
39
40
#ifdef SBR_DEC41
mp4ASC->sbr_present_flag = -1;42
- if (mp4ASC->objectTypeIndex == 5)43
+ if (mp4ASC->objectTypeIndex == 5 || mp4ASC->objectTypeIndex == 29)44
{45
uint8_t tmp;46
47
48
else49
bits_to_decode = (int8_t)(buffer_size*8 - (startpos-faad_get_processed_bits(ld)));50
51
- if ((mp4ASC->objectTypeIndex != 5) && (bits_to_decode >= 16))52
+ if ((mp4ASC->objectTypeIndex != 5 && mp4ASC->objectTypeIndex != 29) && (bits_to_decode >= 16))53
{54
int16_t syncExtensionType = (int16_t)faad_getbits(ld, 1155
DEBUGVAR(1,9,"parse_audio_decoder_specific_info(): syncExtensionType"));56
faad2-2.9.2.tar.gz/libfaad/mp4.h -> faad2-2.10.0.tar.gz/libfaad/mp4.h
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
uint32_t buffer_size,27
mp4AudioSpecificConfig *mp4ASC,28
program_config *pce, uint8_t short_form);29
- 30
+31
int8_t AudioSpecificConfigFromBitfile(bitfile *ld,32
mp4AudioSpecificConfig *mp4ASC,33
program_config *pce, uint32_t bsize, uint8_t short_form);34
faad2-2.9.2.tar.gz/libfaad/ms.c -> faad2-2.10.0.tar.gz/libfaad/ms.c
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
27
if (ics->ms_mask_present >= 1)28
{29
- for (g = 0; g < ics->num_window_groups; g++) 30
+ for (g = 0; g < ics->num_window_groups; g++)31
{32
for (b = 0; b < ics->window_group_length[g]; b++)33
{34
faad2-2.9.2.tar.gz/libfaad/ms.h -> faad2-2.10.0.tar.gz/libfaad/ms.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/output.c -> faad2-2.10.0.tar.gz/libfaad/output.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/output.h -> faad2-2.10.0.tar.gz/libfaad/output.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/pns.c -> faad2-2.10.0.tar.gz/libfaad/pns.c
Changed
59
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
if ((ics_right != NULL)27
&& is_noise(ics_right, g, sfb))28
{29
- if (channel_pair &&30
+#ifdef LTP_DEC31
+ /* See comment above. */32
+ ics_right->ltp.long_used[sfb] = 0;33
+ ics_right->ltp2.long_used[sfb] = 0;34
+#endif35
+#ifdef MAIN_DEC36
+ /* See comment above. */37
+ ics_right->pred.prediction_used[sfb] = 0;38
+#endif39
+40
+ if (channel_pair && is_noise(ics_left, g, sfb) &&41
(((ics_left->ms_mask_present == 1) &&42
(ics_left->ms_used[g][sfb])) ||43
(ics_left->ms_mask_present == 2)))44
45
46
} else /*if (ics_left->ms_mask_present == 0)*/ {47
48
-#ifdef LTP_DEC49
- ics_right->ltp.long_used[sfb] = 0;50
- ics_right->ltp2.long_used[sfb] = 0;51
-#endif52
-#ifdef MAIN_DEC53
- ics_right->pred.prediction_used[sfb] = 0;54
-#endif55
-56
offs = ics_right->swb_offset[sfb];57
size = min(ics_right->swb_offset[sfb+1], ics_right->swb_offset_max) - offs;58
59
faad2-2.9.2.tar.gz/libfaad/pns.h -> faad2-2.10.0.tar.gz/libfaad/pns.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ps_dec.c -> faad2-2.10.0.tar.gz/libfaad/ps_dec.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ps_dec.h -> faad2-2.10.0.tar.gz/libfaad/ps_dec.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ps_tables.h -> faad2-2.10.0.tar.gz/libfaad/ps_tables.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/pulse.c -> faad2-2.10.0.tar.gz/libfaad/pulse.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/pulse.h -> faad2-2.10.0.tar.gz/libfaad/pulse.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/rvlc.c -> faad2-2.10.0.tar.gz/libfaad/rvlc.c
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
int8_t index;27
uint32_t cw;28
rvlc_huff_table *h = book_rvlc;29
- 30
+31
i = h->len;32
if (direction > 0)33
cw = faad_getbits(ld_sf, i DEBUGVAR(1,0,""));34
faad2-2.9.2.tar.gz/libfaad/rvlc.h -> faad2-2.10.0.tar.gz/libfaad/rvlc.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_dct.c -> faad2-2.10.0.tar.gz/libfaad/sbr_dct.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_dct.h -> faad2-2.10.0.tar.gz/libfaad/sbr_dct.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_dec.c -> faad2-2.10.0.tar.gz/libfaad/sbr_dec.c
Changed
62
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
{27
sbr->numTimeSlotsRate = RATE * NO_TIME_SLOTS_960;28
sbr->numTimeSlots = NO_TIME_SLOTS_960;29
- } else {30
+ }31
+ else if (framelength == 1024)32
+ {33
sbr->numTimeSlotsRate = RATE * NO_TIME_SLOTS;34
sbr->numTimeSlots = NO_TIME_SLOTS;35
}36
+ else37
+ {38
+ faad_free(sbr);39
+ return NULL;40
+ }41
42
sbr->GQ_ringbuf_index[0] = 0;43
sbr->GQ_ringbuf_index[1] = 0;44
45
}46
47
#ifdef PS_DEC48
- if (sbr->ps != NULL) 49
+ if (sbr->ps != NULL)50
ps_free(sbr->ps);51
#endif52
53
54
55
memset(sbr->Xsbr[0], 0, (sbr->numTimeSlotsRate+sbr->tHFGen)*64 * sizeof(qmf_t));56
memset(sbr->Xsbr[1], 0, (sbr->numTimeSlotsRate+sbr->tHFGen)*64 * sizeof(qmf_t));57
- 58
+59
sbr->GQ_ringbuf_index[0] = 0;60
sbr->GQ_ringbuf_index[1] = 0;61
sbr->header_count = 0;62
faad2-2.9.2.tar.gz/libfaad/sbr_dec.h -> faad2-2.10.0.tar.gz/libfaad/sbr_dec.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_e_nf.c -> faad2-2.10.0.tar.gz/libfaad/sbr_e_nf.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_e_nf.h -> faad2-2.10.0.tar.gz/libfaad/sbr_e_nf.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_fbt.c -> faad2-2.10.0.tar.gz/libfaad/sbr_fbt.c
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
{27
return startMin + offset[offsetIndex][bs_start_freq];28
29
-#if 0 /* replaced by offsetIndexTable */ 30
+#if 0 /* replaced by offsetIndexTable */31
switch (sample_rate)32
{33
case 16000:34
faad2-2.9.2.tar.gz/libfaad/sbr_fbt.h -> faad2-2.10.0.tar.gz/libfaad/sbr_fbt.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_hfadj.c -> faad2-2.10.0.tar.gz/libfaad/sbr_hfadj.c
Changed
97
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
};27
28
static const real_t log_Qplus1[31] = {29
- REAL_CONST(6.022367813028454), REAL_CONST(5.044394119358453), REAL_CONST(4.087462841250339), 30
- REAL_CONST(3.169925001442313), REAL_CONST(2.321928094887362), REAL_CONST(1.584962500721156), 31
- REAL_CONST(1.000000000000000), REAL_CONST(0.584962500721156), REAL_CONST(0.321928094887362), 32
- REAL_CONST(0.169925001442312), REAL_CONST(0.087462841250339), REAL_CONST(0.044394119358453), 33
- REAL_CONST(0.022367813028455), REAL_CONST(0.011227255423254), REAL_CONST(0.005624549193878), 34
- REAL_CONST(0.002815015607054), REAL_CONST(0.001408194392808), REAL_CONST(0.000704269011247), 35
- REAL_CONST(0.000352177480301), REAL_CONST(0.000176099486443), REAL_CONST(0.000088052430122), 36
- REAL_CONST(0.000044026886827), REAL_CONST(0.000022013611360), REAL_CONST(0.000011006847667), 37
- REAL_CONST(0.000005503434331), REAL_CONST(0.000002751719790), REAL_CONST(0.000001375860551), 38
- REAL_CONST(0.000000687930439), REAL_CONST(0.000000343965261), REAL_CONST(0.000000171982641), 39
+ REAL_CONST(6.022367813028454), REAL_CONST(5.044394119358453), REAL_CONST(4.087462841250339),40
+ REAL_CONST(3.169925001442313), REAL_CONST(2.321928094887362), REAL_CONST(1.584962500721156),41
+ REAL_CONST(1.000000000000000), REAL_CONST(0.584962500721156), REAL_CONST(0.321928094887362),42
+ REAL_CONST(0.169925001442312), REAL_CONST(0.087462841250339), REAL_CONST(0.044394119358453),43
+ REAL_CONST(0.022367813028455), REAL_CONST(0.011227255423254), REAL_CONST(0.005624549193878),44
+ REAL_CONST(0.002815015607054), REAL_CONST(0.001408194392808), REAL_CONST(0.000704269011247),45
+ REAL_CONST(0.000352177480301), REAL_CONST(0.000176099486443), REAL_CONST(0.000088052430122),46
+ REAL_CONST(0.000044026886827), REAL_CONST(0.000022013611360), REAL_CONST(0.000011006847667),47
+ REAL_CONST(0.000005503434331), REAL_CONST(0.000002751719790), REAL_CONST(0.000001375860551),48
+ REAL_CONST(0.000000687930439), REAL_CONST(0.000000343965261), REAL_CONST(0.000000171982641),49
REAL_CONST(0.000000000000000)50
};51
52
53
};54
55
static const real_t log_Qplus1[31] = {56
- REAL_CONST(6.022367813028454), REAL_CONST(5.044394119358453), REAL_CONST(4.087462841250339), 57
- REAL_CONST(3.169925001442313), REAL_CONST(2.321928094887362), REAL_CONST(1.584962500721156), 58
- REAL_CONST(1.000000000000000), REAL_CONST(0.584962500721156), REAL_CONST(0.321928094887362), 59
- REAL_CONST(0.169925001442312), REAL_CONST(0.087462841250339), REAL_CONST(0.044394119358453), 60
- REAL_CONST(0.022367813028455), REAL_CONST(0.011227255423254), REAL_CONST(0.005624549193878), 61
- REAL_CONST(0.002815015607054), REAL_CONST(0.001408194392808), REAL_CONST(0.000704269011247), 62
- REAL_CONST(0.000352177480301), REAL_CONST(0.000176099486443), REAL_CONST(0.000088052430122), 63
- REAL_CONST(0.000044026886827), REAL_CONST(0.000022013611360), REAL_CONST(0.000011006847667), 64
- REAL_CONST(0.000005503434331), REAL_CONST(0.000002751719790), REAL_CONST(0.000001375860551), 65
- REAL_CONST(0.000000687930439), REAL_CONST(0.000000343965261), REAL_CONST(0.000000171982641), 66
+ REAL_CONST(6.022367813028454), REAL_CONST(5.044394119358453), REAL_CONST(4.087462841250339),67
+ REAL_CONST(3.169925001442313), REAL_CONST(2.321928094887362), REAL_CONST(1.584962500721156),68
+ REAL_CONST(1.000000000000000), REAL_CONST(0.584962500721156), REAL_CONST(0.321928094887362),69
+ REAL_CONST(0.169925001442312), REAL_CONST(0.087462841250339), REAL_CONST(0.044394119358453),70
+ REAL_CONST(0.022367813028455), REAL_CONST(0.011227255423254), REAL_CONST(0.005624549193878),71
+ REAL_CONST(0.002815015607054), REAL_CONST(0.001408194392808), REAL_CONST(0.000704269011247),72
+ REAL_CONST(0.000352177480301), REAL_CONST(0.000176099486443), REAL_CONST(0.000088052430122),73
+ REAL_CONST(0.000044026886827), REAL_CONST(0.000022013611360), REAL_CONST(0.000011006847667),74
+ REAL_CONST(0.000005503434331), REAL_CONST(0.000002751719790), REAL_CONST(0.000001375860551),75
+ REAL_CONST(0.000000687930439), REAL_CONST(0.000000343965261), REAL_CONST(0.000000171982641),76
REAL_CONST(0.000000000000000)77
};78
79
80
i++;81
}82
}83
- } 84
+ }85
86
if (grouping)87
{88
89
for (k = 0; k < sbr->N_G[l]; k++)90
{91
E_total_est = E_total = 0;92
- 93
+94
for (m = sbr->f_group[l][k<<1]; m < sbr->f_group[l][(k<<1) + 1]; m++)95
{96
/* E_curr: integer */97
faad2-2.9.2.tar.gz/libfaad/sbr_hfadj.h -> faad2-2.10.0.tar.gz/libfaad/sbr_hfadj.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_hfgen.c -> faad2-2.10.0.tar.gz/libfaad/sbr_hfgen.c
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
/* improves accuracy */27
if (exp > 0)28
exp -= 1;29
- 30
+31
pow2_to_exp = 1<<(exp-1);32
33
temp2_r = (QMF_RE(buffer[offset-2][bd]) + pow2_to_exp) >> exp;34
faad2-2.9.2.tar.gz/libfaad/sbr_hfgen.h -> faad2-2.10.0.tar.gz/libfaad/sbr_hfgen.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_huff.c -> faad2-2.10.0.tar.gz/libfaad/sbr_huff.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_huff.h -> faad2-2.10.0.tar.gz/libfaad/sbr_huff.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_noise.h -> faad2-2.10.0.tar.gz/libfaad/sbr_noise.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_qmf.c -> faad2-2.10.0.tar.gz/libfaad/sbr_qmf.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_qmf.h -> faad2-2.10.0.tar.gz/libfaad/sbr_qmf.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_qmf_c.h -> faad2-2.10.0.tar.gz/libfaad/sbr_qmf_c.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_syntax.c -> faad2-2.10.0.tar.gz/libfaad/sbr_syntax.c
Changed
43
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
{27
result += calc_sbr_tables(sbr, saved_start_freq, saved_stop_freq,28
saved_samplerate_mode, saved_freq_scale,29
- saved_alter_scale, saved_xover_band); 30
+ saved_alter_scale, saved_xover_band);31
}32
33
/* we should be able to safely set result to 0 now, */34
35
#ifdef DRM36
if (!sbr->Is_DRM_SBR)37
#endif38
- { 39
+ {40
/* -4 does not apply, bs_extension_type is re-read in this function */41
num_align_bits = 8*cnt /*- 4*/ - num_sbr_bits2;42
43
faad2-2.9.2.tar.gz/libfaad/sbr_syntax.h -> faad2-2.10.0.tar.gz/libfaad/sbr_syntax.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_tf_grid.c -> faad2-2.10.0.tar.gz/libfaad/sbr_tf_grid.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sbr_tf_grid.h -> faad2-2.10.0.tar.gz/libfaad/sbr_tf_grid.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/sine_win.h -> faad2-2.10.0.tar.gz/libfaad/sine_win.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/specrec.c -> faad2-2.10.0.tar.gz/libfaad/specrec.c
Changed
79
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
wb = wa + bin;27
28
spec_data[wb+0] = iquant(quant_data[k+0], tab, &error) * scf;29
- spec_data[wb+1] = iquant(quant_data[k+1], tab, &error) * scf; 30
- spec_data[wb+2] = iquant(quant_data[k+2], tab, &error) * scf; 31
+ spec_data[wb+1] = iquant(quant_data[k+1], tab, &error) * scf;32
+ spec_data[wb+2] = iquant(quant_data[k+2], tab, &error) * scf;33
spec_data[wb+3] = iquant(quant_data[k+3], tab, &error) * scf;34
- 35
+36
#else37
real_t iq0 = iquant(quant_data[k+0], tab, &error);38
real_t iq1 = iquant(quant_data[k+1], tab, &error);39
40
/* sanity check, CVE-2018-20199, CVE-2018-20360 */41
if(!hDecoder->time_out[sce->channel])42
return 15;43
+ if(output_channels > 1 && !hDecoder->time_out[sce->channel+1])44
+ return 15;45
+ if(!hDecoder->fb_intermed[sce->channel])46
+ return 15;47
48
/* dequantisation and scaling */49
retval = quant_to_spec(hDecoder, ics, spec_data, spec_coef, hDecoder->frameLength);50
51
#endif52
);53
}54
+ if (!hDecoder->sbr[ele])55
+ return 19;56
57
if (sce->ics1.window_sequence == EIGHT_SHORT_SEQUENCE)58
hDecoder->sbr[ele]->maxAACLine = 8*min(sce->ics1.swb_offset[max(sce->ics1.max_sfb-1, 0)], sce->ics1.swb_offset_max);59
60
}61
62
/* sanity check, CVE-2018-20199, CVE-2018-20360 */63
- if(!hDecoder->time_out[cpe->channel])64
+ if(!hDecoder->time_out[cpe->channel] || !hDecoder->time_out[cpe->paired_channel])65
+ return 15;66
+ if(!hDecoder->fb_intermed[cpe->channel] || !hDecoder->fb_intermed[cpe->paired_channel])67
return 15;68
69
/* dequantisation and scaling */70
71
#endif72
);73
}74
+ if (!hDecoder->sbr[ele])75
+ return 19;76
77
if (cpe->ics1.window_sequence == EIGHT_SHORT_SEQUENCE)78
hDecoder->sbr[ele]->maxAACLine = 8*min(cpe->ics1.swb_offset[max(cpe->ics1.max_sfb-1, 0)], cpe->ics1.swb_offset_max);79
faad2-2.9.2.tar.gz/libfaad/specrec.h -> faad2-2.10.0.tar.gz/libfaad/specrec.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ssr.c -> faad2-2.10.0.tar.gz/libfaad/ssr.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ssr.h -> faad2-2.10.0.tar.gz/libfaad/ssr.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ssr_fb.c -> faad2-2.10.0.tar.gz/libfaad/ssr_fb.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ssr_fb.h -> faad2-2.10.0.tar.gz/libfaad/ssr_fb.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ssr_ipqf.c -> faad2-2.10.0.tar.gz/libfaad/ssr_ipqf.c
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
-2.1939551286300665E-02, -2.4533179947088161E-02, -2.2591663337768787E-02,27
-1.5122066420044672E-02, -1.7971713448186293E-03, 1.6903413428575379E-02,28
3.9672315874127042E-02, 6.4487527248102796E-02, 8.8850025474701726E-02,29
- 0.1101132906105560 , 0.1258540205143761 , 0.1342239368467012 30
+ 0.1101132906105560 , 0.1258540205143761 , 0.134223936846701231
};32
33
for (j = 0; j < 48; ++j)34
faad2-2.9.2.tar.gz/libfaad/ssr_ipqf.h -> faad2-2.10.0.tar.gz/libfaad/ssr_ipqf.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/ssr_win.h -> faad2-2.10.0.tar.gz/libfaad/ssr_win.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/structs.h -> faad2-2.10.0.tar.gz/libfaad/structs.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/syntax.c -> faad2-2.10.0.tar.gz/libfaad/syntax.c
Changed
183
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
can become 2 when some form of Parametric Stereo coding is used27
*/28
29
- if (hDecoder->frame && hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele) {30
+ if (hDecoder->element_id[hDecoder->fr_ch_ele] != INVALID_ELEMENT_ID &&31
+ hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele)32
+ {33
/* element inconsistency */34
hInfo->error = 21;35
return;36
37
return;38
}39
40
- if (hDecoder->frame && hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele) {41
+ if (hDecoder->element_id[hDecoder->fr_ch_ele] != INVALID_ELEMENT_ID &&42
+ hDecoder->element_id[hDecoder->fr_ch_ele] != id_syn_ele)43
+ {44
/* element inconsistency */45
hInfo->error = 21;46
return;47
48
break;49
case 3:50
decode_sce_lfe(hDecoder, hInfo, ld, ID_SCE);51
+ if (hInfo->error > 0)52
+ return;53
decode_cpe(hDecoder, hInfo, ld, ID_CPE);54
if (hInfo->error > 0)55
return;56
break;57
case 4:58
decode_sce_lfe(hDecoder, hInfo, ld, ID_SCE);59
+ if (hInfo->error > 0)60
+ return;61
decode_cpe(hDecoder, hInfo, ld, ID_CPE);62
+ if (hInfo->error > 0)63
+ return;64
decode_sce_lfe(hDecoder, hInfo, ld, ID_SCE);65
if (hInfo->error > 0)66
return;67
break;68
case 5:69
decode_sce_lfe(hDecoder, hInfo, ld, ID_SCE);70
+ if (hInfo->error > 0)71
+ return;72
decode_cpe(hDecoder, hInfo, ld, ID_CPE);73
+ if (hInfo->error > 0)74
+ return;75
decode_cpe(hDecoder, hInfo, ld, ID_CPE);76
if (hInfo->error > 0)77
return;78
break;79
case 6:80
decode_sce_lfe(hDecoder, hInfo, ld, ID_SCE);81
+ if (hInfo->error > 0)82
+ return;83
decode_cpe(hDecoder, hInfo, ld, ID_CPE);84
+ if (hInfo->error > 0)85
+ return;86
decode_cpe(hDecoder, hInfo, ld, ID_CPE);87
+ if (hInfo->error > 0)88
+ return;89
decode_sce_lfe(hDecoder, hInfo, ld, ID_LFE);90
if (hInfo->error > 0)91
return;92
break;93
case 7: /* 8 channels */94
decode_sce_lfe(hDecoder, hInfo, ld, ID_SCE);95
+ if (hInfo->error > 0)96
+ return;97
decode_cpe(hDecoder, hInfo, ld, ID_CPE);98
+ if (hInfo->error > 0)99
+ return;100
decode_cpe(hDecoder, hInfo, ld, ID_CPE);101
+ if (hInfo->error > 0)102
+ return;103
decode_cpe(hDecoder, hInfo, ld, ID_CPE);104
+ if (hInfo->error > 0)105
+ return;106
decode_sce_lfe(hDecoder, hInfo, ld, ID_LFE);107
if (hInfo->error > 0)108
return;109
110
if ((ics->ltp.data_present = faad_get1bit(ld111
DEBUGVAR(1,50,"ics_info(): ltp.data_present"))) & 1)112
{113
- ltp_data(hDecoder, ics, &(ics->ltp), ld);114
+ if ((retval = ltp_data(hDecoder, ics, &(ics->ltp), ld)) > 0)115
+ {116
+ return retval;117
+ }118
}119
}120
#endif121
122
#endif123
);124
}125
+ if (!hDecoder->sbr[sbr_ele])126
+ return 19;127
128
hDecoder->sbr_present_flag = 1;129
130
131
}132
#else133
faad_get1bit(ld);134
-#endif 135
+#endif136
137
hInfo->error = side_info(hDecoder, &cpe, ld, ics1, 1);138
if (hInfo->error > 0)139
140
hDecoder->sbr[0] = sbrDecodeInit(hDecoder->frameLength, hDecoder->element_id[0],141
2*get_sample_rate(hDecoder->sf_index), 0 /* ds SBR */, 1);142
}143
+ if (!hDecoder->sbr[0])144
+ {145
+ hInfo->error = 19;146
+ return;147
+ }148
149
/* Reverse bit reading of SBR data in DRM audio frame */150
revbuffer = (uint8_t*)faad_malloc(buffer_size*sizeof(uint8_t));151
152
if (result > 0)153
return result;154
155
- if (hDecoder->object_type >= ER_OBJECT_START) 156
+ if (hDecoder->object_type >= ER_OBJECT_START)157
{158
if (ics->tns_data_present)159
tns_data(ics, &(ics->tns), ld);160
161
return n;162
case EXT_FILL_DATA:163
/* fill_nibble = */ faad_getbits(ld, 4164
- DEBUGVAR(1,136,"extension_payload(): fill_nibble")); /* must be 0000 */165
+ DEBUGVAR(1,136,"extension_payload(): fill_nibble")); /* must be '0000' */166
for (i = 0; i < count-1; i++)167
{168
/* fill_byte[i] = */ faad_getbits(ld, 8169
- DEBUGVAR(1,88,"extension_payload(): fill_byte")); /* must be 10100101 */170
+ DEBUGVAR(1,88,"extension_payload(): fill_byte")); /* must be '10100101' */171
}172
return count;173
case EXT_DATA_ELEMENT:174
175
endpos = faad_get_processed_bits(ld);176
if(ret>0)177
return (len*8)-(endpos-initpos);178
- //faad_getbits(ld, initpos-endpos); //go back to initpos, but is valid a getbits(-N) ? 179
+ //faad_getbits(ld, initpos-endpos); //go back to initpos, but is valid a getbits(-N) ?180
}181
return 0xFFFFFFFF;182
}183
faad2-2.9.2.tar.gz/libfaad/syntax.h -> faad2-2.10.0.tar.gz/libfaad/syntax.h
Changed
33
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
#define ID_PCE 0x527
#define ID_FIL 0x628
#define ID_END 0x729
+#define INVALID_ELEMENT_ID 25530
31
#define ONLY_LONG_SEQUENCE 0x032
#define LONG_START_SEQUENCE 0x133
faad2-2.9.2.tar.gz/libfaad/tns.c -> faad2-2.10.0.tar.gz/libfaad/tns.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/libfaad/tns.h -> faad2-2.10.0.tar.gz/libfaad/tns.h
Changed
34
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003-2005 M. Bakker, Nero AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
27
#define TNS_MAX_ORDER 2028
29
- 30
+31
void tns_decode_frame(ic_stream *ics, tns_info *tns, uint8_t sr_index,32
uint8_t object_type, real_t *spec, uint16_t frame_len);33
void tns_encode_frame(ic_stream *ics, tns_info *tns, uint8_t sr_index,34
faad2-2.9.2.tar.gz/plugins/QCD/QCDFAAD.c -> faad2-2.10.0.tar.gz/plugins/QCD/QCDFAAD.c
Changed
201
1
2
/*3
** FAAD - Freeware Advanced Audio Decoder4
** Copyright (C) 2002 M. Bakker5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** $Id: QCDFAAD.c,v 1.2 2003/04/28 19:04:35 menno Exp $25
26
{27
case WM_INITDIALOG:28
/* Set priority slider range and previous position */29
- SendMessage(GetDlgItem(hwndDlg, THREAD_PRIORITY_SLIDER), TBM_SETRANGE, TRUE, MAKELONG(1, 5)); 30
+ SendMessage(GetDlgItem(hwndDlg, THREAD_PRIORITY_SLIDER), TBM_SETRANGE, TRUE, MAKELONG(1, 5));31
SendMessage(GetDlgItem(hwndDlg, THREAD_PRIORITY_SLIDER), TBM_SETPOS, TRUE, m_priority);32
SetDlgItemText(hwndDlg, IDC_STATIC2, priority_text[m_priority]);33
- 34
+35
/* Put a limit to the amount of characters allowed in the buffer boxes */36
SendMessage(GetDlgItem(hwndDlg, LOCAL_BUFFER_TXT), EM_LIMITTEXT, 4, 0);37
SendMessage(GetDlgItem(hwndDlg, STREAM_BUFFER_TXT), EM_LIMITTEXT, 4, 0);38
39
if(GetDlgItem(hwndDlg, VARBITRATE_CHK) == (HWND) lParam)40
{41
/* Variable Bitrate checkbox hit */42
- m_variable_bitrate_display = SendMessage(GetDlgItem(hwndDlg, VARBITRATE_CHK), BM_GETCHECK, 0, 0); 43
+ m_variable_bitrate_display = SendMessage(GetDlgItem(hwndDlg, VARBITRATE_CHK), BM_GETCHECK, 0, 0);44
}45
if(GetDlgItem(hwndDlg, IDC_MEMMAP) == (HWND) lParam)46
{47
/* Variable Bitrate checkbox hit */48
- m_memmap_file = SendMessage(GetDlgItem(hwndDlg, IDC_MEMMAP), BM_GETCHECK, 0, 0); 49
+ m_memmap_file = SendMessage(GetDlgItem(hwndDlg, IDC_MEMMAP), BM_GETCHECK, 0, 0);50
}51
}52
53
54
55
SetDlgItemText(hwndDlg, IDC_PLUGINVER, szPluginVer);56
SetDlgItemText(hwndDlg, IDC_FAADVER, szFLACVer);57
- 58
+59
return TRUE;60
case WM_MOUSEMOVE:61
ptMouse.x = LOWORD(lParam);62
ptMouse.y = HIWORD(lParam);63
ClientToScreen(hwndDlg, &ptMouse);64
- if( (ptMouse.x >= rcLOGO.left && ptMouse.x <= rcLOGO.right && 65
- ptMouse.y >= rcLOGO.top && ptMouse.y<= rcLOGO.bottom) 66
+ if( (ptMouse.x >= rcLOGO.left && ptMouse.x <= rcLOGO.right &&67
+ ptMouse.y >= rcLOGO.top && ptMouse.y<= rcLOGO.bottom)68
||69
- (ptMouse.x >= rcMail1.left && ptMouse.x <= rcMail1.right && 70
- ptMouse.y >= rcMail1.top && ptMouse.y<= rcMail1.bottom) 71
+ (ptMouse.x >= rcMail1.left && ptMouse.x <= rcMail1.right &&72
+ ptMouse.y >= rcMail1.top && ptMouse.y<= rcMail1.bottom)73
||74
- (ptMouse.x >= rcMail2.left && ptMouse.x <= rcMail2.right && 75
- ptMouse.y >= rcMail2.top && ptMouse.y<= rcMail2.bottom) 76
+ (ptMouse.x >= rcMail2.left && ptMouse.x <= rcMail2.right &&77
+ ptMouse.y >= rcMail2.top && ptMouse.y<= rcMail2.bottom)78
/* ||79
- (ptMouse.x >= rcMail3.left && ptMouse.x <= rcMail3.right && 80
+ (ptMouse.x >= rcMail3.left && ptMouse.x <= rcMail3.right &&81
ptMouse.y >= rcMail3.top && ptMouse.y<= rcMail3.bottom)*/ )82
SetCursor(LoadCursor(NULL, MAKEINTRESOURCE(32649)));83
else84
85
ptMouse.x = LOWORD(lParam);86
ptMouse.y = HIWORD(lParam);87
ClientToScreen(hwndDlg, &ptMouse);88
- if(ptMouse.x >= rcLOGO.left && ptMouse.x <= rcLOGO.right && 89
+ if(ptMouse.x >= rcLOGO.left && ptMouse.x <= rcLOGO.right &&90
ptMouse.y >= rcLOGO.top && ptMouse.y<= rcLOGO.bottom)91
ShellExecute(0, NULL, "http://www.audiocoding.com", NULL,NULL, SW_NORMAL);92
- else if(ptMouse.x >= rcMail1.left && ptMouse.x <= rcMail1.right && 93
+ else if(ptMouse.x >= rcMail1.left && ptMouse.x <= rcMail1.right &&94
ptMouse.y >= rcMail1.top && ptMouse.y<= rcMail1.bottom)95
ShellExecute(0, NULL, "mailto:shaohao@elong.com", NULL,NULL, SW_NORMAL);96
- else if(ptMouse.x >= rcMail2.left && ptMouse.x <= rcMail2.right && 97
+ else if(ptMouse.x >= rcMail2.left && ptMouse.x <= rcMail2.right &&98
ptMouse.y >= rcMail2.top && ptMouse.y<= rcMail2.bottom)99
ShellExecute(0, NULL, "mailto:menno@audiocoding.com", NULL,NULL, SW_NORMAL);100
-/* else if(ptMouse.x >= rcMail3.left && ptMouse.x <= rcMail3.right && 101
+/* else if(ptMouse.x >= rcMail3.left && ptMouse.x <= rcMail3.right &&102
ptMouse.y >= rcMail3.top && ptMouse.y<= rcMail3.bottom)103
ShellExecute(0, NULL, "I don't know", NULL,NULL, SW_NORMAL);104
*/105
106
void About(int flags)107
{108
if(!IsWindow(hwndAbout))109
- hwndAbout = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_ABOUT), hwndPlayer, about_dialog_proc); 110
+ hwndAbout = CreateDialog(hInstance, MAKEINTRESOURCE(IDD_ABOUT), hwndPlayer, about_dialog_proc);111
ShowWindow(hwndAbout, SW_SHOW);112
}113
114
115
if(StringComp(ch, ".aac", 4) == 0)116
{117
in = open_filestream((char *)medianame);118
- 119
+120
if(in != NULL && mediaInfo)121
{122
if(in->http)123
124
else125
mediaInfo->op_canSeek = FALSE; /* ADIF or Headerless - not seekable */126
}127
- 128
+129
close_filestream(in);130
return TRUE;131
}132
133
}134
}135
else136
- return FALSE; 137
+ return FALSE;138
}139
140
unsigned long samplerate, channels;141
142
int tagsize = 0;143
144
infile = open_filestream(fn);145
- 146
+147
if (infile == NULL)148
return 1;149
150
151
ZeroMemory(buffer, 768*2);152
153
infile = open_filestream(fn);154
- 155
+156
if (infile == NULL)157
return 1;158
159
160
buffer = (unsigned char*)LocalAlloc(LPTR, 768*2);161
162
current_file_mode = m_memmap_file;163
- 164
+165
if(current_file_mode)166
{167
if(play_memmap((char *)medianame))168
169
if(play_file((char *)medianame))170
return FALSE;171
}172
- 173
+174
if(seek_table)175
{176
free(seek_table);177
seek_table = NULL;178
seek_table_length = 0;179
}180
- 181
+182
get_AAC_format((char *)medianame, &file_info, &seek_table, &seek_table_length, 0);183
- 184
+185
seek_needed = playfrom > 0 ? playfrom : -1;186
killPlayThread = 0;187
strcpy(lastfn,medianame);188
189
play_thread_handle = CreateThread(NULL, 0, (LPTHREAD_START_ROUTINE) PlayThread, (void *) &killPlayThread, 0, &thread_id);190
if(!play_thread_handle)191
return FALSE;192
- 193
+194
// Note: This line seriously slows down start up time195
if(m_priority != 3) // if the priority in config window is set to normal, there is nothing to reset!196
SetThreadPriority(play_thread_handle, priority_table[m_priority]);197
- 198
+199
}200
201
faad2-2.9.2.tar.gz/plugins/QCD/QCDInputDLL.h -> faad2-2.10.0.tar.gz/plugins/QCD/QCDInputDLL.h
Changed
17
1
2
//-----------------------------------------------------------------------------3
-// 4
+//5
// File: QCDInputDLL.h6
//7
// About: QCD Player Input module DLL interface. For more documentation, see8
9
//10
// Copyright (C) 1997-2002 Quinnware11
//12
-// This code is free. If you redistribute it in any form, leave this notice 13
+// This code is free. If you redistribute it in any form, leave this notice14
// here.15
//16
// This program is distributed in the hope that it will be useful,17
faad2-2.9.2.tar.gz/plugins/QCD/QCDModDefs.h -> faad2-2.10.0.tar.gz/plugins/QCD/QCDModDefs.h
Changed
118
1
2
//3
// Copyright (C) 1997-2002 Quinnware4
//5
-// This code is free. If you redistribute it in any form, leave this notice 6
+// This code is free. If you redistribute it in any form, leave this notice7
// here.8
//9
// This program is distributed in the hope that it will be useful,10
11
//-----------------------------------------------------------------------------12
// Services (ops) provided by the Player13
//-----------------------------------------------------------------------------14
-typedef enum 15
+typedef enum16
{ //*** below returns numeric info (*buffer not used)17
18
opGetPlayerVersion = 0, // high-order word = major version (eg 3.01 is 3), low-order word = minor (eg 3.01 = 1)19
20
opGetTrackLength = 14, // get track length, param1 = index of track in playlist, -1 for current21
// param2 = 0 for seconds, 1 for milliseconds22
opGetTime = 15, // get time on player, param1 = 0 for time displayed, 1 for track time, 2 for playlist time23
- // param2 = 0 for elapsed, 1 for remaining 24
+ // param2 = 0 for elapsed, 1 for remaining25
opGetTrackState = 16, // get whether track is marked, param1 = index of track, -1 for current26
opGetPlaylistNum = 17, // get playlist number of index, param1 = index of track in playlist, -1 for current27
opGetMediaType = 18, // get media type of track, param1 = index if track in playlist, -1 for current28
29
30
opGetIndexFromPLNum = 28, // get index from playlist number, param1 = playlist number31
32
- opGetChildWnd = 30, // handle to the draggable window extension (only available on some skins) 33
+ opGetChildWnd = 30, // handle to the draggable window extension (only available on some skins)34
opGetExtVisWnd = 31, // handle to the external visual window35
- opGetMusicBrowserWnd = 32, // handle to the music browser window 36
- opGetSkinPreviewWnd = 33, // handle to the skin preview window 37
- opGetPropertiesWnd = 34, // handle to the player properties window 38
- opGetExtInfoWnd = 35, // handle to the extended information window 39
- opGetAboutWnd = 36, // handle to the about window 40
- opGetSegmentsWnd = 37, // handle to the segments window 41
- opGetEQPresetsWnd = 38, // handle to the EQ presets window 42
+ opGetMusicBrowserWnd = 32, // handle to the music browser window43
+ opGetSkinPreviewWnd = 33, // handle to the skin preview window44
+ opGetPropertiesWnd = 34, // handle to the player properties window45
+ opGetExtInfoWnd = 35, // handle to the extended information window46
+ opGetAboutWnd = 36, // handle to the about window47
+ opGetSegmentsWnd = 37, // handle to the segments window48
+ opGetEQPresetsWnd = 38, // handle to the EQ presets window49
50
opGetVisDimensions = 50, // gets the width and height of visual window (param1 = -1 current vis window, 0 internal vis, 1 external vis, 2 full screen)51
- // returns: HEIGHT in high word, WIDTH in low word 52
+ // returns: HEIGHT in high word, WIDTH in low word53
54
opGetQueriesComplete = 60, // get status on whether all tracks in playlist have been queryied for their info55
56
57
opGetSkinFolder = 112, // get current skin folder58
opGetCDDBCacheFolder = 113, // get current folder for CDDB cached info59
60
- opGetCurrentPlaylist = 114, // get full pathname of playlist currently loaded 61
+ opGetCurrentPlaylist = 114, // get full pathname of playlist currently loaded62
63
opGetMediaID = 115, // get media identifier, param2 = index of track in playlist, -1 for current64
- // - for CD's it's the TOC - for anything else, right now it's 0 65
+ // - for CD's it's the TOC - for anything else, right now it's 066
67
opGetSupportedExtensions = 116, // get file extensions supported by the player, param2 = 0 - get all extensions, 1 - get registered extensions68
// - returned extensions will be colon delimited69
70
UINT nch; // number of channels71
UINT srate; // sample rate72
73
- UINT markerstart; // Marker position at start of data (marker is time value of data) 74
+ UINT markerstart; // Marker position at start of data (marker is time value of data)75
// (set to WAVE_VIS_DATA_ONLY to not have data sent to output plugins)76
UINT markerend; // Marker position at end of data (not currently used, set to 0)77
} WriteDataStruct;78
79
typedef struct // for GetTrackExtents Input Plugin callback80
{81
UINT track; // for CD's, set the track number. Otherwise set to 1.82
- UINT start; // for CD's or media that doesn't start at the beginning 83
+ UINT start; // for CD's or media that doesn't start at the beginning84
// of the file, set to start position. Otherwise set to 0.85
UINT end; // set to end position of media.86
UINT unitpersec; // whatever units are being used for this media, how many87
- // of them per second. 88
+ // of them per second.89
// (Note: ((end - start) / unitpersecond) = file length90
UINT bytesize; // size of file in bytes (if applicable, otherwise 0).91
} TrackExtents;92
93
//-----------------------------------------------------------------------------94
typedef struct // for opSetAudioInfo service95
-{ 96
+{97
long struct_size; // sizeof(AudioInfo)98
long level; // MPEG level (1 for MPEG1, 2 for MPEG2, 3 for MPEG2.5, 7 for MPEGpro)99
long layer; // and layer (1, 2 or 3)100
101
typedef struct // for coming QCD version102
{103
long struct_size; // sizeof(EQInfo)104
- char enabled; 105
+ char enabled;106
char preamp; // -128 to 127, 0 is even107
char bands[10]; // -128 to 127, 0 is even108
} EQInfo;109
110
111
//-----------------------------------------------------------------------------112
typedef enum // for MediaInfo.mediaType113
-{ 114
+{115
UNKNOWN_MEDIA = 0,116
CD_AUDIO_MEDIA = 1,117
DIGITAL_FILE_MEDIA = 2,118
faad2-2.9.2.tar.gz/plugins/QCD/QCDModInput.h -> faad2-2.10.0.tar.gz/plugins/QCD/QCDModInput.h
Changed
57
1
2
//3
// File: QCDModInput.h4
//5
-// About: Input plugin module interface. This file is published with the 6
+// About: Input plugin module interface. This file is published with the7
// Input plugin SDK.8
//9
// Authors: Written by Paul Quinn and Richard Carlson.10
11
//12
// Copyright (C) 1997-2002 Quinnware13
//14
-// This code is free. If you redistribute it in any form, leave this notice 15
+// This code is free. If you redistribute it in any form, leave this notice16
// here.17
//18
// This program is distributed in the hope that it will be useful,19
20
#define PLAYFLAG_SEEKING 0x221
22
// Wave Marker flags23
-#define WAVE_VIS_DATA_ONLY -1 // set to WaveDataStruct.markerstart in OutputWrite() call have data only go to vis 24
+#define WAVE_VIS_DATA_ONLY -1 // set to WaveDataStruct.markerstart in OutputWrite() call have data only go to vis25
// and not to output plugin26
// pause flags27
#define PAUSE_DISABLED 0 // Pause() call is to unpause playback28
29
//-----------------------------------------------------------------------------30
// Input Module31
//-----------------------------------------------------------------------------32
-typedef struct 33
+typedef struct34
{35
unsigned int size; // size of init structure36
unsigned int version; // plugin structure version (set to PLUGIN_API_VERSION)37
38
39
// output plugin calls40
int (*OutputOpen)(const char* medianame, WAVEFORMATEX*); // open output for wave data41
- int (*OutputWrite)(WriteDataStruct*); // send PCM audio data to output 42
- // (blocks until write completes, thus if output is paused can 43
+ int (*OutputWrite)(WriteDataStruct*); // send PCM audio data to output44
+ // (blocks until write completes, thus if output is paused can45
// block until unpaused)46
int (*OutputDrain)(int flags); // wait for all output to complete (blocking)47
int (*OutputDrainCancel)(int flags); // break a drain in progress48
49
void *Reserved[10];50
} toPlayer;51
52
- struct 53
+ struct54
{55
int (*Initialize)(QCDModInfo *modInfo, int flags); // initialize plugin56
void (*ShutDown)(int flags); // shutdown plugin57
faad2-2.9.2.tar.gz/plugins/QCD/resource.h -> faad2-2.10.0.tar.gz/plugins/QCD/resource.h
Changed
10
1
2
#define IDC_MAIL3 10543
4
// Next default values for new objects5
-// 6
+//7
#ifdef APSTUDIO_INVOKED8
#ifndef APSTUDIO_READONLY_SYMBOLS9
#define _APS_NEXT_RESOURCE_VALUE 10910
faad2-2.9.2.tar.gz/plugins/QCDMp4/QCDInputDLL.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/QCDInputDLL.h
Changed
17
1
2
//-----------------------------------------------------------------------------3
-// 4
+//5
// File: QCDInputDLL.h6
//7
// About: QCD Player Input module DLL interface. For more documentation, see8
9
//10
// Copyright (C) 1997-2002 Quinnware11
//12
-// This code is free. If you redistribute it in any form, leave this notice 13
+// This code is free. If you redistribute it in any form, leave this notice14
// here.15
//16
// This program is distributed in the hope that it will be useful,17
faad2-2.9.2.tar.gz/plugins/QCDMp4/QCDModDefs.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/QCDModDefs.h
Changed
154
1
2
//3
// Copyright (C) 1997-2002 Quinnware4
//5
-// This code is free. If you redistribute it in any form, leave this notice 6
+// This code is free. If you redistribute it in any form, leave this notice7
// here.8
//9
// This program is distributed in the hope that it will be useful,10
11
// Current plugin version12
13
// use this version for old style API calls (all returned text in native encoding)14
-#define PLUGIN_API_VERSION 250 15
+#define PLUGIN_API_VERSION 25016
17
// use this version for new style API calls (all returned text in UTF8 encoding on WinNT/2K/XP (native encoding on Win9x))18
#define PLUGIN_API_VERSION_WANTUTF8 ((PLUGIN_API_WANTUTF8<<16)|PLUGIN_API_VERSION)19
20
21
//-----------------------------------------------------------------------------22
23
-typedef struct 24
+typedef struct25
{26
char *moduleString;27
char *moduleExtensions;28
29
//-----------------------------------------------------------------------------30
// Services (ops) provided by the Player31
//-----------------------------------------------------------------------------32
-typedef enum 33
+typedef enum34
{ //*** below returns numeric info (*buffer not used)35
36
opGetPlayerVersion = 0, // high-order word = major version (eg 3.01 is 3), low-order word = minor (eg 3.01 = 1)37
38
opGetTrackLength = 14, // get track length, param1 = index of track in playlist, -1 for current39
// param2 = 0 for seconds, 1 for milliseconds40
opGetTime = 15, // get time on player, param1 = 0 for time displayed, 1 for track time, 2 for playlist time41
- // param2 = 0 for elapsed, 1 for remaining 42
+ // param2 = 0 for elapsed, 1 for remaining43
opGetTrackState = 16, // get whether track is marked, param1 = index of track, -1 for current44
opGetPlaylistNum = 17, // get playlist number of index, param1 = index of track in playlist, -1 for current45
opGetMediaType = 18, // get media type of track, param1 = index if track in playlist, -1 for current46
47
48
opGetExtensionWnd = 30, // handle to the draggable window extension (only available on some skins), param1 = extension number (0 - 9)49
opGetExtVisWnd = 31, // handle to the external visual window50
- opGetMusicBrowserWnd = 32, // handle to the music browser window 51
- opGetSkinPreviewWnd = 33, // handle to the skin preview window 52
- opGetPropertiesWnd = 34, // handle to the player properties window 53
- opGetExtInfoWnd = 35, // handle to the extended information window 54
- opGetAboutWnd = 36, // handle to the about window 55
- opGetSegmentsWnd = 37, // handle to the segments window 56
- opGetEQPresetsWnd = 38, // handle to the EQ presets window 57
- opGetVideoWnd = 39, // handle to the video window 58
+ opGetMusicBrowserWnd = 32, // handle to the music browser window59
+ opGetSkinPreviewWnd = 33, // handle to the skin preview window60
+ opGetPropertiesWnd = 34, // handle to the player properties window61
+ opGetExtInfoWnd = 35, // handle to the extended information window62
+ opGetAboutWnd = 36, // handle to the about window63
+ opGetSegmentsWnd = 37, // handle to the segments window64
+ opGetEQPresetsWnd = 38, // handle to the EQ presets window65
+ opGetVideoWnd = 39, // handle to the video window66
67
opGetVisDimensions = 50, // gets the width and height of visual window (param1 = -1 current vis window, 0 internal vis, 1 external vis, 2 full screen)68
- // returns: HEIGHT in high word, WIDTH in low word 69
+ // returns: HEIGHT in high word, WIDTH in low word70
71
opShowVideoWindow = 55, // Show or Close video window (param1 = 1 for create, 2 for create and show, 0 for close)72
73
74
opGetSkinFolder = 112, // get current skin folder75
opGetCDDBCacheFolder = 113, // get current folder for CDDB cached info76
77
- opGetCurrentPlaylist = 114, // get full pathname of playlist currently loaded 78
+ opGetCurrentPlaylist = 114, // get full pathname of playlist currently loaded79
80
opGetMediaID = 115, // get media identifier, param2 = index of track in playlist, -1 for current81
- // - for CD's it's the TOC - for anything else, right now it's 0 82
+ // - for CD's it's the TOC - for anything else, right now it's 083
84
opGetSupportedExtensions = 116, // get file extensions supported by the player, param2 = 0 - get all extensions, 1 - get registered extensions85
// - returned extensions will be colon delimited86
87
opSetPlayNext = 1009, // set the next index to be played (buffer = NULL, param1 = index, index = -1 unsets playnext)88
opSetIndexFilename = 1010, // updates the filename (or stream) that an index in the current playlist refers to, buffer = new filename, param1 = index89
90
- opSetPlaylist = 1006, // clear playlist, add files to playlist or reset playlist with new files 91
+ opSetPlaylist = 1006, // clear playlist, add files to playlist or reset playlist with new files92
// buffer = file list (each file in quotes, string null terminated) Eg; buffer="\"file1.mp3\" \"file2.mp3\"\0" - NULL to clear playlist93
- // param1 = (string ptr)originating path (can be NULL if paths included with files) 94
+ // param1 = (string ptr)originating path (can be NULL if paths included with files)95
// param2 = 1 - clear playlist flag, 2 - enqueue to top96
97
- opInsertPlaylist = 1011, // insert tracks into playlist 98
+ opInsertPlaylist = 1011, // insert tracks into playlist99
// buffer = file list (each file in quotes, string null terminated) Eg; buffer="\"file1.mp3\" \"file2.mp3\"\0"100
- // param1 = (string ptr)originating path (can be NULL if paths included with files) 101
+ // param1 = (string ptr)originating path (can be NULL if paths included with files)102
// param2 = index location to insert tracks (-1 to insert at end)103
104
opMovePlaylistTrack = 1012, // param1 = index of track to move, param2 = destination index (move shifts tracks between param1 and param2)105
106
UINT nch; // number of channels107
UINT srate; // sample rate108
109
- UINT markerstart; // Marker position at start of data (marker is time value of data) 110
+ UINT markerstart; // Marker position at start of data (marker is time value of data)111
// (set to WAVE_VIS_DATA_ONLY to not have data sent to output plugins)112
UINT markerend; // Marker position at end of data (not currently used, set to 0)113
} WriteDataStruct;114
115
typedef struct // for GetTrackExtents Input Plugin callback116
{117
UINT track; // for CD's, set the track number. Otherwise set to 1.118
- UINT start; // for CD's or media that doesn't start at the beginning 119
+ UINT start; // for CD's or media that doesn't start at the beginning120
// of the file, set to start position. Otherwise set to 0.121
UINT end; // set to end position of media.122
UINT unitpersec; // whatever units are being used for this media, how many123
- // of them per second. 124
+ // of them per second.125
// (Note: ((end - start) / unitpersecond) = file length126
UINT bytesize; // size of file in bytes (if applicable, otherwise 0).127
} TrackExtents;128
129
//-----------------------------------------------------------------------------130
typedef struct // for opSetAudioInfo service131
-{ 132
+{133
long struct_size; // sizeof(AudioInfo)134
long level; // MPEG level (1 for MPEG1, 2 for MPEG2, 3 for MPEG2.5, 7 for MPEGpro)135
long layer; // and layer (1, 2 or 3)136
137
typedef struct // for coming QCD version138
{139
long struct_size; // sizeof(EQInfo)140
- char enabled; 141
+ char enabled;142
char preamp; // -128 to 127, 0 is even143
char bands[10]; // -128 to 127, 0 is even144
} EQInfo;145
146
147
//-----------------------------------------------------------------------------148
typedef enum // for MediaInfo.mediaType149
-{ 150
+{151
UNKNOWN_MEDIA = 0,152
CD_AUDIO_MEDIA = 1,153
DIGITAL_FILE_MEDIA = 2,154
faad2-2.9.2.tar.gz/plugins/QCDMp4/QCDModInput.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/QCDModInput.h
Changed
57
1
2
//3
// File: QCDModInput.h4
//5
-// About: Input plugin module interface. This file is published with the 6
+// About: Input plugin module interface. This file is published with the7
// Input plugin SDK.8
//9
// Authors: Written by Paul Quinn and Richard Carlson.10
11
//12
// Copyright (C) 1997-2002 Quinnware13
//14
-// This code is free. If you redistribute it in any form, leave this notice 15
+// This code is free. If you redistribute it in any form, leave this notice16
// here.17
//18
// This program is distributed in the hope that it will be useful,19
20
#define PLAYFLAG_SEEKING 0x221
22
// Wave Marker flags23
-#define WAVE_VIS_DATA_ONLY -1 // set to WaveDataStruct.markerstart in OutputWrite() call have data only go to vis 24
+#define WAVE_VIS_DATA_ONLY -1 // set to WaveDataStruct.markerstart in OutputWrite() call have data only go to vis25
// and not to output plugin26
// pause flags27
#define PAUSE_DISABLED 0 // Pause() call is to unpause playback28
29
//-----------------------------------------------------------------------------30
// Input Module31
//-----------------------------------------------------------------------------32
-typedef struct 33
+typedef struct34
{35
unsigned int size; // size of init structure36
unsigned int version; // plugin structure version (set to PLUGIN_API_VERSION)37
38
39
// output plugin calls40
int (*OutputOpen)(const char* medianame, WAVEFORMATEX*); // open output for wave data41
- int (*OutputWrite)(WriteDataStruct*); // send PCM audio data to output 42
- // (blocks until write completes, thus if output is paused can 43
+ int (*OutputWrite)(WriteDataStruct*); // send PCM audio data to output44
+ // (blocks until write completes, thus if output is paused can45
// block until unpaused)46
int (*OutputDrain)(int flags); // wait for all output to complete (blocking)47
int (*OutputDrainCancel)(int flags); // break a drain in progress48
49
void *Reserved[10];50
} toPlayer;51
52
- struct 53
+ struct54
{55
int (*Initialize)(QCDModInfo *modInfo, int flags); // initialize plugin56
void (*ShutDown)(int flags); // shutdown plugin57
faad2-2.9.2.tar.gz/plugins/QCDMp4/QCDModTagEditor.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/QCDModTagEditor.h
Changed
51
1
2
//3
// File: QCDModTagEditor4
//5
-// About: Tag Editing plugin module interface. This file is published with the 6
+// About: Tag Editing plugin module interface. This file is published with the7
// QCD plugin SDK.8
//9
// Authors: Written by Paul Quinn10
11
//12
// Copyright (C) 2002 Quinnware13
//14
-// This code is free. If you redistribute it in any form, leave this notice 15
+// This code is free. If you redistribute it in any form, leave this notice16
// here.17
//18
// This program is distributed in the hope that it will be useful,19
20
21
TAGFIELD_TITLE = 0,22
TAGFIELD_ARTIST,23
- TAGFIELD_ALBUM, 24
+ TAGFIELD_ALBUM,25
TAGFIELD_GENRE,26
- TAGFIELD_YEAR, 27
- TAGFIELD_TRACK, 28
+ TAGFIELD_YEAR,29
+ TAGFIELD_TRACK,30
TAGFIELD_COMMENT,31
32
TAGFIELD_COMPOSER,33
34
TAGFIELD_YEARCOMPOSED,35
36
TAGFIELD_ORIGARTIST,37
- TAGFIELD_LABEL, 38
+ TAGFIELD_LABEL,39
TAGFIELD_COPYRIGHT,40
TAGFIELD_ENCODER,41
TAGFIELD_CDDBTAGID,42
43
44
//-----------------------------------------------------------------------------45
46
-typedef struct 47
+typedef struct48
{49
UINT size; // size of init structure50
UINT version; // plugin structure version (set to PLUGIN_API_VERSION)51
faad2-2.9.2.tar.gz/plugins/QCDMp4/QCDMp4.c -> faad2-2.10.0.tar.gz/plugins/QCDMp4/QCDMp4.c
Changed
79
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
27
//----------------------------------------------------------------------------28
29
-void ShutDown(int flags) 30
+void ShutDown(int flags)31
{32
Stop(mp4state.filename, STOPFLAG_FORCESTOP);33
}34
35
return tagsize;36
}37
38
-int GetMediaSupported(const char* medianame, MediaInfo *mediaInfo) 39
+int GetMediaSupported(const char* medianame, MediaInfo *mediaInfo)40
{41
int tagsize = 0, init;42
43
44
}45
}46
}47
- 48
+49
Sleep(10);50
51
// catch pause52
53
if (frameInfo.channels > 0 && mp4state.samplerate > 0)54
mp4state.cur_pos_sec += ((double)(frameInfo.samples/frameInfo.channels))/(double)mp4state.samplerate;55
}56
- 57
+58
Sleep(10);59
60
// catch pause61
62
module.QCDCallbacks.toModule.Pause = Pause;63
module.QCDCallbacks.toModule.Stop = Stop;64
module.QCDCallbacks.toModule.About = About;65
- module.QCDCallbacks.toModule.Configure = Configure; 66
+ module.QCDCallbacks.toModule.Configure = Configure;67
module.QCDCallbacks.toModule.SetEQ = NULL;68
module.QCDCallbacks.toModule.SetVolume = SetVolume;69
70
71
// free(temp);72
//73
// return ret;74
-//} 75
+//}76
//77
//__declspec(dllexport) int winampWriteExtendedFileInfo()78
//{79
faad2-2.9.2.tar.gz/plugins/QCDMp4/QCDMp4Tag.cpp -> faad2-2.10.0.tar.gz/plugins/QCDMp4/QCDMp4Tag.cpp
Changed
19
1
2
//------------------------------------------------------------------------------3
4
PLUGIN_API QCDModInitTag* TAGEDITORDLL_ENTRY_POINT()5
-{ 6
+{7
ModInitTag.size = sizeof(QCDModInitTag);8
ModInitTag.version = PLUGIN_API_VERSION;9
ModInitTag.ShutDown = ShutDown_Tag;10
11
file = MP4Modify(filename, 0, 0);12
if (file == MP4_INVALID_FILE_HANDLE)13
return false;14
- 15
+16
MP4MetadataDelete(file);17
18
MP4Close(file);19
faad2-2.9.2.tar.gz/plugins/QCDMp4/aac2mp4.cpp -> faad2-2.10.0.tar.gz/plugins/QCDMp4/aac2mp4.cpp
Changed
91
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
26
27
static u_int8_t firstHeader[ADTS_HEADER_MAX_SIZE];28
29
-/* 30
- * hdr must point to at least ADTS_HEADER_MAX_SIZE bytes of memory 31
+/*32
+ * hdr must point to at least ADTS_HEADER_MAX_SIZE bytes of memory33
*/34
static bool LoadNextAdtsHeader(FILE* inFile, u_int8_t* hdr)35
{36
37
hdr[state] = b;38
state = 1;39
} else {40
- /* else drop it */ 41
+ /* else drop it */42
dropped++;43
}44
}45
46
if (!LoadNextAdtsHeader(inFile, hdrBuf)) {47
return false;48
}49
- 50
+51
/* get frame size from header */52
frameSize = MP4AV_AdtsGetFrameSize(hdrBuf);53
54
/* get header size in bits and bytes from header */55
hdrBitSize = MP4AV_AdtsGetHeaderBitSize(hdrBuf);56
hdrByteSize = MP4AV_AdtsGetHeaderByteSize(hdrBuf);57
- 58
+59
/* adjust the frame size to what remains to be read */60
frameSize -= hdrByteSize;61
62
63
64
/* remember where we are */65
fgetpos(inFile, &curPos);66
- 67
+68
/* go back to start of file */69
rewind(inFile);70
71
72
}73
74
// add the new audio track75
- MP4TrackId trackId = 76
- MP4AddAudioTrack(mp4File, 77
+ MP4TrackId trackId =78
+ MP4AddAudioTrack(mp4File,79
samplesPerSecond, 1024, audioType);80
81
if (trackId == MP4_INVALID_TRACK_ID) {82
83
samplesPerSecond,84
channelConfig);85
86
- if (!MP4SetTrackESConfiguration(mp4File, trackId, 87
+ if (!MP4SetTrackESConfiguration(mp4File, trackId,88
pConfig, configLength)) {89
MP4DeleteTrack(mp4File, trackId);90
return MP4_INVALID_TRACK_ID;91
faad2-2.9.2.tar.gz/plugins/QCDMp4/aac2mp4.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/aac2mp4.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/plugins/QCDMp4/aacinfo.c -> faad2-2.10.0.tar.gz/plugins/QCDMp4/aacinfo.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/plugins/QCDMp4/aacinfo.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/aacinfo.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/plugins/QCDMp4/config.c -> faad2-2.10.0.tar.gz/plugins/QCDMp4/config.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/plugins/QCDMp4/config.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/config.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/plugins/QCDMp4/mbs.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/mbs.h
Changed
39
1
2
* License Version 1.1 (the "License"); you may not use this file3
* except in compliance with the License. You may obtain a copy of4
* the License at http://www.mozilla.org/MPL/5
- * 6
+ *7
* Software distributed under the License is distributed on an "AS8
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or9
* implied. See the License for the specific language governing10
* rights and limitations under the License.11
- * 12
+ *13
* The Original Code is MPEG4IP.14
- * 15
+ *16
* The Initial Developer of the Original Code is Cisco Systems Inc.17
* Portions created by Cisco Systems Inc. are18
* Copyright (C) Cisco Systems Inc. 2001-2002. All Rights Reserved.19
- * 20
- * Contributor(s): 21
+ *22
+ * Contributor(s):23
* Dave Mackie dmackie@cisco.com24
*/25
26
#ifndef __MBS_INCLUDED__27
-#define __MBS_INCLUDED__ 28
+#define __MBS_INCLUDED__29
30
class CMemoryBitstream {31
public:32
33
u_int32_t m_numBits;34
};35
36
-#endif /* __MBS_INCLUDED__ */ 37
+#endif /* __MBS_INCLUDED__ */38
39
faad2-2.9.2.tar.gz/plugins/QCDMp4/resource.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/resource.h
Changed
10
1
2
#define IDC_TITLEFORMAT 10403
4
// Next default values for new objects5
-// 6
+//7
#ifdef APSTUDIO_INVOKED8
#ifndef APSTUDIO_READONLY_SYMBOLS9
#define _APS_NEXT_RESOURCE_VALUE 10310
faad2-2.9.2.tar.gz/plugins/QCDMp4/utils.c -> faad2-2.10.0.tar.gz/plugins/QCDMp4/utils.c
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/plugins/QCDMp4/utils.h -> faad2-2.10.0.tar.gz/plugins/QCDMp4/utils.h
Changed
25
1
2
/*3
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding4
** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com5
-** 6
+**7
** This program is free software; you can redistribute it and/or modify8
** it under the terms of the GNU General Public License as published by9
** the Free Software Foundation; either version 2 of the License, or10
** (at your option) any later version.11
-** 12
+**13
** This program is distributed in the hope that it will be useful,14
** but WITHOUT ANY WARRANTY; without even the implied warranty of15
** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the16
** GNU General Public License for more details.17
-** 18
+**19
** You should have received a copy of the GNU General Public License20
-** along with this program; if not, write to the Free Software 21
+** along with this program; if not, write to the Free Software22
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.23
**24
** Any non-GPL usage of this software or parts of this software is strictly25
faad2-2.9.2.tar.gz/project/msvc/faad.vcxproj -> faad2-2.10.0.tar.gz/project/msvc/faad.vcxproj
Changed
179
1
2
<Configuration>Debug</Configuration>3
<Platform>Win32</Platform>4
</ProjectConfiguration>5
+ <ProjectConfiguration Include="Debug|x64">6
+ <Configuration>Debug</Configuration>7
+ <Platform>x64</Platform>8
+ </ProjectConfiguration>9
<ProjectConfiguration Include="Release|Win32">10
<Configuration>Release</Configuration>11
<Platform>Win32</Platform>12
</ProjectConfiguration>13
+ <ProjectConfiguration Include="Release|x64">14
+ <Configuration>Release</Configuration>15
+ <Platform>x64</Platform>16
+ </ProjectConfiguration>17
</ItemGroup>18
<PropertyGroup Label="Globals">19
<ProjectGuid>{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}</ProjectGuid>20
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>21
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>22
</PropertyGroup>23
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />24
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">25
<ConfigurationType>Application</ConfigurationType>26
- <PlatformToolset>v141</PlatformToolset>27
+ <PlatformToolset>v142</PlatformToolset>28
+ </PropertyGroup>29
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">30
+ <ConfigurationType>Application</ConfigurationType>31
+ <PlatformToolset>v142</PlatformToolset>32
</PropertyGroup>33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">34
<ConfigurationType>Application</ConfigurationType>35
- <PlatformToolset>v141</PlatformToolset>36
+ <PlatformToolset>v142</PlatformToolset>37
+ </PropertyGroup>38
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">39
+ <ConfigurationType>Application</ConfigurationType>40
+ <PlatformToolset>v142</PlatformToolset>41
</PropertyGroup>42
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />43
<ImportGroup Label="ExtensionSettings">44
45
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">46
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />47
</ImportGroup>48
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">49
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />50
+ </ImportGroup>51
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">52
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />53
</ImportGroup>54
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">55
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />56
+ </ImportGroup>57
<PropertyGroup Label="UserMacros" />58
<PropertyGroup>59
<_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>60
61
<CodeAnalysisRules />62
<CodeAnalysisRuleAssemblies />63
</PropertyGroup>64
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">65
+ <OutDir>.\bin\$(Configuration)\</OutDir>66
+ <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>67
+ <LinkIncremental>true</LinkIncremental>68
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>69
+ <CodeAnalysisRules />70
+ <CodeAnalysisRuleAssemblies />71
+ </PropertyGroup>72
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">73
<OutDir>.\bin\$(Configuration)\</OutDir>74
<IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>75
76
<CodeAnalysisRules />77
<CodeAnalysisRuleAssemblies />78
</PropertyGroup>79
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">80
+ <OutDir>.\bin\$(Configuration)\</OutDir>81
+ <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>82
+ <LinkIncremental>false</LinkIncremental>83
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>84
+ <CodeAnalysisRules />85
+ <CodeAnalysisRuleAssemblies />86
+ </PropertyGroup>87
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">88
<Midl>89
<TypeLibraryName>.\Debug/faad.tlb</TypeLibraryName>90
</Midl>91
<ClCompile>92
<Optimization>Disabled</Optimization>93
- <AdditionalIncludeDirectories>../../include;../../common/mp4ff;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>94
+ <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>95
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>96
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>97
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>98
99
<SubSystem>Console</SubSystem>100
</Link>101
</ItemDefinitionGroup>102
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">103
+ <Midl>104
+ <TypeLibraryName>.\Debug/faad.tlb</TypeLibraryName>105
+ </Midl>106
+ <ClCompile>107
+ <Optimization>Disabled</Optimization>108
+ <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>109
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>110
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>111
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>112
+ <PrecompiledHeader>113
+ </PrecompiledHeader>114
+ <WarningLevel>Level3</WarningLevel>115
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>116
+ </ClCompile>117
+ <ResourceCompile>118
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>119
+ <Culture>0x0413</Culture>120
+ </ResourceCompile>121
+ <Link>122
+ <GenerateDebugInformation>true</GenerateDebugInformation>123
+ <SubSystem>Console</SubSystem>124
+ </Link>125
+ </ItemDefinitionGroup>126
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">127
<Midl>128
<TypeLibraryName>.\Release/faad.tlb</TypeLibraryName>129
130
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>131
<IntrinsicFunctions>true</IntrinsicFunctions>132
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>133
- <AdditionalIncludeDirectories>../../include;../../common/mp4ff;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>134
+ <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>135
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>136
<StringPooling>true</StringPooling>137
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>138
139
<SubSystem>Console</SubSystem>140
</Link>141
</ItemDefinitionGroup>142
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">143
+ <Midl>144
+ <TypeLibraryName>.\Release/faad.tlb</TypeLibraryName>145
+ </Midl>146
+ <ClCompile>147
+ <Optimization>MinSpace</Optimization>148
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>149
+ <IntrinsicFunctions>true</IntrinsicFunctions>150
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>151
+ <AdditionalIncludeDirectories>../../include;../../frontend;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>152
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>153
+ <StringPooling>true</StringPooling>154
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>155
+ <FunctionLevelLinking>true</FunctionLevelLinking>156
+ <PrecompiledHeader>157
+ </PrecompiledHeader>158
+ <WarningLevel>Level3</WarningLevel>159
+ </ClCompile>160
+ <ResourceCompile>161
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>162
+ <Culture>0x0413</Culture>163
+ </ResourceCompile>164
+ <Link>165
+ <SubSystem>Console</SubSystem>166
+ </Link>167
+ </ItemDefinitionGroup>168
<ItemGroup>169
<ClCompile Include="..\..\frontend\audio.c" />170
<ClCompile Include="..\..\frontend\main.c" />171
172
</ItemGroup>173
<ItemGroup>174
<ClInclude Include="..\..\frontend\getopt.h" />175
- <ClInclude Include="..\..\common\mp4v2\win32_ver.h" />176
<ClInclude Include="..\..\frontend\mp4read.h" />177
<ClInclude Include="..\..\frontend\unicode_support.h" />178
<ClInclude Include="..\..\include\neaacdec.h" />179
faad2-2.9.2.tar.gz/project/msvc/faad.vcxproj.filters -> faad2-2.10.0.tar.gz/project/msvc/faad.vcxproj.filters
Changed
11
1
2
<ClInclude Include="..\..\include\neaacdec.h">3
<Filter>Header Files</Filter>4
</ClInclude>5
- <ClInclude Include="..\..\common\mp4v2\win32_ver.h">6
- <Filter>Header Files</Filter>7
- </ClInclude>8
<ClInclude Include="..\..\frontend\mp4read.h">9
<Filter>Header Files</Filter>10
</ClInclude>11
faad2-2.9.2.tar.gz/project/msvc/faad2.sln -> faad2-2.10.0.tar.gz/project/msvc/faad2.sln
Changed
46
1
2
Microsoft Visual Studio Solution File, Format Version 12.003
-# Visual Studio 154
-VisualStudioVersion = 15.0.27130.20105
+# Visual Studio Version 166
+VisualStudioVersion = 16.0.30114.1057
MinimumVisualStudioVersion = 10.0.40219.18
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libfaad", "libfaad.vcxproj", "{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}"9
EndProject10
11
Global12
GlobalSection(SolutionConfigurationPlatforms) = preSolution13
Debug|Win32 = Debug|Win3214
+ Debug|x64 = Debug|x6415
Release|Win32 = Release|Win3216
+ Release|x64 = Release|x6417
EndGlobalSection18
GlobalSection(ProjectConfigurationPlatforms) = postSolution19
{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.ActiveCfg = Debug|Win3220
{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|Win32.Build.0 = Debug|Win3221
+ {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|x64.ActiveCfg = Debug|x6422
+ {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Debug|x64.Build.0 = Debug|x6423
{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.ActiveCfg = Release|Win3224
{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|Win32.Build.0 = Release|Win3225
+ {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|x64.ActiveCfg = Release|x6426
+ {BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}.Release|x64.Build.0 = Release|x6427
{482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|Win32.ActiveCfg = Debug|Win3228
{482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|Win32.Build.0 = Debug|Win3229
+ {482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|x64.ActiveCfg = Debug|x6430
+ {482DA264-EE88-4575-B208-87C4CB80CD08}.Debug|x64.Build.0 = Debug|x6431
{482DA264-EE88-4575-B208-87C4CB80CD08}.Release|Win32.ActiveCfg = Release|Win3232
{482DA264-EE88-4575-B208-87C4CB80CD08}.Release|Win32.Build.0 = Release|Win3233
+ {482DA264-EE88-4575-B208-87C4CB80CD08}.Release|x64.ActiveCfg = Release|x6434
+ {482DA264-EE88-4575-B208-87C4CB80CD08}.Release|x64.Build.0 = Release|x6435
{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|Win32.ActiveCfg = Debug|Win3236
{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|Win32.Build.0 = Debug|Win3237
+ {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|x64.ActiveCfg = Debug|x6438
+ {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Debug|x64.Build.0 = Debug|x6439
{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|Win32.ActiveCfg = Release|Win3240
{2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|Win32.Build.0 = Release|Win3241
+ {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|x64.ActiveCfg = Release|x6442
+ {2BD8CBB3-DFC9-4A6A-9B7A-07ED749BED58}.Release|x64.Build.0 = Release|x6443
EndGlobalSection44
GlobalSection(SolutionProperties) = preSolution45
HideSolutionNode = FALSE46
faad2-2.9.2.tar.gz/project/msvc/libfaad.vcxproj -> faad2-2.10.0.tar.gz/project/msvc/libfaad.vcxproj
Changed
151
1
2
<Configuration>Debug</Configuration>3
<Platform>Win32</Platform>4
</ProjectConfiguration>5
+ <ProjectConfiguration Include="Debug|x64">6
+ <Configuration>Debug</Configuration>7
+ <Platform>x64</Platform>8
+ </ProjectConfiguration>9
<ProjectConfiguration Include="Release|Win32">10
<Configuration>Release</Configuration>11
<Platform>Win32</Platform>12
</ProjectConfiguration>13
+ <ProjectConfiguration Include="Release|x64">14
+ <Configuration>Release</Configuration>15
+ <Platform>x64</Platform>16
+ </ProjectConfiguration>17
</ItemGroup>18
<PropertyGroup Label="Globals">19
<ProjectGuid>{BC3EFE27-9015-4C9C-AD3C-72B3B7ED2114}</ProjectGuid>20
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>21
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>22
</PropertyGroup>23
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />24
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">25
<ConfigurationType>StaticLibrary</ConfigurationType>26
- <PlatformToolset>v141</PlatformToolset>27
+ <PlatformToolset>v142</PlatformToolset>28
+ </PropertyGroup>29
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">30
+ <ConfigurationType>StaticLibrary</ConfigurationType>31
+ <PlatformToolset>v142</PlatformToolset>32
</PropertyGroup>33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">34
<ConfigurationType>StaticLibrary</ConfigurationType>35
- <PlatformToolset>v141</PlatformToolset>36
+ <PlatformToolset>v142</PlatformToolset>37
+ </PropertyGroup>38
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">39
+ <ConfigurationType>StaticLibrary</ConfigurationType>40
+ <PlatformToolset>v142</PlatformToolset>41
</PropertyGroup>42
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />43
<ImportGroup Label="ExtensionSettings">44
45
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">46
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />47
</ImportGroup>48
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">49
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />50
+ </ImportGroup>51
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">52
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />53
</ImportGroup>54
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">55
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />56
+ </ImportGroup>57
<PropertyGroup Label="UserMacros" />58
<PropertyGroup>59
<_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>60
61
<CodeAnalysisRules />62
<CodeAnalysisRuleAssemblies />63
</PropertyGroup>64
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">65
+ <OutDir>.\bin\$(Configuration)\</OutDir>66
+ <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>67
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>68
+ <CodeAnalysisRules />69
+ <CodeAnalysisRuleAssemblies />70
+ </PropertyGroup>71
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">72
<OutDir>.\bin\$(Configuration)\</OutDir>73
<IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>74
75
<CodeAnalysisRules />76
<CodeAnalysisRuleAssemblies />77
</PropertyGroup>78
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">79
+ <OutDir>.\bin\$(Configuration)\</OutDir>80
+ <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>81
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>82
+ <CodeAnalysisRules />83
+ <CodeAnalysisRuleAssemblies />84
+ </PropertyGroup>85
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">86
<ClCompile>87
<Optimization>MaxSpeed</Optimization>88
89
<Message>Retrieving package version...</Message>90
</PreBuildEvent>91
</ItemDefinitionGroup>92
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">93
+ <ClCompile>94
+ <Optimization>MaxSpeed</Optimization>95
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>96
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>97
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;WIN32;_LIB;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions>98
+ <StringPooling>true</StringPooling>99
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>100
+ <FunctionLevelLinking>true</FunctionLevelLinking>101
+ <PrecompiledHeader>102
+ </PrecompiledHeader>103
+ <WarningLevel>Level3</WarningLevel>104
+ </ClCompile>105
+ <ResourceCompile>106
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>107
+ <Culture>0x0413</Culture>108
+ </ResourceCompile>109
+ <Lib />110
+ <PreBuildEvent>111
+ <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command>112
+ </PreBuildEvent>113
+ <PreBuildEvent>114
+ <Message>Retrieving package version...</Message>115
+ </PreBuildEvent>116
+ </ItemDefinitionGroup>117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">118
<ClCompile>119
<Optimization>Disabled</Optimization>120
121
<Message>Retrieving package version...</Message>122
</PreBuildEvent>123
</ItemDefinitionGroup>124
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">125
+ <ClCompile>126
+ <Optimization>Disabled</Optimization>127
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>128
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;WIN32;_LIB;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions>129
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>130
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>131
+ <PrecompiledHeader>132
+ </PrecompiledHeader>133
+ <WarningLevel>Level3</WarningLevel>134
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>135
+ </ClCompile>136
+ <ResourceCompile>137
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>138
+ <Culture>0x0413</Culture>139
+ </ResourceCompile>140
+ <Lib />141
+ <PreBuildEvent>142
+ <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command>143
+ </PreBuildEvent>144
+ <PreBuildEvent>145
+ <Message>Retrieving package version...</Message>146
+ </PreBuildEvent>147
+ </ItemDefinitionGroup>148
<ItemGroup>149
<ClCompile Include="..\..\libfaad\bits.c" />150
<ClCompile Include="..\..\libfaad\cfft.c" />151
faad2-2.9.2.tar.gz/project/msvc/libfaad2_dll.vcxproj -> faad2-2.10.0.tar.gz/project/msvc/libfaad2_dll.vcxproj
Changed
169
1
2
<Configuration>Debug</Configuration>3
<Platform>Win32</Platform>4
</ProjectConfiguration>5
+ <ProjectConfiguration Include="Debug|x64">6
+ <Configuration>Debug</Configuration>7
+ <Platform>x64</Platform>8
+ </ProjectConfiguration>9
<ProjectConfiguration Include="Release|Win32">10
<Configuration>Release</Configuration>11
<Platform>Win32</Platform>12
</ProjectConfiguration>13
+ <ProjectConfiguration Include="Release|x64">14
+ <Configuration>Release</Configuration>15
+ <Platform>x64</Platform>16
+ </ProjectConfiguration>17
</ItemGroup>18
<PropertyGroup Label="Globals">19
<ProjectGuid>{482DA264-EE88-4575-B208-87C4CB80CD08}</ProjectGuid>20
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>21
+ <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>22
</PropertyGroup>23
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />24
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">25
<ConfigurationType>DynamicLibrary</ConfigurationType>26
- <PlatformToolset>v141</PlatformToolset>27
+ <PlatformToolset>v142</PlatformToolset>28
+ </PropertyGroup>29
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">30
+ <ConfigurationType>DynamicLibrary</ConfigurationType>31
+ <PlatformToolset>v142</PlatformToolset>32
</PropertyGroup>33
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">34
<ConfigurationType>DynamicLibrary</ConfigurationType>35
- <PlatformToolset>v141</PlatformToolset>36
+ <PlatformToolset>v142</PlatformToolset>37
+ </PropertyGroup>38
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">39
+ <ConfigurationType>DynamicLibrary</ConfigurationType>40
+ <PlatformToolset>v142</PlatformToolset>41
</PropertyGroup>42
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />43
<ImportGroup Label="ExtensionSettings">44
45
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">46
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />47
</ImportGroup>48
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">49
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />50
+ </ImportGroup>51
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">52
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />53
</ImportGroup>54
+ <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">55
+ <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />56
+ </ImportGroup>57
<PropertyGroup Label="UserMacros" />58
<PropertyGroup>59
<_ProjectFileVersion>15.0.26730.12</_ProjectFileVersion>60
61
<CodeAnalysisRules />62
<CodeAnalysisRuleAssemblies />63
</PropertyGroup>64
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">65
+ <OutDir>.\bin\$(Configuration)\</OutDir>66
+ <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>67
+ <LinkIncremental>true</LinkIncremental>68
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>69
+ <CodeAnalysisRules />70
+ <CodeAnalysisRuleAssemblies />71
+ </PropertyGroup>72
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">73
<OutDir>.\bin\$(Configuration)\</OutDir>74
<IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>75
76
<CodeAnalysisRules />77
<CodeAnalysisRuleAssemblies />78
</PropertyGroup>79
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">80
+ <OutDir>.\bin\$(Configuration)\</OutDir>81
+ <IntDir>.\intermediate\$(Configuration)\$(ProjectName)\</IntDir>82
+ <LinkIncremental>false</LinkIncremental>83
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>84
+ <CodeAnalysisRules />85
+ <CodeAnalysisRuleAssemblies />86
+ </PropertyGroup>87
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">88
<Midl>89
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>90
91
<Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command>92
</PreBuildEvent>93
</ItemDefinitionGroup>94
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">95
+ <Midl>96
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>97
+ <MkTypLibCompatible>true</MkTypLibCompatible>98
+ <SuppressStartupBanner>true</SuppressStartupBanner>99
+ <TypeLibraryName>.\DebugDLL/libfaad2_dll.tlb</TypeLibraryName>100
+ </Midl>101
+ <ClCompile>102
+ <Optimization>Disabled</Optimization>103
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>104
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions>105
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>106
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>107
+ <PrecompiledHeader>108
+ </PrecompiledHeader>109
+ <WarningLevel>Level3</WarningLevel>110
+ <SuppressStartupBanner>true</SuppressStartupBanner>111
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>112
+ </ClCompile>113
+ <ResourceCompile>114
+ <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>115
+ <Culture>0x0407</Culture>116
+ </ResourceCompile>117
+ <Link>118
+ <ModuleDefinitionFile>.\libfaad2.def</ModuleDefinitionFile>119
+ <GenerateDebugInformation>true</GenerateDebugInformation>120
+ </Link>121
+ <PreBuildEvent>122
+ <Message>Retrieving package version...</Message>123
+ <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command>124
+ </PreBuildEvent>125
+ </ItemDefinitionGroup>126
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">127
<Midl>128
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>129
130
<Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command>131
</PreBuildEvent>132
</ItemDefinitionGroup>133
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">134
+ <Midl>135
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>136
+ <MkTypLibCompatible>true</MkTypLibCompatible>137
+ <SuppressStartupBanner>true</SuppressStartupBanner>138
+ <TypeLibraryName>.\ReleaseDLL/libfaad2_dll.tlb</TypeLibraryName>139
+ </Midl>140
+ <ClCompile>141
+ <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>142
+ <IntrinsicFunctions>true</IntrinsicFunctions>143
+ <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>144
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;HAVE_LRINTF;%(PreprocessorDefinitions)</PreprocessorDefinitions>145
+ <StringPooling>true</StringPooling>146
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>147
+ <FunctionLevelLinking>true</FunctionLevelLinking>148
+ <PrecompiledHeader>149
+ </PrecompiledHeader>150
+ <WarningLevel>Level3</WarningLevel>151
+ <SuppressStartupBanner>true</SuppressStartupBanner>152
+ <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>153
+ </ClCompile>154
+ <ResourceCompile>155
+ <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>156
+ <Culture>0x0407</Culture>157
+ </ResourceCompile>158
+ <Link>159
+ <ModuleDefinitionFile>.\libfaad2.def</ModuleDefinitionFile>160
+ </Link>161
+ <PreBuildEvent>162
+ <Message>Retrieving package version...</Message>163
+ <Command>"$(SolutionDir)..\..\utils\win32\ac2ver.exe" "faad2" "$(SolutionDir)..\..\configure.ac" > "$(SolutionDir)..\..\libfaad\win32_ver.h"</Command>164
+ </PreBuildEvent>165
+ </ItemDefinitionGroup>166
<ItemGroup>167
<ClCompile Include="..\..\libfaad\bits.c" />168
<ClCompile Include="..\..\libfaad\cfft.c" />169
faad2-2.9.2.tar.gz/utils/win32/ac2ver.c -> faad2-2.10.0.tar.gz/utils/win32/ac2ver.c
Changed
10
1
2
/*3
** AC2VER - extract version number from AC_INIT macro (configure.ac)4
** Copyright (C) 2017 LoRd_MuldeR <mulder2@GMX.de>5
-** 6
+**7
** This software is released under the CC0 1.0 Universal [CC0 1.0] licence!8
** https://creativecommons.org/publicdomain/zero/1.0/legalcode9
**/10