hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-30 12:44:07 +00:00
Code Issues Actions Projects Releases Wiki Activity

Fix frame counter and stats

Browse source
This commit is contained in:
Laurent Fasnacht 2014-06-16 13:21:52 +02:00
parent 84d34c2655
commit ef9c2258e9
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/encmain.c
View file

@ -321,7 +321,7 @@ int main(int argc, char *argv[])
encoding_start_cpu_time = clock(); encoding_start_cpu_time = clock();
// Start coding cycle while data on input and not on the last frame // Start coding cycle while data on input and not on the last frame
while(!cfg->frames || encoder_states[current_encoder_state].global->frame < cfg->frames) { while(!cfg->frames || encoder_states[current_encoder_state].global->frame < cfg->frames - 1) {
// Skip '--seek' frames before input. // Skip '--seek' frames before input.
// This block can be moved outside this while loop when there is a // This block can be moved outside this while loop when there is a
// mechanism to skip the while loop on error. // mechanism to skip the while loop on error.
@ -359,16 +359,15 @@ int main(int argc, char *argv[])
if (!read_one_frame(input, &encoder_states[current_encoder_state])) { if (!read_one_frame(input, &encoder_states[current_encoder_state])) {
if (!feof(input)) if (!feof(input))
fprintf(stderr, "Failed to read a frame %d\n", encoder_states[current_encoder_state].global->frame); fprintf(stderr, "Failed to read a frame %d\n", encoder_states[current_encoder_state].global->frame);
//Ignore this frame, which is not valid...
encoder_states[current_encoder_state].stats_done = 1;
break; break;
} }
// The actual coding happens here, after this function we have a coded frame // The actual coding happens here, after this function we have a coded frame
encode_one_frame(&encoder_states[current_encoder_state]); encode_one_frame(&encoder_states[current_encoder_state]);
//Stop otherwise we will end up doing too much work
if (encoder_states[current_encoder_state].global->frame >= cfg->frames - 1) {
break;
}
//Switch to the next encoder //Switch to the next encoder
current_encoder_state = (current_encoder_state + 1) % (encoder.owf + 1); current_encoder_state = (current_encoder_state + 1) % (encoder.owf + 1);
} }