highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffmpeg: choose_pix_fmt: pass target fmt in

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-04-17 03:15:19 +02:00
parent 4778783160
commit 8a28fa010a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ffmpeg.c
View File

@ -667,11 +667,11 @@ static void filter_release_buffer(AVFilterBuffer *fb)
unref_buffer(buf->ist, buf); unref_buffer(buf->ist, buf);
} }
static void choose_pixel_fmt(AVStream *st, AVCodec *codec) static enum PixelFormat choose_pixel_fmt(AVStream *st, AVCodec *codec, enum PixelFormat target)
{ {
if (codec && codec->pix_fmts) { if (codec && codec->pix_fmts) {
const enum PixelFormat *p = codec->pix_fmts; const enum PixelFormat *p = codec->pix_fmts;
int has_alpha= av_pix_fmt_descriptors[st->codec->pix_fmt].nb_components % 2 == 0; int has_alpha= av_pix_fmt_descriptors[target].nb_components % 2 == 0;
enum PixelFormat best= PIX_FMT_NONE; enum PixelFormat best= PIX_FMT_NONE;
if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) { if (st->codec->strict_std_compliance <= FF_COMPLIANCE_UNOFFICIAL) {
if (st->codec->codec_id == CODEC_ID_MJPEG) { if (st->codec->codec_id == CODEC_ID_MJPEG) {
@ -682,20 +682,21 @@ static void choose_pixel_fmt(AVStream *st, AVCodec *codec)
} }
} }
for (; *p != PIX_FMT_NONE; p++) { for (; *p != PIX_FMT_NONE; p++) {
best= avcodec_find_best_pix_fmt2(best, *p, st->codec->pix_fmt, has_alpha, NULL); best= avcodec_find_best_pix_fmt2(best, *p, target, has_alpha, NULL);
if (*p == st->codec->pix_fmt) if (*p == target)
break; break;
} }
if (*p == PIX_FMT_NONE) { if (*p == PIX_FMT_NONE) {
if (st->codec->pix_fmt != PIX_FMT_NONE) if (target != PIX_FMT_NONE)
av_log(NULL, AV_LOG_WARNING, av_log(NULL, AV_LOG_WARNING,
"Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n", "Incompatible pixel format '%s' for codec '%s', auto-selecting format '%s'\n",
av_pix_fmt_descriptors[st->codec->pix_fmt].name, av_pix_fmt_descriptors[target].name,
codec->name, codec->name,
av_pix_fmt_descriptors[best].name); av_pix_fmt_descriptors[best].name);
st->codec->pix_fmt = best; return best;
} }
} }
return target;
} }
static const enum PixelFormat *choose_pixel_fmts(OutputStream *ost) static const enum PixelFormat *choose_pixel_fmts(OutputStream *ost)
@ -4789,7 +4790,7 @@ static int read_ffserver_streams(OptionsContext *o, AVFormatContext *s, const ch
if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && !ost->stream_copy) if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO && !ost->stream_copy)
choose_sample_fmt(st, codec); choose_sample_fmt(st, codec);
else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy) else if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && !ost->stream_copy)
choose_pixel_fmt(st, codec); choose_pixel_fmt(st, codec, st->codec->pix_fmt);
} }
avformat_close_input(&ic); avformat_close_input(&ic);