generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ffmpeg: move quality parameter to do_video_out() scope.

Browse Source 
This make do_video_out() and do_audio_out() consistent. Also simplifies
callers.
This commit is contained in:
Clément Bœsch 2012-02-08 17:55:04 +01:00 committed by Clément Bœsch
parent 63b5e99fab
commit 158bd596a6
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ffmpeg.c
View File

@ -1487,11 +1487,8 @@ static void do_video_stats(AVFormatContext *os, OutputStream *ost,
} }
static void do_video_out(AVFormatContext *s, static void do_video_out(AVFormatContext *s, OutputStream *ost,
OutputStream *ost, InputStream *ist, AVFrame *in_picture)
InputStream *ist,
AVFrame *in_picture,
float quality)
{ {
int nb_frames, i, ret, format_video_sync; int nb_frames, i, ret, format_video_sync;
AVFrame *final_picture; AVFrame *final_picture;
@ -1499,6 +1496,8 @@ static void do_video_out(AVFormatContext *s,
double sync_ipts; double sync_ipts;
double duration = 0; double duration = 0;
int frame_size = 0; int frame_size = 0;
float quality = same_quant ? in_picture->quality
: ost->st->codec->global_quality;
enc = ost->st->codec; enc = ost->st->codec;
@ -2054,7 +2053,6 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
AVFrame *decoded_frame; AVFrame *decoded_frame;
void *buffer_to_free = NULL; void *buffer_to_free = NULL;
int i, ret = 0; int i, ret = 0;
float quality = 0;
int64_t *best_effort_timestamp; int64_t *best_effort_timestamp;
AVRational *frame_sample_aspect; AVRational *frame_sample_aspect;
@ -2072,7 +2070,6 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
if (ret < 0) if (ret < 0)
return ret; return ret;
quality = same_quant ? decoded_frame->quality : 0;
if (!*got_output) { if (!*got_output) {
/* no picture yet */ /* no picture yet */
return ret; return ret;
@ -2147,14 +2144,12 @@ static int transcode_video(InputStream *ist, AVPacket *pkt, int *got_output, int
} }
if (ost->picref->video && !ost->frame_aspect_ratio) if (ost->picref->video && !ost->frame_aspect_ratio)
ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio; ost->st->codec->sample_aspect_ratio = ost->picref->video->sample_aspect_ratio;
do_video_out(output_files[ost->file_index].ctx, ost, ist, filtered_frame, do_video_out(output_files[ost->file_index].ctx, ost, ist, filtered_frame);
same_quant ? quality : ost->st->codec->global_quality);
cont: cont:
avfilter_unref_buffer(ost->picref); avfilter_unref_buffer(ost->picref);
} }
#else #else
do_video_out(output_files[ost->file_index].ctx, ost, ist, decoded_frame, do_video_out(output_files[ost->file_index].ctx, ost, ist, decoded_frame);
same_quant ? quality : ost->st->codec->global_quality);
#endif #endif
} }