RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-23 23:36:57 +00:00
Code Issues Projects Releases Wiki Activity

ffmpeg: change ost->finished to an enum

Browse Source 
Idea-by: ramiro
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-01-17 23:52:55 +01:00
parent d73f897669
commit 740e6042a0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ffmpeg.c
View File

@ -548,7 +548,7 @@ static void update_benchmark(const char *fmt, ...)
} }
} }
static void close_all_output_streams(OutputStream *ost, int this_stream, int others) static void close_all_output_streams(OutputStream *ost, OSTFinished this_stream, OSTFinished others)
{ {
int i; int i;
for (i = 0; i < nb_output_streams; i++) { for (i = 0; i < nb_output_streams; i++) {
@ -658,7 +658,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
if (ret < 0) { if (ret < 0) {
print_error("av_interleaved_write_frame()", ret); print_error("av_interleaved_write_frame()", ret);
main_return_code = 1; main_return_code = 1;
close_all_output_streams(ost, 3, 1); close_all_output_streams(ost, MUXER_FINISHED | ENCODER_FINISHED, ENCODER_FINISHED);
} }
} }
@ -666,7 +666,7 @@ static void close_output_stream(OutputStream *ost)
{ {
OutputFile *of = output_files[ost->file_index]; OutputFile *of = output_files[ost->file_index];
ost->finished |= 1; ost->finished |= ENCODER_FINISHED;
if (of->shortest) { if (of->shortest) {
int64_t end = av_rescale_q(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, AV_TIME_BASE_Q); int64_t end = av_rescale_q(ost->sync_opts - ost->first_pts, ost->st->codec->time_base, AV_TIME_BASE_Q);
of->recording_time = FFMIN(of->recording_time, end); of->recording_time = FFMIN(of->recording_time, end);
@ -1388,7 +1388,7 @@ static void flush_encoders(void)
stop_encoding = 1; stop_encoding = 1;
break; break;
} }
if (ost->finished > 1) { if (ost->finished & MUXER_FINISHED) {
av_free_packet(&pkt); av_free_packet(&pkt);
continue; continue;
} }

7
ffmpeg.h
View File

@ -344,6 +344,11 @@ enum forced_keyframes_const {
extern const char *const forced_keyframes_const_names[]; extern const char *const forced_keyframes_const_names[];
typedef enum {
ENCODER_FINISHED = 1,
MUXER_FINISHED = 2,
} OSTFinished ;
typedef struct OutputStream { typedef struct OutputStream {
int file_index; /* file index */ int file_index; /* file index */
int index; /* stream index in the output file */ int index; /* stream index in the output file */
@ -397,7 +402,7 @@ typedef struct OutputStream {
AVDictionary *swr_opts; AVDictionary *swr_opts;
AVDictionary *resample_opts; AVDictionary *resample_opts;
char *apad; char *apad;
int finished; /* no more packets should be written for this stream */ OSTFinished finished; /* no more packets should be written for this stream */
int unavailable; /* true if the steram is unavailable (possibly temporarily) */ int unavailable; /* true if the steram is unavailable (possibly temporarily) */
int stream_copy; int stream_copy;
const char *attachment_filename; const char *attachment_filename;