shithub: openh264

Download patch

ref: 014f4d8250a607f6afa108d655aaa6b8e0cf9255
parent: a93dd7ca4206e4f13d75f0d352a8a1abb225eab9
author: Martin Storsjö <[email protected]>
date: Fri Mar 7 07:13:41 EST 2014

Merge the slice mode comments with the enum

--- a/codec/api/svc/codec_app_def.h
+++ b/codec/api/svc/codec_app_def.h
@@ -154,21 +154,15 @@
   } 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_SINGLE_SLICE         = 0, //	| SliceNum==1
+  SM_FIXEDSLCNUM_SLICE    = 1, //	| according to SliceNum		| Enabled dynamic slicing for multi-thread
+  SM_RASTER_SLICE         = 2, //	| according to SlicesAssign	| Need input of MB numbers each slice. In addition, if other constraint in SSliceArgument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
+  SM_ROWMB_SLICE          = 3, //	| according to PictureMBHeight	| Typical of single row of mbs each slice?+ slice size constraint which including re-encoding
+  SM_DYN_SLICE            = 4, //	| according to SliceSize	| Dynamic slicing (have no idea about slice_nums until encoding current frame)
   SM_RESERVED             = 5
 } SliceModeEnum;
 
 typedef struct {
-
-  //# 0 SM_SINGLE_SLICE			| SliceNum==1
-  //# 1 SM_FIXEDSLCNUM_SLICE	| according to SliceNum			| Enabled dynamic slicing for multi-thread
-  //# 2 SM_RASTER_SLICE			| according to SlicesAssign		| Need input of MB numbers each slice. In addition, if other constraint in SSliceArgument is presented, need to follow the constraints. Typically if MB num and slice size are both constrained, re-encoding may be involved.
-  //# 3 SM_ROWMB_SLICE			| according to PictureMBHeight	|  Typical of single row of mbs each slice?+ slice size constraint which including re-encoding
-  //# 4 SM_DYN_SLICE			| according to SliceSize		| Dynamic slicing (have no idea about slice_nums until encoding current frame)
   unsigned int uiSliceMode; //by default, uiSliceMode will be 0
   SSliceArgument sSliceArgument;
 } SSliceConfig;