X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fasfenc.c;h=79b44a74e00b37c294660297b69efcb0f4230192;hb=2ded57371abead879bcee56da5131e5fac0d17ef;hp=9ac395382db3029b0644b25b53cac1b2d45cdfbd;hpb=0177b7d23aadeab218601893953f0a05209d037c;p=ffmpeg diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 9ac395382db..79b44a74e00 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -18,12 +18,14 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/dict.h" +#include "libavutil/mathematics.h" #include "avformat.h" +#include "avio_internal.h" #include "internal.h" #include "riff.h" #include "asf.h" -#include "avio_internal.h" -#include "libavutil/dict.h" #undef NDEBUG #include @@ -33,10 +35,9 @@ #define ASF_INDEX_BLOCK 600 #define ASF_PACKET_ERROR_CORRECTION_DATA_SIZE 0x2 -#define ASF_PACKET_ERROR_CORRECTION_FLAGS (\ - ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \ - ASF_PACKET_ERROR_CORRECTION_DATA_SIZE\ - ) +#define ASF_PACKET_ERROR_CORRECTION_FLAGS \ + (ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT | \ + ASF_PACKET_ERROR_CORRECTION_DATA_SIZE) #if (ASF_PACKET_ERROR_CORRECTION_FLAGS != 0) # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 1 @@ -44,12 +45,11 @@ # define ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE 0 #endif -#define ASF_PPI_PROPERTY_FLAGS (\ - ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \ - ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \ - ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \ - ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE \ - ) +#define ASF_PPI_PROPERTY_FLAGS \ + (ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_IS_BYTE | \ + ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_IS_DWORD | \ + ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_IS_BYTE | \ + ASF_PL_FLAG_STREAM_NUMBER_LENGTH_FIELD_IS_BYTE) #define ASF_PPI_LENGTH_TYPE_FLAGS 0 @@ -68,7 +68,6 @@ # define ASF_PPI_SEQUENCE_FIELD_SIZE 0 #endif - #if (ASF_PPI_FLAG_PACKET_LENGTH_FIELD_IS_BYTE == (ASF_PPI_LENGTH_TYPE_FLAGS & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE)) # define ASF_PPI_PACKET_LENGTH_FIELD_SIZE 1 #endif @@ -144,51 +143,47 @@ # define ASF_PAYLOAD_LENGTH_FIELD_SIZE 0 #endif -#define PACKET_HEADER_MIN_SIZE (\ - ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE + \ - ASF_PACKET_ERROR_CORRECTION_DATA_SIZE + \ - 1 + /*Length Type Flags*/ \ - 1 + /*Property Flags*/ \ - ASF_PPI_PACKET_LENGTH_FIELD_SIZE + \ - ASF_PPI_SEQUENCE_FIELD_SIZE + \ - ASF_PPI_PADDING_LENGTH_FIELD_SIZE + \ - 4 + /*Send Time Field*/ \ - 2 /*Duration Field*/ \ - ) - +#define PACKET_HEADER_MIN_SIZE \ + (ASF_PACKET_ERROR_CORRECTION_FLAGS_FIELD_SIZE + \ + ASF_PACKET_ERROR_CORRECTION_DATA_SIZE + \ + 1 + /* Length Type Flags */ \ + 1 + /* Property Flags */ \ + ASF_PPI_PACKET_LENGTH_FIELD_SIZE + \ + ASF_PPI_SEQUENCE_FIELD_SIZE + \ + ASF_PPI_PADDING_LENGTH_FIELD_SIZE + \ + 4 + /* Send Time Field */ \ + 2) /* Duration Field */ // Replicated Data shall be at least 8 bytes long. #define ASF_PAYLOAD_REPLICATED_DATA_LENGTH 0x08 -#define PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD (\ - 1 + /*Stream Number*/ \ - ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \ - ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \ - ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \ - ASF_PAYLOAD_REPLICATED_DATA_LENGTH \ - ) - -#define PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS (\ - 1 + /*Stream Number*/ \ - ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \ - ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \ - ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \ - ASF_PAYLOAD_REPLICATED_DATA_LENGTH + \ - ASF_PAYLOAD_LENGTH_FIELD_SIZE \ - ) - -#define SINGLE_PAYLOAD_DATA_LENGTH (\ - PACKET_SIZE - \ - PACKET_HEADER_MIN_SIZE - \ - PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD \ - ) - -#define MULTI_PAYLOAD_CONSTANT (\ - PACKET_SIZE - \ - PACKET_HEADER_MIN_SIZE - \ - 1 - /*Payload Flags*/ \ - 2*PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \ - ) +#define PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD \ + (1 + /* Stream Number */ \ + ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \ + ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \ + ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \ + ASF_PAYLOAD_REPLICATED_DATA_LENGTH) + +#define PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS \ + (1 + /* Stream Number */ \ + ASF_PAYLOAD_MEDIA_OBJECT_NUMBER_FIELD_SIZE + \ + ASF_PAYLOAD_OFFSET_INTO_MEDIA_OBJECT_FIELD_SIZE + \ + ASF_PAYLOAD_REPLICATED_DATA_LENGTH_FIELD_SIZE + \ + ASF_PAYLOAD_REPLICATED_DATA_LENGTH + \ + ASF_PAYLOAD_LENGTH_FIELD_SIZE) + +#define SINGLE_PAYLOAD_DATA_LENGTH \ + (PACKET_SIZE - \ + PACKET_HEADER_MIN_SIZE - \ + PAYLOAD_HEADER_SIZE_SINGLE_PAYLOAD) + +#define MULTI_PAYLOAD_CONSTANT \ + (PACKET_SIZE - \ + PACKET_HEADER_MIN_SIZE - \ + 1 - /* Payload Flags */ \ + 2 * PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS) + +#define DATA_HEADER_SIZE 50 typedef struct { uint32_t seqno; @@ -209,17 +204,17 @@ typedef struct { uint64_t data_offset; ///< beginning of the first data packet int64_t last_indexed_pts; - ASFIndex* index_ptr; + 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') }, - { CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, - { CODEC_ID_NONE, 0 }, + { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, + { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, + { AV_CODEC_ID_MSMPEG4V3, MKTAG('M', 'P', '4', '3') }, + { AV_CODEC_ID_NONE, 0 }, }; #define PREROLL_TIME 3100 @@ -267,7 +262,8 @@ static void end_header(AVIOContext *pb, int64_t pos) } /* write an asf chunk (only used in streaming case) */ -static void put_chunk(AVFormatContext *s, int type, int payload_length, int flags) +static void put_chunk(AVFormatContext *s, int type, + int payload_length, int flags) { ASFContext *asf = s->priv_data; AVIOContext *pb = s->pb; @@ -275,10 +271,10 @@ static void put_chunk(AVFormatContext *s, int type, int payload_length, int flag length = payload_length + 8; avio_wl16(pb, type); - avio_wl16(pb, length); //size - avio_wl32(pb, asf->seqno);//sequence number - avio_wl16(pb, flags); /* unknown bytes */ - avio_wl16(pb, length); //size_confirm + avio_wl16(pb, length); // size + avio_wl32(pb, asf->seqno); // sequence number + avio_wl16(pb, flags); // unknown bytes + avio_wl16(pb, length); // size_confirm asf->seqno++; } @@ -287,13 +283,72 @@ static int64_t unix_to_file_time(int ti) { int64_t t; - t = ti * INT64_C(10000000); + t = ti * INT64_C(10000000); t += INT64_C(116444736000000000); return t; } +static int32_t get_send_time(ASFContext *asf, int64_t pres_time, uint64_t *offset) +{ + int i; + int32_t send_time = 0; + *offset = asf->data_offset + DATA_HEADER_SIZE; + for (i = 0; i < asf->nb_index_count; i++) { + if (pres_time <= asf->index_ptr[i].send_time) + break; + send_time = asf->index_ptr[i].send_time; + *offset = asf->index_ptr[i].offset; + } + + return send_time / 10000; +} + +static int asf_write_markers(AVFormatContext *s) +{ + ASFContext *asf = s->priv_data; + AVIOContext *pb = s->pb; + int i; + AVRational scale = {1, 10000000}; + int64_t hpos = put_header(pb, &ff_asf_marker_header); + + put_guid(pb, &ff_asf_reserved_4); // ASF spec mandates this reserved value + avio_wl32(pb, s->nb_chapters); // markers count + avio_wl16(pb, 0); // ASF spec mandates 0 for this + avio_wl16(pb, 0); // name length 0, no name given + + for (i = 0; i < s->nb_chapters; i++) { + AVChapter *c = s->chapters[i]; + AVDictionaryEntry *t = av_dict_get(c->metadata, "title", NULL, 0); + int64_t pres_time = av_rescale_q(c->start, c->time_base, scale); + uint64_t offset; + int32_t send_time = get_send_time(asf, pres_time, &offset); + int len = 0; + uint8_t *buf; + AVIOContext *dyn_buf; + if (t) { + if (avio_open_dyn_buf(&dyn_buf) < 0) + return AVERROR(ENOMEM); + avio_put_str16le(dyn_buf, t->value); + len = avio_close_dyn_buf(dyn_buf, &buf); + } + avio_wl64(pb, offset); // offset of the packet with send_time + avio_wl64(pb, pres_time + PREROLL_TIME * 10000); // presentation time + avio_wl16(pb, 12 + len); // entry length + avio_wl32(pb, send_time); // send time + avio_wl32(pb, 0); // flags, should be 0 + avio_wl32(pb, len / 2); // marker desc length in WCHARS! + if (t) { + avio_write(pb, buf, len); // marker desc + av_freep(&buf); + } + } + end_header(pb, hpos); + return 0; +} + /* write the header (used two times if non streamed) */ -static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data_chunk_size) +static int asf_write_header1(AVFormatContext *s, int64_t file_size, + int64_t data_chunk_size) { ASFContext *asf = s->priv_data; AVIOContext *pb = s->pb; @@ -308,18 +363,18 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data ff_metadata_conv(&s->metadata, ff_asf_metadata_conv, NULL); - tags[0] = av_dict_get(s->metadata, "title" , NULL, 0); - tags[1] = av_dict_get(s->metadata, "author" , NULL, 0); + tags[0] = av_dict_get(s->metadata, "title", NULL, 0); + tags[1] = av_dict_get(s->metadata, "author", NULL, 0); tags[2] = av_dict_get(s->metadata, "copyright", NULL, 0); - tags[3] = av_dict_get(s->metadata, "comment" , NULL, 0); - tags[4] = av_dict_get(s->metadata, "rating" , NULL, 0); + tags[3] = av_dict_get(s->metadata, "comment", NULL, 0); + tags[4] = av_dict_get(s->metadata, "rating", NULL, 0); - duration = asf->duration + PREROLL_TIME * 10000; - has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4]; - metadata_count = s->metadata ? s->metadata->count : 0; + duration = asf->duration + PREROLL_TIME * 10000; + has_title = tags[0] || tags[1] || tags[2] || tags[3] || tags[4]; + metadata_count = av_dict_count(s->metadata); bit_rate = 0; - for(n=0;nnb_streams;n++) { + for (n = 0; n < s->nb_streams; n++) { enc = s->streams[n]->codec; avpriv_set_pts_info(s->streams[n], 32, 1, 1000); /* 32 bit pts in ms */ @@ -339,7 +394,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data /* file header */ header_offset = avio_tell(pb); - hpos = put_header(pb, &ff_asf_file_header); + hpos = put_header(pb, &ff_asf_file_header); put_guid(pb, &ff_asf_my_guid); avio_wl64(pb, file_size); file_time = 0; @@ -348,7 +403,7 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data avio_wl64(pb, duration); /* end time stamp (in 100ns units) */ avio_wl64(pb, asf->duration); /* duration (in 100ns units) */ avio_wl64(pb, PREROLL_TIME); /* start time stamp */ - avio_wl32(pb, (asf->is_streamed || !pb->seekable ) ? 3 : 2); /* ??? */ + avio_wl32(pb, (asf->is_streamed || !pb->seekable) ? 3 : 2); /* ??? */ avio_wl32(pb, s->packet_size); /* packet size */ avio_wl32(pb, s->packet_size); /* packet size */ avio_wl32(pb, bit_rate); /* Nominal data rate in bps */ @@ -392,28 +447,32 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data } end_header(pb, hpos); } - + /* chapters using ASF markers */ + if (!asf->is_streamed && s->nb_chapters) { + int ret; + if (ret = asf_write_markers(s)) + return ret; + } /* stream headers */ - for(n=0;nnb_streams;n++) { + for (n = 0; n < s->nb_streams; n++) { int64_t es_pos; // ASFStream *stream = &asf->streams[n]; - enc = s->streams[n]->codec; + enc = s->streams[n]->codec; asf->streams[n].num = n + 1; asf->streams[n].seq = 0; - - switch(enc->codec_type) { + switch (enc->codec_type) { case AVMEDIA_TYPE_AUDIO: wav_extra_size = 0; - extra_size = 18 + wav_extra_size; - extra_size2 = 8; + extra_size = 18 + wav_extra_size; + extra_size2 = 8; break; default: case AVMEDIA_TYPE_VIDEO: wav_extra_size = enc->extradata_size; - extra_size = 0x33 + wav_extra_size; - extra_size2 = 0; + extra_size = 0x33 + wav_extra_size; + extra_size2 = 0; break; } @@ -446,10 +505,10 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data } /* ERROR Correction */ avio_w8(pb, 0x01); - if(enc->codec_id == CODEC_ID_ADPCM_G726 || !enc->block_align){ + if (enc->codec_id == AV_CODEC_ID_ADPCM_G726 || !enc->block_align) { avio_wl16(pb, 0x0190); avio_wl16(pb, 0x0190); - }else{ + } else { avio_wl16(pb, enc->block_align); avio_wl16(pb, enc->block_align); } @@ -472,40 +531,43 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data hpos = put_header(pb, &ff_asf_codec_comment_header); put_guid(pb, &ff_asf_codec_comment1_header); avio_wl32(pb, s->nb_streams); - for(n=0;nnb_streams;n++) { - AVCodec *p; + for (n = 0; n < s->nb_streams; n++) { + const AVCodecDescriptor *codec_desc; const char *desc; - int len; - uint8_t *buf; - AVIOContext *dyn_buf; - enc = s->streams[n]->codec; - p = avcodec_find_encoder(enc->codec_id); + enc = s->streams[n]->codec; + codec_desc = avcodec_descriptor_get(enc->codec_id); - if(enc->codec_type == AVMEDIA_TYPE_AUDIO) + if (enc->codec_type == AVMEDIA_TYPE_AUDIO) avio_wl16(pb, 2); - else if(enc->codec_type == AVMEDIA_TYPE_VIDEO) + else if (enc->codec_type == AVMEDIA_TYPE_VIDEO) avio_wl16(pb, 1); else avio_wl16(pb, -1); - if(enc->codec_id == CODEC_ID_WMAV2) + if (enc->codec_id == AV_CODEC_ID_WMAV2) desc = "Windows Media Audio V8"; else - desc = p ? p->name : enc->codec_name; + desc = codec_desc ? codec_desc->name : NULL; - if ( avio_open_dyn_buf(&dyn_buf) < 0) - return AVERROR(ENOMEM); + if (desc) { + AVIOContext *dyn_buf; + uint8_t *buf; + int len; - avio_put_str16le(dyn_buf, desc); - len = avio_close_dyn_buf(dyn_buf, &buf); - avio_wl16(pb, len / 2); // "number of characters" = length in bytes / 2 + if (avio_open_dyn_buf(&dyn_buf) < 0) + return AVERROR(ENOMEM); - avio_write(pb, buf, len); - av_freep(&buf); + avio_put_str16le(dyn_buf, desc); + len = avio_close_dyn_buf(dyn_buf, &buf); + avio_wl16(pb, len / 2); // "number of characters" = length in bytes / 2 - avio_wl16(pb, 0); /* no parameters */ + avio_write(pb, buf, len); + av_freep(&buf); + } else + avio_wl16(pb, 0); + avio_wl16(pb, 0); /* no parameters */ /* id */ if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { @@ -515,24 +577,24 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data avio_wl16(pb, 4); avio_wl32(pb, enc->codec_tag); } - if(!enc->codec_tag) + if (!enc->codec_tag) return -1; } end_header(pb, hpos); /* patch the header size fields */ - cur_pos = avio_tell(pb); + cur_pos = avio_tell(pb); header_size = cur_pos - header_offset; if (asf->is_streamed) { - header_size += 8 + 30 + 50; + header_size += 8 + 30 + DATA_HEADER_SIZE; avio_seek(pb, header_offset - 10 - 30, SEEK_SET); avio_wl16(pb, header_size); avio_seek(pb, header_offset - 2 - 30, SEEK_SET); avio_wl16(pb, header_size); - header_size -= 8 + 30 + 50; + header_size -= 8 + 30 + DATA_HEADER_SIZE; } header_size += 24 + 6; avio_seek(pb, header_offset - 14, SEEK_SET); @@ -557,27 +619,27 @@ static int asf_write_header(AVFormatContext *s) s->packet_size = PACKET_SIZE; asf->nb_packets = 0; - asf->last_indexed_pts = 0; - asf->index_ptr = av_malloc( sizeof(ASFIndex) * ASF_INDEX_BLOCK ); + asf->last_indexed_pts = 0; + asf->index_ptr = av_malloc(sizeof(ASFIndex) * ASF_INDEX_BLOCK); asf->nb_index_memory_alloc = ASF_INDEX_BLOCK; - asf->nb_index_count = 0; - asf->maximum_packet = 0; + asf->nb_index_count = 0; + asf->maximum_packet = 0; - /* the data-chunk-size has to be 50, which is data_size - asf->data_offset - * at the moment this function is done. It is needed to use asf as - * streamable format. */ - if (asf_write_header1(s, 0, 50) < 0) { + /* the data-chunk-size has to be 50 (DATA_HEADER_SIZE), which is + * data_size - asf->data_offset at the moment this function is done. + * It is needed to use asf as a streamable format. */ + if (asf_write_header1(s, 0, DATA_HEADER_SIZE) < 0) { //av_free(asf); return -1; } avio_flush(s->pb); - asf->packet_nb_payloads = 0; + asf->packet_nb_payloads = 0; asf->packet_timestamp_start = -1; - asf->packet_timestamp_end = -1; + asf->packet_timestamp_end = -1; ffio_init_context(&asf->pb, asf->packet_buf, s->packet_size, 1, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL); return 0; } @@ -591,30 +653,25 @@ static int asf_write_stream_header(AVFormatContext *s) return asf_write_header(s); } -static int put_payload_parsing_info( - AVFormatContext *s, - unsigned int sendtime, - unsigned int duration, - int nb_payloads, - int padsize - ) +static int put_payload_parsing_info(AVFormatContext *s, + unsigned sendtime, unsigned duration, + int nb_payloads, int padsize) { ASFContext *asf = s->priv_data; AVIOContext *pb = s->pb; int ppi_size, i; - int64_t start= avio_tell(pb); + int64_t start = avio_tell(pb); int iLengthTypeFlags = ASF_PPI_LENGTH_TYPE_FLAGS; padsize -= PACKET_HEADER_MIN_SIZE; - if(asf->multi_payloads_present) + if (asf->multi_payloads_present) padsize--; - assert(padsize>=0); + assert(padsize >= 0); avio_w8(pb, ASF_PACKET_ERROR_CORRECTION_FLAGS); - for (i = 0; i < ASF_PACKET_ERROR_CORRECTION_DATA_SIZE; i++){ + for (i = 0; i < ASF_PACKET_ERROR_CORRECTION_DATA_SIZE; i++) avio_w8(pb, 0x0); - } if (asf->multi_payloads_present) iLengthTypeFlags |= ASF_PPI_FLAG_MULTIPLE_PAYLOADS_PRESENT; @@ -651,17 +708,15 @@ static void flush_packet(AVFormatContext *s) assert(asf->packet_timestamp_end >= asf->packet_timestamp_start); - if (asf->is_streamed) { + if (asf->is_streamed) put_chunk(s, 0x4424, s->packet_size, 0); - } - packet_hdr_size = put_payload_parsing_info( - s, - asf->packet_timestamp_start, - asf->packet_timestamp_end - asf->packet_timestamp_start, - asf->packet_nb_payloads, - asf->packet_size_left - ); + packet_hdr_size = put_payload_parsing_info(s, + asf->packet_timestamp_start, + asf->packet_timestamp_end - + asf->packet_timestamp_start, + asf->packet_nb_payloads, + asf->packet_size_left); packet_filled_size = PACKET_SIZE - asf->packet_size_left; assert(packet_hdr_size <= asf->packet_size_left); @@ -671,22 +726,16 @@ static void flush_packet(AVFormatContext *s) avio_flush(s->pb); asf->nb_packets++; - asf->packet_nb_payloads = 0; + asf->packet_nb_payloads = 0; asf->packet_timestamp_start = -1; - asf->packet_timestamp_end = -1; + asf->packet_timestamp_end = -1; ffio_init_context(&asf->pb, asf->packet_buf, s->packet_size, 1, - NULL, NULL, NULL, NULL); + NULL, NULL, NULL, NULL); } -static void put_payload_header( - AVFormatContext *s, - ASFStream *stream, - int presentation_time, - int m_obj_size, - int m_obj_offset, - int payload_len, - int flags - ) +static void put_payload_header(AVFormatContext *s, ASFStream *stream, + int presentation_time, int m_obj_size, + int m_obj_offset, int payload_len, int flags) { ASFContext *asf = s->priv_data; AVIOContext *pb = &asf->pb; @@ -697,8 +746,8 @@ static void put_payload_header( val |= ASF_PL_FLAG_KEY_FRAME; avio_w8(pb, val); - avio_w8(pb, stream->seq); //Media object number - avio_wl32(pb, m_obj_offset); //Offset Into Media Object + avio_w8(pb, stream->seq); // Media object number + avio_wl32(pb, m_obj_offset); // Offset Into Media Object // Replicated Data shall be at least 8 bytes long. // The first 4 bytes of data shall contain the @@ -707,23 +756,17 @@ static void put_payload_header( // Presentation Time for the media object that the payload belongs to. avio_w8(pb, ASF_PAYLOAD_REPLICATED_DATA_LENGTH); - avio_wl32(pb, m_obj_size); //Replicated Data - Media Object Size - avio_wl32(pb, presentation_time);//Replicated Data - Presentation Time + avio_wl32(pb, m_obj_size); // Replicated Data - Media Object Size + avio_wl32(pb, presentation_time); // Replicated Data - Presentation Time - if (asf->multi_payloads_present){ - avio_wl16(pb, payload_len); //payload length + if (asf->multi_payloads_present) { + avio_wl16(pb, payload_len); // payload length } } -static void put_frame( - AVFormatContext *s, - ASFStream *stream, - AVStream *avst, - int timestamp, - const uint8_t *buf, - int m_obj_size, - int flags - ) +static void put_frame(AVFormatContext *s, ASFStream *stream, AVStream *avst, + int timestamp, const uint8_t *buf, + int m_obj_size, int flags) { ASFContext *asf = s->priv_data; int m_obj_offset, payload_len, frag_len1; @@ -735,19 +778,20 @@ static void put_frame( asf->multi_payloads_present = (payload_len < MULTI_PAYLOAD_CONSTANT); asf->packet_size_left = PACKET_SIZE; - if (asf->multi_payloads_present){ + if (asf->multi_payloads_present) { frag_len1 = MULTI_PAYLOAD_CONSTANT - 1; - } - else { + } else { frag_len1 = SINGLE_PAYLOAD_DATA_LENGTH; } asf->packet_timestamp_start = timestamp; - } - else { + } else { // multi payloads - frag_len1 = asf->packet_size_left - PAYLOAD_HEADER_SIZE_MULTIPLE_PAYLOADS - PACKET_HEADER_MIN_SIZE - 1; + 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 == AVMEDIA_TYPE_AUDIO){ + if (frag_len1 < payload_len && + avst->codec->codec_type == AVMEDIA_TYPE_AUDIO) { flush_packet(s); continue; } @@ -756,9 +800,10 @@ static void put_frame( if (payload_len > frag_len1) payload_len = frag_len1; else if (payload_len == (frag_len1 - 1)) - payload_len = frag_len1 - 2; //additional byte need to put padding length + payload_len = frag_len1 - 2; // additional byte need to put padding length - put_payload_header(s, stream, timestamp+PREROLL_TIME, m_obj_size, m_obj_offset, payload_len, flags); + put_payload_header(s, stream, timestamp + PREROLL_TIME, + m_obj_size, m_obj_offset, payload_len, flags); avio_write(&asf->pb, buf, payload_len); if (asf->multi_payloads_present) @@ -772,7 +817,7 @@ static void put_frame( payload_len = 0; } m_obj_offset += payload_len; - buf += payload_len; + buf += payload_len; if (!asf->multi_payloads_present) flush_packet(s); @@ -785,61 +830,73 @@ static void put_frame( static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) { ASFContext *asf = s->priv_data; + AVIOContext *pb = s->pb; ASFStream *stream; int64_t duration; AVCodecContext *codec; - int64_t packet_st,pts; - int start_sec,i; - int flags= pkt->flags; + int64_t packet_st, pts; + int start_sec, i; + int flags = pkt->flags; + uint64_t offset = avio_tell(pb); - codec = s->streams[pkt->stream_index]->codec; + codec = s->streams[pkt->stream_index]->codec; stream = &asf->streams[pkt->stream_index]; - if(codec->codec_type == AVMEDIA_TYPE_AUDIO) + 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); - duration = pts * 10000; - asf->duration= FFMAX(asf->duration, duration + pkt->duration * 10000); + duration = pts * 10000; + asf->duration = FFMAX(asf->duration, duration + pkt->duration * 10000); packet_st = asf->nb_packets; - put_frame(s, stream, s->streams[pkt->stream_index], pkt->dts, pkt->data, pkt->size, flags); + put_frame(s, stream, s->streams[pkt->stream_index], + pkt->dts, pkt->data, pkt->size, flags); /* check index */ 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=asf->nb_index_memory_alloc) { + for (i = asf->nb_index_count; i < start_sec; i++) { + if (i >= asf->nb_index_memory_alloc) { + int err; asf->nb_index_memory_alloc += ASF_INDEX_BLOCK; - asf->index_ptr = (ASFIndex*)av_realloc( asf->index_ptr, sizeof(ASFIndex) * asf->nb_index_memory_alloc ); + if ((err = av_reallocp_array(&asf->index_ptr, + asf->nb_index_memory_alloc, + sizeof(*asf->index_ptr))) < 0) { + asf->nb_index_memory_alloc = 0; + return err; + } } // store asf->index_ptr[i].packet_number = (uint32_t)packet_st; - asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets-packet_st); - asf->maximum_packet = FFMAX(asf->maximum_packet, (uint16_t)(asf->nb_packets-packet_st)); + asf->index_ptr[i].packet_count = (uint16_t)(asf->nb_packets - packet_st); + asf->index_ptr[i].send_time = start_sec * INT64_C(10000000); + asf->index_ptr[i].offset = offset; + asf->maximum_packet = FFMAX(asf->maximum_packet, + (uint16_t)(asf->nb_packets - packet_st)); } - asf->nb_index_count = start_sec; + asf->nb_index_count = start_sec; asf->last_indexed_pts = duration; } } return 0; } -// -static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, uint32_t count) +static int asf_write_index(AVFormatContext *s, ASFIndex *index, + uint16_t max, uint32_t count) { AVIOContext *pb = s->pb; int i; put_guid(pb, &ff_asf_simple_index_header); - avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2)*count); + avio_wl64(pb, 24 + 16 + 8 + 4 + 4 + (4 + 2) * count); put_guid(pb, &ff_asf_my_guid); avio_wl64(pb, ASF_INDEXED_INTERVAL); avio_wl32(pb, max); avio_wl32(pb, count); - for(i=0; ipriv_data; - int64_t file_size,data_size; + int64_t file_size, data_size; /* flush the current packet */ if (asf->pb.buf_ptr > asf->pb.buffer) @@ -858,9 +915,8 @@ static int asf_write_trailer(AVFormatContext *s) /* write index */ data_size = avio_tell(s->pb); - if ((!asf->is_streamed) && (asf->nb_index_count != 0)) { + if ((!asf->is_streamed) && (asf->nb_index_count != 0)) asf_write_index(s, asf->index_ptr, asf->maximum_packet, asf->nb_index_count); - } avio_flush(s->pb); if (asf->is_streamed || !s->pb->seekable) { @@ -872,7 +928,6 @@ static int asf_write_trailer(AVFormatContext *s) asf_write_header1(s, file_size, data_size - asf->data_offset); } - avio_flush(s->pb); av_free(asf->index_ptr); return 0; } @@ -884,17 +939,17 @@ AVOutputFormat ff_asf_muxer = { .mime_type = "video/x-ms-asf", .extensions = "asf,wmv,wma", .priv_data_size = sizeof(ASFContext), - .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_MP2, - .video_codec = CODEC_ID_MSMPEG4V3, + .audio_codec = CONFIG_LIBMP3LAME ? AV_CODEC_ID_MP3 : AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MSMPEG4V3, .write_header = asf_write_header, .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, .flags = AVFMT_GLOBALHEADER, - .codec_tag = (const AVCodecTag* const []){ + .codec_tag = (const AVCodecTag * const []) { codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 }, }; -#endif +#endif /* CONFIG_ASF_MUXER */ #if CONFIG_ASF_STREAM_MUXER AVOutputFormat ff_asf_stream_muxer = { @@ -903,14 +958,14 @@ AVOutputFormat ff_asf_stream_muxer = { .mime_type = "video/x-ms-asf", .extensions = "asf,wmv,wma", .priv_data_size = sizeof(ASFContext), - .audio_codec = CONFIG_LIBMP3LAME ? CODEC_ID_MP3 : CODEC_ID_MP2, - .video_codec = CODEC_ID_MSMPEG4V3, + .audio_codec = CONFIG_LIBMP3LAME ? AV_CODEC_ID_MP3 : AV_CODEC_ID_MP2, + .video_codec = AV_CODEC_ID_MSMPEG4V3, .write_header = asf_write_stream_header, .write_packet = asf_write_packet, .write_trailer = asf_write_trailer, .flags = AVFMT_GLOBALHEADER, - .codec_tag = (const AVCodecTag* const []){ + .codec_tag = (const AVCodecTag * const []) { codec_asf_bmp_tags, ff_codec_bmp_tags, ff_codec_wav_tags, 0 }, }; -#endif //CONFIG_ASF_STREAM_MUXER +#endif /* CONFIG_ASF_STREAM_MUXER */