openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

Added frame counter to writer class, to help generate a valid PTS

Browse Source
This commit is contained in:
Jonathan Thomas
2012-10-26 02:11:39 -05:00
parent a0b24c61f0
commit 5fcead37f2
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/FFmpegWriter.h
View File

@@ -57,6 +57,7 @@ namespace openshot
string path;
int cache_size;
bool is_writing;
int64 write_frame_count;
AVOutputFormat *fmt;
AVFormatContext *oc;

8
src/FFmpegWriter.cpp
View File

@@ -30,8 +30,8 @@ using namespace openshot;
FFmpegWriter::FFmpegWriter(string path) throw (InvalidFile, InvalidFormat, InvalidCodec, InvalidOptions, OutOfMemory) :
path(path), fmt(NULL), oc(NULL), audio_st(NULL), video_st(NULL), audio_pts(0), video_pts(0), samples(NULL),
audio_outbuf(NULL), audio_outbuf_size(0), audio_input_frame_size(0), audio_input_position(0),
initial_audio_input_frame_size(0), resampler(NULL), img_convert_ctx(NULL), cache_size(8),
num_of_rescalers(32), rescaler_position(0), video_codec(NULL), audio_codec(NULL), is_writing(false)
initial_audio_input_frame_size(0), resampler(NULL), img_convert_ctx(NULL), cache_size(8), num_of_rescalers(32),
rescaler_position(0), video_codec(NULL), audio_codec(NULL), is_writing(false), write_frame_count(0)
{
// Init FileInfo struct (clear all values)
@@ -502,6 +502,9 @@ void FFmpegWriter::Close()
avio_close(oc->pb);
}
// Reset frame counter
write_frame_count = 0;
// Free the stream
av_free(oc);
}
@@ -1032,6 +1035,7 @@ void FFmpegWriter::write_video_packet(tr1::shared_ptr<Frame> frame, AVFrame* fra
/* write the compressed frame in the media file */
int averror = av_write_frame(oc, &pkt);
//int averror = av_interleaved_write_frame(oc, &pkt);
if (averror != 0)
{
//string error_description = av_err2str(averror);