AVDictionary *tmp = NULL;
AVCodecContext *codec = NULL;
AVOutputFormat *of = s->oformat;
+ const AVCodecDescriptor *desc;
if (options)
av_dict_copy(&tmp, *options, 0);
break;
}
+ desc = avcodec_descriptor_get(codec->codec_id);
+ if (desc && desc->props & AV_CODEC_PROP_REORDER)
+ st->internal->reorder = 1;
+
if (of->codec_tag) {
if (codec->codec_tag &&
codec->codec_id == AV_CODEC_ID_RAWVIDEO &&
return 0;
}
+#if FF_API_COMPUTE_PKT_FIELDS2
//FIXME merge with compute_pkt_fields
static int compute_pkt_fields2(AVFormatContext *s, AVStream *st, AVPacket *pkt)
{
int delay = FFMAX(st->codec->has_b_frames, !!st->codec->max_b_frames);
int num, den, i;
+ if (!s->internal->missing_ts_warning &&
+ !(s->oformat->flags & AVFMT_NOTIMESTAMPS) &&
+ (pkt->pts == AV_NOPTS_VALUE || pkt->dts == AV_NOPTS_VALUE)) {
+ av_log(s, AV_LOG_WARNING,
+ "Timestamps are unset in a packet for stream %d. "
+ "This is deprecated and will stop working in the future. "
+ "Fix your code to set the timestamps properly\n", st->index);
+ s->internal->missing_ts_warning = 1;
+ }
+
av_log(s, AV_LOG_TRACE, "compute_pkt_fields2: pts:%" PRId64 " dts:%" PRId64 " cur_dts:%" PRId64 " b:%d size:%d st:%d\n",
pkt->pts, pkt->dts, st->cur_dts, delay, pkt->size, pkt->stream_index);
return 0;
}
+#endif
/*
* FIXME: this function should NEVER get undefined pts/dts beside when the
return 0;
}
-int av_write_frame(AVFormatContext *s, AVPacket *pkt)
+static int prepare_input_packet(AVFormatContext *s, AVPacket *pkt)
{
int ret;
if (ret < 0)
return ret;
+#if !FF_API_COMPUTE_PKT_FIELDS2
+ /* sanitize the timestamps */
+ if (!(s->oformat->flags & AVFMT_NOTIMESTAMPS)) {
+ AVStream *st = s->streams[pkt->stream_index];
+
+ /* when there is no reordering (so dts is equal to pts), but
+ * only one of them is set, set the other as well */
+ if (!st->internal->reorder) {
+ if (pkt->pts == AV_NOPTS_VALUE && pkt->dts != AV_NOPTS_VALUE)
+ pkt->pts = pkt->dts;
+ if (pkt->dts == AV_NOPTS_VALUE && pkt->pts != AV_NOPTS_VALUE)
+ pkt->dts = pkt->pts;
+ }
+
+ /* check that the timestamps are set */
+ if (pkt->pts == AV_NOPTS_VALUE || pkt->dts == AV_NOPTS_VALUE) {
+ av_log(s, AV_LOG_ERROR,
+ "Timestamps are unset in a packet for stream %d\n", st->index);
+ return AVERROR(EINVAL);
+ }
+
+ /* check that the dts are increasing (or at least non-decreasing,
+ * if the format allows it */
+ if (st->cur_dts != AV_NOPTS_VALUE &&
+ ((!(s->oformat->flags & AVFMT_TS_NONSTRICT) && st->cur_dts >= pkt->dts) ||
+ st->cur_dts > pkt->dts)) {
+ av_log(s, AV_LOG_ERROR,
+ "Application provided invalid, non monotonically increasing "
+ "dts to muxer in stream %d: %" PRId64 " >= %" PRId64 "\n",
+ st->index, st->cur_dts, pkt->dts);
+ return AVERROR(EINVAL);
+ }
+
+ if (pkt->pts < pkt->dts) {
+ av_log(s, AV_LOG_ERROR, "pts %" PRId64 " < dts %" PRId64 " in stream %d\n",
+ pkt->pts, pkt->dts, st->index);
+ return AVERROR(EINVAL);
+ }
+ }
+#endif
+
+ return 0;
+}
+
+int av_write_frame(AVFormatContext *s, AVPacket *pkt)
+{
+ int ret;
+
+ ret = prepare_input_packet(s, pkt);
+ if (ret < 0)
+ return ret;
+
if (!pkt) {
if (s->oformat->flags & AVFMT_ALLOW_FLUSH)
return s->oformat->write_packet(s, pkt);
return 1;
}
+#if FF_API_COMPUTE_PKT_FIELDS2
ret = compute_pkt_fields2(s, s->streams[pkt->stream_index], pkt);
if (ret < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
return ret;
+#endif
ret = write_packet(s, pkt);
{
int ret, flush = 0;
- ret = check_packet(s, pkt);
+ ret = prepare_input_packet(s, pkt);
if (ret < 0)
goto fail;
av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame size:%d dts:%" PRId64 " pts:%" PRId64 "\n",
pkt->size, pkt->dts, pkt->pts);
+#if FF_API_COMPUTE_PKT_FIELDS2
if ((ret = compute_pkt_fields2(s, st, pkt)) < 0 && !(s->oformat->flags & AVFMT_NOTIMESTAMPS))
goto fail;
+#endif
if (pkt->dts == AV_NOPTS_VALUE && !(s->oformat->flags & AVFMT_NOTIMESTAMPS)) {
ret = AVERROR(EINVAL);