Commit Graph

1373 Commits

Author SHA1 Message Date
ruil2
b3dedb3f37 modify the interface for delivery info and add some comments 2014-06-23 13:16:15 +08:00
huili2
dc56892d72 misaligned_rc_structure 2014-06-22 18:47:33 -07:00
Martin Storsjö
30058e091f Remove the executable bit from aarch64 assembly source files 2014-06-22 21:36:22 +03:00
huili2
fa0eee2470 Merge pull request #990 from zhilwang/arm64-intrapred
Add Arm64 neon Intra-pred code
2014-06-21 07:03:24 +08:00
huili2
777a3951aa Merge pull request #995 from huili2/permit_mb_re-con
enable MB re-decoding
2014-06-21 07:02:27 +08:00
huili2
f9152e6f40 fix crash 1027692 2014-06-20 02:21:54 -07:00
huili2
95012b0af6 enable MB re-decoding 2014-06-20 02:01:02 -07:00
dongzha
dd5b9b89f6 Merge pull request #991 from huili2/reorder_output_EC
put EC before output
2014-06-20 16:19:14 +08:00
ruil2
f49fa81d42 add interface parameter(profile/levle/numref) support 2014-06-20 16:02:56 +08:00
HaiboZhu
497b8dea84 Merge pull request #989 from HaiboZhu/win64_remove_warnings
Win64 remove warnings
2014-06-20 15:57:36 +08:00
dongzha
2f012f6e07 Merge pull request #986 from ruil2/rename
rename some varialbes
2014-06-20 10:00:37 +08:00
dongzha
b750a3b974 Merge pull request #985 from ruil2/encoder_check
input parameters validation
2014-06-20 09:58:53 +08:00
Haibo Zhu
998d012ea7 try 2014-06-19 18:46:19 -07:00
Haibo Zhu
dbe226b7cc try 2014-06-19 18:35:56 -07:00
Haibo Zhu
34fda74674 more remove 2014-06-19 18:35:56 -07:00
Haibo Zhu
f8ab6b3aa0 remove extra update 2014-06-19 18:33:58 -07:00
Haibo Zhu
443609286e modification about welsenc.cpp 2014-06-19 18:31:39 -07:00
Haibo Zhu
daf67d607f add win 64 warnings remove 2014-06-19 18:31:39 -07:00
ganyang
22342648af fix rc initialize bug 2014-06-19 15:36:48 +08:00
ruil2
b1efc8f723 rename some varialbes 2014-06-19 15:24:13 +08:00
ruil2
15e225ab35 check resolution configure 2014-06-19 15:11:02 +08:00
ruil2
66447349f6 check the number of spatial layer for screen content 2014-06-19 14:46:04 +08:00
ruil2
2242214368 update initilaization of m_pLastSpatialPicture 2014-06-19 13:12:39 +08:00
JuannyWang
45c78f438e Squashed commit of the following:
commit 9c95d6a0b10d2e40cb5003934ccc98af6330dfcb
Author: JuannyWang <hongjwan@cisco.com>
Date:   Thu Jun 19 10:43:15 2014 +0800

    [delay skip] delay skip to relieve bitrate burst somehow
2014-06-19 10:46:49 +08:00
huili2
d1437f2304 remove unused param to prevent access violation 2014-06-18 19:40:54 -07:00
huili2
fe0f10a063 add missing declaration of members for render 2014-06-18 02:14:29 -07:00
dongzha
51af10a25b Merge pull request #968 from huili2/render_syureyi
support rendering changing resollution output yuv on windows platform
2014-06-18 13:55:04 +08:00
dongzha
b5e1746b87 Merge pull request #978 from huili2/ULL_insteadof_LL
remove multiplication overflow warning by ULL instead of LL
2014-06-18 13:19:44 +08:00
dongzha
cf4026a948 Merge pull request #976 from huili2/modify_EncUT_scroll_xplatform
to support cross-platform LD32 in scroll detection
2014-06-18 13:19:20 +08:00
ruil2
778275ee1b Merge pull request #980 from huili2/enc_remove_bsflush
remove unnecessary flush buffer in encoder
2014-06-18 11:32:43 +08:00
huili2
887b2727f0 remove multiplication overflow warning by ULL instead of LL 2014-06-17 18:51:09 -07:00
huili2
5263eeb973 to support cross-platform UT of lD/ST 32 in scroll detection 2014-06-17 18:18:46 -07:00
Ethan Hugg
aaa5bcc157 Merge pull request #975 from mstorsjo/cleanup-asm
Clean up the aarch64 deblocking assembly
2014-06-17 08:33:46 -07:00
huili2
971ccccab4 remove unnecessary flush buffer in encoder 2014-06-17 02:40:28 -07:00
Martin Storsjö
720f8dcc52 Fix building the deblocking aarch64 assembly with gnu binutils 2014-06-17 10:10:50 +03:00
Martin Storsjö
b9477cdb94 Unify the copyright header in the aarch64 deblocking assembly
This file was the only one that had a differently formatted
copyright header.
2014-06-17 10:02:57 +03:00
Martin Storsjö
062937ac5a Unify the indentation of the new aarch64 assembly 2014-06-17 10:01:23 +03:00
Martin Storsjö
d15534ecb8 Get rid of mixed tabs and spaces in the aarch64 assembly 2014-06-17 10:00:07 +03:00
ruil2
c635ce442f fix a bug that dump reconstruct frame 2014-06-17 14:48:39 +08:00
ruil2
ce870bf20e add bitrate validation 2014-06-17 11:08:38 +08:00
sijchen
61017a2d4d Merge pull request #969 from ruil2/cleanup_encoder
cleanup interface parameters
2014-06-17 09:46:48 +08:00
ruil2
1111757977 Merge pull request #967 from dongzha/Deblock_AArch64
add arm 64 deblock code and Unit Test code
2014-06-16 17:19:25 +08:00
ruil2
7acf0e5b02 cleanup interface parameters 2014-06-16 17:17:24 +08:00
root
67afd91888 put EC before output 2014-06-15 23:14:31 -07:00
zhiliang wang
cfc2b95f59 Refine some code 2014-06-13 16:06:45 +08:00
zhiliang wang
947e3c64fe Add arm64 code for intra-pred 2014-06-13 15:21:48 +08:00
huili2
1b68890e1e modify render for display diff resolution 2014-06-12 22:23:40 -07:00
huili2
91cd93e5d0 Merge pull request #962 from dongzha/UseIntInRC
Use Int instead of Double in Rate Control and Modify anchor SHA1 value
2014-06-13 10:59:50 +08:00
dongzha
53f77ee7b5 Merge pull request #954 from huili2/instant_dec
enable no-delay decoding for MSlice
2014-06-13 10:58:25 +08:00
dongzha
f6ce43f83b Use Int instead of Double in Rate Control and Modify anchor SHA1 value 2014-06-12 17:30:13 +08:00
sijchen
0c09847ec9 Merge pull request #965 from ruil2/uinit_fix
fix #948 issue -- Using unititialized value in unittest.
2014-06-12 16:46:40 +08:00
lyao2
79ef0e19b2 fix SetOption scc ltr_ref_num casued memory leak issue. 2014-06-12 16:15:29 +08:00
ruil2
17d47533ed fix #948 issue -- Using unititialized value in unittest. 2014-06-12 15:20:10 +08:00
ruil2
44b048edd6 move trace related info to interface header 2014-06-11 17:05:40 +08:00
Martin Storsjö
090229f8a1 Add public options for setting a log callback 2014-06-11 08:08:56 +03:00
Martin Storsjö
dc91e0958b Integrate the lone function from logging.cpp into welsCodecTrace.cpp 2014-06-11 08:08:56 +03:00
Martin Storsjö
6e5f31214a Add a method for overriding the logging function in welsCodecTrace 2014-06-11 08:08:56 +03:00
Martin Storsjö
ce8065fe68 Don't use global variables in welsCodecTrace
This allows actually honoring the requested log level
properly if there are multiple codec instances within
the same process.
2014-06-11 08:08:56 +03:00
Martin Storsjö
cb5ee6c239 Remove the global log callback function
Now all logging should use a non-null log context, allowing to
pass the messages to the right recipient.
2014-06-11 08:08:56 +03:00
Martin Storsjö
b2cf56c618 Set a log context in the decoder 2014-06-11 08:08:55 +03:00
Martin Storsjö
9583ac4d52 Set and use a proper log context in the encoder 2014-06-11 08:08:55 +03:00
Martin Storsjö
8bac9315e6 Expose a SLogContext from welsCodecTrace 2014-06-11 08:08:29 +03:00
Martin Storsjö
4e428ab020 Add a log context to the encoder and decoder contexts
This will allow setting non-global logging callbacks, that
are different for each encoder or decoder instance.
2014-06-11 08:08:29 +03:00
Martin Storsjö
c8b81b4239 Only keep one single trace function pointer in welsCodecTrace 2014-06-11 08:08:29 +03:00
Martin Storsjö
20e889fadb Change CM_WELS_TRACE to take a plain string, not a format and variadic arguments
The format string was always "%s" anyway.
2014-06-11 08:08:29 +03:00
Martin Storsjö
5e22d5366e Remove the unused level parameter to welsStderrLevelTrace 2014-06-11 08:08:29 +03:00
Martin Storsjö
cfc9367610 Remove WelsStderrSetTraceLevel
The logging level is checked in welsCodecTrace anyway.

Previously, error logging wasn't ever shown if the trace
level was set to WELS_LOG_ERROR (as it was by default),
since welsStderrLevelTrace required the message level to
be strictly lower than the trace level.
2014-06-11 08:08:29 +03:00
Martin Storsjö
90be3d8215 Don't treat log levels as a bitmask
All use of log levels in the library just do a numerical
greater-than comparison between the set log level and the
level of the current message.
2014-06-11 08:08:29 +03:00
Martin Storsjö
0628c9b190 Set the trace level in the decoder console app via a proper option 2014-06-11 08:08:29 +03:00
Martin Storsjö
573dad7d04 Add a decoder option for setting the trace level 2014-06-11 08:08:29 +03:00
Martin Storsjö
77c3594e08 Actually set the trace level in the encoder console app 2014-06-11 08:08:29 +03:00
Martin Storsjö
c4a59690da Allow setting the trace level before initializing the encoder 2014-06-11 08:08:29 +03:00
Martin Storsjö
1bccef940c Read the right command line arguments in h264dec.cpp
pArgV[i++] evalates to the same string as cmd (which is
pArgV[i]); we need to increment i before indexing into
pArgV again.
2014-06-11 08:08:29 +03:00
Martin Storsjö
4f1ea1c4f8 Remove some unused typedefs 2014-06-11 08:08:29 +03:00
huili2
6f0cdd14f8 enable no-delay decoding for MSlice 2014-06-10 19:25:57 -07:00
Martin Storsjö
65616c2c53 Use a more descriptive include guard in the welsEncoder/DecoderExt.h files 2014-06-10 17:06:14 +03:00
Martin Storsjö
e6ba730c59 Remove a misleading comment
This comment claimed to be a completely different file.
2014-06-10 17:06:13 +03:00
Martin Storsjö
1ea50e209a Fix a typo, setttings -> settings 2014-06-10 17:06:13 +03:00
Martin Storsjö
cc65a1d76c Don't include a [ENCODER]: prefix in all logging
The same trace module is used for the decoder now as well.
2014-06-10 10:52:26 +03:00
Martin Storsjö
17fc6bd66e Remove the unnecessary method WelsTraceModuleIsExist(), which always returned true 2014-06-10 10:52:26 +03:00
Martin Storsjö
d93488448e Remove some commented out lines 2014-06-10 10:52:26 +03:00
Martin Storsjö
968d87045d Remove an unnecessary local function 2014-06-10 10:52:26 +03:00
Martin Storsjö
40af75c19d Remove the unnecessary WelsSet/GetLogLevel functions
Nothing actually used the variable that these functions
handled.
2014-06-10 10:52:06 +03:00
Martin Storsjö
ba1de16ac2 Make internal logging variables static
This avoids polluting the global namespace.
2014-06-10 09:28:45 +03:00
Martin Storsjö
ab4fe3fdf4 Remove an unused variable 2014-06-10 09:27:54 +03:00
dongzhang
0e0c8b5569 add arm 64 deblock code and Unit Test code 2014-06-10 11:23:51 +08:00
huili2
a6ebecd707 Merge pull request #936 from ruil2/trace_cleanup
cleanup trace module
2014-06-10 10:55:46 +08:00
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