@@ -400,18 +400,19 @@ vp8enc_upload_thread_function(void *data)
400
400
void vp8enc_init_QMatrix (VAQMatrixBufferVP8 * qMatrix )
401
401
{
402
402
// 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 ++ ) {
404
405
qMatrix -> quantization_index [i ] = settings .quantization_parameter ;
405
406
}
406
407
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 ++ ) {
408
409
qMatrix -> quantization_index_delta [i ] = 0 ;
409
410
}
410
-
411
411
}
412
412
413
413
void vp8enc_init_SequenceParameterBuffer (VAEncSequenceParameterBufferVP8 * seqParam )
414
414
{
415
+ size_t i ;
415
416
416
417
memset (seqParam , 0 , sizeof (VAEncSequenceParameterBufferVP8 ));
417
418
@@ -426,12 +427,13 @@ void vp8enc_init_SequenceParameterBuffer(VAEncSequenceParameterBufferVP8* seqPar
426
427
seqParam -> intra_period = settings .intra_period ;
427
428
seqParam -> error_resilient = settings .error_resilient ;
428
429
429
- for (size_t i = 0 ; i < N_ELEMENTS (seqParam -> reference_frames ); i ++ )
430
+ for (i = 0 ; i < N_ELEMENTS (seqParam -> reference_frames ); i ++ )
430
431
seqParam -> reference_frames [i ] = VA_INVALID_ID ;
431
432
}
432
433
433
434
void vp8enc_init_PictureParameterBuffer (VAEncPictureParameterBufferVP8 * picParam )
434
435
{
436
+ size_t i ;
435
437
memset (picParam , 0 , sizeof (VAEncPictureParameterBufferVP8 ));
436
438
437
439
picParam -> ref_last_frame = VA_INVALID_SURFACE ;
@@ -441,7 +443,7 @@ void vp8enc_init_PictureParameterBuffer(VAEncPictureParameterBufferVP8 *picParam
441
443
/* always show it */
442
444
picParam -> pic_flags .bits .show_frame = 1 ;
443
445
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 ++ ) {
445
447
picParam -> loop_filter_level [i ] = settings .loop_filter_level ;
446
448
}
447
449
@@ -578,8 +580,9 @@ void vp8enc_update_picture_parameter(int frame_type, int current_frame)
578
580
VASurfaceID vp8enc_get_unused_surface ()
579
581
{
580
582
VASurfaceID current_surface ;
583
+ size_t i = 0 ;
581
584
582
- for (size_t i = 0 ; i < NUM_REF_SURFACES ; i ++ ) {
585
+ for (i = 0 ; i < NUM_REF_SURFACES ; i ++ ) {
583
586
current_surface = vaapi_context .surfaces [i ];
584
587
585
588
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()
676
679
{
677
680
VAEntrypoint entrypoints [5 ];
678
681
int num_entrypoints ;
682
+ int i ;
679
683
bool entrypoint_found ;
680
684
VAConfigAttrib conf_attrib [2 ];
681
685
VASurfaceAttrib surface_attrib ;
@@ -690,7 +694,7 @@ void vp8enc_create_EncoderPipe()
690
694
& num_entrypoints );
691
695
692
696
entrypoint_found = true;
693
- for (int i = 0 ; i < num_entrypoints ;i ++ )
697
+ for (i = 0 ; i < num_entrypoints ;i ++ )
694
698
{
695
699
if (entrypoints [i ] == settings .vaapi_entry_point )
696
700
entrypoint_found = true;
@@ -773,6 +777,7 @@ void vp8enc_destory_EncoderPipe()
773
777
774
778
void vp8enc_init_VaapiContext ()
775
779
{
780
+ size_t i ;
776
781
vaapi_context .profile = VAProfileVP8Version0_3 ;
777
782
778
783
vp8enc_init_SequenceParameterBuffer (& vaapi_context .seq_param );
@@ -784,7 +789,7 @@ void vp8enc_init_VaapiContext()
784
789
vaapi_context .rate_control_param .header .type = VAEncMiscParameterTypeRateControl ;
785
790
vp8enc_init_MiscParameterBuffers (& vaapi_context .hrd_param .data , & vaapi_context .frame_rate_param .data ,& vaapi_context .rate_control_param .data );
786
791
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 ++ )
788
793
vaapi_context .va_buffers [i ] = VA_INVALID_ID ;
789
794
vaapi_context .num_va_buffers = 0 ;
790
795
@@ -956,9 +961,10 @@ vp8enc_render_picture()
956
961
957
962
void vp8enc_destroy_buffers ()
958
963
{
964
+ int i ;
959
965
VAStatus va_status ;
960
966
961
- for (int i = 0 ; i < vaapi_context .num_va_buffers ; i ++ ) {
967
+ for (i = 0 ; i < vaapi_context .num_va_buffers ; i ++ ) {
962
968
if (vaapi_context .va_buffers [i ] != VA_INVALID_ID ) {
963
969
va_status = vaDestroyBuffer (vaapi_context .display , vaapi_context .va_buffers [i ]);
964
970
CHECK_VASTATUS (va_status ,"vaDestroyBuffer" );
0 commit comments