Commit Graph

4163 Commits

Author SHA1 Message Date
ruil2
174f09bd10 Merge pull request #2246 from shihuade/MultiThread_V4.1_SliceCtx_V2_Pull
SSliceCtx structure refactoring----change input parameters for UpdateSl…
2015-11-18 13:42:20 +08:00
ruil2
a8584b530f Merge pull request #2245 from shihuade/MultiThread_V4.1_SliceCtx_V1_Pull_V2
SSliceCtx structure refactoring----change input parameters for UpdateMb…
2015-11-18 13:42:02 +08:00
huade
8d44427dc6 SSliceCtx struture refactoring----change input paramters for UpdateSlicepEncCtxWithPartition 2015-11-17 20:54:27 +08:00
huade
06eb03578d SSliceCtx struture refactoring----change input paramters for UpdateMbListNeighborParallel 2015-11-17 17:54:58 +08:00
HaiboZhu
148f86f3b0 Merge pull request #2244 from pengyanhai/master
Merge back the changes of v1.5.2 to master and generate PDB file on Windows
2015-11-17 14:35:16 +08:00
huili2
dc2cbe4a22 remove API data format in decoder in 1.6 2015-11-17 13:58:57 +08:00
Hank Peng
28bdcc3871 Update the plugin version to v1.5.2 2015-11-16 16:59:21 -08:00
Hank Peng
baa69f3cd0 Shut down the encoder/decoder thread when Encoding/DecodingComplete is invoked, to avoid potential crash on Android 2015-11-16 16:56:11 -08:00
Hank Peng
e014b5ea43 Avoid to call any host API after Encoding/DecodingComplete(), to avoid potential crash in the browser 2015-11-16 16:55:58 -08:00
Hank Peng
545612e4d7 Merge branch 'master' of github.com:pengyanhai/openh264 2015-11-16 16:53:58 -08:00
sijchen
7bc1b7abf5 Merge pull request #2240 from ruil2/qp_trace
add qp related trace
2015-11-16 10:36:24 -08:00
sijchen
18fdf6292d Merge pull request #2239 from ruil2/remove_trace
remove iAbsDiffPicNumMinus1 processing for no reference frame
2015-11-16 10:36:00 -08:00
ruil2
8f785ebcd5 Merge pull request #2241 from shihuade/MultiThread_V4.0_ThreadPoolChange_V5_astyle
astyle for codec/encoder/core/src/slice_multi_threading.cpp
2015-11-16 17:39:40 +08:00
huade
953f74a8a2 astyle for codec/encoder/core/src/slice_multi_threading.cpp 2015-11-16 15:20:24 +08:00
Karina
96b5b3965e add qp related trace 2015-11-16 13:08:48 +08:00
Karina
42222b8e7e remove iAbsDiffPicNumMinus1 processing for no reference frame 2015-11-16 12:22:10 +08:00
HaiboZhu
8d2883277c Merge pull request #2236 from sijchen/thp82
[Encoder] add error handling of task returns
2015-11-16 10:26:45 +08:00
HaiboZhu
991b05fb69 Merge pull request #2238 from shihuade/MultiThread_V4.0_ThreadPoolChange_V2
fixed bug for NeedDynamicAdjust()
2015-11-16 10:13:02 +08:00
huade
0d4d32efbd fixed bug for NeedDynamicAdjust() 2015-11-16 08:57:38 +08:00
sijchen
6fe05b0996 add error handling of task returns 2015-11-13 12:05:06 -08:00
sijchen
b5d890c1ea Merge pull request #2224 from sijchen/thp73
[Encoder] put the logic related to multiple D layer into a class …
2015-11-13 11:57:07 -08:00
HaiboZhu
da0965c42f Merge pull request #2234 from HaiboZhu/Revert_Simply_Dec_Ctx
Revert "Merge pull request #2217 from huili2/simply_dec_ctx"
2015-11-13 20:45:11 +08:00
Haibo Zhu
628befe8be Revert "Merge pull request #2217 from huili2/simply_dec_ctx"
This reverts commit 27172bafd7, reversing
changes made to 24916a652e.
2015-11-13 20:16:03 +08:00
HaiboZhu
513a34069d Merge pull request #2232 from ruil2/fix_crash_1
fix crash
2015-11-13 17:19:16 +08:00
Karina
7c1fbad53a fix crash 2015-11-13 17:16:26 +08:00
huili2
d2e66deb66 Merge pull request #2227 from sijchen/thp92
[Encoder] fix the missing loadbalancing part
2015-11-13 07:38:06 +08:00
sijchen
e508c86dac fix the missing loadbalancing part 2015-11-12 13:15:07 -08:00
sijchen
aeb5ab4b99 [Encoder] put the logic related to multiple D layer into a class for better structure 2015-11-11 22:55:16 -08:00
HaiboZhu
beacba76e3 Merge pull request #2220 from sijchen/thp61
[Encoder] add preencodingtasklist in task management
2015-11-12 13:54:49 +08:00
pengyanhai
b5792a09f9 Generate PDB file for openh264.dll and gmpopenh264.dll 2015-11-10 20:37:17 -08:00
HaiboZhu
1a2606f45d Merge pull request #2219 from sijchen/api3
[Encoder] change API for slicing part for easier usage
2015-11-11 09:19:03 +08:00
HaiboZhu
27172bafd7 Merge pull request #2217 from huili2/simply_dec_ctx
remove bParseonly in ctx using that in param, and slightly modify the…
2015-11-11 09:18:04 +08:00
sijchen
33c378f7b7 change API for slicing part for easier usage (the UseLoadBalancing flag is still under working) 2015-11-10 09:50:06 -08:00
huili2
24916a652e Merge pull request #2215 from pengyanhai/master
Tear down the OpenH264 encoder and decoder properly to avoid potential crash and memory leak
2015-11-10 09:07:41 +08:00
pengyanhai
b5f1460dd1 Tear down the OpenH264 encoder and decoder properly to avoid potential crash and memory leak 2015-11-09 11:52:11 -08:00
HaiboZhu
643df65c58 Merge pull request #2212 from ruil2/rc2
remove an useless code line
2015-11-09 09:53:28 +08:00
HaiboZhu
f1b10e454d Merge pull request #2213 from ruil2/rc4
do GOM rate control for I frame
2015-11-09 09:53:05 +08:00
Karina
e20ce63778 do GOM rate control for I frame 2015-11-06 16:08:52 +08:00
Karina
a251504aa2 remove an useless code line 2015-11-06 13:43:21 +08:00
huili2
17e610da9f Merge pull request #2209 from sijchen/fixslc
[UT] add autolock in ThreadPoolTest to avoid possible conflict
2015-11-05 13:46:51 +08:00
huili2
c47d235942 Merge pull request #2210 from pengyanhai/master
Never call GMPVideoDecoderCallback after Encoding/DecodingComplete, to fix bug #1204588 in Bugzilla
2015-11-05 09:09:55 +08:00
Hank Peng
955fce60a1 Never call GMPVideoDecoderCallback after DecodingComplete, to fix bug #1204588 in Bugzilla 2015-11-04 11:29:02 -08:00
sijchen
59779539e7 add autolock in ThreadPoolTest to avoid possible conflict 2015-11-04 10:29:08 -08:00
HaiboZhu
f13f502203 Merge pull request #2208 from sijchen/fixslc
[Encoder] Fix for a slicing and multi-threading setting
2015-11-04 09:24:08 +08:00
HaiboZhu
e6d9d44344 Merge pull request #2204 from sijchen/ut_template2
[UT] add a .template file for codec UT
2015-11-04 09:23:26 +08:00
Sijia Chen
2dab8bf087 fix for a slicing and multi-threading setting 2015-11-03 14:42:56 -08:00
Sijia Chen
ee27d13262 add preencodingtasklist in task manegement
add interface to enable different task list
2015-11-03 09:33:26 -08:00
sijchen
597adfd98c Merge pull request #2207 from sijchen/thp53
[Encoder] remove unneeded codes and add some logs (basing on PR2206)
2015-11-03 09:05:55 -08:00
sijchen
b0c6ea9385 Merge pull request #2206 from sijchen/thp42
[Encoder] adjust encoder tasks, add ut and enable new thread pool under some cases
2015-11-03 09:05:43 -08:00
Sijia Chen
3d3884641c use the correct commit number in comment 2015-11-02 23:19:02 -08:00