Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AVCodecEncoder: Use new API

Browse Source 
Change-Id: I5b985cebf241e67f901e93a5a4bb61a67a659cdf
This commit is contained in:
JackBurton79 2018-08-07 17:46:39 +02:00 committed by Barrett17
parent 247f2fb691
commit c85dd27c9e
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/add-ons/media/plugins/ffmpeg/AVCodecEncoder.cpp
View File

@ -700,20 +700,20 @@ AVCodecEncoder::_EncodeVideo(const void* buffer, int64 frameCount,
fDstFrame.linesize); fDstFrame.linesize);
// Encode one video chunk/frame. // Encode one video chunk/frame.
int gotPacket; int result = avcodec_send_frame(fCodecContext, fFrame);
if (result != 0) {
TRACE(" avcodec_send_frame() failed: %d\n", result);
return B_ERROR;
}
// avcodec.h says we need to set it.
fFrame->pts++;
AVPacket pkt; AVPacket pkt;
pkt.data = NULL; pkt.data = NULL;
pkt.size = 0; pkt.size = 0;
av_init_packet(&pkt); av_init_packet(&pkt);
int usedBytes = avcodec_encode_video2(fCodecContext, &pkt, fFrame, &gotPacket); if (avcodec_receive_packet(fCodecContext, &pkt) == 0) {
// avcodec.h says we need to set it.
fFrame->pts++;
if (usedBytes < 0) {
TRACE(" avcodec_encode_video() failed: %d\n", usedBytes);
return B_ERROR;
}
// Maybe we need to use this PTS to calculate start_time: // Maybe we need to use this PTS to calculate start_time:
if (pkt.pts != AV_NOPTS_VALUE) { if (pkt.pts != AV_NOPTS_VALUE) {
TRACE(" codec frame PTS: %lld (codec time_base: %d/%d)\n", TRACE(" codec frame PTS: %lld (codec time_base: %d/%d)\n",
@ -724,7 +724,6 @@ AVCodecEncoder::_EncodeVideo(const void* buffer, int64 frameCount,
fCodecContext->time_base.num, fCodecContext->time_base.den); fCodecContext->time_base.num, fCodecContext->time_base.den);
} }
if (gotPacket == 1) {
// Setup media_encode_info, most important is the time stamp. // Setup media_encode_info, most important is the time stamp.
info->start_time = (bigtime_t)(fFramesWritten * 1000000LL info->start_time = (bigtime_t)(fFramesWritten * 1000000LL
/ fInputFormat.u.raw_video.field_rate); / fInputFormat.u.raw_video.field_rate);