Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'

Browse Source 
* commit '86bbdf865e04bc5ddc2021b0620e6de634375253':
  avformat: refactor avformat_write_header

Conflicts:
	libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/6/head
Michael Niedermayer 12 years ago
parent 513042c926 86bbdf865e
commit 6cbbf4a274
1 changed files with 44 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      libavformat/mux.c

77
libavformat/mux.c
Unescape View File

@ -204,9 +204,12 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
int ret = 0, i; int ret = 0, i;
AVStream *st; AVStream *st;
AVDictionary *tmp = NULL; AVDictionary *tmp = NULL;
AVCodecContext *codec = NULL;
AVOutputFormat *of = s->oformat;
if (options) if (options)
av_dict_copy(&tmp, *options, 0); av_dict_copy(&tmp, *options, 0);
if ((ret = av_opt_set_dict(s, &tmp)) < 0) if ((ret = av_opt_set_dict(s, &tmp)) < 0)
goto fail; goto fail;
if (s->priv_data && s->oformat->priv_class && *(const AVClass**)s->priv_data==s->oformat->priv_class && if (s->priv_data && s->oformat->priv_class && *(const AVClass**)s->priv_data==s->oformat->priv_class &&
@ -214,87 +217,95 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
goto fail; goto fail;
// some sanity checks // some sanity checks
if (s->nb_streams == 0 && !(s->oformat->flags & AVFMT_NOSTREAMS)) { if (s->nb_streams == 0 && !(of->flags & AVFMT_NOSTREAMS)) {
av_log(s, AV_LOG_ERROR, "no streams\n"); av_log(s, AV_LOG_ERROR, "no streams\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
st = s->streams[i]; st = s->streams[i];
codec = st->codec;
switch (st->codec->codec_type) { switch (codec->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
if (st->codec->sample_rate <= 0) { if (codec->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, "sample rate not set\n"); av_log(s, AV_LOG_ERROR, "sample rate not set\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
if (!st->codec->block_align) if (!codec->block_align)
st->codec->block_align = st->codec->channels * codec->block_align = codec->channels *
av_get_bits_per_sample(st->codec->codec_id) >> 3; av_get_bits_per_sample(codec->codec_id) >> 3;
break; break;
case AVMEDIA_TYPE_VIDEO: case AVMEDIA_TYPE_VIDEO:
if (st->codec->time_base.num <= 0 || st->codec->time_base.den <= 0) { //FIXME audio too? if (codec->time_base.num <= 0 ||
codec->time_base.den <= 0) { //FIXME audio too?
av_log(s, AV_LOG_ERROR, "time base not set\n"); av_log(s, AV_LOG_ERROR, "time base not set\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
if ((st->codec->width <= 0 || st->codec->height <= 0) && !(s->oformat->flags & AVFMT_NODIMENSIONS)) {
if ((codec->width <= 0 || codec->height <= 0) &&
!(of->flags & AVFMT_NODIMENSIONS)) {
av_log(s, AV_LOG_ERROR, "dimensions not set\n"); av_log(s, AV_LOG_ERROR, "dimensions not set\n");
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
if (av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio) if (av_cmp_q(st->sample_aspect_ratio, codec->sample_aspect_ratio)
&& FFABS(av_q2d(st->sample_aspect_ratio) - av_q2d(st->codec->sample_aspect_ratio)) > 0.004*av_q2d(st->sample_aspect_ratio) && FFABS(av_q2d(st->sample_aspect_ratio) - av_q2d(codec->sample_aspect_ratio)) > 0.004*av_q2d(st->sample_aspect_ratio)
) { ) {
av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between muxer " av_log(s, AV_LOG_ERROR, "Aspect ratio mismatch between muxer "
"(%d/%d) and encoder layer (%d/%d)\n", "(%d/%d) and encoder layer (%d/%d)\n",
st->sample_aspect_ratio.num, st->sample_aspect_ratio.den, st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
st->codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.num,
st->codec->sample_aspect_ratio.den); codec->sample_aspect_ratio.den);
ret = AVERROR(EINVAL); ret = AVERROR(EINVAL);
goto fail; goto fail;
} }
break; break;
} }
if (s->oformat->codec_tag) { if (of->codec_tag) {
if ( st->codec->codec_tag if ( codec->codec_tag
&& st->codec->codec_id == AV_CODEC_ID_RAWVIDEO && codec->codec_id == AV_CODEC_ID_RAWVIDEO
&& (av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id) == 0 || av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id) ==MKTAG('r', 'a', 'w', ' ')) && ( av_codec_get_tag(of->codec_tag, codec->codec_id) == 0
&& !validate_codec_tag(s, st)) { || av_codec_get_tag(of->codec_tag, codec->codec_id) == MKTAG('r', 'a', 'w', ' '))
//the current rawvideo encoding system ends up setting the wrong codec_tag for avi/mov, we override it here && !validate_codec_tag(s, st)) {
st->codec->codec_tag = 0; // the current rawvideo encoding system ends up setting
// the wrong codec_tag for avi/mov, we override it here
codec->codec_tag = 0;
} }
if (st->codec->codec_tag) { if (codec->codec_tag) {
if (!validate_codec_tag(s, st)) { if (!validate_codec_tag(s, st)) {
char tagbuf[32], cortag[32]; char tagbuf[32], cortag[32];
av_get_codec_tag_string(tagbuf, sizeof(tagbuf), st->codec->codec_tag); av_get_codec_tag_string(tagbuf, sizeof(tagbuf), codec->codec_tag);
av_get_codec_tag_string(cortag, sizeof(cortag), av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id)); av_get_codec_tag_string(cortag, sizeof(cortag), av_codec_get_tag(s->oformat->codec_tag, codec->codec_id));
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Tag %s/0x%08x incompatible with output codec id '%d' (%s)\n", "Tag %s/0x%08x incompatible with output codec id '%d' (%s)\n",
tagbuf, st->codec->codec_tag, st->codec->codec_id, cortag); tagbuf, codec->codec_tag, codec->codec_id, cortag);
ret = AVERROR_INVALIDDATA; ret = AVERROR_INVALIDDATA;
goto fail; goto fail;
} }
} else } else
st->codec->codec_tag = av_codec_get_tag(s->oformat->codec_tag, st->codec->codec_id); codec->codec_tag = av_codec_get_tag(of->codec_tag, codec->codec_id);
} }
if (s->oformat->flags & AVFMT_GLOBALHEADER && if (of->flags & AVFMT_GLOBALHEADER &&
!(st->codec->flags & CODEC_FLAG_GLOBAL_HEADER)) !(codec->flags & CODEC_FLAG_GLOBAL_HEADER))
av_log(s, AV_LOG_WARNING, "Codec for stream %d does not use global headers but container format requires global headers\n", i); av_log(s, AV_LOG_WARNING,
"Codec for stream %d does not use global headers "
"but container format requires global headers\n", i);
} }
if (!s->priv_data && s->oformat->priv_data_size > 0) { if (!s->priv_data && of->priv_data_size > 0) {
s->priv_data = av_mallocz(s->oformat->priv_data_size); s->priv_data = av_mallocz(of->priv_data_size);
if (!s->priv_data) { if (!s->priv_data) {
ret = AVERROR(ENOMEM); ret = AVERROR(ENOMEM);
goto fail; goto fail;
} }
if (s->oformat->priv_class) { if (of->priv_class) {
*(const AVClass **)s->priv_data = s->oformat->priv_class; *(const AVClass **)s->priv_data = of->priv_class;
av_opt_set_defaults(s->priv_data); av_opt_set_defaults(s->priv_data);
if ((ret = av_opt_set_dict(s->priv_data, &tmp)) < 0) if ((ret = av_opt_set_dict(s->priv_data, &tmp)) < 0)
goto fail; goto fail;
@ -743,4 +754,4 @@ int av_get_output_timestamp(struct AVFormatContext *s, int stream,
return AVERROR(ENOSYS); return AVERROR(ENOSYS);
s->oformat->get_output_timestamp(s, stream, dts, wall); s->oformat->get_output_timestamp(s, stream, dts, wall);
return 0; return 0;
} }

Write Preview
Loading…
Cancel
Save