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

examples/output: switch to the new encoding API

Browse Source
This commit is contained in:
Anton Khirnov 2016-09-22 09:32:08 +02:00
parent 7bf8db4db6
commit 67d28f4a0f
1 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
doc/examples/output.c
View File

@ -233,25 +233,37 @@ static AVFrame *get_audio_frame(OutputStream *ost)
static int encode_audio_frame(AVFormatContext *oc, OutputStream *ost, static int encode_audio_frame(AVFormatContext *oc, OutputStream *ost,
AVFrame *frame) AVFrame *frame)
{ {
int ret;
ret = avcodec_send_frame(ost->enc, frame);
if (ret < 0) {
fprintf(stderr, "Error submitting a frame for encoding\n");
exit(1);
}
while (ret >= 0) {
AVPacket pkt = { 0 }; // data and size must be 0; AVPacket pkt = { 0 }; // data and size must be 0;
int got_packet;
av_init_packet(&pkt); av_init_packet(&pkt);
avcodec_encode_audio2(ost->enc, &pkt, frame, &got_packet);
if (got_packet) { ret = avcodec_receive_packet(ost->enc, &pkt);
if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
fprintf(stderr, "Error encoding a video frame\n");
exit(1);
} else if (ret >= 0) {
av_packet_rescale_ts(&pkt, ost->enc->time_base, ost->st->time_base);
pkt.stream_index = ost->st->index; pkt.stream_index = ost->st->index;
av_packet_rescale_ts(&pkt, ost->enc->time_base, ost->st->time_base);
/* Write the compressed frame to the media file. */ /* Write the compressed frame to the media file. */
if (av_interleaved_write_frame(oc, &pkt) != 0) { ret = av_interleaved_write_frame(oc, &pkt);
fprintf(stderr, "Error while writing audio frame\n"); if (ret < 0) {
fprintf(stderr, "Error while writing video frame\n");
exit(1); exit(1);
} }
} }
}
return (frame || got_packet) ? 0 : 1; return ret == AVERROR_EOF;
} }
/* /*
@ -517,36 +529,41 @@ static int write_video_frame(AVFormatContext *oc, OutputStream *ost)
int ret; int ret;
AVCodecContext *c; AVCodecContext *c;
AVFrame *frame; AVFrame *frame;
AVPacket pkt = { 0 };
int got_packet = 0;
c = ost->enc; c = ost->enc;
frame = get_video_frame(ost); frame = get_video_frame(ost);
av_init_packet(&pkt);
/* encode the image */ /* encode the image */
ret = avcodec_encode_video2(c, &pkt, frame, &got_packet); ret = avcodec_send_frame(c, frame);
if (ret < 0) { if (ret < 0) {
fprintf(stderr, "Error encoding a video frame\n"); fprintf(stderr, "Error submitting a frame for encoding\n");
exit(1); exit(1);
} }
if (got_packet) { while (ret >= 0) {
AVPacket pkt = { 0 };
av_init_packet(&pkt);
ret = avcodec_receive_packet(c, &pkt);
if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) {
fprintf(stderr, "Error encoding a video frame\n");
exit(1);
} else if (ret >= 0) {
av_packet_rescale_ts(&pkt, c->time_base, ost->st->time_base); av_packet_rescale_ts(&pkt, c->time_base, ost->st->time_base);
pkt.stream_index = ost->st->index; pkt.stream_index = ost->st->index;
/* Write the compressed frame to the media file. */ /* Write the compressed frame to the media file. */
ret = av_interleaved_write_frame(oc, &pkt); ret = av_interleaved_write_frame(oc, &pkt);
} if (ret < 0) {
if (ret != 0) {
fprintf(stderr, "Error while writing video frame\n"); fprintf(stderr, "Error while writing video frame\n");
exit(1); exit(1);
} }
}
}
return (frame || got_packet) ? 0 : 1; return ret == AVERROR_EOF;
} }
static void close_stream(AVFormatContext *oc, OutputStream *ost) static void close_stream(AVFormatContext *oc, OutputStream *ost)