X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Frmenc.c;h=0312d161c7d796871fff72e87ce4587ef5e4f452;hb=2c07c1804831fa0ae6d494a63fdd10facfd6074b;hp=21748d5d5253f5c15618e66fc95028eef28816f2;hpb=8b9794e5424387db0134d2d320cad1ff78e329e7;p=ffmpeg diff --git a/libavformat/rmenc.c b/libavformat/rmenc.c index 21748d5d525..0312d161c7d 100644 --- a/libavformat/rmenc.c +++ b/libavformat/rmenc.c @@ -2,24 +2,26 @@ * "Real" compatible muxer. * Copyright (c) 2000, 2001 Fabrice Bellard * - * This file is part of FFmpeg. + * This file is part of Libav. * - * FFmpeg is free software; you can redistribute it and/or + * Libav 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, + * Libav 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 + * License along with Libav; 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 "rm.h" +#include "libavutil/dict.h" typedef struct { int nb_packets; @@ -44,45 +46,45 @@ typedef struct { #define BUFFER_DURATION 0 -static void put_str(ByteIOContext *s, const char *tag) +static void put_str(AVIOContext *s, const char *tag) { - put_be16(s,strlen(tag)); + avio_wb16(s,strlen(tag)); while (*tag) { - put_byte(s, *tag++); + avio_w8(s, *tag++); } } -static void put_str8(ByteIOContext *s, const char *tag) +static void put_str8(AVIOContext *s, const char *tag) { - put_byte(s, strlen(tag)); + avio_w8(s, strlen(tag)); while (*tag) { - put_byte(s, *tag++); + avio_w8(s, *tag++); } } -static void rv10_write_header(AVFormatContext *ctx, - int data_size, int index_pos) +static int rv10_write_header(AVFormatContext *ctx, + int data_size, int index_pos) { RMMuxContext *rm = ctx->priv_data; - ByteIOContext *s = ctx->pb; + AVIOContext *s = ctx->pb; StreamInfo *stream; unsigned char *data_offset_ptr, *start_ptr; const char *desc, *mimetype; int nb_packets, packet_total_size, packet_max_size, size, packet_avg_size, i; int bit_rate, v, duration, flags, data_pos; - AVMetadataTag *tag; + AVDictionaryEntry *tag; start_ptr = s->buf_ptr; - put_tag(s, ".RMF"); - put_be32(s,18); /* header size */ - put_be16(s,0); - put_be32(s,0); - put_be32(s,4 + ctx->nb_streams); /* num headers */ + ffio_wfourcc(s, ".RMF"); + avio_wb32(s,18); /* header size */ + avio_wb16(s,0); + avio_wb32(s,0); + avio_wb32(s,4 + ctx->nb_streams); /* num headers */ - put_tag(s,"PROP"); - put_be32(s, 50); - put_be16(s, 0); + ffio_wfourcc(s,"PROP"); + avio_wb32(s, 50); + avio_wb16(s, 0); packet_max_size = 0; packet_total_size = 0; nb_packets = 0; @@ -100,39 +102,39 @@ static void rv10_write_header(AVFormatContext *ctx, if (v > duration) duration = v; } - put_be32(s, bit_rate); /* max bit rate */ - put_be32(s, bit_rate); /* avg bit rate */ - put_be32(s, packet_max_size); /* max packet size */ + avio_wb32(s, bit_rate); /* max bit rate */ + avio_wb32(s, bit_rate); /* avg bit rate */ + avio_wb32(s, packet_max_size); /* max packet size */ if (nb_packets > 0) packet_avg_size = packet_total_size / nb_packets; else packet_avg_size = 0; - put_be32(s, packet_avg_size); /* avg packet size */ - put_be32(s, nb_packets); /* num packets */ - put_be32(s, duration); /* duration */ - put_be32(s, BUFFER_DURATION); /* preroll */ - put_be32(s, index_pos); /* index offset */ + avio_wb32(s, packet_avg_size); /* avg packet size */ + avio_wb32(s, nb_packets); /* num packets */ + avio_wb32(s, duration); /* duration */ + avio_wb32(s, BUFFER_DURATION); /* preroll */ + avio_wb32(s, index_pos); /* index offset */ /* computation of data the data offset */ data_offset_ptr = s->buf_ptr; - put_be32(s, 0); /* data offset : will be patched after */ - put_be16(s, ctx->nb_streams); /* num streams */ + avio_wb32(s, 0); /* data offset : will be patched after */ + avio_wb16(s, ctx->nb_streams); /* num streams */ flags = 1 | 2; /* save allowed & perfect play */ - if (url_is_streamed(s)) + if (!s->seekable) flags |= 4; /* live broadcast */ - put_be16(s, flags); + avio_wb16(s, flags); /* comments */ - put_tag(s,"CONT"); + ffio_wfourcc(s,"CONT"); size = 4 * 2 + 10; for(i=0; imetadata, ff_rm_metadata[i], NULL, 0); + tag = av_dict_get(ctx->metadata, ff_rm_metadata[i], NULL, 0); if(tag) size += strlen(tag->value); } - put_be32(s,size); - put_be16(s,0); + avio_wb32(s,size); + avio_wb16(s,0); for(i=0; imetadata, ff_rm_metadata[i], NULL, 0); + tag = av_dict_get(ctx->metadata, ff_rm_metadata[i], NULL, 0); put_str(s, tag ? tag->value : ""); } @@ -141,7 +143,7 @@ static void rv10_write_header(AVFormatContext *ctx, stream = &rm->streams[i]; - if (stream->enc->codec_type == CODEC_TYPE_AUDIO) { + if (stream->enc->codec_type == AVMEDIA_TYPE_AUDIO) { desc = "The Audio Stream"; mimetype = "audio/x-pn-realaudio"; codec_data_size = 73; @@ -151,45 +153,45 @@ static void rv10_write_header(AVFormatContext *ctx, codec_data_size = 34; } - put_tag(s,"MDPR"); + ffio_wfourcc(s,"MDPR"); size = 10 + 9 * 4 + strlen(desc) + strlen(mimetype) + codec_data_size; - put_be32(s, size); - put_be16(s, 0); + avio_wb32(s, size); + avio_wb16(s, 0); - put_be16(s, i); /* stream number */ - put_be32(s, stream->bit_rate); /* max bit rate */ - put_be32(s, stream->bit_rate); /* avg bit rate */ - put_be32(s, stream->packet_max_size); /* max packet size */ + avio_wb16(s, i); /* stream number */ + avio_wb32(s, stream->bit_rate); /* max bit rate */ + avio_wb32(s, stream->bit_rate); /* avg bit rate */ + avio_wb32(s, stream->packet_max_size); /* max packet size */ if (stream->nb_packets > 0) packet_avg_size = stream->packet_total_size / stream->nb_packets; else packet_avg_size = 0; - put_be32(s, packet_avg_size); /* avg packet size */ - put_be32(s, 0); /* start time */ - put_be32(s, BUFFER_DURATION); /* preroll */ + avio_wb32(s, packet_avg_size); /* avg packet size */ + avio_wb32(s, 0); /* start time */ + avio_wb32(s, BUFFER_DURATION); /* preroll */ /* duration */ - if (url_is_streamed(s) || !stream->total_frames) - put_be32(s, (int)(3600 * 1000)); + if (!s->seekable || !stream->total_frames) + avio_wb32(s, (int)(3600 * 1000)); else - put_be32(s, (int)(stream->total_frames * 1000 / stream->frame_rate)); + avio_wb32(s, (int)(stream->total_frames * 1000 / stream->frame_rate)); put_str8(s, desc); put_str8(s, mimetype); - put_be32(s, codec_data_size); + avio_wb32(s, codec_data_size); - if (stream->enc->codec_type == CODEC_TYPE_AUDIO) { + if (stream->enc->codec_type == AVMEDIA_TYPE_AUDIO) { int coded_frame_size, fscode, sample_rate; sample_rate = stream->enc->sample_rate; coded_frame_size = (stream->enc->bit_rate * stream->enc->frame_size) / (8 * sample_rate); /* audio codec info */ - put_tag(s, ".ra"); - put_byte(s, 0xfd); - put_be32(s, 0x00040000); /* version */ - put_tag(s, ".ra4"); - put_be32(s, 0x01b53530); /* stream length */ - put_be16(s, 4); /* unknown */ - put_be32(s, 0x39); /* header size */ + avio_write(s, ".ra", 3); + avio_w8(s, 0xfd); + avio_wb32(s, 0x00040000); /* version */ + ffio_wfourcc(s, ".ra4"); + avio_wb32(s, 0x01b53530); /* stream length */ + avio_wb16(s, 4); /* unknown */ + avio_wb32(s, 0x39); /* header size */ switch(sample_rate) { case 48000: @@ -208,50 +210,57 @@ static void rv10_write_header(AVFormatContext *ctx, case 8000: fscode = 3; } - put_be16(s, fscode); /* codec additional info, for AC-3, seems + avio_wb16(s, fscode); /* codec additional info, for AC-3, seems to be a frequency code */ /* special hack to compensate rounding errors... */ if (coded_frame_size == 557) coded_frame_size--; - put_be32(s, coded_frame_size); /* frame length */ - put_be32(s, 0x51540); /* unknown */ - put_be32(s, 0x249f0); /* unknown */ - put_be32(s, 0x249f0); /* unknown */ - put_be16(s, 0x01); + avio_wb32(s, coded_frame_size); /* frame length */ + avio_wb32(s, 0x51540); /* unknown */ + avio_wb32(s, 0x249f0); /* unknown */ + avio_wb32(s, 0x249f0); /* unknown */ + avio_wb16(s, 0x01); /* frame length : seems to be very important */ - put_be16(s, coded_frame_size); - put_be32(s, 0); /* unknown */ - put_be16(s, stream->enc->sample_rate); /* sample rate */ - put_be32(s, 0x10); /* unknown */ - put_be16(s, stream->enc->channels); + avio_wb16(s, coded_frame_size); + avio_wb32(s, 0); /* unknown */ + avio_wb16(s, stream->enc->sample_rate); /* sample rate */ + avio_wb32(s, 0x10); /* unknown */ + avio_wb16(s, stream->enc->channels); put_str8(s, "Int0"); /* codec name */ - put_str8(s, "dnet"); /* codec name */ - put_be16(s, 0); /* title length */ - put_be16(s, 0); /* author length */ - put_be16(s, 0); /* copyright length */ - put_byte(s, 0); /* end of header */ + if (stream->enc->codec_tag) { + avio_w8(s, 4); /* tag length */ + avio_wl32(s, stream->enc->codec_tag); + } else { + av_log(ctx, AV_LOG_ERROR, "Invalid codec tag\n"); + return -1; + } + avio_wb16(s, 0); /* title length */ + avio_wb16(s, 0); /* author length */ + avio_wb16(s, 0); /* copyright length */ + avio_w8(s, 0); /* end of header */ } else { /* video codec info */ - put_be32(s,34); /* size */ + avio_wb32(s,34); /* size */ + ffio_wfourcc(s, "VIDO"); if(stream->enc->codec_id == CODEC_ID_RV10) - put_tag(s,"VIDORV10"); + ffio_wfourcc(s,"RV10"); else - put_tag(s,"VIDORV20"); - put_be16(s, stream->enc->width); - put_be16(s, stream->enc->height); - put_be16(s, (int) stream->frame_rate); /* frames per seconds ? */ - put_be32(s,0); /* unknown meaning */ - put_be16(s, (int) stream->frame_rate); /* unknown meaning */ - put_be32(s,0); /* unknown meaning */ - put_be16(s, 8); /* unknown meaning */ + ffio_wfourcc(s,"RV20"); + avio_wb16(s, stream->enc->width); + avio_wb16(s, stream->enc->height); + avio_wb16(s, (int) stream->frame_rate); /* frames per seconds ? */ + avio_wb32(s,0); /* unknown meaning */ + avio_wb16(s, (int) stream->frame_rate); /* unknown meaning */ + avio_wb32(s,0); /* unknown meaning */ + avio_wb16(s, 8); /* unknown meaning */ /* Seems to be the codec version: only use basic H263. The next versions seems to add a diffential DC coding as in MPEG... nothing new under the sun */ if(stream->enc->codec_id == CODEC_ID_RV10) - put_be32(s,0x10000000); + avio_wb32(s,0x10000000); else - put_be32(s,0x20103001); - //put_be32(s,0x10003000); + avio_wb32(s,0x20103001); + //avio_wb32(s,0x10003000); } } @@ -264,32 +273,33 @@ static void rv10_write_header(AVFormatContext *ctx, data_offset_ptr[3] = data_pos; /* data stream */ - put_tag(s,"DATA"); - put_be32(s,data_size + 10 + 8); - put_be16(s,0); + ffio_wfourcc(s, "DATA"); + avio_wb32(s,data_size + 10 + 8); + avio_wb16(s,0); - put_be32(s, nb_packets); /* number of packets */ - put_be32(s,0); /* next data header */ + avio_wb32(s, nb_packets); /* number of packets */ + avio_wb32(s,0); /* next data header */ + return 0; } static void write_packet_header(AVFormatContext *ctx, StreamInfo *stream, int length, int key_frame) { int timestamp; - ByteIOContext *s = ctx->pb; + AVIOContext *s = ctx->pb; stream->nb_packets++; stream->packet_total_size += length; if (length > stream->packet_max_size) stream->packet_max_size = length; - put_be16(s,0); /* version */ - put_be16(s,length + 12); - put_be16(s, stream->num); /* stream number */ + avio_wb16(s,0); /* version */ + avio_wb16(s,length + 12); + avio_wb16(s, stream->num); /* stream number */ timestamp = (1000 * (float)stream->nb_frames) / stream->frame_rate; - put_be32(s, timestamp); /* timestamp */ - put_byte(s, 0); /* reserved */ - put_byte(s, key_frame ? 2 : 0); /* flags */ + avio_wb32(s, timestamp); /* timestamp */ + avio_w8(s, 0); /* reserved */ + avio_w8(s, key_frame ? 2 : 0); /* flags */ } static int rm_write_header(AVFormatContext *s) @@ -309,7 +319,7 @@ static int rm_write_header(AVFormatContext *s) stream->enc = codec; switch(codec->codec_type) { - case CODEC_TYPE_AUDIO: + case AVMEDIA_TYPE_AUDIO: rm->audio_stream = stream; stream->frame_rate = (float)codec->sample_rate / (float)codec->frame_size; /* XXX: dummy values */ @@ -317,7 +327,7 @@ static int rm_write_header(AVFormatContext *s) stream->nb_packets = 0; stream->total_frames = stream->nb_packets; break; - case CODEC_TYPE_VIDEO: + case AVMEDIA_TYPE_VIDEO: rm->video_stream = stream; stream->frame_rate = (float)codec->time_base.den / (float)codec->time_base.num; /* XXX: dummy values */ @@ -330,8 +340,9 @@ static int rm_write_header(AVFormatContext *s) } } - rv10_write_header(s, 0, 0); - put_flush_packet(s->pb); + if (rv10_write_header(s, 0, 0)) + return AVERROR_INVALIDDATA; + avio_flush(s->pb); return 0; } @@ -339,22 +350,26 @@ static int rm_write_audio(AVFormatContext *s, const uint8_t *buf, int size, int { uint8_t *buf1; RMMuxContext *rm = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; StreamInfo *stream = rm->audio_stream; int i; /* XXX: suppress this malloc */ - buf1= (uint8_t*) av_malloc( size * sizeof(uint8_t) ); + buf1 = av_malloc(size * sizeof(uint8_t)); - write_packet_header(s, stream, size, !!(flags & PKT_FLAG_KEY)); + write_packet_header(s, stream, size, !!(flags & AV_PKT_FLAG_KEY)); - /* for AC-3, the words seem to be reversed */ - for(i=0;ienc->codec_id == CODEC_ID_AC3) { + /* for AC-3, the words seem to be reversed */ + for(i=0;inb_frames++; av_free(buf1); return 0; @@ -363,9 +378,9 @@ static int rm_write_audio(AVFormatContext *s, const uint8_t *buf, int size, int static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int flags) { RMMuxContext *rm = s->priv_data; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; StreamInfo *stream = rm->video_stream; - int key_frame = !!(flags & PKT_FLAG_KEY); + int key_frame = !!(flags & AV_PKT_FLAG_KEY); /* XXX: this is incorrect: should be a parameter */ @@ -374,32 +389,32 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int #if 1 write_packet_header(s, stream, size + 7 + (size >= 0x4000)*4, key_frame); /* bit 7: '1' if final packet of a frame converted in several packets */ - put_byte(pb, 0x81); + avio_w8(pb, 0x81); /* bit 7: '1' if I frame. bits 6..0 : sequence number in current frame starting from 1 */ if (key_frame) { - put_byte(pb, 0x81); + avio_w8(pb, 0x81); } else { - put_byte(pb, 0x01); + avio_w8(pb, 0x01); } if(size >= 0x4000){ - put_be32(pb, size); /* total frame size */ - put_be32(pb, size); /* offset from the start or the end */ + avio_wb32(pb, size); /* total frame size */ + avio_wb32(pb, size); /* offset from the start or the end */ }else{ - put_be16(pb, 0x4000 | size); /* total frame size */ - put_be16(pb, 0x4000 | size); /* offset from the start or the end */ + avio_wb16(pb, 0x4000 | size); /* total frame size */ + avio_wb16(pb, 0x4000 | size); /* offset from the start or the end */ } #else /* full frame */ write_packet_header(s, size + 6); - put_byte(pb, 0xc0); - put_be16(pb, 0x4000 + size); /* total frame size */ - put_be16(pb, 0x4000 + packet_number * 126); /* position in stream */ + avio_w8(pb, 0xc0); + avio_wb16(pb, 0x4000 + size); /* total frame size */ + avio_wb16(pb, 0x4000 + packet_number * 126); /* position in stream */ #endif - put_byte(pb, stream->nb_frames & 0xff); + avio_w8(pb, stream->nb_frames & 0xff); - put_buffer(pb, buf, size); - put_flush_packet(pb); + avio_write(pb, buf, size); + avio_flush(pb); stream->nb_frames++; return 0; @@ -408,7 +423,7 @@ static int rm_write_video(AVFormatContext *s, const uint8_t *buf, int size, int static int rm_write_packet(AVFormatContext *s, AVPacket *pkt) { if (s->streams[pkt->stream_index]->codec->codec_type == - CODEC_TYPE_AUDIO) + AVMEDIA_TYPE_AUDIO) return rm_write_audio(s, pkt->data, pkt->size, pkt->flags); else return rm_write_video(s, pkt->data, pkt->size, pkt->flags); @@ -418,42 +433,43 @@ static int rm_write_trailer(AVFormatContext *s) { RMMuxContext *rm = s->priv_data; int data_size, index_pos, i; - ByteIOContext *pb = s->pb; + AVIOContext *pb = s->pb; - if (!url_is_streamed(s->pb)) { + if (s->pb->seekable) { /* end of file: finish to write header */ - index_pos = url_fseek(pb, 0, SEEK_CUR); + index_pos = avio_tell(pb); data_size = index_pos - rm->data_pos; /* FIXME: write index */ /* undocumented end header */ - put_be32(pb, 0); - put_be32(pb, 0); + avio_wb32(pb, 0); + avio_wb32(pb, 0); - url_fseek(pb, 0, SEEK_SET); + avio_seek(pb, 0, SEEK_SET); for(i=0;inb_streams;i++) rm->streams[i].total_frames = rm->streams[i].nb_frames; rv10_write_header(s, data_size, 0); } else { /* undocumented end header */ - put_be32(pb, 0); - put_be32(pb, 0); + avio_wb32(pb, 0); + avio_wb32(pb, 0); } - put_flush_packet(pb); + avio_flush(pb); return 0; } -AVOutputFormat rm_muxer = { - "rm", - NULL_IF_CONFIG_SMALL("RealMedia format"), - "application/vnd.rn-realmedia", - "rm,ra", - sizeof(RMMuxContext), - CODEC_ID_AC3, - CODEC_ID_RV10, - rm_write_header, - rm_write_packet, - rm_write_trailer, +AVOutputFormat ff_rm_muxer = { + .name = "rm", + .long_name = NULL_IF_CONFIG_SMALL("RealMedia format"), + .mime_type = "application/vnd.rn-realmedia", + .extensions = "rm,ra", + .priv_data_size = sizeof(RMMuxContext), + .audio_codec = CODEC_ID_AC3, + .video_codec = CODEC_ID_RV10, + .write_header = rm_write_header, + .write_packet = rm_write_packet, + .write_trailer = rm_write_trailer, + .codec_tag= (const AVCodecTag* const []){ff_rm_codec_tags, 0}, };