diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-02-06 00:44:00 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-02-06 09:48:51 +0100 |
| commit | 48a4ffa722c0874b251de9d201babed52cef0bcb (patch) | |
| tree | 2648a734acbd1963f3971bf3af77edef5a675377 | |
| parent | 77bcb89600e79fbf37d4b739480813ef03292c5b (diff) | |
asf: K&R formatting cosmetics
| -rw-r--r-- | libavformat/asf.c | 49 | ||||
| -rw-r--r-- | libavformat/asfcrypt.c | 62 | ||||
| -rw-r--r-- | libavformat/asfdec.c | 605 | ||||
| -rw-r--r-- | libavformat/asfenc.c | 344 |
4 files changed, 552 insertions, 508 deletions
diff --git a/libavformat/asf.c b/libavformat/asf.c index cc2833ddf6..eda8bd0e0c 100644 --- a/libavformat/asf.c +++ b/libavformat/asf.c @@ -20,7 +20,6 @@ #include "asf.h" - const ff_asf_guid ff_asf_header = { 0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C }; @@ -48,7 +47,7 @@ const ff_asf_guid ff_asf_audio_conceal_none = { }; const ff_asf_guid ff_asf_audio_conceal_spread = { - 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 + 0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20 }; const ff_asf_guid ff_asf_video_stream = { @@ -91,31 +90,31 @@ const ff_asf_guid ff_asf_head2_guid = { }; const ff_asf_guid ff_asf_extended_content_header = { - 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50 + 0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50 }; const ff_asf_guid ff_asf_simple_index_header = { - 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB + 0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB }; const ff_asf_guid ff_asf_ext_stream_embed_stream_header = { - 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43 + 0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43 }; const ff_asf_guid ff_asf_ext_stream_audio_stream = { - 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03 + 0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03 }; const ff_asf_guid ff_asf_metadata_header = { - 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca + 0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca }; const ff_asf_guid ff_asf_marker_header = { - 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 + 0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65 }; /* I am not a number !!! This GUID is the one found on the PC used to - generate the stream */ + * generate the stream */ const ff_asf_guid ff_asf_my_guid = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; @@ -138,23 +137,23 @@ const ff_asf_guid ff_asf_digital_signature = { /* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */ const AVMetadataConv ff_asf_metadata_conv[] = { - { "WM/AlbumArtist" , "album_artist"}, - { "WM/AlbumTitle" , "album" }, - { "Author" , "artist" }, - { "Description" , "comment" }, - { "WM/Composer" , "composer" }, - { "WM/EncodedBy" , "encoded_by" }, - { "WM/EncodingSettings", "encoder" }, - { "WM/Genre" , "genre" }, - { "WM/Language" , "language" }, - { "WM/OriginalFilename", "filename" }, - { "WM/PartOfSet" , "disc" }, - { "WM/Publisher" , "publisher" }, - { "WM/Tool" , "encoder" }, - { "WM/TrackNumber" , "track" }, - { "WM/Track" , "track" }, + { "WM/AlbumArtist", "album_artist" }, + { "WM/AlbumTitle", "album" }, + { "Author", "artist" }, + { "Description", "comment" }, + { "WM/Composer", "composer" }, + { "WM/EncodedBy", "encoded_by" }, + { "WM/EncodingSettings", "encoder" }, + { "WM/Genre", "genre" }, + { "WM/Language", "language" }, + { "WM/OriginalFilename", "filename" }, + { "WM/PartOfSet", "disc" }, + { "WM/Publisher", "publisher" }, + { "WM/Tool", "encoder" }, + { "WM/TrackNumber", "track" }, + { "WM/Track", "track" }, { "WM/MediaStationCallSign", "service_provider" }, - { "WM/MediaStationName", "service_name" }, + { "WM/MediaStationName", "service_name" }, // { "Year" , "date" }, TODO: conversion year<->date { 0 } }; diff --git a/libavformat/asfcrypt.c b/libavformat/asfcrypt.c index 6c48a1967a..c261475848 100644 --- a/libavformat/asfcrypt.c +++ b/libavformat/asfcrypt.c @@ -20,10 +20,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "libavutil/common.h" -#include "libavutil/intreadwrite.h" #include "libavutil/bswap.h" +#include "libavutil/common.h" #include "libavutil/des.h" +#include "libavutil/intreadwrite.h" #include "libavutil/rc4.h" #include "asfcrypt.h" @@ -32,7 +32,8 @@ * @param v number to invert, must be odd! * @return number so that result * v = 1 (mod 2^32) */ -static uint32_t inverse(uint32_t v) { +static uint32_t inverse(uint32_t v) +{ // v ^ 3 gives the inverse (mod 16), could also be implemented // as table etc. (only lowest 4 bits matter!) uint32_t inverse = v * v * v; @@ -50,7 +51,8 @@ static uint32_t inverse(uint32_t v) { * @param keys output key array containing the keys for encryption in * native endianness */ -static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12]) { +static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12]) +{ int i; for (i = 0; i < 12; i++) keys[i] = AV_RL32(keybuf + (i << 2)) | 1; @@ -61,7 +63,8 @@ static void multiswap_init(const uint8_t keybuf[48], uint32_t keys[12]) { * the other way round. * @param keys key array of ints to invert */ -static void multiswap_invert_keys(uint32_t keys[12]) { +static void multiswap_invert_keys(uint32_t keys[12]) +{ int i; for (i = 0; i < 5; i++) keys[i] = inverse(keys[i]); @@ -69,23 +72,25 @@ static void multiswap_invert_keys(uint32_t keys[12]) { keys[i] = inverse(keys[i]); } -static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) { +static uint32_t multiswap_step(const uint32_t keys[12], uint32_t v) +{ int i; v *= keys[0]; for (i = 1; i < 5; i++) { - v = (v >> 16) | (v << 16); + v = (v >> 16) | (v << 16); v *= keys[i]; } v += keys[5]; return v; } -static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) { +static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) +{ int i; v -= keys[5]; for (i = 4; i > 0; i--) { v *= keys[i]; - v = (v >> 16) | (v << 16); + v = (v >> 16) | (v << 16); } v *= keys[0]; return v; @@ -99,17 +104,19 @@ static uint32_t multiswap_inv_step(const uint32_t keys[12], uint32_t v) { * @param data data to encrypt * @return encrypted data */ -static uint64_t multiswap_enc(const uint32_t keys[12], uint64_t key, uint64_t data) { +static uint64_t multiswap_enc(const uint32_t keys[12], + uint64_t key, uint64_t data) +{ uint32_t a = data; uint32_t b = data >> 32; uint32_t c; uint32_t tmp; - a += key; - tmp = multiswap_step(keys , a); - b += tmp; - c = (key >> 32) + tmp; + a += key; + tmp = multiswap_step(keys, a); + b += tmp; + c = (key >> 32) + tmp; tmp = multiswap_step(keys + 6, b); - c += tmp; + c += tmp; return ((uint64_t)c << 32) | tmp; } @@ -121,25 +128,28 @@ static uint64_t multiswap_enc(const uint32_t keys[12], uint64_t key, uint64_t da * @param data data to decrypt * @return decrypted data */ -static uint64_t multiswap_dec(const uint32_t keys[12], uint64_t key, uint64_t data) { +static uint64_t multiswap_dec(const uint32_t keys[12], + uint64_t key, uint64_t data) +{ uint32_t a; uint32_t b; - uint32_t c = data >> 32; + uint32_t c = data >> 32; uint32_t tmp = data; - c -= tmp; - b = multiswap_inv_step(keys + 6, tmp); + c -= tmp; + b = multiswap_inv_step(keys + 6, tmp); tmp = c - (key >> 32); - b -= tmp; - a = multiswap_inv_step(keys , tmp); - a -= key; + b -= tmp; + a = multiswap_inv_step(keys, tmp); + a -= key; return ((uint64_t)b << 32) | a; } -void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) { +void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) +{ struct AVDES des; struct AVRC4 rc4; - int num_qwords = len >> 3; - uint8_t *qwords = data; + int num_qwords = len >> 3; + uint8_t *qwords = data; uint64_t rc4buff[8] = { 0 }; uint64_t packetkey; uint32_t ms_keys[12]; @@ -155,7 +165,7 @@ void ff_asfcrypt_dec(const uint8_t key[20], uint8_t *data, int len) { av_rc4_crypt(&rc4, (uint8_t *)rc4buff, NULL, sizeof(rc4buff), NULL, 1); multiswap_init((uint8_t *)rc4buff, ms_keys); - packetkey = AV_RN64(&qwords[num_qwords*8 - 8]); + packetkey = AV_RN64(&qwords[num_qwords * 8 - 8]); packetkey ^= rc4buff[7]; av_des_init(&des, key + 12, 64, 1); av_des_crypt(&des, (uint8_t *)&packetkey, (uint8_t *)&packetkey, 1, NULL, 1); diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c index ca6c73b914..a1dfec36e0 100644 --- a/libavformat/asfdec.c +++ b/libavformat/asfdec.c @@ -22,20 +22,20 @@ //#define DEBUG #include "libavutil/attributes.h" +#include "libavutil/avstring.h" #include "libavutil/bswap.h" #include "libavutil/common.h" -#include "libavutil/avstring.h" #include "libavutil/dict.h" #include "libavutil/mathematics.h" #include "libavutil/opt.h" #include "avformat.h" -#include "internal.h" #include "avio_internal.h" +#include "avlanguage.h" #include "id3v2.h" +#include "internal.h" #include "riff.h" #include "asf.h" #include "asfcrypt.h" -#include "avlanguage.h" typedef struct { const AVClass *class; @@ -75,13 +75,13 @@ typedef struct { int stream_index; - ASFStream* asf_st; ///< currently decoded stream + ASFStream *asf_st; ///< currently decoded stream int no_resync_search; } ASFContext; static const AVOption options[] = { - {"no_resync_search", "Don't try to resynchronize by looking for a certain optional start code", offsetof(ASFContext, no_resync_search), AV_OPT_TYPE_INT, {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, + { "no_resync_search", "Don't try to resynchronize by looking for a certain optional start code", offsetof(ASFContext, no_resync_search), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; @@ -108,9 +108,9 @@ static const ff_asf_guid stream_bitrate_guid = { /* (http://get.to/sdp) */ 0xce, 0x75, 0xf8, 0x7b, 0x8d, 0x46, 0xd1, 0x11, 0x8d, 0x82, 0x00, 0x60, 0x97, 0xc9, 0xa2, 0xb2 }; -#define PRINT_IF_GUID(g,cmp) \ -if (!ff_guidcmp(g, &cmp)) \ - av_dlog(NULL, "(GUID: %s) ", #cmp) +#define PRINT_IF_GUID(g, cmp) \ + if (!ff_guidcmp(g, &cmp)) \ + av_dlog(NULL, "(GUID: %s) ", # cmp) static void print_guid(const ff_asf_guid *g) { @@ -141,7 +141,7 @@ static void print_guid(const ff_asf_guid *g) else PRINT_IF_GUID(g, ff_asf_language_guid); else av_dlog(NULL, "(GUID: unknown) "); - for(i=0;i<16;i++) + for (i = 0; i < 16; i++) av_dlog(NULL, " 0x%02x,", (*g)[i]); av_dlog(NULL, "}\n"); } @@ -165,13 +165,19 @@ static int asf_probe(AVProbeData *pd) return 0; } -static int get_value(AVIOContext *pb, int type){ - switch(type){ - case 2: return avio_rl32(pb); - case 3: return avio_rl32(pb); - case 4: return avio_rl64(pb); - case 5: return avio_rl16(pb); - default:return INT_MIN; +static int get_value(AVIOContext *pb, int type) +{ + switch (type) { + case 2: + return avio_rl32(pb); + case 3: + return avio_rl32(pb); + case 4: + return avio_rl64(pb); + case 5: + return avio_rl16(pb); + default: + return INT_MIN; } } @@ -179,9 +185,9 @@ static int get_value(AVIOContext *pb, int type){ * but in reality this is only loosely similar */ static int asf_read_picture(AVFormatContext *s, int len) { - AVPacket pkt = { 0 }; + AVPacket pkt = { 0 }; const CodecMime *mime = ff_id3v2_mime_tags; - enum AVCodecID id = AV_CODEC_ID_NONE; + enum AVCodecID id = AV_CODEC_ID_NONE; char mimetype[64]; uint8_t *desc = NULL; ASFStream *ast = NULL; @@ -204,7 +210,7 @@ static int asf_read_picture(AVFormatContext *s, int len) /* picture data size */ picsize = avio_rl32(s->pb); - len -= 4; + len -= 4; /* picture MIME type */ len -= avio_get_str16le(s->pb, len, mimetype, sizeof(mimetype)); @@ -238,21 +244,19 @@ static int asf_read_picture(AVFormatContext *s, int len) if (ret < 0) goto fail; - st = avformat_new_stream(s, NULL); + st = avformat_new_stream(s, NULL); ast = av_mallocz(sizeof(*ast)); if (!st || !ast) { ret = AVERROR(ENOMEM); goto fail; } - st->priv_data = ast; - - st->disposition |= AV_DISPOSITION_ATTACHED_PIC; - st->codec->codec_type = AVMEDIA_TYPE_VIDEO; - st->codec->codec_id = id; - - st->attached_pic = pkt; + st->priv_data = ast; + st->disposition |= AV_DISPOSITION_ATTACHED_PIC; + st->codec->codec_type = AVMEDIA_TYPE_VIDEO; + st->codec->codec_id = id; + st->attached_pic = pkt; st->attached_pic.stream_index = st->index; - st->attached_pic.flags |= AV_PKT_FLAG_KEY; + st->attached_pic.flags |= AV_PKT_FLAG_KEY; if (*desc) av_dict_set(&st->metadata, "title", desc, AV_DICT_DONT_STRDUP_VAL); @@ -275,15 +279,15 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len) char *value; int64_t off = avio_tell(s->pb); - if ((unsigned)len >= (UINT_MAX - 1)/2) + if ((unsigned)len >= (UINT_MAX - 1) / 2) return; - value = av_malloc(2*len+1); + value = av_malloc(2 * len + 1); if (!value) goto finish; if (type == 0) { // UTF16-LE - avio_get_str16le(s->pb, len, value, 2*len + 1); + avio_get_str16le(s->pb, len, value, 2 * len + 1); } else if (type > 1 && type <= 5) { // boolean or DWORD or QWORD or WORD uint64_t num = get_value(s->pb, type); snprintf(value, len, "%"PRIu64, num); @@ -291,11 +295,13 @@ static void get_tag(AVFormatContext *s, const char *key, int type, int len) asf_read_picture(s, len); goto finish; } else { - av_log(s, AV_LOG_DEBUG, "Unsupported value type %d in tag %s.\n", type, key); + av_log(s, AV_LOG_DEBUG, + "Unsupported value type %d in tag %s.\n", type, key); goto finish; } if (*value) av_dict_set(&s->metadata, key, value, 0); + finish: av_freep(&value); avio_seek(s->pb, off + len, SEEK_SET); @@ -307,20 +313,20 @@ static int asf_read_file_properties(AVFormatContext *s, int64_t size) AVIOContext *pb = s->pb; ff_get_guid(pb, &asf->hdr.guid); - asf->hdr.file_size = avio_rl64(pb); - asf->hdr.create_time = avio_rl64(pb); + asf->hdr.file_size = avio_rl64(pb); + asf->hdr.create_time = avio_rl64(pb); avio_rl64(pb); /* number of packets */ - asf->hdr.play_time = avio_rl64(pb); - asf->hdr.send_time = avio_rl64(pb); - asf->hdr.preroll = avio_rl32(pb); - asf->hdr.ignore = avio_rl32(pb); - asf->hdr.flags = avio_rl32(pb); - asf->hdr.min_pktsize = avio_rl32(pb); - asf->hdr.max_pktsize = avio_rl32(pb); - if (asf->hdr.min_pktsize >= (1U<<29)) + asf->hdr.play_time = avio_rl64(pb); + asf->hdr.send_time = avio_rl64(pb); + asf->hdr.preroll = avio_rl32(pb); + asf->hdr.ignore = avio_rl32(pb); + asf->hdr.flags = avio_rl32(pb); + asf->hdr.min_pktsize = avio_rl32(pb); + asf->hdr.max_pktsize = avio_rl32(pb); + if (asf->hdr.min_pktsize >= (1U << 29)) return AVERROR_INVALIDDATA; - asf->hdr.max_bitrate = avio_rl32(pb); - s->packet_size = asf->hdr.max_pktsize; + asf->hdr.max_bitrate = avio_rl32(pb); + s->packet_size = asf->hdr.max_pktsize; return 0; } @@ -336,7 +342,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) int type_specific_size, sizeX; unsigned int tag1; int64_t pos1, pos2, start_time; - int test_for_ext_stream_audio, is_dvr_ms_audio=0; + int test_for_ext_stream_audio, is_dvr_ms_audio = 0; if (s->nb_streams == ASF_MAX_STREAMS) { av_log(s, AV_LOG_ERROR, "too many streams\n"); @@ -352,15 +358,15 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) asf_st = av_mallocz(sizeof(ASFStream)); if (!asf_st) return AVERROR(ENOMEM); - st->priv_data = asf_st; + st->priv_data = asf_st; st->start_time = 0; - start_time = asf->hdr.preroll; + start_time = asf->hdr.preroll; asf_st->stream_language_index = 128; // invalid stream index means no language info - if(!(asf->hdr.flags & 0x01)) { // if we aren't streaming... + if (!(asf->hdr.flags & 0x01)) { // if we aren't streaming... st->duration = asf->hdr.play_time / - (10000000 / 1000) - start_time; + (10000000 / 1000) - start_time; } ff_get_guid(pb, &g); @@ -370,13 +376,13 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) } else if (!ff_guidcmp(&g, &ff_asf_video_stream)) { type = AVMEDIA_TYPE_VIDEO; } else if (!ff_guidcmp(&g, &ff_asf_jfif_media)) { - type = AVMEDIA_TYPE_VIDEO; + type = AVMEDIA_TYPE_VIDEO; st->codec->codec_id = AV_CODEC_ID_MJPEG; } else if (!ff_guidcmp(&g, &ff_asf_command_stream)) { type = AVMEDIA_TYPE_DATA; } else if (!ff_guidcmp(&g, &ff_asf_ext_stream_embed_stream_header)) { test_for_ext_stream_audio = 1; - type = AVMEDIA_TYPE_UNKNOWN; + type = AVMEDIA_TYPE_UNKNOWN; } else { return -1; } @@ -393,8 +399,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) if (test_for_ext_stream_audio) { ff_get_guid(pb, &g); if (!ff_guidcmp(&g, &ff_asf_ext_stream_audio_stream)) { - type = AVMEDIA_TYPE_AUDIO; - is_dvr_ms_audio=1; + type = AVMEDIA_TYPE_AUDIO; + is_dvr_ms_audio = 1; ff_get_guid(pb, &g); avio_rl32(pb); avio_rl32(pb); @@ -412,46 +418,46 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) if (is_dvr_ms_audio) { // codec_id and codec_tag are unreliable in dvr_ms // files. Set them later by probing stream. - st->codec->codec_id = AV_CODEC_ID_PROBE; + st->codec->codec_id = AV_CODEC_ID_PROBE; st->codec->codec_tag = 0; } - if (st->codec->codec_id == AV_CODEC_ID_AAC) { + if (st->codec->codec_id == AV_CODEC_ID_AAC) st->need_parsing = AVSTREAM_PARSE_NONE; - } else { + else st->need_parsing = AVSTREAM_PARSE_FULL; - } /* We have to init the frame size at some point .... */ pos2 = avio_tell(pb); if (size >= (pos2 + 8 - pos1 + 24)) { - asf_st->ds_span = avio_r8(pb); + asf_st->ds_span = avio_r8(pb); asf_st->ds_packet_size = avio_rl16(pb); - asf_st->ds_chunk_size = avio_rl16(pb); - avio_rl16(pb); //ds_data_size - avio_r8(pb); //ds_silence_data + asf_st->ds_chunk_size = avio_rl16(pb); + avio_rl16(pb); // ds_data_size + avio_r8(pb); // ds_silence_data } if (asf_st->ds_span > 1) { - if (!asf_st->ds_chunk_size - || (asf_st->ds_packet_size/asf_st->ds_chunk_size <= 1) - || asf_st->ds_packet_size % asf_st->ds_chunk_size) - asf_st->ds_span = 0; // disable descrambling + if (!asf_st->ds_chunk_size || + (asf_st->ds_packet_size / asf_st->ds_chunk_size <= 1) || + asf_st->ds_packet_size % asf_st->ds_chunk_size) + asf_st->ds_span = 0; // disable descrambling } } else if (type == AVMEDIA_TYPE_VIDEO && - size - (avio_tell(pb) - pos1 + 24) >= 51) { + size - (avio_tell(pb) - pos1 + 24) >= 51) { avio_rl32(pb); avio_rl32(pb); avio_r8(pb); avio_rl16(pb); /* size */ - sizeX= avio_rl32(pb); /* size */ - st->codec->width = avio_rl32(pb); + sizeX = avio_rl32(pb); /* size */ + st->codec->width = avio_rl32(pb); st->codec->height = avio_rl32(pb); /* not available for asf */ avio_rl16(pb); /* panes */ st->codec->bits_per_coded_sample = avio_rl16(pb); /* depth */ - tag1 = avio_rl32(pb); + tag1 = avio_rl32(pb); avio_skip(pb, 20); if (sizeX > 40) { st->codec->extradata_size = sizeX - 40; - st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE); + st->codec->extradata = av_mallocz(st->codec->extradata_size + + FF_INPUT_BUFFER_PADDING_SIZE); avio_read(pb, st->codec->extradata, st->codec->extradata_size); } @@ -461,8 +467,8 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) if (st->codec->extradata_size && (st->codec->bits_per_coded_sample <= 8)) { #if HAVE_BIGENDIAN int i; - for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++) - asf_st->palette[i] = av_bswap32(((uint32_t*)st->codec->extradata)[i]); + for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE) / 4; i++) + asf_st->palette[i] = av_bswap32(((uint32_t *)st->codec->extradata)[i]); #else memcpy(asf_st->palette, st->codec->extradata, FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)); @@ -471,16 +477,18 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size) } st->codec->codec_tag = tag1; - st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); - if(tag1 == MKTAG('D', 'V', 'R', ' ')){ + st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag1); + if (tag1 == MKTAG('D', 'V', 'R', ' ')) { st->need_parsing = AVSTREAM_PARSE_FULL; - // issue658 containse wrong w/h and MS even puts a fake seq header with wrong w/h in extradata while a correct one is in te stream. maximum lameness - st->codec->width = + /* issue658 contains wrong w/h and MS even puts a fake seq header + * with wrong w/h in extradata while a correct one is in the stream. + * maximum lameness */ + st->codec->width = st->codec->height = 0; av_freep(&st->codec->extradata); - st->codec->extradata_size=0; + st->codec->extradata_size = 0; } - if(st->codec->codec_id == AV_CODEC_ID_H264) + if (st->codec->codec_id == AV_CODEC_ID_H264) st->need_parsing = AVSTREAM_PARSE_FULL_ONCE; } pos2 = avio_tell(pb); @@ -515,22 +523,22 @@ static int asf_read_ext_stream_properties(AVFormatContext *s, int64_t size) asf->streams[stream_num].stream_language_index = stream_languageid_index; avio_rl64(pb); // avg frametime in 100ns units - stream_ct = avio_rl16(pb); //stream-name-count - payload_ext_ct = avio_rl16(pb); //payload-extension-system-count + stream_ct = avio_rl16(pb); // stream-name-count + payload_ext_ct = avio_rl16(pb); // payload-extension-system-count if (stream_num < 128) asf->stream_bitrates[stream_num] = leak_rate; - for (i=0; i<stream_ct; i++){ + for (i = 0; i < stream_ct; i++) { avio_rl16(pb); ext_len = avio_rl16(pb); avio_skip(pb, ext_len); } - for (i=0; i<payload_ext_ct; i++){ + for (i = 0; i < payload_ext_ct; i++) { ff_get_guid(pb, &g); avio_skip(pb, 2); - ext_len=avio_rl32(pb); + ext_len = avio_rl32(pb); avio_skip(pb, ext_len); } @@ -547,10 +555,10 @@ static int asf_read_content_desc(AVFormatContext *s, int64_t size) len3 = avio_rl16(pb); len4 = avio_rl16(pb); len5 = avio_rl16(pb); - get_tag(s, "title" , 0, len1); - get_tag(s, "author" , 0, len2); + get_tag(s, "title", 0, len1); + get_tag(s, "author", 0, len2); get_tag(s, "copyright", 0, len3); - get_tag(s, "comment" , 0, len4); + get_tag(s, "comment", 0, len4); avio_skip(pb, len5); return 0; @@ -563,28 +571,27 @@ static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size) int desc_count, i, ret; desc_count = avio_rl16(pb); - for(i=0;i<desc_count;i++) { - int name_len,value_type,value_len; + for (i = 0; i < desc_count; i++) { + int name_len, value_type, value_len; char name[1024]; name_len = avio_rl16(pb); - if (name_len%2) // must be even, broken lavf versions wrote len-1 + if (name_len % 2) // must be even, broken lavf versions wrote len-1 name_len += 1; if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len) avio_skip(pb, name_len - ret); value_type = avio_rl16(pb); value_len = avio_rl16(pb); - if (!value_type && value_len%2) + if (!value_type && value_len % 2) value_len += 1; - /** - * My sample has that stream set to 0 maybe that mean the container. - * Asf stream count start at 1. I am using 0 to the container value since it's unused - */ - if (!strcmp(name, "AspectRatioX")){ - asf->dar[0].num= get_value(s->pb, value_type); - } else if(!strcmp(name, "AspectRatioY")){ - asf->dar[0].den= get_value(s->pb, value_type); - } else + /* My sample has that stream set to 0 maybe that mean the container. + * ASF stream count starts at 1. I am using 0 to the container value + * since it's unused. */ + if (!strcmp(name, "AspectRatioX")) + asf->dar[0].num = get_value(s->pb, value_type); + else if (!strcmp(name, "AspectRatioY")) + asf->dar[0].den = get_value(s->pb, value_type); + else get_tag(s, name, value_type, value_len); } @@ -597,13 +604,15 @@ static int asf_read_language_list(AVFormatContext *s, int64_t size) ASFContext *asf = s->priv_data; int j, ret; int stream_count = avio_rl16(pb); - for(j = 0; j < stream_count; j++) { + for (j = 0; j < stream_count; j++) { char lang[6]; unsigned int lang_len = avio_r8(pb); - if ((ret = avio_get_str16le(pb, lang_len, lang, sizeof(lang))) < lang_len) + if ((ret = avio_get_str16le(pb, lang_len, lang, + sizeof(lang))) < lang_len) avio_skip(pb, lang_len - ret); if (j < 128) - av_strlcpy(asf->stream_languages[j], lang, sizeof(*asf->stream_languages)); + av_strlcpy(asf->stream_languages[j], lang, + sizeof(*asf->stream_languages)); } return 0; @@ -617,26 +626,30 @@ static int asf_read_metadata(AVFormatContext *s, int64_t size) int ret, i; n = avio_rl16(pb); - for(i=0;i<n;i++) { + for (i = 0; i < n; i++) { char name[1024]; int av_unused value_type; - avio_rl16(pb); //lang_list_index - stream_num= avio_rl16(pb); - name_len= avio_rl16(pb); + avio_rl16(pb); // lang_list_index + stream_num = avio_rl16(pb); + name_len = avio_rl16(pb); value_type = avio_rl16(pb); /* value_type */ - value_len= avio_rl32(pb); + value_len = avio_rl32(pb); if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) < name_len) avio_skip(pb, name_len - ret); av_dlog(s, "%d %d %d %d %d <%s>\n", i, stream_num, name_len, value_type, value_len, name); - value_num= avio_rl16(pb);//we should use get_value() here but it does not work 2 is le16 here but le32 elsewhere + /* We should use get_value() here but it does not work 2 is le16 + * here but le32 elsewhere. */ + value_num = avio_rl16(pb); avio_skip(pb, value_len - 2); - if(stream_num<128){ - if (!strcmp(name, "AspectRatioX")) asf->dar[stream_num].num= value_num; - else if(!strcmp(name, "AspectRatioY")) asf->dar[stream_num].den= value_num; + if (stream_num < 128) { + if (!strcmp(name, "AspectRatioX")) + asf->dar[stream_num].num = value_num; + else if (!strcmp(name, "AspectRatioY")) + asf->dar[stream_num].den = value_num; } } @@ -654,11 +667,10 @@ static int asf_read_marker(AVFormatContext *s, int64_t size) count = avio_rl32(pb); // markers count avio_rl16(pb); // reserved 2 bytes name_len = avio_rl16(pb); // name length - for(i=0;i<name_len;i++){ + for (i = 0; i < name_len; i++) avio_r8(pb); // skip the name - } - for(i=0;i<count;i++){ + for (i = 0; i < count; i++) { int64_t pres_time; int name_len; @@ -668,9 +680,11 @@ static int asf_read_marker(AVFormatContext *s, int64_t size) avio_rl32(pb); // send time avio_rl32(pb); // flags name_len = avio_rl32(pb); // name length - if ((ret = avio_get_str16le(pb, name_len * 2, name, sizeof(name))) < name_len) + if ((ret = avio_get_str16le(pb, name_len * 2, name, + sizeof(name))) < name_len) avio_skip(pb, name_len - ret); - avpriv_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name ); + avpriv_new_chapter(s, i, (AVRational) { 1, 10000000 }, pres_time, + AV_NOPTS_VALUE, name); } return 0; @@ -692,19 +706,19 @@ static int asf_read_header(AVFormatContext *s) avio_r8(pb); avio_r8(pb); memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid)); - for(;;) { - uint64_t gpos= avio_tell(pb); + for (;;) { + uint64_t gpos = avio_tell(pb); ff_get_guid(pb, &g); gsize = avio_rl64(pb); print_guid(&g); if (!ff_guidcmp(&g, &ff_asf_data_header)) { asf->data_object_offset = avio_tell(pb); - // if not streaming, gsize is not unlimited (how?), and there is enough space in the file.. - if (!(asf->hdr.flags & 0x01) && gsize >= 100) { + /* If not streaming, gsize is not unlimited (how?), + * and there is enough space in the file.. */ + if (!(asf->hdr.flags & 0x01) && gsize >= 100) asf->data_object_size = gsize - 24; - } else { + else asf->data_object_size = (uint64_t)-1; - } break; } if (gsize < 24) @@ -740,16 +754,21 @@ static int asf_read_header(AVFormatContext *s) } else { if (!s->keylen) { if (!ff_guidcmp(&g, &ff_asf_content_encryption)) { - av_log(s, AV_LOG_WARNING, "DRM protected stream detected, decoding will likely fail!\n"); + av_log(s, AV_LOG_WARNING, + "DRM protected stream detected, decoding will likely fail!\n"); } else if (!ff_guidcmp(&g, &ff_asf_ext_content_encryption)) { - av_log(s, AV_LOG_WARNING, "Ext DRM protected stream detected, decoding will likely fail!\n"); + av_log(s, AV_LOG_WARNING, + "Ext DRM protected stream detected, decoding will likely fail!\n"); } else if (!ff_guidcmp(&g, &ff_asf_digital_signature)) { - av_log(s, AV_LOG_WARNING, "Digital signature detected, decoding will likely fail!\n"); + av_log(s, AV_LOG_WARNING, + "Digital signature detected, decoding will likely fail!\n"); } } } - if(avio_tell(pb) != gpos + gsize) - av_log(s, AV_LOG_DEBUG, "gpos mismatch our pos=%"PRIu64", end=%"PRId64"\n", avio_tell(pb)-gpos, gsize); + if (avio_tell(pb) != gpos + gsize) + av_log(s, AV_LOG_DEBUG, + "gpos mismatch our pos=%"PRIu64", end=%"PRId64"\n", + avio_tell(pb) - gpos, gsize); avio_seek(pb, gpos + gsize, SEEK_SET); } ff_get_guid(pb, &g); @@ -758,21 +777,22 @@ static int asf_read_header(AVFormatContext *s) avio_r8(pb); if (pb->eof_reached) return -1; - asf->data_offset = avio_tell(pb); + asf->data_offset = avio_tell(pb); asf->packet_size_left = 0; - - for(i=0; i<128; i++){ - int stream_num= asf->asfid2avid[i]; - if(stream_num>=0){ + for (i = 0; i < 128; i++) { + int stream_num = asf->asfid2avid[i]; + if (stream_num >= 0) { AVStream *st = s->streams[stream_num]; if (!st->codec->bit_rate) st->codec->bit_rate = asf->stream_bitrates[i]; - if (asf->dar[i].num > 0 && asf->dar[i].den > 0){ + if (asf->dar[i].num > 0 && asf->dar[i].den > 0) { av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, asf->dar[i].num, asf->dar[i].den, INT_MAX); - } else if ((asf->dar[0].num > 0) && (asf->dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set. + } else if ((asf->dar[0].num > 0) && (asf->dar[0].den > 0) && + // Use ASF container value if the stream doesn't set AR. + (st->codec->codec_type == AVMEDIA_TYPE_VIDEO)) av_reduce(&st->sample_aspect_ratio.num, &st->sample_aspect_ratio.den, asf->dar[0].num, asf->dar[0].den, INT_MAX); @@ -786,7 +806,8 @@ static int asf_read_header(AVFormatContext *s) const char *rfc1766 = asf->stream_languages[asf->streams[i].stream_language_index]; if (rfc1766 && strlen(rfc1766) > 1) { const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any - const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL); + const char *iso6392 = av_convert_lang_to(primary_tag, + AV_LANG_ISO639_2_BIBL); if (iso6392) av_dict_set(&st->metadata, "language", iso6392, 0); } @@ -799,13 +820,23 @@ static int asf_read_header(AVFormatContext *s) return 0; } -#define DO_2BITS(bits, var, defval) \ - switch (bits & 3) \ - { \ - case 3: var = avio_rl32(pb); rsize += 4; break; \ - case 2: var = avio_rl16(pb); rsize += 2; break; \ - case 1: var = avio_r8(pb); rsize++; break; \ - default: var = defval; break; \ +#define DO_2BITS(bits, var, defval) \ + switch (bits & 3) { \ + case 3: \ + var = avio_rl32(pb); \ + rsize += 4; \ + break; \ + case 2: \ + var = avio_rl16(pb); \ + rsize += 2; \ + break; \ + case 1: \ + var = avio_r8(pb); \ + rsize++; \ + break; \ + default: \ + var = defval; \ + break; \ } /** @@ -822,31 +853,31 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) int c, d, e, off; // if we do not know packet size, allow skipping up to 32 kB - off= 32768; + off = 32768; if (asf->no_resync_search) off = 3; else if (s->packet_size > 0) - off= (avio_tell(pb) - s->data_offset) % s->packet_size + 3; - - c=d=e=-1; - while(off-- > 0){ - c=d; d=e; - e= avio_r8(pb); - if(c == 0x82 && !d && !e) + off = (avio_tell(pb) - s->data_offset) % s->packet_size + 3; + + c = d = e = -1; + while (off-- > 0) { + c = d; + d = e; + e = avio_r8(pb); + if (c == 0x82 && !d && !e) break; } if (c != 0x82) { - /** - * This code allows handling of -EAGAIN at packet boundaries (i.e. + /* This code allows handling of -EAGAIN at packet boundaries (i.e. * if the packet sync code above triggers -EAGAIN). This does not * imply complete -EAGAIN handling support at random positions in - * the stream. - */ + * the stream. */ if (pb->error == AVERROR(EAGAIN)) return AVERROR(EAGAIN); if (!pb->eof_reached) - av_log(s, AV_LOG_ERROR, "ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb)); + av_log(s, AV_LOG_ERROR, + "ff asf bad header %x at:%"PRId64"\n", c, avio_tell(pb)); } if ((c & 0x8f) == 0x82) { if (d || e) { @@ -854,11 +885,11 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n"); return -1; } - c= avio_r8(pb); - d= avio_r8(pb); - rsize+=3; + c = avio_r8(pb); + d = avio_r8(pb); + rsize += 3; } else if (!pb->eof_reached) { - avio_seek(pb, -1, SEEK_CUR); //FIXME + avio_seek(pb, -1, SEEK_CUR); // FIXME } asf->packet_flags = c; @@ -868,13 +899,16 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length - //the following checks prevent overflows and infinite loops - if(!packet_length || packet_length >= (1U<<29)){ - av_log(s, AV_LOG_ERROR, "invalid packet_length %d at:%"PRId64"\n", packet_length, avio_tell(pb)); + // the following checks prevent overflows and infinite loops + if (!packet_length || packet_length >= (1U << 29)) { + av_log(s, AV_LOG_ERROR, + "invalid packet_length %d at:%"PRId64"\n", + packet_length, avio_tell(pb)); return -1; } - if(padsize >= packet_length){ - av_log(s, AV_LOG_ERROR, "invalid padsize %d at:%"PRId64"\n", padsize, avio_tell(pb)); + if (padsize >= packet_length) { + av_log(s, AV_LOG_ERROR, + "invalid padsize %d at:%"PRId64"\n", padsize, avio_tell(pb)); return -1; } @@ -883,10 +917,11 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) // rsize has at least 11 bytes which have to be present if (asf->packet_flags & 0x01) { - asf->packet_segsizetype = avio_r8(pb); rsize++; + asf->packet_segsizetype = avio_r8(pb); + rsize++; asf->packet_segments = asf->packet_segsizetype & 0x3f; } else { - asf->packet_segments = 1; + asf->packet_segments = 1; asf->packet_segsizetype = 0x80; } if (rsize > packet_length - padsize) { @@ -900,7 +935,8 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) if (packet_length < asf->hdr.min_pktsize) padsize += asf->hdr.min_pktsize - packet_length; asf->packet_padsize = padsize; - av_dlog(s, "packet: size=%d padsize=%d left=%d\n", s->packet_size, asf->packet_padsize, asf->packet_size_left); + av_dlog(s, "packet: size=%d padsize=%d left=%d\n", + s->packet_size, asf->packet_padsize, asf->packet_size_left); return 0; } @@ -908,15 +944,16 @@ static int ff_asf_get_packet(AVFormatContext *s, AVIOContext *pb) * * @return <0 if error */ -static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ +static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb) +{ ASFContext *asf = s->priv_data; - int rsize = 1; - int num = avio_r8(pb); + int rsize = 1; + int num = avio_r8(pb); int64_t ts0; asf->packet_segments--; asf->packet_key_frame = num >> 7; - asf->stream_index = asf->asfid2avid[num & 0x7f]; + asf->stream_index = asf->asfid2avid[num & 0x7f]; // sequence should be ignored! DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0); DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0); @@ -926,33 +963,36 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ asf->packet_frag_offset, asf->packet_replic_size); if (asf->packet_replic_size >= 8) { asf->packet_obj_size = avio_rl32(pb); - if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){ + if (asf->packet_obj_size >= (1 << 24) || asf->packet_obj_size <= 0) { av_log(s, AV_LOG_ERROR, "packet_obj_size invalid\n"); return -1; } asf->packet_frag_timestamp = avio_rl32(pb); // timestamp - if(asf->packet_replic_size >= 8+38+4){ + if (asf->packet_replic_size >= 8 + 38 + 4) { avio_skip(pb, 10); - ts0= avio_rl64(pb); - avio_skip(pb, 8);; + ts0 = avio_rl64(pb); + avio_skip(pb, 8); avio_skip(pb, 12); avio_rl32(pb); avio_skip(pb, asf->packet_replic_size - 8 - 38 - 4); - if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000; - else asf->packet_frag_timestamp= AV_NOPTS_VALUE; - }else + if (ts0 != -1) + asf->packet_frag_timestamp = ts0 / 10000; + else + asf->packet_frag_timestamp = AV_NOPTS_VALUE; + } else avio_skip(pb, asf->packet_replic_size - 8); rsize += asf->packet_replic_size; // FIXME - check validity - } else if (asf->packet_replic_size==1){ + } else if (asf->packet_replic_size == 1) { // multipacket - frag_offset is beginning timestamp - asf->packet_time_start = asf->packet_frag_offset; - asf->packet_frag_offset = 0; + asf->packet_time_start = asf->packet_frag_offset; + asf->packet_frag_offset = 0; asf->packet_frag_timestamp = asf->packet_timestamp; asf->packet_time_delta = avio_r8(pb); rsize++; - }else if(asf->packet_replic_size!=0){ - av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", asf->packet_replic_size); + } else if (asf->packet_replic_size != 0) { + av_log(s, AV_LOG_ERROR, "unexpected packet_replic_size of %d\n", + asf->packet_replic_size); return -1; } if (asf->packet_flags & 0x01) { @@ -960,9 +1000,10 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ if (rsize > asf->packet_size_left) { av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n"); return -1; - } else if(asf->packet_frag_size > asf->packet_size_left - rsize){ + } else if (asf->packet_frag_size > asf->packet_size_left - rsize) { if (asf->packet_frag_size > asf->packet_size_left - rsize + asf->packet_padsize) { - av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid (%d-%d)\n", asf->packet_size_left, rsize); + av_log(s, AV_LOG_ERROR, "packet_frag_size is invalid (%d-%d)\n", + asf->packet_size_left, rsize); return -1; } else { int diff = asf->packet_frag_size - (asf->packet_size_left - rsize); @@ -998,7 +1039,7 @@ static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb){ */ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pkt) { - ASFContext *asf = s->priv_data; + ASFContext *asf = s->priv_data; ASFStream *asf_st = 0; for (;;) { int ret; @@ -1014,10 +1055,10 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk /* fail safe */ avio_skip(pb, ret); - asf->packet_pos= avio_tell(pb); + asf->packet_pos = avio_tell(pb); if (asf->data_object_size != (uint64_t)-1 && (asf->packet_pos - asf->data_object_offset >= asf->data_object_size)) - return AVERROR_EOF; /* Do not exceed the size of the data object */ + return AVERROR_EOF; /* Do not exceed the size of the data object */ return 1; } if (asf->packet_time_start == 0) { @@ -1034,7 +1075,8 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk avio_skip(pb, asf->packet_frag_size); asf->packet_size_left -= asf->packet_frag_size; if (asf->stream_index < 0) - av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", asf->packet_frag_size); + av_log(s, AV_LOG_ERROR, "ff asf skip %d (unknown stream)\n", + asf->packet_frag_size); continue; } asf->asf_st = s->streams[asf->stream_index]->priv_data; @@ -1065,11 +1107,12 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk } if (asf_st->pkt.size != asf->packet_obj_size || - //FIXME is this condition sufficient? + // FIXME is this condition sufficient? asf_st->frag_offset + asf->packet_frag_size > asf_st->pkt.size) { if (asf_st->pkt.data) { - av_log(s, AV_LOG_INFO, "freeing incomplete packet size %d, " - "new %d\n", asf_st->pkt.size, asf->packet_obj_size); + av_log(s, AV_LOG_INFO, + "freeing incomplete packet size %d, new %d\n", + asf_st->pkt.size, asf->packet_obj_size); asf_st->frag_offset = 0; av_free_packet(&asf_st->pkt); } @@ -1112,8 +1155,10 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk if (asf->packet_frag_offset >= asf_st->pkt.size || asf->packet_frag_size > asf_st->pkt.size - asf->packet_frag_offset) { - av_log(s, AV_LOG_ERROR, "packet fragment position invalid %u,%u not in %u\n", - asf->packet_frag_offset, asf->packet_frag_size, asf_st->pkt.size); + av_log(s, AV_LOG_ERROR, + "packet fragment position invalid %u,%u not in %u\n", + asf->packet_frag_offset, asf->packet_frag_size, + asf_st->pkt.size); continue; } @@ -1141,11 +1186,12 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk asf_st->frag_offset += ret; /* test if whole packet is read */ if (asf_st->frag_offset == asf_st->pkt.size) { - //workaround for macroshit radio DVR-MS files + // workaround for macroshit radio DVR-MS files if (s->streams[asf->stream_index]->codec->codec_id == AV_CODEC_ID_MPEG2VIDEO && asf_st->pkt.size > 100) { int i; - for (i = 0; i < asf_st->pkt.size && !asf_st->pkt.data[i]; i++); + for (i = 0; i < asf_st->pkt.size && !asf_st->pkt.data[i]; i++) + ; if (i == asf_st->pkt.size) { av_log(s, AV_LOG_DEBUG, "discarding ms fart\n"); asf_st->frag_offset = 0; @@ -1156,23 +1202,26 @@ static int ff_asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket *pk /* return packet */ if (asf_st->ds_span > 1) { - if(asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span) { - av_log(s, AV_LOG_ERROR, "pkt.size != ds_packet_size * " - "ds_span (%d %d %d)\n", asf_st->pkt.size, - asf_st->ds_packet_size, asf_st->ds_span); + if (asf_st->pkt.size != asf_st->ds_packet_size * asf_st->ds_span) { + av_log(s, AV_LOG_ERROR, + "pkt.size != ds_packet_size * ds_span (%d %d %d)\n", + asf_st->pkt.size, asf_st->ds_packet_size, + asf_st->ds_span); } else { /* packet descrambling */ - uint8_t *newdata = av_malloc(asf_st->pkt.size + FF_INPUT_BUFFER_PADDING_SIZE); + uint8_t *newdata = av_malloc(asf_st->pkt.size + + FF_INPUT_BUFFER_PADDING_SIZE); if (newdata) { int offset = 0; - memset(newdata + asf_st->pkt.size, 0, FF_INPUT_BUFFER_PADDING_SIZE); + memset(newdata + asf_st->pkt.size, 0, + FF_INPUT_BUFFER_PADDING_SIZE); while (offset < asf_st->pkt.size) { int off = offset / asf_st->ds_chunk_size; int row = off / asf_st->ds_span; int col = off % asf_st->ds_span; int idx = row + col * asf_st->ds_packet_size / asf_st->ds_chunk_size; assert(offset + asf_st->ds_chunk_size <= asf_st->pkt.size); - assert(idx+1 <= asf_st->pkt.size / asf_st->ds_chunk_size); + assert(idx + 1 <= asf_st->pkt.size / asf_st->ds_chunk_size); memcpy(newdata + offset, asf_st->pkt.data + idx * asf_st->ds_chunk_size, asf_st->ds_chunk_size); @@ -1206,7 +1255,8 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt) if ((ret = ff_asf_parse_packet(s, s->pb, pkt)) <= 0) return ret; if ((ret = ff_asf_get_packet(s, s->pb)) < 0) - assert(asf->packet_size_left < FRAME_HEADER_SIZE || asf->packet_segments < 1); + assert(asf->packet_size_left < FRAME_HEADER_SIZE || + asf->packet_segments < 1); asf->packet_time_start = 0; } } @@ -1220,32 +1270,32 @@ static void asf_reset_header(AVFormatContext *s) ASFStream *asf_st; int i; - asf->packet_size_left = 0; - asf->packet_segments = 0; - asf->packet_flags = 0; - asf->packet_property = 0; - asf->packet_timestamp = 0; - asf->packet_segsizetype = 0; - asf->packet_segments = 0; - asf->packet_seq = 0; - asf->packet_replic_size = 0; - asf->packet_key_frame = 0; - asf->packet_padsize = 0; - asf->packet_frag_offset = 0; - asf->packet_frag_size = 0; + asf->packet_size_left = 0; + asf->packet_segments = 0; + asf->packet_flags = 0; + asf->packet_property = 0; + asf->packet_timestamp = 0; + asf->packet_segsizetype = 0; + asf->packet_segments = 0; + asf->packet_seq = 0; + asf->packet_replic_size = 0; + asf->packet_key_frame = 0; + asf->packet_padsize = 0; + asf->packet_frag_offset = 0; + asf->packet_frag_size = 0; asf->packet_frag_timestamp = 0; - asf->packet_multi_size = 0; - asf->packet_obj_size = 0; - asf->packet_time_delta = 0; - asf->packet_time_start = 0; + asf->packet_multi_size = 0; + asf->packet_obj_size = 0; + asf->packet_time_delta = 0; + asf->packet_time_start = 0; - for(i=0; i<s->nb_streams; i++){ - asf_st= s->streams[i]->priv_data; + for (i = 0; i < s->nb_streams; i++) { + asf_st = s->streams[i]->priv_data; av_free_packet(&asf_st->pkt); - asf_st->frag_offset=0; - asf_st->seq=0; + asf_st->frag_offset = 0; + asf_st->seq = 0; } - asf->asf_st= NULL; + asf->asf_st = NULL; } static int asf_read_close(AVFormatContext *s) @@ -1255,27 +1305,29 @@ static int asf_read_close(AVFormatContext *s) return 0; } -static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit) +static int64_t asf_read_pts(AVFormatContext *s, int stream_index, + int64_t *ppos, int64_t pos_limit) { AVPacket pkt1, *pkt = &pkt1; ASFStream *asf_st; int64_t pts; - int64_t pos= *ppos; + int64_t pos = *ppos; int i; int64_t start_pos[ASF_MAX_STREAMS]; - for(i=0; i<s->nb_streams; i++){ - start_pos[i]= pos; - } + for (i = 0; i < s->nb_streams; i++) + start_pos[i] = pos; if (s->packet_size > 0) - pos= (pos+s->packet_size-1-s->data_offset)/s->packet_size*s->packet_size+ s->data_offset; - *ppos= pos; + pos = (pos + s->packet_size - 1 - s->data_offset) / + s->packet_size * s->packet_size + + s->data_offset; + *ppos = pos; avio_seek(s->pb, pos, SEEK_SET); asf_reset_header(s); - for(;;){ - if (asf_read_packet(s, pkt) < 0){ + for (;;) { + if (asf_read_packet(s, pkt) < 0) { av_log(s, AV_LOG_INFO, "asf_read_pts failed\n"); return AV_NOPTS_VALUE; } @@ -1283,79 +1335,84 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos, pts = pkt->dts; av_free_packet(pkt); - if(pkt->flags&AV_PKT_FLAG_KEY){ - i= pkt->stream_index; + if (pkt->flags & AV_PKT_FLAG_KEY) { + i = pkt->stream_index; - asf_st= s->streams[i]->priv_data; + asf_st = s->streams[i]->priv_data; // assert((asf_st->packet_pos - s->data_offset) % s->packet_size == 0); - pos= asf_st->packet_pos; + pos = asf_st->packet_pos; - av_add_index_entry(s->streams[i], pos, pts, pkt->size, pos - start_pos[i] + 1, AVINDEX_KEYFRAME); - start_pos[i]= asf_st->packet_pos + 1; + av_add_index_entry(s->streams[i], pos, pts, pkt->size, + pos - start_pos[i] + 1, AVINDEX_KEYFRAME); + start_pos[i] = asf_st->packet_pos + 1; - if(pkt->stream_index == stream_index) - break; + if (pkt->stream_index == stream_index) + break; } } - *ppos= pos; + *ppos = pos; return pts; } static void asf_build_simple_index(AVFormatContext *s, int stream_index) { ff_asf_guid g; - ASFContext *asf = s->priv_data; - int64_t current_pos= avio_tell(s->pb); + ASFContext *asf = s->priv_data; + int64_t current_pos = avio_tell(s->pb); int i; avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET); ff_get_guid(s->pb, &g); /* the data object can be followed by other top-level objects, - skip them until the simple index object is reached */ + * skip them until the simple index object is reached */ while (ff_guidcmp(&g, &index_guid)) { - int64_t gsize= avio_rl64(s->pb); + int64_t gsize = avio_rl64(s->pb); if (gsize < 24 || s->pb->eof_reached) { avio_seek(s->pb, current_pos, SEEK_SET); return; } - avio_skip(s->pb, gsize-24); + avio_skip(s->pb, gsize - 24); ff_get_guid(s->pb, &g); } { - int64_t itime, last_pos=-1; + int64_t itime, last_pos = -1; int pct, ict; - int64_t av_unused gsize= avio_rl64(s->pb); + int64_t av_unused gsize = avio_rl64(s->pb); ff_get_guid(s->pb, &g); - itime=avio_rl64(s->pb); - pct=avio_rl32(s->pb); - ict=avio_rl32(s->pb); - av_log(s, AV_LOG_DEBUG, "itime:0x%"PRIx64", pct:%d, ict:%d\n",itime,pct,ict); - - for (i=0;i<ict;i++){ - int pktnum=avio_rl32(s->pb); - int pktct =avio_rl16(s->pb); - int64_t pos = s->data_offset + s->packet_size*(int64_t)pktnum; - int64_t index_pts= FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0); - - if(pos != last_pos){ - av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n", pktnum, pktct, index_pts); - av_add_index_entry(s->streams[stream_index], pos, index_pts, s->packet_size, 0, AVINDEX_KEYFRAME); - last_pos=pos; + itime = avio_rl64(s->pb); + pct = avio_rl32(s->pb); + ict = avio_rl32(s->pb); + av_log(s, AV_LOG_DEBUG, + "itime:0x%"PRIx64", pct:%d, ict:%d\n", itime, pct, ict); + + for (i = 0; i < ict; i++) { + int pktnum = avio_rl32(s->pb); + int pktct = avio_rl16(s->pb); + int64_t pos = s->data_offset + s->packet_size * (int64_t)pktnum; + int64_t index_pts = FFMAX(av_rescale(itime, i, 10000) - asf->hdr.preroll, 0); + + if (pos != last_pos) { + av_log(s, AV_LOG_DEBUG, "pktnum:%d, pktct:%d pts: %"PRId64"\n", + pktnum, pktct, index_pts); + av_add_index_entry(s->streams[stream_index], pos, index_pts, + s->packet_size, 0, AVINDEX_KEYFRAME); + last_pos = pos; } } - asf->index_read= ict > 0; + asf->index_read = ict > 0; } avio_seek(s->pb, current_pos, SEEK_SET); } -static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int flags) +static int asf_read_seek(AVFormatContext *s, int stream_index, + int64_t pts, int flags) { ASFContext *asf = s->priv_data; - AVStream *st = s->streams[stream_index]; + AVStream *st = s->streams[stream_index]; int64_t pos; int index; @@ -1363,9 +1420,9 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int return -1; /* Try using the protocol's read_seek if available */ - if(s->pb) { + if (s->pb) { int ret = avio_seek_time(s->pb, stream_index, pts, flags); - if(ret >= 0) + if (ret >= 0) asf_reset_header(s); if (ret != AVERROR(ENOSYS)) return ret; @@ -1374,9 +1431,9 @@ static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t pts, int if (!asf->index_read) asf_build_simple_index(s, stream_index); - if((asf->index_read && st->index_entries)){ - index= av_index_search_timestamp(st, pts, flags); - if(index >= 0) { + if ((asf->index_read && st->index_entries)) { + index = av_index_search_timestamp(st, pts, flags); + if (index >= 0) { /* find the position */ pos = st->index_entries[index].pos; diff --git a/libavformat/asfenc.c b/libavformat/asfenc.c index 5c820becb2..a523b3a051 100644 --- a/libavformat/asfenc.c +++ b/libavformat/asfenc.c @@ -18,12 +18,13 @@ * 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 "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 <assert.h> @@ -33,10 +34,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 +44,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 +67,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 +142,45 @@ # 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) typedef struct { uint32_t seqno; @@ -209,17 +201,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[] = { - { AV_CODEC_ID_MPEG4, MKTAG('M', 'P', '4', 'S') }, - { AV_CODEC_ID_MPEG4, MKTAG('M', '4', 'S', '2') }, + { 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 }, + { AV_CODEC_ID_NONE, 0 }, }; #define PREROLL_TIME 3100 @@ -267,7 +259,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 +268,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 +280,14 @@ 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; } /* 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 +302,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]; + 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;n<s->nb_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 +333,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 +342,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 */ @@ -394,26 +388,25 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data } /* stream headers */ - for(n=0;n<s->nb_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 +439,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 == AV_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,7 +465,7 @@ 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;n<s->nb_streams;n++) { + for (n = 0; n < s->nb_streams; n++) { AVCodec *p; const char *desc; int len; @@ -480,21 +473,21 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data AVIOContext *dyn_buf; enc = s->streams[n]->codec; - p = avcodec_find_encoder(enc->codec_id); + p = avcodec_find_encoder(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 == AV_CODEC_ID_WMAV2) + if (enc->codec_id == AV_CODEC_ID_WMAV2) desc = "Windows Media Audio V8"; else desc = p ? p->name : enc->codec_name; - if ( avio_open_dyn_buf(&dyn_buf) < 0) + if (avio_open_dyn_buf(&dyn_buf) < 0) return AVERROR(ENOMEM); avio_put_str16le(dyn_buf, desc); @@ -506,7 +499,6 @@ static int asf_write_header1(AVFormatContext *s, int64_t file_size, int64_t data avio_wl16(pb, 0); /* no parameters */ - /* id */ if (enc->codec_type == AVMEDIA_TYPE_AUDIO) { avio_wl16(pb, 2); @@ -515,14 +507,14 @@ 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; @@ -557,11 +549,11 @@ 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 @@ -573,11 +565,11 @@ static int asf_write_header(AVFormatContext *s) 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 +583,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 +638,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 +656,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 +676,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 +686,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 +708,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 +730,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 +747,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); @@ -788,58 +763,62 @@ static int asf_write_packet(AVFormatContext *s, AVPacket *pkt) 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; - 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<start_sec;i++) { - if (i>=asf->nb_index_memory_alloc) { + for (i = asf->nb_index_count; i < start_sec; i++) { + if (i >= asf->nb_index_memory_alloc) { asf->nb_index_memory_alloc += ASF_INDEX_BLOCK; - asf->index_ptr = (ASFIndex*)av_realloc( asf->index_ptr, sizeof(ASFIndex) * asf->nb_index_memory_alloc ); + asf->index_ptr = (ASFIndex *)av_realloc(asf->index_ptr, + sizeof(ASFIndex) * + asf->nb_index_memory_alloc); } // 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->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; i<count; i++) { + for (i = 0; i < count; i++) { avio_wl32(pb, index[i].packet_number); avio_wl16(pb, index[i].packet_count); } @@ -850,7 +829,7 @@ static int asf_write_index(AVFormatContext *s, ASFIndex *index, uint16_t max, ui static int asf_write_trailer(AVFormatContext *s) { ASFContext *asf = s->priv_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 +837,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) { @@ -889,11 +867,11 @@ AVOutputFormat ff_asf_muxer = { .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 = { @@ -908,8 +886,8 @@ AVOutputFormat ff_asf_stream_muxer = { .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 */ |