Commit Graph

3948 Commits

Author SHA1 Message Date
HaiboZhu
60f36eb25a Merge pull request #2275 from HaiboZhu/Fix_Emulation_Prevention_Bytes_Profiles_Bugs
Add protection for emulation prevention bytes and profile_id
2015-11-25 12:30:51 +08:00
HaiboZhu
f47be08065 Merge pull request #2271 from sijchen/rf1
[Encoder] refactor multi-thread logic and add error-dealing
2015-11-25 12:04:00 +08:00
unknown
cc6b409f12 Add protection for emulation prevention bytes and profile_id 2015-11-25 11:48:07 +08:00
HaiboZhu
d85b1f6863 Merge pull request #2274 from shihuade/MultiThread_V4.2_SSliceCtx_PFirstMBInSlice_Pull_BugFixed
fixed bug for firsMbIndex in multi-thread-slice encoding with slicemo…
2015-11-25 11:12:24 +08:00
HaiboZhu
404315ab19 Merge pull request #2270 from huili2/parseonly_api_bugfix
disable wrongly calling for parseonly related
2015-11-25 09:00:54 +08:00
sijchen
1247006cbb remove unneeded variable 2015-11-24 13:39:27 -08:00
sijchen
2df092bcae refactor multi-thread logic 2015-11-24 13:35:55 -08:00
huade
29dd5e71be fixed bug for firsMbIndex in multi-thread-slice encoding with slicemode==SM_SIZELIMITED_SLICE 2015-11-24 17:55:30 +08:00
HaiboZhu
01016b1c83 Merge pull request #2264 from sijchen/api41
[Encoder] put bUseLoadBalancing into actual usage and add test case for it
2015-11-24 14:16:21 +08:00
ruil2
9ea1f0c7ea Merge pull request #2269 from shihuade/MultiThread_V4.2_SSliceCtx_pSliceComplexRatio_pull
remove pSliceComplexRatio from SliceThreading
2015-11-24 12:37:58 +08:00
huili2
9fade10d77 disable wrongly calling for parseonly related 2015-11-24 11:11:27 +08:00
huade
f263f0710a remove pSliceComplexRatio from SliceThreading 2015-11-24 10:44:23 +08:00
HaiboZhu
aeb55e07fe Merge pull request #2268 from HaiboZhu/Update_ftell_fseek_support_long_file
Update encoder console to support 64bit file length
2015-11-24 10:35:54 +08:00
HaiboZhu
4c19823d44 Merge pull request #2267 from shihuade/MultiThread_V4.2_SSliceCtx_SliceConSumeTime_Pull
remove pSliceConsumeTime in SSliceCtx and SliceThreading
2015-11-24 10:35:43 +08:00
Haibo Zhu
d7644664a6 Update the ftell and fseek to support 64bit length 2015-11-24 09:23:18 +08:00
huade
b001785eee remove pSliceConsumeTime in SSliceCtx and pSliceThreading 2015-11-24 08:58:37 +08:00
sijchen
f3c4b878ff update the usage of flag and MD5 value 2015-11-23 11:54:43 -08:00
ruil2
2d3071e37c Merge pull request #2262 from shihuade/MultiThread_V4.2_SSliceCtx_PFirstMBInSlice_Pull
remove pFirstMbInSlice in SSliceCtx
2015-11-20 14:35:00 +08:00
huade
9ef07c5b99 remove pFirstMbInSlice in SSliceCtx 2015-11-20 09:51:01 +08:00
huili2
6f15550b9e Merge pull request #2261 from mstorsjo/fix-test-init-uninit
Fix DecoderInterfaceTest::TestInitUninit()
2015-11-20 08:35:33 +08:00
Martin Storsjö
eaf4798119 Readd a test for GetOption in TestInitUninit
In dc2cbe4, the previous test for GetOption that succeeds when the
decoder is initialized was removed. Add a GetOption call for a different
option, now that DECODER_OPTION_DATAFORMAT is removed.
2015-11-20 00:17:43 +02:00
Martin Storsjö
b3b083c883 Fully initialize m_sDecParam in TestInitUninit
Before dc2cbe4, the DecoderConfigParam function returned early
since DecoderSetCsp signaled a failure, which is why the uninitialized
parameters weren't read before.

This fixes valgrind warnings about conditional jumps depending on
uninitialized values.
2015-11-20 00:13:42 +02:00
sijchen
222c84c193 Merge pull request #2260 from shihuade/MultiThread_V4.1_SliceCtx_V10V11_Pull_V4
change input parameters for  UpdateMbNeighbourInfoForNextSlice etc.
2015-11-19 13:20:28 -08:00
huade
b77b68ffa0 change input parameters for UpdateMbNeighbourInfoForNextSlice etc. 2015-11-19 17:18:03 +08:00
HaiboZhu
54a194ce66 Merge pull request #2258 from shihuade/MultiThread_V4.1_SliceCtx_V6V7V8V9_Pull_V2
change input parameters for AssignMbMapMultipleSlices etc,
2015-11-19 16:10:54 +08:00
huade
c842c5c946 change input parameters for DynamicAdjustSlicePEncCtxAll etc, SSliceCtx refactoring 2015-11-19 15:00:38 +08:00
HaiboZhu
e4229db53d Merge pull request #2257 from shihuade/MultiThread_V4.1_SliceCtx_V5_Pull
change input parameters for AssignMbMapMultipleSlices
2015-11-19 14:51:52 +08:00
HaiboZhu
40b2cc85f3 Merge pull request #2256 from shihuade/MultiThread_V4.1_SliceCtx_V4_Pull_V3
change input paramters for Init/UninitSlicePEncCtx()
2015-11-19 14:07:29 +08:00
huade
c298755da5 SSliceCtx structure refactoring----change input parameters for AssignMbMapMultipleSlices 2015-11-19 13:29:16 +08:00
huade
b60bb67b4e SSliceCtx struture refactoring----change input paramters for Init/UninitSlicePEncCtx() 2015-11-19 13:19:34 +08:00
HaiboZhu
268e6cf09f Merge pull request #2255 from shihuade/MultiThread_V4.1_SliceCtx_V3_Pull_V3
remove (ppCtx)->pSliceCtxList and only keep DqLayer->sSliceCtx
2015-11-19 13:13:01 +08:00
huade
35ab32b1a3 remove (ppCtx)->pSliceCtxList and only keep DqLayer->sSliceCtx to simply the structure manage 2015-11-19 11:03:50 +08:00
HaiboZhu
f9d8e9a76e Merge pull request #2249 from huili2/remove_output_colorformat
remove data format in decoder API
2015-11-19 09:11:29 +08:00
sijchen
e0282587d1 Merge pull request #2251 from luser/plugin-name
add an echo-plugin-name target
2015-11-18 10:03:42 -08:00
Ted Mielczarek
bdb837ffaf add an echo-plugin-name target 2015-11-18 06:47:39 -05:00
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