virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

test/api-seek: clean up properly on failure

Browse Source 
Also propagate better error values.

Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-12 10:36:44 -03:00
parent 88deeb3eba
commit bdd07d7796
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/api/api-seek-test.c
View File

@ -197,19 +197,22 @@ static int seek_test(const char *input_filename, const char *start, const char *
result = avformat_find_stream_info(fmt_ctx, NULL); result = avformat_find_stream_info(fmt_ctx, NULL);
if (result < 0) { if (result < 0) {
av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n"); av_log(NULL, AV_LOG_ERROR, "Can't get stream info\n");
return result; goto end;
} }
start_ts = read_seek_range(start); start_ts = read_seek_range(start);
end_ts = read_seek_range(end); end_ts = read_seek_range(end);
if ((start_ts < 0) || (end_ts < 0)) if ((start_ts < 0) || (end_ts < 0)) {
return -1; result = -1;
goto end;
}
//TODO: add ability to work with audio format //TODO: add ability to work with audio format
video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0); video_stream = av_find_best_stream(fmt_ctx, AVMEDIA_TYPE_VIDEO, -1, -1, NULL, 0);
if (video_stream < 0) { if (video_stream < 0) {
av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n"); av_log(NULL, AV_LOG_ERROR, "Can't find video stream in input file\n");
return -1; result = video_stream;
goto end;
} }
origin_par = fmt_ctx->streams[video_stream]->codecpar; origin_par = fmt_ctx->streams[video_stream]->codecpar;
@ -217,52 +220,56 @@ static int seek_test(const char *input_filename, const char *start, const char *
codec = avcodec_find_decoder(origin_par->codec_id); codec = avcodec_find_decoder(origin_par->codec_id);
if (!codec) { if (!codec) {
av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n"); av_log(NULL, AV_LOG_ERROR, "Can't find decoder\n");
return -1; result = AVERROR_DECODER_NOT_FOUND;
goto end;
} }
ctx = avcodec_alloc_context3(codec); ctx = avcodec_alloc_context3(codec);
if (!ctx) { if (!ctx) {
av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n"); av_log(NULL, AV_LOG_ERROR, "Can't allocate decoder context\n");
return AVERROR(ENOMEM); result = AVERROR(ENOMEM);
goto end;
} }
result = avcodec_parameters_to_context(ctx, origin_par); result = avcodec_parameters_to_context(ctx, origin_par);
if (result) { if (result) {
av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n"); av_log(NULL, AV_LOG_ERROR, "Can't copy decoder context\n");
return result; goto end;
} }
result = avcodec_open2(ctx, codec, NULL); result = avcodec_open2(ctx, codec, NULL);
if (result < 0) { if (result < 0) {
av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n"); av_log(ctx, AV_LOG_ERROR, "Can't open decoder\n");
return result; goto end;
} }
fr = av_frame_alloc(); fr = av_frame_alloc();
if (!fr) { if (!fr) {
av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n"); av_log(NULL, AV_LOG_ERROR, "Can't allocate frame\n");
return AVERROR(ENOMEM); result = AVERROR(ENOMEM);
goto end;
} }
result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, 0, 0, 1); result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, 0, 0, 1);
if (result != 0) if (result != 0)
return -1; goto end;
for (i = start_ts; i < end_ts; i += 100) { for (i = start_ts; i < end_ts; i += 100) {
for (j = i + 100; j < end_ts; j += 100) { for (j = i + 100; j < end_ts; j += 100) {
result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, i, j, 0); result = compute_crc_of_packets(fmt_ctx, video_stream, ctx, fr, i, j, 0);
if (result != 0) if (result != 0)
return -1; break;
} }
} }
end:
av_freep(&crc_array); av_freep(&crc_array);
av_freep(&pts_array); av_freep(&pts_array);
av_frame_free(&fr); av_frame_free(&fr);
avcodec_close(ctx); avcodec_close(ctx);
avformat_close_input(&fmt_ctx); avformat_close_input(&fmt_ctx);
avcodec_free_context(&ctx); avcodec_free_context(&ctx);
return 0; return result;
} }
int main(int argc, char **argv) int main(int argc, char **argv)