ref: 5f1c2078453ff25aca0124a6503965314176beb6
parent: 94a0eaf1e77fa80b5aa2c10f46ef10d86af758e4
author: Martin Storsjö <[email protected]>
date: Fri Mar 7 07:09:17 EST 2014
Move the slice mode enum to the public header This simplifies setting the slice mode in the public API.
--- a/codec/api/svc/codec_app_def.h
+++ b/codec/api/svc/codec_app_def.h
@@ -153,6 +153,15 @@
unsigned int uiSliceSizeConstraint;
} SSliceArgument;//not all the elements in this argument will be used, how it will be used depends on uiSliceMode; see below
+typedef enum {+ SM_SINGLE_SLICE = 0,
+ SM_FIXEDSLCNUM_SLICE = 1,
+ SM_RASTER_SLICE = 2,
+ SM_ROWMB_SLICE = 3,
+ SM_DYN_SLICE = 4,
+ SM_RESERVED = 5
+} SliceModeEnum;
+
typedef struct {//# 0 SM_SINGLE_SLICE | SliceNum==1
--- a/codec/encoder/core/inc/svc_enc_slice_segment.h
+++ b/codec/encoder/core/inc/svc_enc_slice_segment.h
@@ -51,14 +51,6 @@
* \brief SSlice mode
*/
typedef uint16_t SliceMode;
-typedef enum {-SM_SINGLE_SLICE = 0,
-SM_FIXEDSLCNUM_SLICE = 1,
-SM_RASTER_SLICE = 2,
-SM_ROWMB_SLICE = 3,
-SM_DYN_SLICE = 4,
-SM_RESERVED = 5
-} SliceModeEnum;
// NOTE: