264_enc: apply encode base class for AVC SVC-T #7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
As reading whole buffer, m_next should equal to m_end after finishing the operation. Signed-off-by: wudping <[email protected]>
Modify the NALREADER_TEST ReadAsUnits and ReadAsWhole to make them compatible with new NalReader behaviors. Signed-off-by: wudping <[email protected]>
When the width or hight overflows the maxmum value of int, guessResolution() returns false. Signed-off-by: wudping <[email protected]>
xuguangxin
reviewed
Jun 23, 2017
encoder/vaapiencoder_base.cpp
Outdated
| rateControl->bits_per_second = ((temproalID == 0) ? | ||
| m_videoParamCommon.rcParams.bitRate : m_videoParamCommon.temporalLayers.bitRate[temproalID-1]); | ||
| rateControl->bits_per_second = | ||
| (temproalID + 1) == m_videoParamCommon.temporalLayers.numLayers ? bitRate() : m_videoParamCommon.temporalLayers.bitRate[temproalID]; |
There was a problem hiding this comment.
better change it to temproalID == (m_videoParamCommon.temporalLayers.numLayers - 1) and add some comments
interface/VideoEncoderDefs.h
Outdated
| //layer 1 framterate is frameRate[0] | ||
| //layer 1 birate is bitRate[0] | ||
| //framerate of the highest layer is VideoParamsCommon.frameRate | ||
| //bitrate of the highest layer is VideoParamsCommon.rcParams.bitRate | ||
| uint8_t numLayers; | ||
| VideoFrameRate frameRate[32]; |
There was a problem hiding this comment.
since we do not need user set this any more, could we move this to VaapiEncBase?
encoder/vaapiencoder_base.cpp
Outdated
| @@ -514,13 +509,12 @@ bool VaapiEncoderBase::ensureMiscParams (VaapiEncPicture* picture) | |||
| if (mode == RATE_CONTROL_CBR || | |||
| mode == RATE_CONTROL_VBR) { | |||
| //+1 for layer 0 | |||
| uint32_t layers = m_videoParamCommon.temporalLayers.numLayers + 1; | |||
| uint32_t layers = m_videoParamCommon.temporalLayers.numLayers; | |||
encoder/vaapiencoder_base.cpp
Outdated
| rate = &m_videoParamCommon.temporalLayers.frameRate[temproalID-1]; | ||
| } | ||
| frameRate->framerate = (rate->frameRateNum<<16) | rate->frameRateDenom; | ||
| frameRate->framerate = m_videoParamCommon.temporalLayers.frameRate[temproalID].frameRateNum | (m_videoParamCommon.temporalLayers.frameRate[temproalID].frameRateDenom << 16); |
There was a problem hiding this comment.
Do we need set highest layer's frame rate?
wudping
force-pushed
the
gx_vp8svct
branch
3 times, most recently
from
f277137
to
2463b3b
Compare
xuguangxin
requested changes
Jun 26, 2017
interface/VideoEncoderDefs.h
Outdated
| @@ -91,6 +91,7 @@ typedef enum { | |||
| #define VIDEO_PARAMS_QUALITYLEVEL_NONE 0 | |||
| #define VIDEO_PARAMS_QUALITYLEVEL_MIN 1 | |||
| #define VIDEO_PARAMS_QUALITYLEVEL_MAX 7 | |||
| #define SVCT_RATE_BUFFER_LENGTH 32 | |||
There was a problem hiding this comment.
Please change to TEMPORAL_LAYER_LENGTH_MAX
encoder/vaapiencoder_vp8.cpp
Outdated
| @@ -474,7 +474,7 @@ bool VaapiEncoderVP8::fill(VAEncPictureParameterBufferVP8* picParam, const Pictu | |||
| } | |||
|
|
|||
| picParam->coded_buf = picture->getCodedBufferID(); | |||
| picParam->ref_flags.bits.temporal_id = picture->m_temporalID; | |||
| //picParam->ref_flags.bits.temporal_id = picture->m_temporalID; | |||
encoder/vaapiencoder_vp8.cpp
Outdated
| Vp8EncoderSvct(const VideoParamsCommon& common); | ||
|
|
||
| Vp8EncoderSvct(uint8_t layerNum) | ||
| : m_layerNum(layerNum % (VP8_MAX_TEMPORAL_LAYER_NUM + 1)) |
There was a problem hiding this comment.
remove +1 here, then you do not need -1 at getTemporalLayer
There was a problem hiding this comment.
If so, the m_layerNum will not equal to the real layer number.
wudping
force-pushed
the
gx_vp8svct
branch
3 times, most recently
from
1efcabf
to
a87b2b4
Compare
we will use this for h264 and vp8 temporal encoder, hope it can apply to all svct encoders.
so we can remove duplicate code in h264 and vp8 svct encoder
all fields move to VideoTemporalLayers
this is preparation for vp8 svct encoder Signed-off-by: wudping <[email protected]> Signed-off-by: Xu Guangxin <[email protected]>
user can use this field to select output dest. frames in diffrent layer may put in diffrent rtp packet Signed-off-by: wudping <[email protected]> Signed-off-by: Xu Guangxin <[email protected]>
Signed-off-by: wudping <[email protected]> Signed-off-by: Xu Guangxin <[email protected]>
the getLayerIds logical is complicate, we can revisit it later Signed-off-by: wudping <[email protected]> Signed-off-by: Xu Guangxin <[email protected]>
xuguangxin
requested changes
Jun 28, 2017
| typedef struct VideoTemproalLayers { | ||
| //bitrate of the highest layer is VideoParamsCommon.rcParams.bitRate | ||
| uint8_t numLayersMinus1; | ||
| uint32_t bitRate[TEMPORAL_LAYER_LENGTH_MAX]; |
There was a problem hiding this comment.
Please change this to NUM_TEMPLAYER_MAX.
add add following comment
//layer 0 bitrate is bitRate[0]
//...
//layer highest birate is VideoParamsCommon.rcParams.bitRate
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Calling base class's functions to set framerate and bitrate for
AVC SVC-T encoding.
Signed-off-by: wudping [email protected]