#include "movenc.h"
#include "libavutil/intreadwrite.h"
#include "internal.h"
+#include "rtpenc_chain.h"
+#include "avio_internal.h"
int ff_mov_init_hinting(AVFormatContext *s, int index, int src_index)
{
MOVTrack *src_track = &mov->tracks[src_index];
AVStream *src_st = s->streams[src_index];
int ret = AVERROR(ENOMEM);
- AVOutputFormat *rtp_format = av_guess_format("rtp", NULL, NULL);
track->tag = MKTAG('r','t','p',' ');
track->src_track = src_index;
- if (!rtp_format) {
- ret = AVERROR(ENOENT);
- goto fail;
- }
-
track->enc = avcodec_alloc_context();
if (!track->enc)
goto fail;
track->enc->codec_type = AVMEDIA_TYPE_DATA;
track->enc->codec_tag = track->tag;
- track->rtp_ctx = avformat_alloc_context();
+ track->rtp_ctx = ff_rtp_chain_mux_open(s, src_st, NULL,
+ RTP_MAX_PACKET_SIZE);
if (!track->rtp_ctx)
goto fail;
- track->rtp_ctx->oformat = rtp_format;
- if (!av_new_stream(track->rtp_ctx, 0))
- goto fail;
-
- /* Copy stream parameters */
- track->rtp_ctx->streams[0]->sample_aspect_ratio =
- src_st->sample_aspect_ratio;
-
- avcodec_copy_context(track->rtp_ctx->streams[0]->codec, src_st->codec);
-
- if ((ret = url_open_dyn_packet_buf(&track->rtp_ctx->pb,
- RTP_MAX_PACKET_SIZE)) < 0)
- goto fail;
- ret = av_write_header(track->rtp_ctx);
- if (ret)
- goto fail;
/* Copy the RTP AVStream timebase back to the hint AVStream */
track->timescale = track->rtp_ctx->streams[0]->time_base.den;
fail:
av_log(s, AV_LOG_WARNING,
"Unable to initialize hinting of stream %d\n", src_index);
- if (track->rtp_ctx && track->rtp_ctx->pb) {
- uint8_t *buf;
- url_close_dyn_buf(track->rtp_ctx->pb, &buf);
- av_free(buf);
- }
- if (track->rtp_ctx && track->rtp_ctx->streams[0]) {
- av_metadata_free(&track->rtp_ctx->streams[0]->metadata);
- av_free(track->rtp_ctx->streams[0]->codec->extradata);
- av_free(track->rtp_ctx->streams[0]->codec);
- av_free(track->rtp_ctx->streams[0]->info);
- av_free(track->rtp_ctx->streams[0]);
- }
- if (track->rtp_ctx) {
- av_metadata_free(&track->rtp_ctx->metadata);
- av_free(track->rtp_ctx->priv_data);
- av_freep(&track->rtp_ctx);
- }
av_freep(&track->enc);
- /* Set a default timescale, to avoid crashes in dump_format */
+ /* Set a default timescale, to avoid crashes in av_dump_format */
track->timescale = 90000;
return ret;
}
}
static void output_immediate(const uint8_t *data, int size,
- ByteIOContext *out, int *entries)
+ AVIOContext *out, int *entries)
{
while (size > 0) {
int len = size;
if (len > 14)
len = 14;
- put_byte(out, 1); /* immediate constructor */
- put_byte(out, len); /* amount of valid data */
- put_buffer(out, data, len);
+ avio_w8(out, 1); /* immediate constructor */
+ avio_w8(out, len); /* amount of valid data */
+ avio_write(out, data, len);
data += len;
size -= len;
for (; len < 14; len++)
- put_byte(out, 0);
+ avio_w8(out, 0);
(*entries)++;
}
}
-static void output_match(ByteIOContext *out, int match_sample,
+static void output_match(AVIOContext *out, int match_sample,
int match_offset, int match_len, int *entries)
{
- put_byte(out, 2); /* sample constructor */
- put_byte(out, 0); /* track reference */
- put_be16(out, match_len);
- put_be32(out, match_sample);
- put_be32(out, match_offset);
- put_be16(out, 1); /* bytes per block */
- put_be16(out, 1); /* samples per block */
+ avio_w8(out, 2); /* sample constructor */
+ avio_w8(out, 0); /* track reference */
+ avio_wb16(out, match_len);
+ avio_wb32(out, match_sample);
+ avio_wb32(out, match_offset);
+ avio_wb16(out, 1); /* bytes per block */
+ avio_wb16(out, 1); /* samples per block */
(*entries)++;
}
static void describe_payload(const uint8_t *data, int size,
- ByteIOContext *out, int *entries,
+ AVIOContext *out, int *entries,
HintSampleQueue *queue)
{
/* Describe the payload using different constructors */
* @param pts pointer where the timestamp for the written RTP hint is stored
* @return the number of RTP packets in the written hint
*/
-static int write_hint_packets(ByteIOContext *out, const uint8_t *data,
+static int write_hint_packets(AVIOContext *out, const uint8_t *data,
int size, MOVTrack *trk, int64_t *pts)
{
int64_t curpos;
int64_t count_pos, entries_pos;
int count = 0, entries;
- count_pos = url_ftell(out);
+ count_pos = avio_tell(out);
/* RTPsample header */
- put_be16(out, 0); /* packet count */
- put_be16(out, 0); /* reserved */
+ avio_wb16(out, 0); /* packet count */
+ avio_wb16(out, 0); /* reserved */
while (size > 4) {
uint32_t packet_len = AV_RB32(data);
count++;
/* RTPpacket header */
- put_be32(out, 0); /* relative_time */
- put_buffer(out, data, 2); /* RTP header */
- put_be16(out, seq); /* RTPsequenceseed */
- put_be16(out, 0); /* reserved + flags */
- entries_pos = url_ftell(out);
- put_be16(out, 0); /* entry count */
+ avio_wb32(out, 0); /* relative_time */
+ avio_write(out, data, 2); /* RTP header */
+ avio_wb16(out, seq); /* RTPsequenceseed */
+ avio_wb16(out, 0); /* reserved + flags */
+ entries_pos = avio_tell(out);
+ avio_wb16(out, 0); /* entry count */
data += 12;
size -= 12;
data += packet_len;
size -= packet_len;
- curpos = url_ftell(out);
- url_fseek(out, entries_pos, SEEK_SET);
- put_be16(out, entries);
- url_fseek(out, curpos, SEEK_SET);
+ curpos = avio_tell(out);
+ avio_seek(out, entries_pos, SEEK_SET);
+ avio_wb16(out, entries);
+ avio_seek(out, curpos, SEEK_SET);
}
- curpos = url_ftell(out);
- url_fseek(out, count_pos, SEEK_SET);
- put_be16(out, count);
- url_fseek(out, curpos, SEEK_SET);
+ curpos = avio_tell(out);
+ avio_seek(out, count_pos, SEEK_SET);
+ avio_wb16(out, count);
+ avio_seek(out, curpos, SEEK_SET);
return count;
}
AVFormatContext *rtp_ctx = trk->rtp_ctx;
uint8_t *buf = NULL;
int size;
- ByteIOContext *hintbuf = NULL;
+ AVIOContext *hintbuf = NULL;
AVPacket hint_pkt;
int ret = 0, count;
/* Fetch the output from the RTP muxer, open a new output buffer
* for next time. */
- size = url_close_dyn_buf(rtp_ctx->pb, &buf);
- if ((ret = url_open_dyn_packet_buf(&rtp_ctx->pb,
+ size = avio_close_dyn_buf(rtp_ctx->pb, &buf);
+ if ((ret = ffio_open_dyn_packet_buf(&rtp_ctx->pb,
RTP_MAX_PACKET_SIZE)) < 0)
goto done;
goto done;
/* Open a buffer for writing the hint */
- if ((ret = url_open_dyn_buf(&hintbuf)) < 0)
+ if ((ret = avio_open_dyn_buf(&hintbuf)) < 0)
goto done;
av_init_packet(&hint_pkt);
count = write_hint_packets(hintbuf, buf, size, trk, &hint_pkt.dts);
av_freep(&buf);
/* Write the hint data into the hint track */
- hint_pkt.size = size = url_close_dyn_buf(hintbuf, &buf);
+ hint_pkt.size = size = avio_close_dyn_buf(hintbuf, &buf);
hint_pkt.data = buf;
hint_pkt.pts = hint_pkt.dts;
hint_pkt.stream_index = track_index;
return;
if (rtp_ctx->pb) {
av_write_trailer(rtp_ctx);
- url_close_dyn_buf(rtp_ctx->pb, &ptr);
+ avio_close_dyn_buf(rtp_ctx->pb, &ptr);
av_free(ptr);
}
- av_metadata_free(&rtp_ctx->streams[0]->metadata);
- av_metadata_free(&rtp_ctx->metadata);
- av_free(rtp_ctx->streams[0]->codec->extradata);
- av_free(rtp_ctx->streams[0]->codec);
- av_free(rtp_ctx->streams[0]->info);
- av_free(rtp_ctx->streams[0]);
- av_freep(&rtp_ctx);
+ avformat_free_context(rtp_ctx);
}
projects / ffmpeg / blobdiff