ref: 84a7669b637bac097519031fb1da11163be38076
parent: 4b6f037020d17caa6461b8ee583d21c3e84d9991
parent: 4d6b1c23fee316e70b9c03a1187cd219daeafd0a
author: HaiboZhu <haibozhu@cisco.com>
date: Wed Jun 15 06:05:15 EDT 2016
Merge pull request #2464 from bumblebritches57/MVC MVC aka Stereoscopic 3D support
--- a/codec/common/inc/wels_common_defs.h
+++ b/codec/common/inc/wels_common_defs.h
@@ -97,12 +97,12 @@
NAL_UNIT_SPS_EXT = 13,
NAL_UNIT_PREFIX = 14,
NAL_UNIT_SUBSET_SPS = 15,
- NAL_UNIT_RESV_16 = 16,
+ NAL_UNIT_DEPTH_PARAM = 16, // NAL_UNIT_RESV_16
NAL_UNIT_RESV_17 = 17,
NAL_UNIT_RESV_18 = 18,
NAL_UNIT_AUX_CODED_SLICE = 19,
NAL_UNIT_CODED_SLICE_EXT = 20,
- NAL_UNIT_RESV_21 = 21,
+ NAL_UNIT_MVC_SLICE_EXT = 21, // NAL_UNIT_RESV_21
NAL_UNIT_RESV_22 = 22,
NAL_UNIT_RESV_23 = 23,
NAL_UNIT_UNSPEC_24 = 24,
--- a/codec/common/src/common_tables.cpp
+++ b/codec/common/src/common_tables.cpp
@@ -165,12 +165,12 @@
{ NON_VCL, NON_VCL }, // 13: NAL_UNIT_SPS_EXT
{ NON_VCL, NON_VCL }, // 14: NAL_UNIT_PREFIX, NEED associate succeeded NAL to make a VCL
{ NON_VCL, NON_VCL }, // 15: NAL_UNIT_SUBSET_SPS
- { NON_VCL, NON_VCL }, // 16: NAL_UNIT_RESV_16
+ { NON_VCL, NON_VCL }, // 16: NAL_UNIT_DEPTH_PARAM
{ NON_VCL, NON_VCL }, // 17: NAL_UNIT_RESV_17
{ NON_VCL, NON_VCL }, // 18: NAL_UNIT_RESV_18
{ NON_VCL, NON_VCL }, // 19: NAL_UNIT_AUX_CODED_SLICE
{ NON_VCL, VCL }, // 20: NAL_UNIT_CODED_SLICE_EXT
- { NON_VCL, NON_VCL }, // 21: NAL_UNIT_RESV_21
+ { NON_VCL, NON_VCL }, // 21: NAL_UNIT_MVC_SLICE_EXT
{ NON_VCL, NON_VCL }, // 22: NAL_UNIT_RESV_22
{ NON_VCL, NON_VCL }, // 23: NAL_UNIT_RESV_23
{ NON_VCL, NON_VCL }, // 24: NAL_UNIT_UNSPEC_24