2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \
)
+typedef struct {
+ uint32_t seqno;
+ int is_streamed;
+ ASFStream streams[128]; ///< it's max number and it's not that big
+ /* non streamed additonnal info */
+ uint64_t nb_packets; ///< how many packets are there in the file, invalid if broadcasting
+ int64_t duration; ///< in 100ns units
+ /* packet filling */
+ unsigned char multi_payloads_present;
+ int packet_size_left;
+ int packet_timestamp_start;
+ int packet_timestamp_end;
+ unsigned int packet_nb_payloads;
+ uint8_t packet_buf[PACKET_SIZE];
+ ByteIOContext pb;
+ /* only for reading */
+ uint64_t data_offset; ///< beginning of the first data packet
+
+ int64_t last_indexed_pts;
+ ASFIndex* index_ptr;
+ uint32_t nb_index_count;
+ uint32_t nb_index_memory_alloc;
+ uint16_t maximum_packet;
+} ASFContext;
+
static const AVCodecTag codec_asf_bmp_tags[] = {
{ CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') },
{ CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') },
put_buffer(s, *g, sizeof(*g));
}
-static void put_str16_nolen(ByteIOContext *s, const char *tag);
static void put_str16(ByteIOContext *s, const char *tag)
{
- put_le16(s,strlen(tag) + 1);
- put_str16_nolen(s, tag);
-}
-
-static void put_str16_nolen(ByteIOContext *s, const char *tag)
-{
- int c;
-
- do{
- c = (uint8_t)*tag++;
- put_le16(s, c);
- }while(c);
+ int len;
+ uint8_t *pb;
+ ByteIOContext *dyn_buf;
+ if (url_open_dyn_buf(&dyn_buf) < 0)
+ return;
+
+ avio_put_str16le(dyn_buf, tag);
+ len = url_close_dyn_buf(dyn_buf, &pb);
+ put_le16(s, len);
+ put_buffer(s, pb, len);
+ av_freep(&pb);
}
static int64_t put_header(ByteIOContext *pb, const ff_asf_guid *g)
{
ASFContext *asf = s->priv_data;
ByteIOContext *pb = s->pb;
- AVMetadataTag *title, *author, *copyright, *comment;
+ AVMetadataTag *tags[5];
int header_size, n, extra_size, extra_size2, wav_extra_size, file_time;
int has_title;
int metadata_count;
int bit_rate;
int64_t duration;
- title = av_metadata_get(s->metadata, "title" , NULL, 0);
- author = av_metadata_get(s->metadata, "author" , NULL, 0);
- copyright = av_metadata_get(s->metadata, "copyright", NULL, 0);
- comment = av_metadata_get(s->metadata, "comment" , NULL, 0);
+ ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL);
+
+ tags[0] = av_metadata_get(s->metadata, "title" , NULL, 0);
+ tags[1] = av_metadata_get(s->metadata, "author" , NULL, 0);
+ tags[2] = av_metadata_get(s->metadata, "copyright", NULL, 0);
+ tags[3] = av_metadata_get(s->metadata, "comment" , NULL, 0);
+ tags[4] = av_metadata_get(s->metadata, "rating" , NULL, 0);
duration = asf->duration + PREROLL_TIME * 10000;
- has_title = title || author || copyright || comment;
+ has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4];
metadata_count = s->metadata ? s->metadata->count : 0;
bit_rate = 0;
put_le64(pb, asf->duration); /* duration (in 100ns units) */
put_le64(pb, PREROLL_TIME); /* start time stamp */
put_le32(pb, (asf->is_streamed || url_is_streamed(pb)) ? 3 : 2); /* ??? */
- put_le32(pb, asf->packet_size); /* packet size */
- put_le32(pb, asf->packet_size); /* packet size */
+ put_le32(pb, s->packet_size); /* packet size */
+ put_le32(pb, s->packet_size); /* packet size */
put_le32(pb, bit_rate); /* Nominal data rate in bps */
end_header(pb, hpos);
/* title and other infos */
if (has_title) {
+ int len;
+ uint8_t *buf;
+ ByteIOContext *dyn_buf;
+
+ if (url_open_dyn_buf(&dyn_buf) < 0)
+ return AVERROR(ENOMEM);
+
hpos = put_header(pb, &ff_asf_comment_header);
- put_le16(pb, title ? 2 * (strlen(title->value ) + 1) : 0);
- put_le16(pb, author ? 2 * (strlen(author->value ) + 1) : 0);
- put_le16(pb, copyright ? 2 * (strlen(copyright->value) + 1) : 0);
- put_le16(pb, comment ? 2 * (strlen(comment->value ) + 1) : 0);
- put_le16(pb, 0);
- if (title ) put_str16_nolen(pb, title->value );
- if (author ) put_str16_nolen(pb, author->value );
- if (copyright) put_str16_nolen(pb, copyright->value);
- if (comment ) put_str16_nolen(pb, comment->value );
+
+ for (n = 0; n < FF_ARRAY_ELEMS(tags); n++) {
+ len = tags[n] ? avio_put_str16le(dyn_buf, tags[n]->value) : 0;
+ put_le16(pb, len);
+ }
+ len = url_close_dyn_buf(dyn_buf, &buf);
+ put_buffer(pb, buf, len);
+ av_freep(&buf);
end_header(pb, hpos);
}
if (metadata_count) {
hpos = put_header(pb, &ff_asf_extended_content_header);
put_le16(pb, metadata_count);
while ((tag = av_metadata_get(s->metadata, "", tag, AV_METADATA_IGNORE_SUFFIX))) {
- put_le16(pb, 2*(strlen(tag->key) + 3) + 1);
- put_le16(pb, 'W');
- put_le16(pb, 'M');
- put_le16(pb, '/');
- put_str16_nolen(pb, tag->key);
+ put_str16(pb, tag->key);
put_le16(pb, 0);
- put_le16(pb, 2*strlen(tag->value) + 1);
- put_str16_nolen(pb, tag->value);
+ put_str16(pb, tag->value);
}
end_header(pb, hpos);
}
switch(enc->codec_type) {
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
wav_extra_size = 0;
extra_size = 18 + wav_extra_size;
extra_size2 = 8;
break;
default:
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
wav_extra_size = enc->extradata_size;
extra_size = 0x33 + wav_extra_size;
extra_size2 = 0;
}
hpos = put_header(pb, &ff_asf_stream_header);
- if (enc->codec_type == CODEC_TYPE_AUDIO) {
+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
put_guid(pb, &ff_asf_audio_stream);
put_guid(pb, &ff_asf_audio_conceal_spread);
} else {
put_le16(pb, n + 1); /* stream number */
put_le32(pb, 0); /* ??? */
- if (enc->codec_type == CODEC_TYPE_AUDIO) {
+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
/* WAVEFORMATEX header */
- int wavsize = put_wav_header(pb, enc);
+ int wavsize = ff_put_wav_header(pb, enc);
if ((enc->codec_id != CODEC_ID_MP3) && (enc->codec_id != CODEC_ID_MP2) && (enc->codec_id != CODEC_ID_ADPCM_IMA_WAV) && (enc->extradata_size==0)) {
wavsize += 2;
put_le16(pb, 0);
put_le16(pb, 40 + enc->extradata_size); /* size */
/* BITMAPINFOHEADER header */
- put_bmp_header(pb, enc, codec_bmp_tags, 1);
+ ff_put_bmp_header(pb, enc, ff_codec_bmp_tags, 1);
}
end_header(pb, hpos);
}
put_le32(pb, s->nb_streams);
for(n=0;n<s->nb_streams;n++) {
AVCodec *p;
+ const char *desc;
+ int len;
+ uint8_t *buf;
+ ByteIOContext *dyn_buf;
enc = s->streams[n]->codec;
p = avcodec_find_encoder(enc->codec_id);
- if(enc->codec_type == CODEC_TYPE_AUDIO)
+ if(enc->codec_type == AVMEDIA_TYPE_AUDIO)
put_le16(pb, 2);
- else if(enc->codec_type == CODEC_TYPE_VIDEO)
+ else if(enc->codec_type == AVMEDIA_TYPE_VIDEO)
put_le16(pb, 1);
else
put_le16(pb, -1);
if(enc->codec_id == CODEC_ID_WMAV2)
- put_str16(pb, "Windows Media Audio V8");
+ desc = "Windows Media Audio V8";
else
- put_str16(pb, p ? p->name : enc->codec_name);
+ desc = p ? p->name : enc->codec_name;
+
+ if ( url_open_dyn_buf(&dyn_buf) < 0)
+ return AVERROR(ENOMEM);
+
+ avio_put_str16le(dyn_buf, desc);
+ len = url_close_dyn_buf(dyn_buf, &buf);
+ put_le16(pb, len / 2); // "number of characters" = length in bytes / 2
+
+ put_buffer(pb, buf, len);
+ av_freep(&buf);
+
put_le16(pb, 0); /* no parameters */
/* id */
- if (enc->codec_type == CODEC_TYPE_AUDIO) {
+ if (enc->codec_type == AVMEDIA_TYPE_AUDIO) {
put_le16(pb, 2);
put_le16(pb, enc->codec_tag);
} else {
{
ASFContext *asf = s->priv_data;
- asf->packet_size = PACKET_SIZE;
+ s->packet_size = PACKET_SIZE;
asf->nb_packets = 0;
asf->last_indexed_pts = 0;
asf->packet_nb_payloads = 0;
asf->packet_timestamp_start = -1;
asf->packet_timestamp_end = -1;
- init_put_byte(&asf->pb, asf->packet_buf, asf->packet_size, 1,
+ init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1,
NULL, NULL, NULL, NULL);
return 0;
assert(asf->packet_timestamp_end >= asf->packet_timestamp_start);
if (asf->is_streamed) {
- put_chunk(s, 0x4424, asf->packet_size, 0);
+ put_chunk(s, 0x4424, s->packet_size, 0);
}
packet_hdr_size = put_payload_parsing_info(
assert(packet_hdr_size <= asf->packet_size_left);
memset(asf->packet_buf + packet_filled_size, 0, asf->packet_size_left);
- put_buffer(s->pb, asf->packet_buf, asf->packet_size - packet_hdr_size);
+ put_buffer(s->pb, asf->packet_buf, s->packet_size - packet_hdr_size);
put_flush_packet(s->pb);
asf->nb_packets++;
asf->packet_nb_payloads = 0;
asf->packet_timestamp_start = -1;
asf->packet_timestamp_end = -1;
- init_put_byte(&asf->pb, asf->packet_buf, asf->packet_size, 1,
+ init_put_byte(&asf->pb, asf->packet_buf, s->packet_size, 1,
NULL, NULL, NULL, NULL);
}
int val;
val = stream->num;
- if (flags & PKT_FLAG_KEY)
+ if (flags & AV_PKT_FLAG_KEY)
val |= ASF_PL_FLAG_KEY_FRAME;
put_byte(pb, val);
// multi payloads
frag_len1 = asf->packet_size_left - PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS - PACKET_HEADER_MIN_SIZE - 1;
- if(frag_len1 < payload_len && avst->codec->codec_type == CODEC_TYPE_AUDIO){
+ if(frag_len1 < payload_len && avst->codec->codec_type == AVMEDIA_TYPE_AUDIO){
flush_packet(s);
continue;
}
codec = s->streams[pkt->stream_index]->codec;
stream = &asf->streams[pkt->stream_index];
- if(codec->codec_type == CODEC_TYPE_AUDIO)
- flags &= ~PKT_FLAG_KEY;
+ if(codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ flags &= ~AV_PKT_FLAG_KEY;
pts = (pkt->pts != AV_NOPTS_VALUE) ? pkt->pts : pkt->dts;
assert(pts != AV_NOPTS_VALUE);
put_frame(s, stream, s->streams[pkt->stream_index], pkt->dts, pkt->data, pkt->size, flags);
/* check index */
- if ((!asf->is_streamed) && (flags & PKT_FLAG_KEY)) {
+ if ((!asf->is_streamed) && (flags & AV_PKT_FLAG_KEY)) {
start_sec = (int)(duration / INT64_C(10000000));
if (start_sec != (int)(asf->last_indexed_pts / INT64_C(10000000))) {
for(i=asf->nb_index_count;i<start_sec;i++) {
}
#if CONFIG_ASF_MUXER
-AVOutputFormat asf_muxer = {
+AVOutputFormat ff_asf_muxer = {
"asf",
NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf",
asf_write_packet,
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
- .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
- .metadata_conv = ff_asf_metadata_conv,
+ .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
};
#endif
#if CONFIG_ASF_STREAM_MUXER
-AVOutputFormat asf_stream_muxer = {
+AVOutputFormat ff_asf_stream_muxer = {
"asf_stream",
NULL_IF_CONFIG_SMALL("ASF format"),
"video/x-ms-asf",
asf_write_packet,
asf_write_trailer,
.flags = AVFMT_GLOBALHEADER,
- .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, codec_bmp_tags, codec_wav_tags, 0},
- .metadata_conv = ff_asf_metadata_conv,
+ .codec_tag= (const AVCodecTag* const []){codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0},
};
#endif //CONFIG_ASF_STREAM_MUXER
projects / ffmpeg / blobdiff