fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-26 03:30:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vl: add interface for H264 B-frame encoding

Browse source 
Signed-off-by: Christian König <christian.koenig@amd.com>
This commit is contained in:
Christian König 2014-04-04 14:22:16 +02:00
parent ee4439c562
commit d7d41ce133
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/radeon/radeon_vce_40_2_2.c
View file

@ -156,8 +156,8 @@ static void pic_control(struct rvce_encoder *enc)
RVCE_CS(0x00000040); // encConstraintSetFlags
RVCE_CS(0x00000000); // encBPicPattern
RVCE_CS(0x00000000); // weightPredModeBPicture
RVCE_CS(0x00000001); // encNumberOfReferenceFrames
RVCE_CS(0x00000001); // encMaxNumRefFrames
RVCE_CS(MIN2(enc->base.max_references, 2)); // encNumberOfReferenceFrames
RVCE_CS(enc->base.max_references + 1); // encMaxNumRefFrames
RVCE_CS(0x00000000); // encNumDefaultActiveRefL0
RVCE_CS(0x00000000); // encNumDefaultActiveRefL1
RVCE_CS(0x00000000); // encSliceMode
@ -297,8 +297,9 @@ static void encode(struct rvce_encoder *enc)
RVCE_CS(0xffffffff); // chromaOffset
}
else if(enc->pic.picture_type == PIPE_H264_ENC_PICTURE_TYPE_P) {
frame_offset(enc, enc->pic.frame_num - 1, &luma_offset, &chroma_offset);
frame_offset(enc, enc->pic.ref_idx_l0, &luma_offset, &chroma_offset);
RVCE_CS(0x00000000); // encPicType
// TODO: Stores these in the CPB backtrack
RVCE_CS(enc->pic.frame_num - 1); // frameNumber
RVCE_CS(enc->pic.frame_num - 1); // pictureOrderCount
RVCE_CS(luma_offset); // lumaOffset
@ -322,8 +323,8 @@ static void encode(struct rvce_encoder *enc)
RVCE_CS(0x00000000); // encReferenceRefBasePictureLumaOffset
RVCE_CS(0x00000000); // encReferenceRefBasePictureChromaOffset
RVCE_CS(0x00000000); // pictureCount
RVCE_CS(0x00000000); // frameNumber
RVCE_CS(0x00000000); // pictureOrderCount
RVCE_CS(enc->pic.frame_num); // frameNumber
RVCE_CS(enc->pic.pic_order_cnt); // pictureOrderCount
RVCE_CS(0x00000000); // numIPicRemainInRCGOP
RVCE_CS(0x00000000); // numPPicRemainInRCGOP
RVCE_CS(0x00000000); // numBPicRemainInRCGOP

3
src/gallium/include/pipe/p_video_state.h
View file

@ -368,6 +368,9 @@ struct pipe_h264_enc_picture_desc
enum pipe_h264_enc_picture_type picture_type;
unsigned frame_num;
unsigned pic_order_cnt;
unsigned ref_idx_l0;
unsigned ref_idx_l1;
};
#ifdef __cplusplus

8
src/gallium/state_trackers/omx/vid_enc.c
View file

@ -769,11 +769,17 @@ static void enc_ControlPicture(omx_base_PortType *port,
if (!(priv->frame_num % OMX_VID_ENC_IDR_PERIOD_DEFAULT) || priv->force_pic_type.IntraRefreshVOP) {
picture->picture_type = PIPE_H264_ENC_PICTURE_TYPE_IDR;
picture->ref_idx_l0 = 0;
picture->ref_idx_l1 = 0;
priv->frame_num = 0;
} else
} else {
picture->picture_type = PIPE_H264_ENC_PICTURE_TYPE_P;
picture->ref_idx_l0 = priv->frame_num - 1;
picture->ref_idx_l1 = 0;
}
picture->frame_num = priv->frame_num++;
picture->pic_order_cnt = picture->frame_num;
priv->force_pic_type.IntraRefreshVOP = OMX_FALSE;
}