|
|
@ -490,26 +490,27 @@ static void *vid_encode_thread(void *arg) {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
while (1) {
|
|
|
|
AVPacket pkt;
|
|
|
|
AVPacket *pkt = av_packet_alloc();
|
|
|
|
av_init_packet(&pkt);
|
|
|
|
int ret = avcodec_receive_packet(ctx->avctx, pkt);
|
|
|
|
|
|
|
|
|
|
|
|
int ret = avcodec_receive_packet(ctx->avctx, &pkt);
|
|
|
|
|
|
|
|
if (ret == AVERROR(EAGAIN)) {
|
|
|
|
if (ret == AVERROR(EAGAIN)) {
|
|
|
|
|
|
|
|
av_packet_free(&pkt);
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
} else if (ret == AVERROR_EOF) {
|
|
|
|
} else if (ret == AVERROR_EOF) {
|
|
|
|
av_log(ctx, AV_LOG_INFO, "Encoder flushed!\n");
|
|
|
|
av_log(ctx, AV_LOG_INFO, "Encoder flushed!\n");
|
|
|
|
|
|
|
|
av_packet_free(&pkt);
|
|
|
|
goto end;
|
|
|
|
goto end;
|
|
|
|
} else if (ret) {
|
|
|
|
} else if (ret) {
|
|
|
|
av_log(ctx, AV_LOG_ERROR, "Error encoding: %s!\n",
|
|
|
|
av_log(ctx, AV_LOG_ERROR, "Error encoding: %s!\n",
|
|
|
|
av_err2str(ret));
|
|
|
|
av_err2str(ret));
|
|
|
|
|
|
|
|
av_packet_free(&pkt);
|
|
|
|
err = ret;
|
|
|
|
err = ret;
|
|
|
|
goto end;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
pkt.stream_index = 0;
|
|
|
|
pkt->stream_index = 0;
|
|
|
|
err = av_interleaved_write_frame(ctx->avf, &pkt);
|
|
|
|
err = av_interleaved_write_frame(ctx->avf, pkt);
|
|
|
|
|
|
|
|
|
|
|
|
av_packet_unref(&pkt);
|
|
|
|
av_packet_free(&pkt);
|
|
|
|
|
|
|
|
|
|
|
|
if (err) {
|
|
|
|
if (err) {
|
|
|
|
av_log(ctx, AV_LOG_ERROR, "Writing packet fail: %s!\n",
|
|
|
|
av_log(ctx, AV_LOG_ERROR, "Writing packet fail: %s!\n",
|
|
|
|