generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #450 from mstorsjo/publish-slice-mode-enum

Browse Source 
Move the slice mode enum to the public API
This commit is contained in:
Ethan Hugg 2014-03-07 09:17:03 -08:00
commit 7632510209
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
codec/api/svc/codec_app_def.h
View File

@ -153,13 +153,16 @@ typedef struct {
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 struct {
typedef enum {
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;
//# 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)
typedef struct {
unsigned int uiSliceMode; //by default, uiSliceMode will be 0
SSliceArgument sSliceArgument;
} SSliceConfig;

8
codec/encoder/core/inc/svc_enc_slice_segment.h
View File

@ -51,14 +51,6 @@ namespace WelsSVCEnc {
* \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:

2
test/BaseEncoderTest.cpp
View File

@ -33,7 +33,7 @@ static int InitWithParam(ISVCEncoder* encoder, int width,
param.sSpatialLayers[0].fFrameRate = frameRate;
param.sSpatialLayers[0].iSpatialBitrate = param.iTargetBitrate;
param.sSpatialLayers[0].sSliceCfg.uiSliceMode = 3; // One slice per MB row
param.sSpatialLayers[0].sSliceCfg.uiSliceMode = SM_ROWMB_SLICE;
return encoder->InitializeExt(&param);
}