Skip to content

Commit 617a49e

Browse files
Alexis Michael Tourapiscyining
Alexis Michael Tourapis
authored and
cyining
committed
Import jm17.1
1 parent 41b8a68 commit 617a49e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+13951
-7810
lines changed

‎CHANGES.TXT

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
Changes in Version JM 17.1 (since JM 17.0)
2+
------------------------------------------
3+
- decoder: fix delta_pic_order_cnt[0] in IDR frames (KS, bug #57)
4+
- decoder: Direct mode fixes (YHE)
5+
- encoder/decoder: various cleanups and bug fixes (AT/YHE)
6+
- encoder/decoder: rewrite of deblocking functions (AT)
7+
- decoder : rewrite of intra prediction functions (AT)
8+
- encoder/decoder: MVC bug fixes (PeP/AL)
9+
- encoder/decoder: Frame Packing SEI Message (AL)
10+
- decoder: Minor CABAC updates (AT)
11+
- encoder/decoder: Update work spaces for VS 2008 and XCode with x64 and OPENMP support (KS)
12+
- encoder/decoder: Update Makefiles for OPENMP support (KS)
13+
- encoder: avoid crashes by prohibiting incompatible tool combinations (KS/YHE)
14+
115
Changes in Version JM 17.0 (since JM 16.2)
216
------------------------------------------
317
- encoder: TIFF input support (LZL)

‎JM.xcodeproj/project.pbxproj

Lines changed: 59 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@
175175
71C905340FE283C10095EA3A /* rd_intra_jm_low.c in Sources */ = {isa = PBXBuildFile; fileRef = 71C905270FE283C10095EA3A /* rd_intra_jm_low.c */; };
176176
71C905360FE283C10095EA3A /* transform8x8_H444.c in Sources */ = {isa = PBXBuildFile; fileRef = 71C905290FE283C10095EA3A /* transform8x8_H444.c */; };
177177
71C905370FE283E50095EA3A /* annexb.c in Sources */ = {isa = PBXBuildFile; fileRef = 43FA4A460D4EE94B001709F1 /* annexb.c */; };
178+
71FBD3DB1198565400A92FBE /* loop_filter_mbaff.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3D91198565400A92FBE /* loop_filter_mbaff.c */; };
179+
71FBD3DC1198565400A92FBE /* loop_filter_normal.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3DA1198565400A92FBE /* loop_filter_normal.c */; };
180+
71FBD3E61198568800A92FBE /* intra4x4_pred_mbaff.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3DE1198568800A92FBE /* intra4x4_pred_mbaff.c */; };
181+
71FBD3E71198568800A92FBE /* intra4x4_pred_normal.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3DF1198568800A92FBE /* intra4x4_pred_normal.c */; };
182+
71FBD3E81198568800A92FBE /* intra8x8_pred_mbaff.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3E01198568800A92FBE /* intra8x8_pred_mbaff.c */; };
183+
71FBD3E91198568800A92FBE /* intra8x8_pred_normal.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3E11198568800A92FBE /* intra8x8_pred_normal.c */; };
184+
71FBD3EA1198568800A92FBE /* intra16x16_pred_mbaff.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3E21198568800A92FBE /* intra16x16_pred_mbaff.c */; };
185+
71FBD3EB1198568800A92FBE /* intra16x16_pred_normal.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3E31198568800A92FBE /* intra16x16_pred_normal.c */; };
186+
71FBD3EC1198568800A92FBE /* loop_filter_mbaff.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3E41198568800A92FBE /* loop_filter_mbaff.c */; };
187+
71FBD3ED1198568800A92FBE /* loop_filter_normal.c in Sources */ = {isa = PBXBuildFile; fileRef = 71FBD3E51198568800A92FBE /* loop_filter_normal.c */; };
178188
/* End PBXBuildFile section */
179189

180190
/* Begin PBXCopyFilesBuildPhase section */
@@ -546,6 +556,18 @@
546556
71C905260FE283C10095EA3A /* rd_intra_jm444.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rd_intra_jm444.c; path = lencod/src/rd_intra_jm444.c; sourceTree = "<group>"; };
547557
71C905270FE283C10095EA3A /* rd_intra_jm_low.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rd_intra_jm_low.c; path = lencod/src/rd_intra_jm_low.c; sourceTree = "<group>"; };
548558
71C905290FE283C10095EA3A /* transform8x8_H444.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = transform8x8_H444.c; path = lencod/src/transform8x8_H444.c; sourceTree = "<group>"; };
559+
71FBD3D81198562500A92FBE /* loop_filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = loop_filter.h; path = lencod/inc/loop_filter.h; sourceTree = "<group>"; };
560+
71FBD3D91198565400A92FBE /* loop_filter_mbaff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loop_filter_mbaff.c; path = lencod/src/loop_filter_mbaff.c; sourceTree = "<group>"; };
561+
71FBD3DA1198565400A92FBE /* loop_filter_normal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = loop_filter_normal.c; path = lencod/src/loop_filter_normal.c; sourceTree = "<group>"; };
562+
71FBD3DD1198566A00A92FBE /* loop_filter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = loop_filter.h; sourceTree = "<group>"; };
563+
71FBD3DE1198568800A92FBE /* intra4x4_pred_mbaff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = intra4x4_pred_mbaff.c; sourceTree = "<group>"; };
564+
71FBD3DF1198568800A92FBE /* intra4x4_pred_normal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = intra4x4_pred_normal.c; sourceTree = "<group>"; };
565+
71FBD3E01198568800A92FBE /* intra8x8_pred_mbaff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = intra8x8_pred_mbaff.c; sourceTree = "<group>"; };
566+
71FBD3E11198568800A92FBE /* intra8x8_pred_normal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = intra8x8_pred_normal.c; sourceTree = "<group>"; };
567+
71FBD3E21198568800A92FBE /* intra16x16_pred_mbaff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = intra16x16_pred_mbaff.c; sourceTree = "<group>"; };
568+
71FBD3E31198568800A92FBE /* intra16x16_pred_normal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = intra16x16_pred_normal.c; sourceTree = "<group>"; };
569+
71FBD3E41198568800A92FBE /* loop_filter_mbaff.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = loop_filter_mbaff.c; sourceTree = "<group>"; };
570+
71FBD3E51198568800A92FBE /* loop_filter_normal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = loop_filter_normal.c; sourceTree = "<group>"; };
549571
8DD76FB20486AB0100D96B5E /* lencod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = lencod; sourceTree = BUILT_PRODUCTS_DIR; };
550572
/* End PBXFileReference section */
551573

@@ -659,6 +681,7 @@
659681
43FA4A100D4EE91C001709F1 /* inc */ = {
660682
isa = PBXGroup;
661683
children = (
684+
71FBD3D81198562500A92FBE /* loop_filter.h */,
662685
710CC1CC113543C700349D61 /* errdo_dist_mhyp.h */,
663686
710CC1CD113543C700349D61 /* intra16x16.h */,
664687
710CC1CE113543C700349D61 /* lambda.h */,
@@ -752,6 +775,8 @@
752775
43FA4A110D4EE920001709F1 /* src */ = {
753776
isa = PBXGroup;
754777
children = (
778+
71FBD3D91198565400A92FBE /* loop_filter_mbaff.c */,
779+
71FBD3DA1198565400A92FBE /* loop_filter_normal.c */,
755780
710CC1D1113543E800349D61 /* errdo_dist_mhyp.c */,
756781
710CC1D2113543E800349D61 /* image_mp.c */,
757782
710CC1D3113543E800349D61 /* intra_chroma.c */,
@@ -937,6 +962,7 @@
937962
71C904B60FE283800095EA3A /* inc */ = {
938963
isa = PBXGroup;
939964
children = (
965+
71FBD3DD1198566A00A92FBE /* loop_filter.h */,
940966
710CC1C11135439300349D61 /* configfile.h */,
941967
710CC1C21135439300349D61 /* h264decoder.h */,
942968
710CC1C31135439300349D61 /* mbuffer_mvc.h */,
@@ -982,6 +1008,14 @@
9821008
71C904D80FE283800095EA3A /* src */ = {
9831009
isa = PBXGroup;
9841010
children = (
1011+
71FBD3DE1198568800A92FBE /* intra4x4_pred_mbaff.c */,
1012+
71FBD3DF1198568800A92FBE /* intra4x4_pred_normal.c */,
1013+
71FBD3E01198568800A92FBE /* intra8x8_pred_mbaff.c */,
1014+
71FBD3E11198568800A92FBE /* intra8x8_pred_normal.c */,
1015+
71FBD3E21198568800A92FBE /* intra16x16_pred_mbaff.c */,
1016+
71FBD3E31198568800A92FBE /* intra16x16_pred_normal.c */,
1017+
71FBD3E41198568800A92FBE /* loop_filter_mbaff.c */,
1018+
71FBD3E51198568800A92FBE /* loop_filter_normal.c */,
9851019
710CC1C4113543A600349D61 /* configfile.c */,
9861020
710CC1C5113543A600349D61 /* decoder_test.c */,
9871021
710CC1C6113543A600349D61 /* mbuffer_mvc.c */,
@@ -1193,6 +1227,14 @@
11931227
710CC1C9113543A600349D61 /* decoder_test.c in Sources */,
11941228
710CC1CA113543A600349D61 /* mbuffer_mvc.c in Sources */,
11951229
710CC1CB113543A600349D61 /* mc_direct.c in Sources */,
1230+
71FBD3E61198568800A92FBE /* intra4x4_pred_mbaff.c in Sources */,
1231+
71FBD3E71198568800A92FBE /* intra4x4_pred_normal.c in Sources */,
1232+
71FBD3E81198568800A92FBE /* intra8x8_pred_mbaff.c in Sources */,
1233+
71FBD3E91198568800A92FBE /* intra8x8_pred_normal.c in Sources */,
1234+
71FBD3EA1198568800A92FBE /* intra16x16_pred_mbaff.c in Sources */,
1235+
71FBD3EB1198568800A92FBE /* intra16x16_pred_normal.c in Sources */,
1236+
71FBD3EC1198568800A92FBE /* loop_filter_mbaff.c in Sources */,
1237+
71FBD3ED1198568800A92FBE /* loop_filter_normal.c in Sources */,
11961238
);
11971239
runOnlyForDeploymentPostprocessing = 0;
11981240
};
@@ -1315,6 +1357,8 @@
13151357
710CC1DE113543E800349D61 /* lln_mc_prediction.c in Sources */,
13161358
710CC1DF113543E800349D61 /* mode_decision_P8x8.c in Sources */,
13171359
710CC1E0113543E800349D61 /* mv_direct.c in Sources */,
1360+
71FBD3DB1198565400A92FBE /* loop_filter_mbaff.c in Sources */,
1361+
71FBD3DC1198565400A92FBE /* loop_filter_normal.c in Sources */,
13181362
);
13191363
runOnlyForDeploymentPostprocessing = 0;
13201364
};
@@ -1324,16 +1368,17 @@
13241368
1DEB928608733DD80010E9CD /* Debug */ = {
13251369
isa = XCBuildConfiguration;
13261370
buildSettings = {
1327-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
1328-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
1371+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
1372+
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
13291373
COPY_PHASE_STRIP = NO;
13301374
GCC_C_LANGUAGE_STANDARD = c99;
13311375
GCC_DYNAMIC_NO_PIC = NO;
13321376
GCC_ENABLE_FIX_AND_CONTINUE = YES;
13331377
GCC_MODEL_TUNING = G5;
13341378
GCC_OPTIMIZATION_LEVEL = 0;
13351379
INSTALL_PATH = "";
1336-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
1380+
LIBRARY_SEARCH_PATHS = "";
1381+
ONLY_ACTIVE_ARCH = NO;
13371382
PRODUCT_NAME = lencod;
13381383
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
13391384
USER_HEADER_SEARCH_PATHS = lencod/inc;
@@ -1344,13 +1389,13 @@
13441389
1DEB928708733DD80010E9CD /* Release */ = {
13451390
isa = XCBuildConfiguration;
13461391
buildSettings = {
1347-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
1348-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
1392+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
1393+
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
13491394
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
13501395
GCC_C_LANGUAGE_STANDARD = c99;
13511396
GCC_MODEL_TUNING = G5;
13521397
INSTALL_PATH = "";
1353-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
1398+
LIBRARY_SEARCH_PATHS = "";
13541399
PRODUCT_NAME = lencod;
13551400
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
13561401
USER_HEADER_SEARCH_PATHS = lencod/inc;
@@ -1360,6 +1405,7 @@
13601405
1DEB928A08733DD80010E9CD /* Debug */ = {
13611406
isa = XCBuildConfiguration;
13621407
buildSettings = {
1408+
ENABLE_OPENMP_SUPPORT = YES;
13631409
GCC_WARN_ABOUT_RETURN_TYPE = YES;
13641410
GCC_WARN_UNUSED_VARIABLE = YES;
13651411
PREBINDING = NO;
@@ -1374,6 +1420,7 @@
13741420
ppc,
13751421
i386,
13761422
);
1423+
ENABLE_OPENMP_SUPPORT = YES;
13771424
GCC_WARN_ABOUT_RETURN_TYPE = YES;
13781425
GCC_WARN_UNUSED_VARIABLE = YES;
13791426
PREBINDING = NO;
@@ -1393,7 +1440,6 @@
13931440
GCC_MODEL_TUNING = G5;
13941441
GCC_OPTIMIZATION_LEVEL = 0;
13951442
INSTALL_PATH = "";
1396-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
13971443
PRODUCT_NAME = rtpdump;
13981444
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
13991445
USER_HEADER_SEARCH_PATHS = "";
@@ -1410,7 +1456,6 @@
14101456
GCC_C_LANGUAGE_STANDARD = c99;
14111457
GCC_MODEL_TUNING = G5;
14121458
INSTALL_PATH = "";
1413-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
14141459
PRODUCT_NAME = rtpdump;
14151460
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
14161461
USER_HEADER_SEARCH_PATHS = "";
@@ -1429,7 +1474,6 @@
14291474
GCC_MODEL_TUNING = G5;
14301475
GCC_OPTIMIZATION_LEVEL = 0;
14311476
INSTALL_PATH = "";
1432-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
14331477
PRODUCT_NAME = rtp_loss;
14341478
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
14351479
USER_HEADER_SEARCH_PATHS = "";
@@ -1446,7 +1490,6 @@
14461490
GCC_C_LANGUAGE_STANDARD = c99;
14471491
GCC_MODEL_TUNING = G5;
14481492
INSTALL_PATH = "";
1449-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
14501493
PRODUCT_NAME = rtp_loss;
14511494
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
14521495
USER_HEADER_SEARCH_PATHS = "";
@@ -1456,17 +1499,16 @@
14561499
43FA4B150D4EECBB001709F1 /* Debug */ = {
14571500
isa = XCBuildConfiguration;
14581501
buildSettings = {
1459-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
1460-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
1502+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
1503+
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
14611504
COPY_PHASE_STRIP = NO;
14621505
GCC_C_LANGUAGE_STANDARD = c99;
14631506
GCC_DYNAMIC_NO_PIC = NO;
14641507
GCC_ENABLE_FIX_AND_CONTINUE = YES;
14651508
GCC_MODEL_TUNING = G5;
14661509
GCC_OPTIMIZATION_LEVEL = 0;
14671510
INSTALL_PATH = "";
1468-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
1469-
MACOSX_DEPLOYMENT_TARGET = 10.4;
1511+
LIBRARY_SEARCH_PATHS = "";
14701512
PRODUCT_NAME = ldecod;
14711513
SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
14721514
USER_HEADER_SEARCH_PATHS = ldecod/inc;
@@ -1477,14 +1519,13 @@
14771519
43FA4B160D4EECBB001709F1 /* Release */ = {
14781520
isa = XCBuildConfiguration;
14791521
buildSettings = {
1480-
ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
1481-
ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
1522+
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
1523+
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
14821524
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
14831525
GCC_C_LANGUAGE_STANDARD = c99;
14841526
GCC_MODEL_TUNING = G5;
14851527
INSTALL_PATH = "";
1486-
LIBRARY_SEARCH_PATHS = /Applications/MATLAB_R2007b/bin/maci/;
1487-
MACOSX_DEPLOYMENT_TARGET = 10.4;
1528+
LIBRARY_SEARCH_PATHS = "";
14881529
PREBINDING = NO;
14891530
PRELINK_LIBS = "";
14901531
PRODUCT_NAME = ldecod;

‎Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@ SUBDIRS := lencod ldecod rtpdump rtp_loss
1111
DBG?= 0
1212
### enforce 32-bit build : 1=yes, 0=no
1313
M32?= 0
14-
### include M32 optimization : 1=yes, 0=no
14+
### static link : 1=yes, 0=no
1515
STC?= 0
16+
### OPENMP support : 1=yes, 0=no
17+
OPENMP?= 1
1618

1719
export DBG
1820
export STC
1921
export M32
22+
export OPENMP
2023

2124
.PHONY: default all distclean clean tags depend $(SUBDIRS)
2225

0 commit comments

Comments
 (0)