Commit Graph

1951 Commits

Author SHA1 Message Date
ruil2
3c4d151e03 Merge pull request #840 from ganyangbbl/clear_code
clean redundant code
2014-05-14 14:21:46 +08:00
ganyang
c06fcb2491 clean redundant code 2014-05-14 14:00:11 +08:00
Ethan Hugg
6a6d1d6186 Merge pull request #819 from mstorsjo/msvc-proj-gui-update
Restructure MSVC project files to what the IDE generates
2014-05-13 22:10:23 -07:00
Martin Storsjö
a6ad04cfdf Don't pass all MSVC specific cflags to gas-preprocessor and armasm
This avoids having to disambiguate between assembler parameters,
preprocessor parameters and MSVC parameters within gas-preprocessor.

In particular, this avoids creating a stray dependency file named
'-.d' while building. Future versions of gas-preprocessor might
require this in order to build at all.
2014-05-13 19:40:51 +03:00
Martin Storsjö
3cc01c6239 Use CCASFLAGS when assembling .S sources
This allows overriding whether all of CFLAGS should be passed
when assembling.
2014-05-13 19:39:26 +03:00
sijchen
52069dac40 Merge pull request #823 from mstorsjo/deblock-unittest
Add a unit test for deblocking
2014-05-13 17:21:55 +08:00
sijchen
31a4d2aa3e Merge pull request #829 from dongzha/FixBugforDeblocking
Fix a bug in deblocking for neon 32 bit arm implementation for master
2014-05-13 17:21:48 +08:00
sijchen
172d5e7988 Merge pull request #830 from ruil2/console_bug
fix a commit bug for console app
2014-05-13 17:20:24 +08:00
ruil2
a6ca8bb904 fix a commit bug for console app 2014-05-13 17:09:15 +08:00
Martin Storsjö
52bc3a41c8 Add a unit test for deblocking 2014-05-13 11:59:08 +03:00
sijchen
80ae4cb7d8 add me function pointers for screen contents 2014-05-13 16:47:18 +08:00
dongzha
cc7535ee52 Merge pull request #826 from huili2/clear_active_ps
clear active PS when only IDR meets
2014-05-13 15:25:42 +08:00
huili2
eb1276013b clear active PS when only IDR meets 2014-05-12 22:02:39 -07:00
huili2
41ddc536d6 Merge pull request #825 from ruil2/console_cleanup1
cleanup encoder console app
2014-05-13 12:58:09 +08:00
ruil2
7ef2e9553c Merge pull request #822 from mstorsjo/simplify-platform-defines
Don't manually define MACOS and LINUX, use built-in defines instead
2014-05-13 12:39:21 +08:00
ruil2
cdada926d8 Merge pull request #821 from mstorsjo/fix-format-string
Fix the format string in a log message
2014-05-13 12:32:55 +08:00
ruil2
5b38a94c9a cleanup encoder console app 2014-05-13 09:50:48 +08:00
Martin Storsjö
0acb780715 Don't define MACOS and LINUX
Nothing within the library actually uses these defines for anything
any more.

If necessary, the built-in defines __APPLE__ and __linux__ can be
used instead of these manually added defines. This is similar to how
we use _WIN32 instead of manually defining WIN32.
2014-05-12 12:17:53 +03:00
Martin Storsjö
6b9167199f Use the built-in define __linux__ instead of the manually set LINUX 2014-05-12 12:14:33 +03:00
Martin Storsjö
a4e1639529 Fix the format string in a log message
The compiler warned about unknown conversion type and too many
arguments for the format.
2014-05-12 12:13:24 +03:00
ruil2
758e89208e Merge pull request #818 from sijchen/md_merge133
[Encoder MD] Add Inter Psub16 MD for screen content coding
2014-05-12 14:47:50 +08:00
sijchen
bff52694c4 Merge pull request #817 from ruil2/enc_bitrate
fix bitrate setting and add bitrate validation
2014-05-12 14:44:06 +08:00
sijchen
4bd6a3a6e8 [Encoder MD] Add Inter Psub16 MD for screen content coding 2014-05-12 14:21:40 +08:00
Martin Storsjö
aafa6e3e53 Reorder sections in encConsole.vcproj
The MSVC GUI seems to want to write the file with data in the order
Debug|Win32, Debug|x64, Release|Win32, Release|x64. This causes a
large number of changes in the git diff even though the content
still basically is the same. Therefore do it in a separate commit,
to make sure that any later actual changes stay minimal.
2014-05-12 09:20:41 +03:00
Martin Storsjö
4354371b4e Revert "Remove the literal CRLF (
) within the nasm commands in msvc project files"
This reverts commit 7aff66d40c.

These CRLF marks are readded by MSVC as soon as the project files
are updated from within the GUI anyway.
2014-05-12 09:20:41 +03:00
ruil2
6a295d5e8e Merge pull request #813 from mstorsjo/msvc-proj-cleanup
Clean up the MSVC project files
2014-05-12 13:21:16 +08:00
ruil2
eb357b51f2 fix bitrate setting and add bitrate validation 2014-05-12 13:09:01 +08:00
huili2
dae4dbf377 Merge pull request #816 from ruil2/enc_scale
fix input source width and height setting issue
2014-05-12 12:39:54 +08:00
huili2
0c24fd66cd Merge pull request #815 from ruil2/enc_threadIdc
add some parameter settings in command line
2014-05-12 12:38:31 +08:00
huili2
a1a22205c6 Merge pull request #814 from ruil2/enc_nalsize
add the maximum nal size setting in command line
2014-05-12 12:38:01 +08:00
unknown
4dc0f07828 fix input source width and height setting issue 2014-05-12 11:55:05 +08:00
ruil2
67327dfb2e add the maximum nal size setting in command line 2014-05-12 11:05:16 +08:00
unknown
61ab32e6f5 add some parameter settings in command line 2014-05-12 10:28:42 +08:00
Martin Storsjö
416bb224e0 Don't hardcode SuppressStartupBanner=true, this is the default value
The fewer fields overridden, the better.
2014-05-09 19:59:06 +03:00
Martin Storsjö
3923d11dc6 Remove unnecessary, empty, file specific FileConfiguration blocks in vcproj files 2014-05-09 19:59:06 +03:00
Martin Storsjö
5842e1b2aa Unify the include directories in the WelsVP project
Some directories had a trailing slash in some configurations, but
not in other configurations. Make sure the directories are the same
in all configurations.
2014-05-09 19:59:06 +03:00
Martin Storsjö
7676c5b65b Unify the include dirs within the decConsole project
Some include directories were only present in debug builds.
2014-05-09 19:59:06 +03:00
Martin Storsjö
1446f8b599 Don't use the encoder include dir when building the decoder 2014-05-09 19:59:06 +03:00
Martin Storsjö
324205df88 Remove references to nonexistent include directories
Some of these were legacy references to absolute paths outside of
the project itself.
2014-05-09 19:59:06 +03:00
Ethan Hugg
2f8f2880ff Merge pull request #812 from mstorsjo/remove-manual-win32-defines
Don't manually define WIN32/WIN64
2014-05-09 09:48:47 -07:00
Martin Storsjö
e8e2cbcc28 Revert "Set ASM_ARCH in all cases to fix Win64 Debug build"
This reverts commit 09025dc8ef.

There is no need to set ASM_ARCH unless assembly sources actually
are built. ASM_ARCH is no longer used for setting unrelated CFLAGS.
2014-05-09 19:34:49 +03:00
Martin Storsjö
4635232d93 Don't manually define WIN32/WIN64
All the code that relies on separating them uses the built-in defines
_WIN32 and _WIN64, or the corresponding machine defines (such as
_M_IX86, for MSVC 32 bit inline assembly).
2014-05-09 19:34:04 +03:00
Ethan Hugg
d63458f8e0 Merge pull request #803 from mstorsjo/remove-unused-defines
Remove unused defines
2014-05-09 09:29:29 -07:00
Martin Storsjö
094aa24bf6 Remove unused manual defines of _WINDOWS 2014-05-09 19:27:42 +03:00
Martin Storsjö
0d8f7ab0e1 Remove the unused WELSDEC/ENCPLUS_EXPORTS defines 2014-05-09 19:27:42 +03:00
Martin Storsjö
e2ec07ae87 Remove the unused leftover define HAVE_CACHE_LINE_ALIGN 2014-05-09 19:27:42 +03:00
sijchen
8d23201a05 Merge pull request #808 from mstorsjo/use-correct-param-types
Use the actual parameter types in PSearchMethodFunc instead of void pointers
2014-05-09 17:22:05 +08:00
sijchen
c215e576e6 Merge pull request #810 from huili2/ps_error_logic_ec
for PS error logic for EC
2014-05-09 17:08:44 +08:00
huili2
51c918f212 for PS error logic for EC 2014-05-09 01:12:08 -07:00
dongzhang
218adc7e29 Fix a bug in deblocking for neon 32 bit arm implementation 2014-05-09 14:06:16 +08:00