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

Improved the flush_encoders method to not raise errors if it encounters errors encoding NULL AVFrames.

Browse Source
This commit is contained in:
Jonathan Thomas
2012-11-18 10:45:16 -06:00
parent 4a96a3b745
commit 547a0dbc63
2 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/FFmpegWriter.cpp
View File

@@ -517,8 +517,8 @@ void FFmpegWriter::flush_encoders()
error_description = av_err2str(error_code);
#endif
cout << "error: " << error_code << ": " << error_description << endl;
throw ErrorEncodingVideo("Error while flushing video frame", -1);
cout << "error encoding video: " << error_code << ": " << error_description << endl;
//throw ErrorEncodingVideo("Error while flushing video frame", -1);
}
if (!got_packet) {
stop_encoding = 1;
@@ -546,8 +546,8 @@ void FFmpegWriter::flush_encoders()
error_description = av_err2str(error_code);
#endif
cout << "error: " << error_code << ": " << error_description << endl;
throw ErrorEncodingVideo("Error while writing video packet to flush encoder", -1);
cout << "error writing video: " << error_code << ": " << error_description << endl;
//throw ErrorEncodingVideo("Error while writing video packet to flush encoder", -1);
}
// Deallocate memory (if needed)
@@ -580,8 +580,8 @@ void FFmpegWriter::flush_encoders()
error_description = av_err2str(error_code);
#endif
cout << "error: " << error_code << ": " << error_description << endl;
throw ErrorEncodingAudio("Error while flushing audio frame", -1);
cout << "error encoding audio: " << error_code << ": " << error_description << endl;
//throw ErrorEncodingAudio("Error while flushing audio frame", -1);
}
if (!got_packet) {
stop_encoding = 1;
@@ -613,8 +613,8 @@ void FFmpegWriter::flush_encoders()
error_description = av_err2str(error_code);
#endif
cout << "error: " << error_code << ": " << error_description << endl;
throw ErrorEncodingAudio("Error while writing audio packet to flush encoder", -1);
cout << "error writing audio: " << error_code << ": " << error_description << endl;
//throw ErrorEncodingAudio("Error while writing audio packet to flush encoder", -1);
}
}
@@ -720,13 +720,6 @@ AVStream* FFmpegWriter::add_audio_stream()
c->bit_rate = info.audio_bit_rate;
c->channels = info.channels;
// Check for valid timebase
// if (c->time_base.den == 0 || c->time_base.num == 0)
// {
// c->time_base.num = st->time_base.num;
// c->time_base.den = st->time_base.den;
// }
// Set valid sample rate (or throw error)
if (codec->supported_samplerates) {
int i;