RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

doc/examples/extract_mvs: switch to new decoding API

This commit is contained in:
Matthieu Bouron 2017-04-03 15:25:09 +02:00
parent 6db36a0227
commit 82116bd8a4
1 changed files with 34 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
doc/examples/extract_mvs.c
View File

@ -34,20 +34,25 @@ static AVFrame *frame = NULL;
static AVPacket pkt;
static int video_frame_count = 0;
static int decode_packet(int *got_frame, int cached)
static int decode_packet(void)
{
int decoded = pkt.size;
*got_frame = 0;
if (pkt.stream_index == video_stream_idx) {
int ret = avcodec_decode_video2(video_dec_ctx, frame, got_frame, &pkt);
int ret = avcodec_send_packet(video_dec_ctx, &pkt);
if (ret < 0) {
fprintf(stderr, "Error decoding video frame (%s)\n", av_err2str(ret));
fprintf(stderr, "Error while sending a packet to the decoder: %s\n", av_err2str(ret));
return ret;
}
if (*got_frame) {
while (ret >= 0) {
ret = avcodec_receive_frame(video_dec_ctx, frame);
if (ret == AVERROR(EAGAIN) || ret == AVERROR_EOF) {
break;
} else if (ret < 0) {
fprintf(stderr, "Error while receiving a frame from the decoder: %s\n", av_err2str(ret));
return ret;
}
if (ret >= 0) {
int i;
AVFrameSideData *sd;
@ -63,10 +68,12 @@ static int decode_packet(int *got_frame, int cached)
mv->dst_x, mv->dst_y, mv->flags);
}
}
av_frame_unref(frame);
}
}
}
return decoded;
return 0;
}
static int open_codec_context(AVFormatContext *fmt_ctx, enum AVMediaType type)
@ -116,7 +123,7 @@ static int open_codec_context(AVFormatContext *fmt_ctx, enum AVMediaType type)
int main(int argc, char **argv)
{
int ret = 0, got_frame;
int ret = 0;
if (argc != 2) {
fprintf(stderr, "Usage: %s <video>\n", argv[0]);
@ -157,28 +164,19 @@ int main(int argc, char **argv)
/* initialize packet, set data to NULL, let the demuxer fill it */
av_init_packet(&pkt);
pkt.data = NULL;
pkt.size = 0;
/* read frames from the file */
while (av_read_frame(fmt_ctx, &pkt) >= 0) {
AVPacket orig_pkt = pkt;
do {
ret = decode_packet(&got_frame, 0);
ret = decode_packet();
av_packet_unref(&pkt);
if (ret < 0)
break;
pkt.data += ret;
pkt.size -= ret;
} while (pkt.size > 0);
av_packet_unref(&orig_pkt);
}
/* flush cached frames */
pkt.data = NULL;
pkt.size = 0;
do {
decode_packet(&got_frame, 1);
} while (got_frame);
decode_packet();
end:
avcodec_free_context(&video_dec_ctx);