Skip to content

Commit 6307b68

Browse files
KevXinfengZhang
Kev
authored andcommitted
KJSL fix up C99 issue
1 parent 809b186 commit 6307b68

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

encode/vp8enc.c

+15-9
Original file line numberDiff line numberDiff line change
@@ -400,18 +400,19 @@ vp8enc_upload_thread_function(void *data)
400400
void vp8enc_init_QMatrix(VAQMatrixBufferVP8 *qMatrix)
401401
{
402402
// When segmentation is disabled, only quantization_index[0] will be used
403-
for (size_t i = 0; i < N_ELEMENTS(qMatrix->quantization_index); i++) {
403+
size_t i;
404+
for (i = 0; i < N_ELEMENTS(qMatrix->quantization_index); i++) {
404405
qMatrix->quantization_index[i] = settings.quantization_parameter;
405406
}
406407

407-
for (size_t i = 0; i < N_ELEMENTS(qMatrix->quantization_index_delta); i++) {
408+
for (i = 0; i < N_ELEMENTS(qMatrix->quantization_index_delta); i++) {
408409
qMatrix->quantization_index_delta[i] = 0;
409410
}
410-
411411
}
412412

413413
void vp8enc_init_SequenceParameterBuffer(VAEncSequenceParameterBufferVP8* seqParam)
414414
{
415+
size_t i;
415416

416417
memset(seqParam, 0, sizeof(VAEncSequenceParameterBufferVP8));
417418

@@ -426,12 +427,13 @@ void vp8enc_init_SequenceParameterBuffer(VAEncSequenceParameterBufferVP8* seqPar
426427
seqParam->intra_period = settings.intra_period;
427428
seqParam->error_resilient = settings.error_resilient;
428429

429-
for (size_t i = 0; i < N_ELEMENTS(seqParam->reference_frames); i++)
430+
for (i = 0; i < N_ELEMENTS(seqParam->reference_frames); i++)
430431
seqParam->reference_frames[i] = VA_INVALID_ID;
431432
}
432433

433434
void vp8enc_init_PictureParameterBuffer(VAEncPictureParameterBufferVP8 *picParam)
434435
{
436+
size_t i;
435437
memset(picParam, 0, sizeof(VAEncPictureParameterBufferVP8));
436438

437439
picParam->ref_last_frame = VA_INVALID_SURFACE;
@@ -441,7 +443,7 @@ void vp8enc_init_PictureParameterBuffer(VAEncPictureParameterBufferVP8 *picParam
441443
/* always show it */
442444
picParam->pic_flags.bits.show_frame = 1;
443445

444-
for (size_t i = 0; i < N_ELEMENTS(picParam->loop_filter_level); i++) {
446+
for (i = 0; i < N_ELEMENTS(picParam->loop_filter_level); i++) {
445447
picParam->loop_filter_level[i] = settings.loop_filter_level;
446448
}
447449

@@ -578,8 +580,9 @@ void vp8enc_update_picture_parameter(int frame_type, int current_frame)
578580
VASurfaceID vp8enc_get_unused_surface()
579581
{
580582
VASurfaceID current_surface;
583+
size_t i = 0;
581584

582-
for (size_t i = 0; i < NUM_REF_SURFACES; i++) {
585+
for (i = 0; i < NUM_REF_SURFACES; i++) {
583586
current_surface = vaapi_context.surfaces[i];
584587

585588
if(current_surface != vaapi_context.last_ref_surface && current_surface != vaapi_context.golden_ref_surface && current_surface != vaapi_context.alt_ref_surface)
@@ -676,6 +679,7 @@ void vp8enc_create_EncoderPipe()
676679
{
677680
VAEntrypoint entrypoints[5];
678681
int num_entrypoints;
682+
int i;
679683
bool entrypoint_found;
680684
VAConfigAttrib conf_attrib[2];
681685
VASurfaceAttrib surface_attrib;
@@ -690,7 +694,7 @@ void vp8enc_create_EncoderPipe()
690694
&num_entrypoints);
691695

692696
entrypoint_found = true;
693-
for(int i = 0; i < num_entrypoints;i++)
697+
for(i = 0; i < num_entrypoints;i++)
694698
{
695699
if (entrypoints[i] == settings.vaapi_entry_point)
696700
entrypoint_found = true;
@@ -773,6 +777,7 @@ void vp8enc_destory_EncoderPipe()
773777

774778
void vp8enc_init_VaapiContext()
775779
{
780+
size_t i;
776781
vaapi_context.profile = VAProfileVP8Version0_3;
777782

778783
vp8enc_init_SequenceParameterBuffer(&vaapi_context.seq_param);
@@ -784,7 +789,7 @@ void vp8enc_init_VaapiContext()
784789
vaapi_context.rate_control_param.header.type = VAEncMiscParameterTypeRateControl;
785790
vp8enc_init_MiscParameterBuffers(&vaapi_context.hrd_param.data, &vaapi_context.frame_rate_param.data,&vaapi_context.rate_control_param.data);
786791

787-
for(size_t i = 0; i < N_ELEMENTS(vaapi_context.va_buffers);i++)
792+
for(i = 0; i < N_ELEMENTS(vaapi_context.va_buffers);i++)
788793
vaapi_context.va_buffers[i] = VA_INVALID_ID;
789794
vaapi_context.num_va_buffers = 0;
790795

@@ -956,9 +961,10 @@ vp8enc_render_picture()
956961

957962
void vp8enc_destroy_buffers()
958963
{
964+
int i;
959965
VAStatus va_status;
960966

961-
for(int i = 0; i < vaapi_context.num_va_buffers; i++) {
967+
for(i = 0; i < vaapi_context.num_va_buffers; i++) {
962968
if (vaapi_context.va_buffers[i] != VA_INVALID_ID) {
963969
va_status = vaDestroyBuffer(vaapi_context.display, vaapi_context.va_buffers[i]);
964970
CHECK_VASTATUS(va_status,"vaDestroyBuffer");

0 commit comments

Comments
 (0)