mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
2905e3ff64
* qatar/master: lavc: add opt_find to AVCodecContext class. h264: Complexify frame num gap shortening code intreadwrite.h: fix AV_RL32/AV_RB32 signedness. Fix decoding of mpegts streams with h264 video that does *NOT* have b frames Add minor bumps and APIChanges entries for lavf private options. ffmpeg: deprecate -vc and -tvstd ffmpeg: use new avformat_open_* API. ffserver: use new avformat_open_* API. ffprobe: use new avformat_open_* API. ffplay: use new avformat_open_* API. cmdutils: add opt_default2(). dict: add AV_DICT_APPEND flag. lavf: add avformat_write_header() as a replacement for av_write_header(). Deprecate av_open_input_* and remove their uses. lavf: add avformat_open_input() as a replacement for av_open_input_* AVOptions: add av_opt_find() as a replacement for av_find_opt. AVOptions: add av_opt_set_dict() mapping a dictionary struct to a context. ffmpeg: don't abuse a global for passing frame size from input to output ffmpeg: don't abuse a global for passing pixel format from input to output ffmpeg: initialise encoders earlier. Conflicts: cmdutils.c doc/APIchanges ffmpeg.c ffplay.c ffprobe.c libavcodec/h264.c libavformat/avformat.h libavformat/utils.c libavformat/version.h libavutil/avutil.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
87 lines
2.7 KiB
C
87 lines
2.7 KiB
C
/*
|
|
* RTP muxer chaining code
|
|
* Copyright (c) 2010 Martin Storsjo
|
|
*
|
|
* This file is part of FFmpeg.
|
|
*
|
|
* FFmpeg is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* FFmpeg is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with FFmpeg; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*/
|
|
|
|
#include "avformat.h"
|
|
#include "avio_internal.h"
|
|
#include "rtpenc_chain.h"
|
|
#include "avio_internal.h"
|
|
#include "libavutil/opt.h"
|
|
|
|
AVFormatContext *ff_rtp_chain_mux_open(AVFormatContext *s, AVStream *st,
|
|
URLContext *handle, int packet_size)
|
|
{
|
|
AVFormatContext *rtpctx;
|
|
int ret;
|
|
AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
|
|
|
|
if (!rtp_format)
|
|
return NULL;
|
|
|
|
/* Allocate an AVFormatContext for each output stream */
|
|
rtpctx = avformat_alloc_context();
|
|
if (!rtpctx)
|
|
return NULL;
|
|
|
|
rtpctx->oformat = rtp_format;
|
|
if (!av_new_stream(rtpctx, 0)) {
|
|
av_free(rtpctx);
|
|
return NULL;
|
|
}
|
|
/* Copy the max delay setting; the rtp muxer reads this. */
|
|
rtpctx->max_delay = s->max_delay;
|
|
/* Copy other stream parameters. */
|
|
rtpctx->streams[0]->sample_aspect_ratio = st->sample_aspect_ratio;
|
|
rtpctx->flags |= s->flags & AVFMT_FLAG_MP4A_LATM;
|
|
|
|
av_set_parameters(rtpctx, NULL);
|
|
/* Copy the rtpflags values straight through */
|
|
if (s->oformat->priv_class &&
|
|
av_find_opt(s->priv_data, "rtpflags", NULL, 0, 0))
|
|
av_set_int(rtpctx->priv_data, "rtpflags",
|
|
av_get_int(s->priv_data, "rtpflags", NULL));
|
|
|
|
/* Set the synchronized start time. */
|
|
rtpctx->start_time_realtime = s->start_time_realtime;
|
|
|
|
avcodec_copy_context(rtpctx->streams[0]->codec, st->codec);
|
|
|
|
if (handle) {
|
|
ffio_fdopen(&rtpctx->pb, handle);
|
|
} else
|
|
ffio_open_dyn_packet_buf(&rtpctx->pb, packet_size);
|
|
ret = avformat_write_header(rtpctx, NULL);
|
|
|
|
if (ret) {
|
|
if (handle) {
|
|
avio_close(rtpctx->pb);
|
|
} else {
|
|
uint8_t *ptr;
|
|
avio_close_dyn_buf(rtpctx->pb, &ptr);
|
|
av_free(ptr);
|
|
}
|
|
avformat_free_context(rtpctx);
|
|
return NULL;
|
|
}
|
|
|
|
return rtpctx;
|
|
}
|
|
|