Commit Graph

1723 Commits

Author SHA1 Message Date
HaiboZhu
3c2d9f7532 Merge pull request #863 from dongzha/FixEncOptionMaster
change comment in encoder option according to issue cisco#859 for master
2014-05-20 10:51:08 +08:00
dongzha
e751502412 Merge pull request #864 from ruil2/enc_quant
set minimum quant as 4 to avoid level code overflow
2014-05-20 10:45:55 +08:00
ruil2
901f8ba19a Merge pull request #858 from sijchen/md_merge145
reformat some missed style and remove unused comments
2014-05-20 10:39:00 +08:00
ruil2
69f2d768b1 Merge pull request #842 from ganyangbbl/refine_nal2
Refine Nal length related structure
2014-05-20 10:30:45 +08:00
unknown
47430de294 set minimum quant as 4 to avoid level code overflow 2014-05-20 10:19:58 +08:00
dongzhang
a9ca4db07b change comment in encoder option according to issue https://github.com/cisco/openh264/issues/859 2014-05-20 10:00:59 +08:00
sijchen
be17261a92 reformat 2014-05-19 17:04:59 +08:00
ruil2
e15742b404 Merge pull request #844 from lyao2/scroll_detection
enable Scroll detection into workflow
2014-05-19 09:45:35 +08:00
huili2
3e258ea74e Merge pull request #853 from dongzha/FixEncUTDequantBugMaster
Fix encoder dequant Unit Test bug for master
2014-05-17 21:51:35 +08:00
huili2
7f3f397706 Merge pull request #831 from sijchen/md_merge144
[Encoder ME] Add ME function assignment for Screen Content Coding
2014-05-17 21:49:07 +08:00
Ethan Hugg
1e3b015a6f Merge pull request #856 from mstorsjo/clarify-comment
Clarify a comment about MSVC parameters to fix building gtest
2014-05-16 16:04:08 -07:00
Martin Storsjö
3f982a4de4 Clarify a comment about MSVC parameters to fix building gtest
The temporary bug in gtest has now been fixed, but we still can keep
using the current way of fixing MSVC 2012 builds instead of switching
to the solution used previously.
2014-05-16 08:54:36 +03:00
HaiboZhu
f946b24e63 Merge pull request #854 from sijchen/bufferlencheck_fix
It is OK for this bug
2014-05-16 12:40:48 +08:00
sijchen
78f3b5c5f6 add minimum buffer size 2014-05-16 11:18:14 +08:00
dongzhang
749bc4ea7e Fix QP<18 dequant UT bug at encoder side
This should be UT for QP<12.
2014-05-16 11:12:59 +08:00
HaiboZhu
0c326fa302 Merge pull request #845 from huili2/bs_buffer_modif
modify bs buffer size to double the AU size at decoder
2014-05-15 16:30:18 +08:00
dongzha
dee5400485 Merge pull request #847 from mstorsjo/remove-write-nal-length
Remove unnecessary writing of nal length in the decoder
2014-05-15 15:02:17 +08:00
Martin Storsjö
e9e4d0a073 Remove unnecessary writing of nal length in the decoder
The written nal length doesn't seem to be used at all.
2014-05-15 09:44:35 +03:00
huili2
b63332de80 modify bs buffer size to double the AU size 2014-05-14 19:43:14 -07:00
lyao2
bd7c04f738 enable Scroll detection into workflow 2014-05-15 09:11:58 +08:00
Ethan Hugg
3d5990500b Merge pull request #832 from mstorsjo/asflags
Don't pass all MSVC specific cflags to gas-preprocessor and armasm
2014-05-14 08:01:25 -07:00
ganyang
c08c0f85eb This refine is to remove slice number limitation in the future. The changes contains:
1. add pNalLen in Structure SWelsEncoderOutput to store each nal length
2. rename iNalLengthInByte[MAX_NAL_UNITS_IN_LAYER] to pNalLengthInByte in Structure SLayerBSInfo, the pointer point to pNalLen, like pBSBuf point to pFrameBS.
2014-05-14 16:00:36 +08:00
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 (&#x0D;&#x0A;) 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