generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,997 Commits 23 Branches 9 Tags 55 MiB
057e38663f
Commit Graph

1286 Commits

Author SHA1 Message Date
ruil2
5aa7cdedb8 clean build warning related encoder 2014-06-10 10:39:44 +08:00
ruil2
4c12f8970c cleanup trace module 2014-06-10 10:24:45 +08:00
ruil2
88e7637a33 Merge pull request #935 from lyao2/pskip_commit_ 
remove ubuntu build warning
 2014-06-10 10:22:18 +08:00
lyao2
41f3e2e0cf remove ubuntu build warning 2014-06-10 09:37:34 +08:00
ruil2
cc66c999b0 Merge pull request #930 from mstorsjo/cleanup-asm 
Do some minor cleanups on the x86 assembly source
 2014-06-09 16:27:52 +08:00
Martin Storsjö
d1a00d8173 Remove mismatched chars at the end of a line marker 
None of the other markers close by have similar chars.
 2014-06-09 11:11:25 +03:00
Martin Storsjö
7bc3e944ad Get rid of uneven spacing after WELS_EXTERN 2014-06-09 11:03:25 +03:00
lyao2
1d79a1ac80 enable static/scroll Pskip functions 2014-06-09 15:57:15 +08:00
sijchen
5cbe4a40d3 Merge pull request #926 from ruil2/enc_reforg 
add ref-original frame assigment
 2014-06-09 10:17:13 +08:00
Martin Storsjö
e1f28cea96 Remove the now unused XCTest.framework references 2014-06-06 10:34:39 +03:00
Martin Storsjö
7773506b00 Remove leftover references to the newly removed test projects 2014-06-06 10:32:26 +03:00
ruil2
74df3e9553 add ref-original frame assigment 2014-06-06 15:24:31 +08:00
lyao2
42d06a1276 Merge pull request #924 from ruil2/expand_pic_1 
resolve unit test warnings
 2014-06-06 15:13:10 +08:00
HaiboZhu
08377f37f3 Merge pull request #916 from huili2/dynamic_dec_au_size 
enable dynamic AU size in decoder
 2014-06-06 14:27:08 +08:00
ruil2
a46b1aa86e Merge pull request #923 from zhilwang/satd-arm64 
Add arm64 neon code for Satd.
 2014-06-06 14:05:53 +08:00
ruil2
3d031ee8f8 Merge pull request #925 from lyao2/pskip_func_commit 
add pskip MD functions
 2014-06-06 14:04:35 +08:00
lyao2
c6e7814b57 add pskip MD functions 2014-06-06 13:51:32 +08:00
ruil2
2d61c97bc7 remove a redundant file in encDemo project 2014-06-06 13:34:32 +08:00
ruil2
ece06b37da resolve unit test warnings 2014-06-06 13:29:30 +08:00
zhiliang wang
5d7e18de54 Add arm64 neon code for Satd. 2014-06-06 09:33:15 +08:00
Martin Storsjö
837a582510 Remove unnecessary autogenerated stub iOS test projects 
The actual unit tests will be hooked up in a separate project.
 2014-06-05 12:13:58 +03:00
dongzha
51b2ff84fc Merge pull request #918 from syureyi/de7621 
for cleaning .o and .d files generated by android demo
 2014-06-05 10:02:24 +08:00
zhuling13
6bf7ad4e2b and space to colon, modify bad note 2014-06-04 18:23:19 -07:00
Kento
977d7cd0b3 Update common.xcodeproj to build successfully 2014-06-04 17:28:48 +09:00
ruil2
030492de19 update decoder mac project for expand picture files position change 2014-06-04 10:08:58 +08:00
Licai Guo
ba1716d846 remove unused argument pBlock 2014-06-03 06:36:07 -07:00
JuannyWang
fbacfbdb69 fix ios build error caused by expand_pic.cpp missing from project configuration 2014-06-03 17:17:17 +08:00
zhuling13
b4c8f6b778 for cleaning .o and .d files generated by android demo 2014-06-02 20:21:10 -07:00
Ethan Hugg
c2c355b623 Merge pull request #911 from mstorsjo/reformat-asm 
Convert all tabs to spaces in assembly sources, unify indentation
 2014-06-02 07:12:30 -07:00
Ethan Hugg
9b6df8a267 Merge pull request #905 from mstorsjo/cleanup-android-projects 
Cleanup android test projects
 2014-06-02 07:06:54 -07:00
Martin Storsjö
57f6bcc4b0 Convert all tabs to spaces in assembly sources, unify indentation 
Previously the assembly sources had mixed indentation consisting
of both spaces and tabs, making it quite hard to read unless
the right tab size was used in the editor.

Tabs have been interpreted as 4 spaces in most cases, matching
the surrounding code.
 2014-06-01 01:35:43 +03:00
Martin Storsjö
faaf62afad Get rid of double spaces in macro declarations 2014-06-01 01:13:01 +03:00
Martin Storsjö
ac03b8b503 Avoid unnecessary tabs in macro declarations 2014-06-01 01:13:01 +03:00
Martin Storsjö
1884c06652 Remove a redundant definition of WELSEMMS 
The same definition already exists in asm_inc.asm.
 2014-06-01 01:13:01 +03:00
Martin Storsjö
932a38abc0 Reformat the copyright header of deblocking_neon.S 
This makes it identical to the ones in the other files.
 2014-05-31 13:44:21 +03:00
sijchen
ba2329a9c0 Merge pull request #904 from ruil2/expand_pic_1 
clean up expand picture.
 2014-05-30 17:25:11 +08:00
volvet
f449033ea8 Merge pull request #906 from mstorsjo/fix-chmod 
Unset the executable bit on source files
 2014-05-30 17:20:58 +08:00
Martin Storsjö
322ce39e98 Remove an unused variable 
This fixes warnings about variables that are set but not used.
 2014-05-30 11:32:22 +03:00
Martin Storsjö
f0240ef3bb Use the right data type for a local variable 
All the values assigned into this variable, and compared with this
variable, are int32_t.

This avoids warnings about comparison between signed and unsigned
types.
 2014-05-30 11:31:48 +03:00
Martin Storsjö
388a93fe25 Enlarge pLongRefList to avoid accesses out of bounds 
This fixes warnings about "array subscript is above array bounds".
 2014-05-30 11:31:11 +03:00
Martin Storsjö
a0c9f8c9a0 Remove the stock example icons 
A test application like these ones can do just fine without any icon
at all - there's no need to bundle 8 different extra binary images
just for that.
 2014-05-30 11:04:54 +03:00
Martin Storsjö
1bb73e017e Remove useless declarations from Application.mk 
OPTIM_debug isn't set by anything in this project, and APP_ABI
is set directly when invoking ndk-build - we don't use these
declarations at all.
 2014-05-30 11:04:54 +03:00
Martin Storsjö
e276ae3c2f Convert android resource xml files to unix newlines 
Some of these files actually had mixed line endings previously.
 2014-05-30 11:04:54 +03:00
Martin Storsjö
2a65a32de1 Remove stray " in android layout xml files 2014-05-30 11:04:54 +03:00
Martin Storsjö
f2948dce67 Unset the executable bit on source files 2014-05-30 09:46:15 +03:00
ruil2
14e5d740cd clean up expand picture. 2014-05-30 11:05:31 +08:00
dongzha
80fdf09b26 Merge pull request #903 from zhilwang/arm64-sad 
Add Arm64 sad code
 2014-05-30 09:26:04 +08:00
huili2
bed18c26c3 enable dynamic AU size in decoder 2014-05-29 18:15:16 -07:00
huili2
0adb3e1b9c remove macro NO_WAITING_AU for always on 2014-05-28 17:56:56 -07:00
huili2
153fa10dc5 Merge pull request #898 from ruil2/enc_rc_4 
simplify stash pop bs
 2014-05-28 16:21:10 +08:00
ruil2
c1620f3868 fix a bug that if..else are grouped incorrectly 2014-05-27 16:13:24 +08:00
ruil2
044af8f674 format update by using astyle 2014-05-27 15:16:43 +08:00
ruil2
c8299d7d8f simplify stash pop bs 2014-05-27 14:51:09 +08:00
ruil2
db11ba7a34 fix vlc overflow 2014-05-27 13:18:52 +08:00
huili2
ce0d371c98 Merge pull request #895 from ruil2/enc_rc_1 
remove redundant code for mb qp calculation
 2014-05-26 15:15:26 +08:00
ruil2
31120dd88c remove redundant code for mb qp calculation 2014-05-26 15:03:06 +08:00
ganyang
2e6f180e95 remove max slice number constraint 2014-05-22 19:39:43 +08:00
huili2
5482207823 modify dec API from void to explicit type, and some comments 2014-05-21 23:47:57 -07:00
sijchen
032d199961 Merge pull request #878 from ruil2/enc_quant 
miss a branch for auto reference frame setting
 2014-05-22 00:14:57 -05:00
ruil2
bcce5fa8e6 Merge pull request #867 from sijchen/rc_doublefloat_fix1 
[Fix] using WelsRound for all the double-int32_t conversion
 2014-05-22 11:46:28 +08:00
ruil2
00a2a9feef Merge branch 'master' of https://github.com/cisco/openh264 into enc_quant 2014-05-22 11:09:57 +08:00
ruil2
e0b92bb633 miss a branch for auto reference frame setting 2014-05-22 10:53:02 +08:00
Ethan Hugg
d3436555f8 Merge pull request #872 from sijchen/fix_me_func_type 
[Fix] fix ME func type in UT
 2014-05-21 08:11:27 -07:00
Sijia Chen
618729bf5a roll back an unnecessary change 2014-05-21 16:46:43 +08:00
sijchen
ff46fc7d93 Merge pull request #876 from huili2/bs_buffer_expand_master 
expand the bs buffer size
 2014-05-21 16:33:26 +08:00
huili2
20295c68fd expand the bs buffer size 2014-05-21 00:35:25 -07:00
dongzha
95d32473a1 Merge pull request #874 from ruil2/enc_quant 
update the minimum quant limiation as 10. quant 4 can't avoid overflow
 2014-05-21 15:12:12 +08:00
ruil2
def2ae50ee drop the last update 2014-05-21 14:45:03 +08:00
ruil2
a7b2797514 Merge branch 'enc_quant' of https://github.com/ruil2/openh264 into enc_quant 2014-05-21 14:43:08 +08:00
ruil2
42bd0f4729 only testing 2014-05-21 14:41:50 +08:00
ruil2
1fd5e6e210 update the minimum quant limiation as 10. quant 4 can't avoid overflow 2014-05-21 14:04:55 +08:00
sijchen
5d1d47c01b fix me func type in UT 2014-05-21 08:57:58 +08:00
HaiboZhu
63b6f6f55e Merge pull request #868 from huili2/add_new_seq_detect_master 
add single function for new seq detection
 2014-05-20 16:46:44 +08:00
Sijia Chen
7413032185 using WelsRound for all the double-int32_t conversion 2014-05-20 14:06:31 +08:00
sijchen
cc81020875 Merge pull request #843 from mstorsjo/remove-unused-function 
Remove an unused static function
 2014-05-20 13:09:17 +08:00
sijchen
2e5700d32d Merge pull request #857 from mstorsjo/remove-unused-ifdef 
Remove two unused ifdefs
 2014-05-20 13:08:27 +08:00
huili2
7c6debbef6 add single function for new seq detection 2014-05-19 19:55:06 -07:00
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
Martin Storsjö
7048fe5377 Remove two unused ifdefs 
Nothing in the project sets HAVE_MMX.

The commented out code for setting pSearchMethodFunc can be readded
once it's actually implemented properly.
 2014-05-17 22:06:28 +03: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
sijchen
78f3b5c5f6 add minimum buffer size 2014-05-16 11:18:14 +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
zhiliang wang
53c8af4566 Refine some code 2014-05-15 15:04:44 +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
zhiliang wang
fe57aa46df Add gnu assembler support. 2014-05-15 09:17:35 +08:00
lyao2
bd7c04f738 enable Scroll detection into workflow 2014-05-15 09:11:58 +08:00
Martin Storsjö
8c10cd220f Remove an unused static function 
This avoids a warning with clang.

This function was added in 4bd6a3a6e8 even though nothing in
that commit actually uses it.
 2014-05-14 22:07:38 +03: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
zhiliang wang
e6c9eb9824 Add Sad arm64 code 2014-05-14 17:06:48 +08: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
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ö
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
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
ruil2
a6ca8bb904 fix a commit bug for console app 2014-05-13 17:09:15 +08: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
5b38a94c9a cleanup encoder console app 2014-05-13 09:50:48 +08: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
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
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
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
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
sijchen
5de9f41f5a Fix the improper slice mmco setting 2014-05-09 10:48:09 +08:00
zhilwang
f6293153c8 Merge pull request #802 from mstorsjo/remove-unused-misspelled-define 
Remove an unused, misspelled define set on only one source file
 2014-05-09 08:45:49 +08:00
volvet
88a25713a5 Merge pull request #801 from mstorsjo/fix-manually-edited-vcproj 
Make manually edited vcproj files match what visual studio actually generates
 2014-05-08 21:19:25 +08:00
volvet
322a3cca50 Merge pull request #805 from mstorsjo/remove-msvc-version-suffix 
Remove msvc version suffix
 2014-05-08 21:06:11 +08:00
volvet
054530fdb4 Merge pull request #800 from mstorsjo/matching-endif 
Make an endif comment match the actual condition
 2014-05-08 20:59:18 +08:00
volvet
ff33fdeb8e Merge pull request #799 from mstorsjo/use-predefined-define 
Use the predefined _WIN32 instead of the manually defined WIN32 for windows specific code
 2014-05-08 20:58:11 +08:00
Martin Storsjö
26edfd1f92 Remove the _2008 suffix from the Visual Studio solutions 
This is the only version of them that we provide - and they
can easily be opened in any newer version anyway.
 2014-05-08 11:47:56 +03:00
Martin Storsjö
66f0f6ccbe Rename the WelsVP vcproj file to match the others 
The other projects don't have the _2008 suffix.
 2014-05-08 11:46:18 +03:00
Martin Storsjö
f8ae7fcc5f Remove an unused, misspelled define set on only one source file 2014-05-08 11:17:29 +03:00
Martin Storsjö
60f1ea8088 Make manually edited vcproj files match what visual studio actually generates 
This changes the indentation from space to tabs, and adds missing
dos newlines to these few lines.

This makes the file be detected as using dos newlines properly in
certain editors.
 2014-05-08 11:15:50 +03:00
Martin Storsjö
6e715ddc10 Make an endif comment match the actual condition 2014-05-08 11:14:24 +03:00
Martin Storsjö
d69d9c4622 Use the predefined _WIN32 instead of the manually defined WIN32 for windows specific code 
This avoids having to rely on manually defining WIN32 in the build
system.
 2014-05-08 11:12:49 +03:00
Martin Storsjö
b5cc7c2fe1 Remove a completely unused header 2014-05-08 09:59:58 +03:00
huili2
1839910bb0 fix order of new AU and new Seq 2014-05-07 17:56:31 -07:00