Quoting Alexandra Hájková (2014-12-25 16:01:50)
> The old one is result of reverse engeneering and guesswork.
> The new one had beem written following the now-available specification.
>
> This work is part of Outreach Program for Women Summer 2014 activities.
> ---
> libavformat/asfdec.c | 2410
> +++++++++++++++++++++++++-------------------------
> 1 file changed, 1221 insertions(+), 1189 deletions(-)
>
> diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
> index 85e800d..bc25b3a 100644
> --- a/libavformat/asfdec.c
> +++ b/libavformat/asfdec.c
> @@ -1,6 +1,6 @@
> /*
> - * ASF compatible demuxer
> - * Copyright (c) 2000, 2001 Fabrice Bellard
> + * Microsoft Advanced Stream Format demuxer
> + * Copyright (c) 2014 Alexandra Hájková
> *
> * This file is part of Libav.
> *
> @@ -19,8 +19,6 @@
> * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> */
>
> -#include <inttypes.h>
> -
> #include "libavutil/attributes.h"
> #include "libavutil/avassert.h"
> #include "libavutil/avstring.h"
> @@ -39,145 +37,278 @@
> #include "asf.h"
> #include "asfcrypt.h"
>
> -typedef struct {
> - const AVClass *class;
> - int asfid2avid[128]; ///< conversion table from asf ID 2
> AVStream ID
> - ASFStream streams[128]; ///< it's max number and it's not
> that big
> - uint32_t stream_bitrates[128]; ///< max number of streams, bitrate
> for each (for streaming)
> - AVRational dar[128];
> - char stream_languages[128][6]; ///< max number of streams,
> language for each (RFC1766, e.g. en-US)
> - /* non streamed additonnal info */
> - /* packet filling */
> - int packet_size_left;
> - /* only for reading */
> - uint64_t data_offset; ///< beginning of the first data
> packet
> - uint64_t data_object_offset; ///< data object offset (excl. GUID
> & size)
> - uint64_t data_object_size; ///< size of the data object
> - int index_read;
> -
> - ASFMainHeader hdr;
> -
> - int packet_flags;
> - int packet_property;
> - int packet_timestamp;
> - int packet_segsizetype;
> - int packet_segments;
> - int packet_seq;
> - int packet_replic_size;
> - int packet_key_frame;
> - int packet_padsize;
> - unsigned int packet_frag_offset;
> - unsigned int packet_frag_size;
> - int64_t packet_frag_timestamp;
> - int packet_multi_size;
> - int packet_obj_size;
> - int packet_time_delta;
> - int packet_time_start;
> - int64_t packet_pos;
> -
> - int stream_index;
> -
> - ASFStream *asf_st; ///< currently decoded stream
> -
> - int no_resync_search;
> +#define ASF_MAX_STREAMS 128
> +#define BMP_HEADER_SIZE 40
> +#define ASF_TYPE_AUDIO 0x2
> +#define ASF_TYPE_VIDEO 0x1
> +#define ASF_STREAM_NUM 0x7F
> +#define ASF_ERROR_CORRECTION_LENGTH_TYPE 0x60
> +#define ASF_PACKET_ERROR_CORRECTION_DATA_SIZE 0x2
> +#define ASF_NUM_OF_PAYLOADS 0x3F
> +#define ASF_UNICODE 0x0
> +#define ASF_BYTE_ARRAY 0x1
> +#define ASF_BOOL 0x2
> +#define ASF_DWORD 0x3
> +#define ASF_QWORD 0x4
> +#define ASF_WORD 0x5
> +
> +typedef struct GUIDParseTable {
> + const char *name;
> + ff_asf_guid guid;
> + int (*read_object)(AVFormatContext *, const struct GUIDParseTable *);
> + int is_subobject;
> +} GUIDParseTable;
> +
> +typedef struct ASFPacket {
> + AVPacket *avpkt;
> + int64_t dts;
> + uint32_t frame_num; // ASF payloads with the same number are parts of
> the same frame
> + int flags;
> + int data_size;
> + int duration;
> + int size_left;
> + uint8_t stream_index;
> +} ASFPacket;
> +
> +typedef struct ASFStreamDemux {
> + uint8_t stream_index; //from packet header
> + int index; // stream index in AVFormatContext, set in
> read_stream_properties
> + int type;
> + int8_t span; // for deinterleaving
> + int16_t virtual_pkt_len;
> + int16_t virtual_chunk_len;
> + int16_t idx_type; // index type in the Index Parameters Object
> + int16_t lan_idx;
> + char lang[100];
> + ASFPacket *pkt;
> +} ASFStreamDemux;
> +
> +typedef struct ASFContext {
> + int data_reached;
> + int seekable;
> + int is_simple_index; // is simple index present or not 1/0
> + int is_header;
> +
> + uint64_t preroll;
> + uint64_t nb_packets; // ASF packets
> + uint32_t packet_size;
> + int64_t send_time;
> + int duration;
> +
> + uint32_t b_flags; // flags with broadcast flag
> + uint32_t prop_flags; // file properties object flags
> +
> + uint64_t data_size; // data object size
> + int64_t header_obj_size;
> + int64_t unknown_size; // size of the unknown object
> +
> + // presentation time offset, equal for all streams, should be equal to
> send time, !100-nanosecond units
> + uint64_t time_offset;
> + int64_t offset; // offset of the current object
> + int64_t data_offset;
> + int64_t first_packet_offset; // packet offset
> + int64_t unknown_offset; // for top level header objects or subobjects
> whithout specified behavior
> +
> + // ASF file must not contain more than 128 streams according to the
> specification
> + ASFStreamDemux *asf_st[ASF_MAX_STREAMS];
> + int nb_streams;
> + int stream_index; //from packet header, for the subpayload case
> + char langs[ASF_MAX_STREAMS][100];
> +
> + //packet parametres
> + uint64_t sub_header_offset; // offset of subplayload header
> + int64_t sub_dts;
> + uint8_t dts_delta; // for subpayloads
> + uint32_t packet_size_internal; // packet size stored inside ASFPacket,
> can be 0
> + int64_t dts;
> + int64_t packet_offset; // offset of the current packet inside Data Object
> + uint32_t pad_len; // padding after payload
> + uint32_t rep_len;
> +
> + // packet state
> + uint64_t sub_left; // subpayloads left or not
> + int nb_sub; // subpayloads get from current ASF packet
> + uint16_t mult_sub_len; // total length of subpayloads array inside
> multiple payload
> + uint64_t nb_mult_left; // multiple payloads left
> + int return_subpayload;
> + enum {
> + PARSE_PACKET_HEADER,
> + READ_SINGLE,
> + READ_SUB,
> + READ_MULTI,
> + READ_MULTI_SUB
> + } state;
> } 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 },
> - { NULL },
> -};
> +static int detect_unknown_subobject(AVFormatContext *s, int64_t offset,
> int64_t size);
> +static const GUIDParseTable *find_guid(ff_asf_guid guid);
>
> -static const AVClass asf_class = {
> - .class_name = "asf demuxer",
> - .item_name = av_default_item_name,
> - .option = options,
> - .version = LIBAVUTIL_VERSION_INT,
> -};
> +static int asf_probe(AVProbeData *pd)
> +{
> + /* check file header */
> + if (!ff_guidcmp(pd->buf, &ff_asf_header))
> + return AVPROBE_SCORE_MAX;
> + else
> + return 0;
> +}
> +
> +static void swap_guid(ff_asf_guid guid)
> +{
> + FFSWAP(unsigned char, guid[0], guid[3]);
> + FFSWAP(unsigned char, guid[1], guid[2]);
> + FFSWAP(unsigned char, guid[4], guid[5]);
> + FFSWAP(unsigned char, guid[6], guid[7]);
> +}
>
> -#undef NDEBUG
> -#include <assert.h>
> +static void align_position(AVIOContext *pb, int64_t offset, uint64_t size)
> +{
> + if (avio_tell(pb) != offset + size)
> + avio_seek(pb, offset + size, SEEK_SET);
> +}
>
> -#define ASF_MAX_STREAMS 127
> -#define FRAME_HEADER_SIZE 17
> -// Fix Me! FRAME_HEADER_SIZE may be different.
> +static int read_unknown(AVFormatContext *s, const GUIDParseTable *g)
> +{
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + uint64_t size = avio_rl64(pb);
> + int ret;
> +
> + if (asf->is_header)
> + asf->unknown_size = size;
> + asf->is_header = 0;
> + if (!g->is_subobject) {
> + if (!(ret = strcmp(g->name, "Header Extension")))
> + avio_skip(pb, 22); // skip reserved fields and Data Size
> + if ((ret = detect_unknown_subobject(s, asf->unknown_offset,
> + asf->unknown_size)) < 0)
> + return ret;
> + } else
> + avio_skip(pb, size - 24);
>
> -static const ff_asf_guid index_guid = {
> - 0x90, 0x08, 0x00, 0x33, 0xb1, 0xe5, 0xcf, 0x11, 0x89, 0xf4, 0x00, 0xa0,
> 0xc9, 0x03, 0x49, 0xcb
> -};
> + return 0;
> +}
>
> -#ifdef DEBUG
> -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
> -};
> +static int get_asf_string(AVIOContext *pb, int maxlen, char *buf, int buflen)
> +{
> + char *q = buf;
> + int ret = 0;
> + if (buflen <= 0)
> + return AVERROR(EINVAL);
> + while (ret + 1 < maxlen) {
> + uint8_t tmp;
> + uint32_t ch;
> + GET_UTF16(ch, (ret += 2) <= maxlen ? avio_rl16(pb) : 0, break;);
> + PUT_UTF8(ch, tmp, if (q - buf < buflen - 1) *q++ = tmp;)
> + }
> + *q = 0;
>
> -#define PRINT_IF_GUID(g, cmp) \
> - if (!ff_guidcmp(g, &cmp)) \
> - av_dlog(NULL, "(GUID: %s) ", # cmp)
> + return ret;
> +}
>
> -static void print_guid(ff_asf_guid *g)
> +static int read_marker(AVFormatContext *s, const GUIDParseTable *g)
> {
> - int i;
> - PRINT_IF_GUID(g, ff_asf_header);
> - else PRINT_IF_GUID(g, ff_asf_file_header);
> - else PRINT_IF_GUID(g, ff_asf_stream_header);
> - else PRINT_IF_GUID(g, ff_asf_audio_stream);
> - else PRINT_IF_GUID(g, ff_asf_audio_conceal_none);
> - else PRINT_IF_GUID(g, ff_asf_video_stream);
> - else PRINT_IF_GUID(g, ff_asf_video_conceal_none);
> - else PRINT_IF_GUID(g, ff_asf_command_stream);
> - else PRINT_IF_GUID(g, ff_asf_comment_header);
> - else PRINT_IF_GUID(g, ff_asf_codec_comment_header);
> - else PRINT_IF_GUID(g, ff_asf_codec_comment1_header);
> - else PRINT_IF_GUID(g, ff_asf_data_header);
> - else PRINT_IF_GUID(g, index_guid);
> - else PRINT_IF_GUID(g, ff_asf_head1_guid);
> - else PRINT_IF_GUID(g, ff_asf_head2_guid);
> - else PRINT_IF_GUID(g, ff_asf_my_guid);
> - else PRINT_IF_GUID(g, ff_asf_ext_stream_header);
> - else PRINT_IF_GUID(g, ff_asf_extended_content_header);
> - else PRINT_IF_GUID(g, ff_asf_ext_stream_embed_stream_header);
> - else PRINT_IF_GUID(g, ff_asf_ext_stream_audio_stream);
> - else PRINT_IF_GUID(g, ff_asf_metadata_header);
> - else PRINT_IF_GUID(g, ff_asf_metadata_library_header);
> - else PRINT_IF_GUID(g, ff_asf_marker_header);
> - else PRINT_IF_GUID(g, stream_bitrate_guid);
> - else PRINT_IF_GUID(g, ff_asf_language_guid);
> - else
> - av_dlog(NULL, "(GUID: unknown) ");
> - for (i = 0; i < 16; i++)
> - av_dlog(NULL, " 0x%02x,", (*g)[i]);
> - av_dlog(NULL, "}\n");
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + uint64_t size = avio_rl64(pb);
> + int i, nb_markers, len, ret;
> + char name[1024];
> +
> + avio_rl64(pb);
> + avio_rl64(pb); // skip reserved GUID
> + nb_markers = avio_rl32(pb);
> + avio_rl16(pb); // skip reserved field
> + len = avio_rl16(pb);
> + for (i = 0; i < len; i++)
> + avio_skip(pb, 1);
> +
> + for (i = 0; i < nb_markers; i++) {
> + int64_t pts;
> +
> + avio_skip(pb, 8);
> + pts = avio_rl64(pb);
> + pts -= asf->preroll * 10000;
> + avio_skip(pb, 2); // entry length
> + avio_skip(pb, 4); // send time
> + avio_skip(pb, 4); // flags
> + len = avio_rl32(pb);
> +
> + if ((ret = avio_get_str16le(pb, len * 2, name,
> + sizeof(name))) < len)
> + avio_skip(pb, len - ret);
> + avpriv_new_chapter(s, i, (AVRational) { 1, 10000000 }, pts,
> + AV_NOPTS_VALUE, name);
> + }
> + align_position(pb, asf->offset, size);
> +
> + return 0;
> }
> -#undef PRINT_IF_GUID
> -#else
> -#define print_guid(g)
> -#endif
>
> -static int asf_probe(AVProbeData *pd)
> +static int read_metadata(AVFormatContext *s, const char *title, uint16_t len,
> + unsigned char *ch, uint16_t max_len)
> {
> - /* check file header */
> - if (!ff_guidcmp(pd->buf, &ff_asf_header))
> - return AVPROBE_SCORE_MAX;
> - else
> - return 0;
> + AVIOContext *pb = s->pb;
> +
> + memset(ch, 0, max_len);
> + avio_get_str16le(pb, len * sizeof(*ch), ch, len * sizeof(*ch));
> + av_dict_set(&s->metadata, title, ch, 0);
> +
> + return 0;
> +}
> +
> +static int read_value(AVFormatContext *s, uint8_t *name,
> + int16_t val_len, int type)
> +{
> + AVIOContext *pb = s->pb;
> + uint8_t *value;
> + int ret;
> +
> + value = av_malloc(2 * val_len);
> + if (!value)
> + return AVERROR(ENOMEM);
> + if (type == ASF_UNICODE) {
> + // get_asf_string reads UTF-16 and converts it to UTF-8 which needs
> longer buffer
> + if ((ret = get_asf_string(pb, val_len, value, 2 * val_len)) < 0)
> + return ret;
> + av_dict_set(&s->metadata, name, value, 0);
> + } else {
> + char buf[32];
> + if ((ret = avio_read(pb, value, val_len)) < 0)
> + return ret;
> + value[ret] = '\0';
> + snprintf(buf, sizeof(buf), "%s", value);
> + av_dict_set(&s->metadata, name, buf, 0);
> + }
> + av_free(value);
> +
> + return 0;
> }
>
> -/* size of type 2 (BOOL) is 32bit for "Extended Content Description Object"
> - * but 16 bit for "Metadata Object" and "Metadata Library Object" */
> -static int get_value(AVIOContext *pb, int type, int type2_size)
> +static int read_generic_value(AVFormatContext *s, int8_t *name, int type)
> {
> + AVIOContext *pb = s->pb;
> + uint64_t value;
> + char buf[32];
> +
> switch (type) {
> - case 2:
> - return (type2_size == 32) ? avio_rl32(pb) : avio_rl16(pb);
> - case 3:
> - return avio_rl32(pb);
> - case 4:
> - return avio_rl64(pb);
> - case 5:
> - return avio_rl16(pb);
> + case ASF_BOOL:
> + value = avio_rl32(pb);
> + break;
> + case ASF_DWORD:
> + value = avio_rl32(pb);
> + break;
> + case ASF_QWORD:
> + value = avio_rl64(pb);
> + break;
> + case ASF_WORD:
> + value = avio_rl16(pb);
> + break;
> default:
> - return INT_MIN;
> + return AVERROR_INVALIDDATA;
> }
> + snprintf(buf, sizeof(buf), "%"PRIu64, value);
> + av_dict_set(&s->metadata, name, buf, 0);
> +
> + return 0;
> }
>
> /* MSDN claims that this should be "compatible with the ID3 frame, APIC",
> @@ -269,1241 +400,1143 @@ fail:
> return ret;
> }
>
> -static void get_id3_tag(AVFormatContext *s, int len)
> -{
> - ID3v2ExtraMeta *id3v2_extra_meta = NULL;
> -
> - ff_id3v2_read(s, ID3v2_DEFAULT_MAGIC, &id3v2_extra_meta);
> - if (id3v2_extra_meta)
> - ff_id3v2_parse_apic(s, &id3v2_extra_meta);
> - ff_id3v2_free_extra_meta(&id3v2_extra_meta);
> -}
> -
> -static void get_tag(AVFormatContext *s, const char *key, int type, int len,
> int type2_size)
> +static int read_ext_content(AVFormatContext *s, const GUIDParseTable *g)
> {
> - char *value;
> - int64_t off = avio_tell(s->pb);
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + uint64_t size = avio_rl64(pb);
> + uint16_t nb_desc = avio_rl16(pb);
> + int i;
>
> - if ((unsigned)len >= (UINT_MAX - 1) / 2)
> - return;
> + for (i = 0; i < nb_desc; i++) {
> + uint16_t name_len, type, val_len;
> + uint8_t *name = NULL;
> + int ret;
>
> - 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);
> - } else if (type == 1) { // byte array
> - if (!strcmp(key, "WM/Picture")) { // handle cover art
> - asf_read_picture(s, len);
> - } else if (!strcmp(key, "ID3")) { // handle ID3 tag
> - get_id3_tag(s, len);
> - } else {
> - av_log(s, AV_LOG_VERBOSE, "Unsupported byte array in tag %s.\n",
> key);
> + name_len = avio_rl16(pb);
> + if (name_len) {
> + name = av_malloc(name_len);
> + if (!name)
> + return AVERROR(ENOMEM);
> + avio_get_str16le(pb, name_len * sizeof(*name), name,
> + name_len);
> }
> - goto finish;
> - } else if (type > 1 && type <= 5) { // boolean or DWORD or QWORD or WORD
> - uint64_t num = get_value(s->pb, type, type2_size);
> - snprintf(value, len, "%"PRIu64, num);
> - } else if (type == 6) { // (don't) handle GUID
> - av_log(s, AV_LOG_DEBUG, "Unsupported GUID value in tag %s.\n", key);
> - goto finish;
> - } else {
> - av_log(s, AV_LOG_DEBUG,
> - "Unsupported value type %d in tag %s.\n", type, key);
> - goto finish;
> + type = avio_rl16(pb);
> + val_len = avio_rl16(pb);
> + if (val_len) {
> + switch (type) {
> + case ASF_UNICODE:
> + read_value(s, name, val_len, type);
> + break;
> + case ASF_BYTE_ARRAY:
> + if (!strcmp(name, "WM/Picture")) // handle cover art
> + asf_read_picture(s, val_len);
> + else
> + read_value(s, name, val_len, type);
> + break;
> + default:
> + if ((ret = read_generic_value(s, name, type)) < 0)
> + return ret;
> + break;
> + }
> + }
> + av_free(name);
> }
> - if (*value)
> - av_dict_set(&s->metadata, key, value, 0);
> + align_position(pb, asf->offset, size);
>
> -finish:
> - av_freep(&value);
> - avio_seek(s->pb, off + len, SEEK_SET);
> + return 0;
> }
>
> -static int asf_read_file_properties(AVFormatContext *s, int64_t size)
> +static int read_content(AVFormatContext *s, const GUIDParseTable *g)
> {
> ASFContext *asf = s->priv_data;
> 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);
> - 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))
> - return AVERROR_INVALIDDATA;
> - asf->hdr.max_bitrate = avio_rl32(pb);
> - s->packet_size = asf->hdr.max_pktsize;
> + int i;
> + uint16_t len[5], max_len = 0;
> + static const char *const titles[] = { "Title", "Author", "Copyright",
> "Description", "Rate" };
> + int8_t *ch;
> + uint64_t size = avio_rl64(pb);
> +
> + for (i = 0; i < 5; i++) {
> + len[i] = avio_rl16(pb);
> + max_len = FFMAX(max_len, len[i]);
> + }
> + ch = av_malloc(max_len * sizeof(*ch));
> + if (!ch)
> + return(AVERROR(ENOMEM));
> + for (i = 0; i < 5; i++)
> + read_metadata(s, titles[i], len[i], ch, max_len);
> + av_free(ch);
> + align_position(pb, asf->offset, size);
>
> return 0;
> }
>
> -static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
> +static int read_properties(AVFormatContext *s, const GUIDParseTable *g)
> {
> ASFContext *asf = s->priv_data;
> AVIOContext *pb = s->pb;
> - AVStream *st;
> - ASFStream *asf_st;
> - ff_asf_guid g;
> - enum AVMediaType type;
> - 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;
> + uint64_t nb_packets, creation_date;
> + uint32_t max_packet_size;
> + struct tm tmbuf;
> + struct tm *tm;
> + char buf[100];
> +
> + avio_rl64(pb); // read object size
> + avio_skip(pb, 16); // skip File ID
> + avio_skip(pb, 8); // skip File size
> + creation_date = avio_rl64(pb);
> + if (!(asf->b_flags & 1)) {
> + // creation date is in 100 ns units from 1 Jan 1601
> + // conversion to seconds
> + creation_date /= 10000000;
> + // there are 11644473600 seconds etween 1 Jan 1601 and 1 Jan 1970
> + creation_date -= 11644473600;
> + tm = gmtime_r(&creation_date, &tmbuf);
> + if (tm) {
> + if (!strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", tm))
> + buf[0] = '\0';
> + } else
> + buf[0] = '\0';
> + }
> + av_dict_set(&s->metadata, "creation date", buf, 0);
> + nb_packets = avio_rl64(pb);
> + asf->duration = avio_rl64(pb) / 10000; // stream duration
> + avio_skip(pb, 8); //skip send duration
> + asf->preroll = avio_rl64(pb);
> + asf->b_flags = avio_rl32(pb);
> + avio_skip(pb, 4); // skip minimal packet size
> + max_packet_size = avio_rl32(pb);
> + avio_skip(pb, 4); //skip max_bitrate
> + asf->nb_packets = nb_packets;
> + asf->packet_size = max_packet_size;
>
> - if (s->nb_streams == ASF_MAX_STREAMS) {
> - av_log(s, AV_LOG_ERROR, "too many streams\n");
> - return AVERROR(EINVAL);
> + return 0;
> +}
> +
> +static int parse_video_info(AVIOContext *pb, AVStream *st)
> +{
> + uint16_t size;
> + unsigned int tag;
> +
> + st->codec->width = avio_rl32(pb);
> + st->codec->height = avio_rl32(pb);
> + avio_skip(pb, 1); // skip reserved flags
> + size = avio_rl16(pb); // size of the Format Data
> + tag = ff_get_bmp_header(pb, st);
> + st->codec->codec_tag = tag;
> + st->codec->codec_id = ff_codec_get_id(ff_codec_bmp_tags, tag);
> +
> + if (size > BMP_HEADER_SIZE) {
> + int ret;
> + st->codec->extradata_size = size - BMP_HEADER_SIZE;
> + if (!(st->codec->extradata = av_malloc(st->codec->extradata_size +
> +
> FF_INPUT_BUFFER_PADDING_SIZE)))
> + return AVERROR(ENOMEM);
> + if ((ret = avio_read(pb, st->codec->extradata,
> st->codec->extradata_size)) < 0)
> + return ret;
> }
> + return 0;
> +}
>
> - pos1 = avio_tell(pb);
> +static int read_stream_properties(AVFormatContext *s, const GUIDParseTable
> *g)
> +{
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + uint64_t size;
> + uint32_t err_data_len, ts_data_len; // time specific data length
> + uint16_t flags;
> + int8_t *ts_data;
> + ff_asf_guid stream_type;
> + enum AVMediaType type;
> + int i, ret;
> + uint8_t span;
> + AVStream *st;
> + ASFStreamDemux *asf_st;
>
> + // ASF file must not contain more than 128 streams according to the
> specification
> + if (asf->nb_streams >= ASF_MAX_STREAMS)
> + return AVERROR_INVALIDDATA;
> st = avformat_new_stream(s, NULL);
> if (!st)
> return AVERROR(ENOMEM);
> - avpriv_set_pts_info(st, 32, 1, 1000); /* 32 bit pts in ms */
> - asf_st = av_mallocz(sizeof(ASFStream));
> - if (!asf_st)
> - return AVERROR(ENOMEM);
> - st->priv_data = asf_st;
> - st->start_time = 0;
> - 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...
> - st->duration = asf->hdr.play_time /
> - (10000000 / 1000) - start_time;
> - }
> - ff_get_guid(pb, &g);
> -
> - test_for_ext_stream_audio = 0;
> - if (!ff_guidcmp(&g, &ff_asf_audio_stream)) {
> + avpriv_set_pts_info(st, 32, 1, 1000); // pts should be dword, in
> milliseconds
> + size = avio_rl64(pb);
> + ff_get_guid(pb, &stream_type);
> + if (!ff_guidcmp(&stream_type, &ff_asf_audio_stream))
> type = AVMEDIA_TYPE_AUDIO;
> - } else if (!ff_guidcmp(&g, &ff_asf_video_stream)) {
> + else if (!ff_guidcmp(&stream_type, &ff_asf_video_stream))
> type = AVMEDIA_TYPE_VIDEO;
> - } else if (!ff_guidcmp(&g, &ff_asf_jfif_media)) {
> + else if (!ff_guidcmp(&stream_type, &ff_asf_jfif_media)) {
> type = AVMEDIA_TYPE_VIDEO;
> - st->codec->codec_id = AV_CODEC_ID_MJPEG;
> - } else if (!ff_guidcmp(&g, &ff_asf_command_stream)) {
> + } else if (!ff_guidcmp(&stream_type, &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;
> - } else {
> - return -1;
> - }
> - ff_get_guid(pb, &g);
> - avio_skip(pb, 8); /* total_size */
> - type_specific_size = avio_rl32(pb);
> - avio_rl32(pb);
> - st->id = avio_rl16(pb) & 0x7f; /* stream id */
> - // mapping of asf ID to AV stream ID;
> - asf->asfid2avid[st->id] = s->nb_streams - 1;
> -
> - avio_rl32(pb);
> -
> - 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;
> - ff_get_guid(pb, &g);
> - avio_rl32(pb);
> - avio_rl32(pb);
> - avio_rl32(pb);
> - ff_get_guid(pb, &g);
> - avio_rl32(pb);
> - }
> - }
> -
> + else if (!ff_guidcmp(&stream_type,
> + &ff_asf_ext_stream_embed_stream_header)) {
> + type = AVMEDIA_TYPE_UNKNOWN;
> + } else
> + return AVERROR_INVALIDDATA;
> st->codec->codec_type = type;
> - if (type == AVMEDIA_TYPE_AUDIO) {
> - int ret = ff_get_wav_header(pb, st->codec, type_specific_size);
> - if (ret < 0)
> - return ret;
> - 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_tag = 0;
> - }
> - if (st->codec->codec_id == AV_CODEC_ID_AAC)
> - st->need_parsing = AVSTREAM_PARSE_NONE;
> - 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_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
> - }
> - 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
> - }
> - } else if (type == AVMEDIA_TYPE_VIDEO &&
> - 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);
> - 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);
> - 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);
> - avio_read(pb, st->codec->extradata, st->codec->extradata_size);
> - }
>
> - /* Extract palette from extradata if bpp <= 8 */
> - /* This code assumes that extradata contains only palette */
> - /* This is true for all paletted codecs implemented in libavcodec */
> - 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]);
> -#else
> - memcpy(asf_st->palette, st->codec->extradata,
> - FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
> -#endif
> - asf_st->palette_changed = 1;
> + ff_get_guid(pb, &stream_type); // error correction type
> + asf->time_offset = avio_rl64(pb);
> + ts_data_len = avio_rl32(pb);
> + err_data_len = avio_rl32(pb);
> + flags = avio_rl16(pb); // bit 15 - Encrypted Content
> + if (!(asf->asf_st[asf->nb_streams] = av_mallocz(sizeof(*asf_st))))
> + return AVERROR(ENOMEM);
> + asf_st = asf->asf_st[asf->nb_streams];
> + asf_st->stream_index = flags & ASF_STREAM_NUM;
> + for (i = 0; i < asf->nb_streams; i++)
> + if (asf_st->stream_index == asf->asf_st[i]->stream_index) {
> + av_log(s, AV_LOG_WARNING, "Duplicate stream found, this stream
> will be ignored.\n");
> + align_position(pb, asf->offset, size);
> + return 0;
> }
> -
> - 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->need_parsing = AVSTREAM_PARSE_FULL;
> - /* 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;
> + asf_st->index = st->index;
> + st->id = flags & ASF_STREAM_NUM;
> + if (!(asf_st->pkt = av_mallocz(sizeof(*asf_st->pkt))))
> + return AVERROR(ENOMEM);
> + if (!(asf_st->pkt->avpkt = av_mallocz(sizeof(*asf_st->pkt->avpkt))))
> + return AVERROR(ENOMEM);
> + av_init_packet(asf_st->pkt->avpkt);
> + asf_st->pkt->data_size = 0;
> + avio_skip(pb, 4); // skip reserved field
> + if (ts_data_len) {
> + ts_data = av_malloc(ts_data_len);
> + if (!ts_data)
> + return AVERROR(ENOMEM);
> + switch (type) {
> + case AVMEDIA_TYPE_AUDIO:
> + asf_st->type = AVMEDIA_TYPE_AUDIO;
> + ret = ff_get_wav_header(pb, st->codec, ts_data_len);
> + if (ret < 0) {
> + av_free(ts_data);
> + return ret;
> + }
> + break;
> + case AVMEDIA_TYPE_VIDEO:
> + asf_st->type = AVMEDIA_TYPE_VIDEO;
> + ret = parse_video_info(pb, st);
> + if (ret < 0) {
> + av_free(ts_data);
> + return ret;
> + }
> + break;
> + default:
> + if ((ret = avio_read(pb, ts_data, ts_data_len)) < 0) {
> + av_free(ts_data);
> + return ret;
> + }
> + break;
> }
> - if (st->codec->codec_id == AV_CODEC_ID_H264)
> - st->need_parsing = AVSTREAM_PARSE_FULL_ONCE;
> + av_free(ts_data);
> + } else {
> + av_log(s, AV_LOG_WARNING, "Suspicious data found! Stream will be
> ignored.\n");
> + align_position(pb, asf->offset, size);
> + return 0;
> }
> - pos2 = avio_tell(pb);
> - avio_skip(pb, size - (pos2 - pos1 + 24));
> -
> - return 0;
> -}
>
> -static int asf_read_ext_stream_properties(AVFormatContext *s, int64_t size)
> -{
> - ASFContext *asf = s->priv_data;
> - AVIOContext *pb = s->pb;
> - ff_asf_guid g;
> - int ext_len, payload_ext_ct, stream_ct, i;
> - uint32_t leak_rate, stream_num;
> - unsigned int stream_languageid_index;
> -
> - avio_rl64(pb); // starttime
> - avio_rl64(pb); // endtime
> - leak_rate = avio_rl32(pb); // leak-datarate
> - avio_rl32(pb); // bucket-datasize
> - avio_rl32(pb); // init-bucket-fullness
> - avio_rl32(pb); // alt-leak-datarate
> - avio_rl32(pb); // alt-bucket-datasize
> - avio_rl32(pb); // alt-init-bucket-fullness
> - avio_rl32(pb); // max-object-size
> - avio_rl32(pb); // flags
> (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits
> reserved)
> - stream_num = avio_rl16(pb); // stream-num
> -
> - stream_languageid_index = avio_rl16(pb); // stream-language-id-index
> - if (stream_num < 128)
> - 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
> -
> - if (stream_num < 128)
> - asf->stream_bitrates[stream_num] = leak_rate;
> -
> - for (i = 0; i < stream_ct; i++) {
> - avio_rl16(pb);
> - ext_len = avio_rl16(pb);
> - avio_skip(pb, ext_len);
> + if (err_data_len) {
> + if (type == AVMEDIA_TYPE_AUDIO) {
> + span = avio_r8(pb);
> + if (span > 1) {
> + asf_st->span = span;
> + asf_st->virtual_pkt_len = avio_rl16(pb);
> + asf_st->virtual_chunk_len = avio_rl16(pb);
> + avio_skip(pb, err_data_len - 5);
> + } else
> + avio_skip(pb, err_data_len);
> + } else
> + avio_skip(pb, err_data_len);
> }
>
> - for (i = 0; i < payload_ext_ct; i++) {
> - ff_get_guid(pb, &g);
> - avio_skip(pb, 2);
> - ext_len = avio_rl32(pb);
> - avio_skip(pb, ext_len);
> - }
> + asf->nb_streams++;
> + align_position(pb, asf->offset, size);
>
> return 0;
> }
>
> -static int asf_read_content_desc(AVFormatContext *s, int64_t size)
> +static void set_language(AVFormatContext *s, const char *rfc1766)
> {
> - AVIOContext *pb = s->pb;
> - int len1, len2, len3, len4, len5;
> -
> - len1 = avio_rl16(pb);
> - len2 = avio_rl16(pb);
> - len3 = avio_rl16(pb);
> - len4 = avio_rl16(pb);
> - len5 = avio_rl16(pb);
> - get_tag(s, "title", 0, len1, 32);
> - get_tag(s, "author", 0, len2, 32);
> - get_tag(s, "copyright", 0, len3, 32);
> - get_tag(s, "comment", 0, len4, 32);
> - avio_skip(pb, len5);
> -
> - return 0;
> + 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);
> + if (iso6392)
> + av_dict_set(&s->metadata, "language", iso6392, 0);
> + }
> }
>
> -static int asf_read_ext_content_desc(AVFormatContext *s, int64_t size)
> +static int read_ext_stream_properties(AVFormatContext *s, const
> GUIDParseTable *g)
> {
> - AVIOContext *pb = s->pb;
> ASFContext *asf = s->priv_data;
> - int desc_count, i, ret;
> -
> - desc_count = avio_rl16(pb);
> - 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
> - 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)
> - value_len += 1;
> - /* 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, 32);
> - else if (!strcmp(name, "AspectRatioY"))
> - asf->dar[0].den = get_value(s->pb, value_type, 32);
> - else
> - get_tag(s, name, value_type, value_len, 32);
> + AVIOContext *pb = s->pb;
> + ff_asf_guid guid;
> + uint64_t size = avio_rl64(pb);
> + uint16_t nb_st_name, nb_pay_exts, st_num, lan_idx;
> + int i, ret;
> +
> + avio_skip(pb, 48); // skip some unused values
> + st_num = avio_rl16(pb);
> + st_num &= ASF_STREAM_NUM;
> + lan_idx = avio_rl16(pb); // Stream Language ID Index
> + for (i = 0; i < asf->nb_streams; i++)
> + if (st_num == asf->asf_st[i]->stream_index)
> + asf->asf_st[i]->lan_idx = lan_idx;
> + avio_skip(pb, 2); // skip average time per frame
> + nb_st_name = avio_rl16(pb);
> + nb_pay_exts = avio_rl16(pb);
> + for (i = 0; i < nb_st_name; i++) {
> + int16_t len;
> +
> + avio_rl16(pb); // Language ID Index
> + len = avio_rl16(pb);
> + avio_skip(pb, len);
> + }
> + for (i = 0; i < nb_pay_exts; i++) {
> + int32_t len;
> + avio_skip(pb, 16); // Extension System ID
> + avio_skip(pb, 2); // Extension Data Size
> + len = avio_rl32(pb);
> + avio_skip(pb, len);
> + }
> + if ((ret = ff_get_guid(pb, &guid)) < 0)
> + return ret;
> + swap_guid(guid);
> + g = find_guid(guid);
> + if (g && !(strcmp(g->name, "Extended Stream Properties"))) {
> + if ((ret = g->read_object(s, g)) < 0)
> + return ret;
> }
>
> + align_position(pb, asf->offset, size);
> return 0;
> }
>
> -static int asf_read_language_list(AVFormatContext *s, int64_t size)
> +static int read_language_list(AVFormatContext *s, const GUIDParseTable *g)
> {
> - AVIOContext *pb = s->pb;
> ASFContext *asf = s->priv_data;
> - int j, ret;
> - int stream_count = avio_rl16(pb);
> - 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)
> - avio_skip(pb, lang_len - ret);
> - if (j < 128)
> - av_strlcpy(asf->stream_languages[j], lang,
> - sizeof(*asf->stream_languages));
> + AVIOContext *pb = s->pb;
> + int i, ret;
> + uint64_t size = avio_rl64(pb);
> + uint16_t nb_langs = avio_rl16(pb);
> +
> + for (i = 0; i < nb_langs; i++) {
> + int8_t len, *name;
> + len = avio_r8(pb);
> + if (!len)
> + len = 6;
> + //len *= 2; // len is number of unicode characters - 2 bytes for
> each char
> + name = av_malloc(2 * len);
> + if (!name) {
> + return AVERROR(ENOMEM);
> + }
> + if ((ret = get_asf_string(pb, len, name, 2 * len)) < 0)
> + return ret;
> + if (i < ASF_MAX_STREAMS)
> + av_strlcpy(asf->langs[i], name, sizeof(*name));
> + av_free(name);
> }
>
> + align_position(pb, asf->offset, size);
> return 0;
> }
>
> -static int asf_read_metadata(AVFormatContext *s, int64_t size)
> +// returns data object offset when reading this object for the first time
> +static int read_data(AVFormatContext *s, const GUIDParseTable *g)
> {
> - AVIOContext *pb = s->pb;
> ASFContext *asf = s->priv_data;
> - int n, stream_num, name_len, value_len;
> - int ret, i;
> - n = avio_rl16(pb);
> -
> - for (i = 0; i < n; i++) {
> - char name[1024];
> - int value_type;
> -
> - 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);
> -
> - if ((ret = avio_get_str16le(pb, name_len, name, sizeof(name))) <
> name_len)
> - avio_skip(pb, name_len - ret);
> - av_dlog(s, "%d stream %d name_len %2d type %d len %4d <%s>\n",
> - i, stream_num, name_len, value_type, value_len, name);
> -
> - if (!strcmp(name, "AspectRatioX")){
> - int aspect_x = get_value(s->pb, value_type, 16);
> - if(stream_num < 128)
> - asf->dar[stream_num].num = aspect_x;
> - } else if(!strcmp(name, "AspectRatioY")){
> - int aspect_y = get_value(s->pb, value_type, 16);
> - if(stream_num < 128)
> - asf->dar[stream_num].den = aspect_y;
> - } else {
> - get_tag(s, name, value_type, value_len, 16);
> - }
> + AVIOContext *pb = s->pb;
> + int i;
> + uint64_t size = asf->data_size = avio_rl64(pb);
> +
> + // skip data reading for now and read Index Object first, then return to
> it
> + if (!asf->data_reached && pb->seekable) {
> + asf->data_offset = asf->offset;
> + asf->data_reached = 1;
> + avio_skip(pb, 26);
> + asf->first_packet_offset = avio_tell(pb);
> + avio_skip(pb, size - 24 - 26);
> + return asf->offset;
> }
> + if (!pb->seekable)
> + asf->seekable = 0;
> + for (i = 0; i < asf->nb_streams; i++)
> + s->streams[i]->duration = asf->duration;
> + asf->data_reached = 0;
> + asf->nb_mult_left = 0;
> + asf->sub_left = 0;
> + asf->state = PARSE_PACKET_HEADER;
> + asf->return_subpayload = 0;
> + asf->packet_size_internal = 0;
> + avio_skip(pb, 16); // skip File ID
> + size = avio_rl64(pb); // Total Data Packets
> + if (size != asf->nb_packets)
> + av_log(s, AV_LOG_WARNING, "Number of Packets from File Properties
> Object is not equal to Total Data packets value! num of packets %"PRIu64"
> total num %"PRIu64".\n", size,
> + asf->nb_packets);
> + avio_skip(pb, 2); // skip reserved field
>
> return 0;
> }
>
> -static int asf_read_marker(AVFormatContext *s, int64_t size)
> +static int read_parameters(AVFormatContext *s, const GUIDParseTable *g)
> {
> - AVIOContext *pb = s->pb;
> ASFContext *asf = s->priv_data;
> - int i, count, name_len, ret;
> - char name[1024];
> + AVIOContext *pb = s->pb;
> + uint16_t nb_idx_specs;
> + int i, j;
> + uint64_t size = avio_rl64(pb);
> +
> + avio_skip(pb, 4);
> + nb_idx_specs = avio_rl16(pb);
> + for (i = 0; i < nb_idx_specs; i++) {
> + uint16_t stream_index = avio_rl16(pb);
> + for (j = 0; j < asf->nb_streams; j++) {
> + if (asf->asf_st[j]->stream_index == stream_index)
> + asf->asf_st[j]-> idx_type = avio_rl16(pb);
>
> - avio_rl64(pb); // reserved 16 bytes
> - avio_rl64(pb); // ...
> - 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++)
> - avio_r8(pb); // skip the name
> -
> - for (i = 0; i < count; i++) {
> - int64_t pres_time;
> - int name_len;
> -
> - avio_rl64(pb); // offset, 8 bytes
> - pres_time = avio_rl64(pb); // presentation time
> - pres_time -= asf->hdr.preroll * 10000;
> - avio_rl16(pb); // entry length
> - 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)
> - avio_skip(pb, name_len - ret);
> - avpriv_new_chapter(s, i, (AVRational) { 1, 10000000 }, pres_time,
> - AV_NOPTS_VALUE, name);
> + else
> + avio_skip(pb, 2);
> + }
> }
>
> + align_position(pb, asf->offset, size);
> return 0;
> }
>
> -static int asf_read_header(AVFormatContext *s)
> +static int read_simple_index(AVFormatContext *s, const GUIDParseTable *g)
> {
> ASFContext *asf = s->priv_data;
> - ff_asf_guid g;
> AVIOContext *pb = s->pb;
> + AVStream *st = NULL;
> + uint64_t interval; // index entry time interval in 100 ns units, usually
> it's 1s
> + uint32_t pkt_num, nb_entries;
> + int32_t prev_pkt_num = -1;
> int i;
> - int64_t gsize;
> + uint64_t size = avio_rl64(pb);
>
> - ff_get_guid(pb, &g);
> - if (ff_guidcmp(&g, &ff_asf_header))
> - return -1;
> - avio_rl64(pb);
> - avio_rl32(pb);
> - avio_r8(pb);
> - avio_r8(pb);
> - memset(&asf->asfid2avid, -1, sizeof(asf->asfid2avid));
> - 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)
> - asf->data_object_size = gsize - 24;
> - else
> - asf->data_object_size = (uint64_t)-1;
> + for (i = 0; i < asf->nb_streams; i++) {
> + if (asf->asf_st[i]->type == AVMEDIA_TYPE_VIDEO) {
> + st = s->streams[asf->asf_st[i]->index];
> break;
> }
> - if (gsize < 24)
> - return -1;
> - if (!ff_guidcmp(&g, &ff_asf_file_header)) {
> - int ret = asf_read_file_properties(s, gsize);
> - if (ret < 0)
> - return ret;
> - } else if (!ff_guidcmp(&g, &ff_asf_stream_header)) {
> - int ret = asf_read_stream_properties(s, gsize);
> - if (ret < 0)
> - return ret;
> - } else if (!ff_guidcmp(&g, &ff_asf_comment_header)) {
> - asf_read_content_desc(s, gsize);
> - } else if (!ff_guidcmp(&g, &ff_asf_language_guid)) {
> - asf_read_language_list(s, gsize);
> - } else if (!ff_guidcmp(&g, &ff_asf_extended_content_header)) {
> - asf_read_ext_content_desc(s, gsize);
> - } else if (!ff_guidcmp(&g, &ff_asf_metadata_header)) {
> - asf_read_metadata(s, gsize);
> - } else if (!ff_guidcmp(&g, &ff_asf_metadata_library_header)) {
> - asf_read_metadata(s, gsize);
> - } else if (!ff_guidcmp(&g, &ff_asf_ext_stream_header)) {
> - asf_read_ext_stream_properties(s, gsize);
> -
> - // there could be a optional stream properties object to follow
> - // if so the next iteration will pick it up
> - continue;
> - } else if (!ff_guidcmp(&g, &ff_asf_head1_guid)) {
> - ff_get_guid(pb, &g);
> - avio_skip(pb, 6);
> - continue;
> - } else if (!ff_guidcmp(&g, &ff_asf_marker_header)) {
> - asf_read_marker(s, gsize);
> - } else if (pb->eof_reached) {
> - return -1;
> - } 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");
> - } 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");
> - } else if (!ff_guidcmp(&g, &ff_asf_digital_signature)) {
> - 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);
> - avio_seek(pb, gpos + gsize, SEEK_SET);
> }
> - ff_get_guid(pb, &g);
> - avio_rl64(pb);
> - avio_r8(pb);
> - avio_r8(pb);
> - if (pb->eof_reached)
> - return -1;
> - 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) {
> - 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) {
> - 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) &&
> - // 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);
> -
> - av_dlog(s, "i=%d, st->codec->codec_type:%d, asf->dar %d:%d
> sar=%d:%d\n",
> - i, st->codec->codec_type, asf->dar[i].num,
> asf->dar[i].den,
> - st->sample_aspect_ratio.num,
> st->sample_aspect_ratio.den);
> -
> - // copy and convert language codes to the frontend
> - if (asf->streams[i].stream_language_index < 128) {
> - 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);
> - if (iso6392)
> - av_dict_set(&st->metadata, "language", iso6392, 0);
> - }
> - }
> + if (!st) {
> + avio_skip(pb, size - 24); // if there's no video stream, skip index
> object
> + return 0;
> + }
> + avio_skip(pb, 16); // skip File ID
> + interval = avio_rl64(pb);
> + avio_skip(pb, 4);
> + nb_entries = avio_rl32(pb);
> + for (i = 0; i < nb_entries; i++) {
> + pkt_num = avio_rl32(pb);
> + avio_skip(pb, 2);
> + if (prev_pkt_num != pkt_num) {
> + av_add_index_entry(st, asf->first_packet_offset +
> asf->packet_size * pkt_num,
> + av_rescale(interval, i, 10000),
> + asf->packet_size, 0, AVINDEX_KEYFRAME);
> + prev_pkt_num = pkt_num;
> }
> }
> -
> - ff_metadata_conv(&s->metadata, NULL, ff_asf_metadata_conv);
> + asf->is_simple_index = 1;
> + align_position(pb, asf->offset, size);
>
> 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; \
> - }
> +static const GUIDParseTable gdef[] = {
> + {"Data", {0x75, 0xB2, 0x26, 0x36, 0x66, 0x8E,
> 0x11, 0xCF, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}, read_data, 1},
> + {"Simple Index", {0x33, 0x00, 0x08, 0x90, 0xE5, 0xB1,
> 0x11, 0xCF, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB},
> read_simple_index, 1},
> + {"Content Description", {0x75, 0xB2, 0x26, 0x33, 0x66 ,0x8E,
> 0x11, 0xCF, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}, read_content, 1},
> + {"Extended Content Description", {0xD2, 0xD0, 0xA4, 0x40, 0xE3, 0x07,
> 0x11, 0xD2, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5e, 0xA8, 0x50},
> read_ext_content, 1},
> + {"Stream Bitrate Properties", {0x7B, 0xF8, 0x75, 0xCE, 0x46, 0x8D,
> 0x11, 0xD1, 0x8D, 0x82, 0x00, 0x60, 0x97, 0xC9, 0xA2, 0xB2}, read_unknown, 1},
> + {"File Properties", {0x8C, 0xAB, 0xDC, 0xA1, 0xA9, 0x47,
> 0x11, 0xCF, 0x8E, 0xE4, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}, read_properties,
> 1},
> + {"Header Extension", {0x5F, 0xBF, 0x03, 0xB5, 0xA9, 0x2E,
> 0x11, 0xCF, 0x8E, 0xE3, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}, read_unknown, 0},
> + {"Stream Properties", {0xB7, 0xDC, 0x07, 0x91, 0xA9, 0xB7,
> 0x11, 0xCF, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65},
> read_stream_properties, 1},
> + {"Codec List", {0x86, 0xD1, 0x52, 0x40, 0x31, 0x1D,
> 0x11, 0xD0, 0xA3, 0xA4, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}, read_unknown, 1},
> + {"Marker", {0xF4, 0x87, 0xCD, 0x01, 0xA9, 0x51,
> 0x11, 0xCF, 0x8E,
> + 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65}, read_marker, 1},
> + {"Script Command", {0x1E, 0xFB, 0x1A, 0x30, 0x0B, 0x62,
> 0x11, 0xD0, 0xA3, 0x9B, 0x00, 0xA0, 0xC9, 0x03, 0x48, 0xF6}, read_unknown, 1},
> + {"Language List", {0x7C, 0x43, 0x46, 0xa9, 0xef, 0xe0,
> 0x4B, 0xFC, 0xB2, 0x29, 0x39, 0x3e, 0xde, 0x41, 0x5c, 0x85},
> read_language_list, 1},
> + {"Padding", {0x18, 0x06, 0xD4, 0x74, 0xCA, 0xDF,
> 0x45, 0x09, 0xA4, 0xBA, 0x9A, 0xAB, 0xCB, 0x96, 0xAA, 0xE8}, read_unknown, 1},
> + {"DRMv1 Header", {0x22, 0x11, 0xB3, 0xFB, 0xBD, 0x23,
> 0x11, 0xD2, 0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}, read_unknown, 1},
> + {"DRMv2 Header", {0x29, 0x8A, 0xE6, 0x14, 0x26, 0x22,
> 0x4C, 0x17, 0xB9, 0x35, 0xDA, 0xE0, 0x7E, 0xE9, 0x28, 0x9c}, read_unknown, 1},
> + {"Index", {0xD6, 0xE2, 0x29, 0xD3, 0x35, 0xDA,
> 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}, read_unknown, 1},
> + {"Media Object Index", {0xFE, 0xB1, 0x03, 0xF8, 0x12, 0xAD,
> 0x4C, 0x64, 0x84, 0x0F, 0x2A, 0x1D, 0x2F, 0x7A, 0xD4, 0x8C}, read_unknown, 1},
> + {"Timecode Index", {0x3C, 0xB7, 0x3F, 0xD0, 0x0C, 0x4A,
> 0x48, 0x03, 0x95, 0x3D, 0xED, 0xF7, 0xB6, 0x22, 0x8F, 0x0C}, read_unknown, 0},
> + {"Bitrate_Mutual_Exclusion", {0xD6, 0xE2, 0x29, 0xDC, 0x35, 0xDA,
> 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}, read_unknown, 1},
> + {"Error Correction", {0x75, 0xB2, 0x26, 0x35, 0x66, 0x8E,
> 0x11, 0xCF, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C}, read_unknown, 1},
> + {"Content Branding", {0x22, 0x11, 0xB3, 0xFA, 0xBD, 0x23,
> 0x11, 0xD2, 0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}, read_unknown, 1},
> + {"Content Encryption", {0x22, 0x11, 0xB3, 0xFB, 0xBD, 0x23,
> 0x11, 0xD2, 0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}, read_unknown, 1},
> + {"Extended Content Encryption", {0x29, 0x8A, 0xE6, 0x14, 0x26, 0x22,
> 0x4C, 0x17, 0xB9, 0x35, 0xDA, 0xE0, 0x7E, 0xE9, 0x28, 0x9C}, read_unknown, 1},
> + {"Digital Signature", {0x22, 0x11, 0xB3, 0xFC, 0xBD, 0x23,
> 0x11, 0xD2, 0xB4, 0xB7, 0x00, 0xA0, 0xC9, 0x55, 0xFC, 0x6E}, read_unknown, 1},
> + {"Extended Stream Properties", {0x14, 0xE6, 0xA5, 0xCB, 0xC6, 0x72,
> 0x43, 0x32, 0x83, 0x99, 0xA9, 0x69, 0x52, 0x06, 0x5B, 0x5A},
> read_ext_stream_properties, 1},
> + {"Advanced Mutual Exclusion", {0xA0, 0x86, 0x49, 0xCF, 0x47, 0x75,
> 0x46, 0x70, 0x8A, 0x16, 0x6E, 0x35, 0x35, 0x75, 0x66, 0xCD}, read_unknown, 1},
> + {"Group Mutual Exclusion", {0xD1, 0x46, 0x5A, 0x40, 0x5A, 0x79,
> 0x43, 0x38, 0xB7, 0x1B, 0xE3, 0x6B, 0x8F, 0xD6, 0xC2, 0x49}, read_unknown, 1},
> + {"Stream Prioritization", {0xD4, 0xFE, 0xD1, 0x5B, 0x88, 0xD3,
> 0x45, 0x4F, 0x81, 0xF0, 0xED, 0x5C, 0x45, 0x99, 0x9E, 0x24}, read_unknown, 1},
> + {"Bandwidth Sharing Object", {0xA6, 0x96, 0x09, 0xE6, 0x51, 0x7B,
> 0x11, 0xD2, 0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9}, read_unknown, 1},
> + {"Metadata", {0xC5, 0xF8, 0xCB, 0xEA, 0x5B, 0xAF,
> 0x48, 0x77, 0x84, 0x67, 0xAA, 0x8C, 0x44, 0xFA, 0x4C, 0xCA}, read_unknown, 1},
> + {"Audio Spread", {0xBF, 0xC3, 0xCD, 0x50, 0x61, 0x8F,
> 0x11, 0xCF, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20}, read_unknown, 1},
> + {"Index Parameters", {0xD6, 0xE2, 0x29, 0xDF, 0x35, 0xDA,
> 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}, read_parameters,
> 1},
> + {"Content Encryption System Windows Media DRM Network Devices",
> + {0x7A, 0x07, 0x9B, 0xB6, 0xDA, 0XA4,
> 0x4e, 0x12, 0xA5, 0xCA, 0x91, 0xD3, 0x8D, 0xC1, 0x1A, 0x8D}, read_unknown, 1},
> + {"Mutex Language", {0xD6, 0xE2, 0x2A, 0x00, 0x25, 0xDA,
> 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}, read_unknown, 1},
> + {"Mutex Bitrate", {0xD6, 0xE2, 0x2A, 0x01, 0x25, 0xDA,
> 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}, read_unknown, 1},
> + {"Mutex Unknown", {0xD6, 0xE2, 0x2A, 0x02, 0x25, 0xDA,
> 0x11, 0xD1, 0x90, 0x34, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xBE}, read_unknown, 1},
> + {"Bandwith Sharing Exclusive", {0xAF, 0x60, 0x60, 0xAA, 0x51, 0x97,
> 0x11, 0xD2, 0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9}, read_unknown, 1},
> + {"Bandwith Sharing Partial", {0xAF, 0x60, 0x60, 0xAB, 0x51, 0x97,
> 0x11, 0xD2, 0xB6, 0xAF, 0x00, 0xC0, 0x4F, 0xD9, 0x08, 0xE9}, read_unknown, 1},
> + {"Payload Extension System Timecode", {0x39, 0x95, 0x95, 0xEC, 0x86,
> 0x67, 0x4E, 0x2D, 0x8F, 0xDB, 0x98, 0x81, 0x4C, 0xE7, 0x6C, 0x1E},
> read_unknown, 1},
> + {"Payload Extension System File Name", {0xE1, 0x65, 0xEC, 0x0E, 0x19,
> 0xED, 0x45, 0xD7, 0xB4, 0xA7, 0x25, 0xCB, 0xD1, 0xE2, 0x8E, 0x9B},
> read_unknown, 1},
> + {"Payload Extension System Content Type", {0xD5, 0x90, 0xDC, 0x20, 0x07,
> 0xBC, 0x43, 0x6C, 0x9C, 0xF7, 0xF3, 0xBB, 0xFB, 0xF1, 0xA4, 0xDC},
> read_unknown, 1},
> + {"Payload Extension System Pixel Aspect Ratio", {0x1, 0x1E, 0xE5, 0x54,
> 0xF9, 0xEA, 0x4B, 0xC8, 0x82, 0x1A, 0x37, 0x6B, 0x74, 0xE4, 0xC4, 0xB8},
> read_unknown, 1},
> + {"Payload Extension System Sample Duration", {0xC6, 0xBD, 0x94, 0x50,
> 0x86, 0x7F, 0x49, 0x07, 0x83, 0xA3, 0xC7, 0x79, 0x21, 0xB7, 0x33, 0xAD},
> read_unknown, 1},
> + {"Payload Extension System Encryption Sample ID", {0x66, 0x98, 0xB8,
> 0x4E, 0x0A, 0xFA, 0x43, 0x30, 0xAE, 0xB2, 0x1C, 0x0A, 0x98, 0xD7, 0xA4,
> 0x4D}, read_unknown, 1},
> + {"Payload Extension System Degradable JPEG", {0x00, 0xE1, 0xAF, 0x06,
> 0x7B, 0xEC, 0x11, 0xD1, 0xA5, 0x82, 0x00, 0xC0, 0x4F, 0xC2, 0x9C, 0xFB},
> read_unknown, 1},
> +};
>
> -/**
> - * Load a single ASF packet into the demuxer.
> - * @param s demux context
> - * @param pb context to read data from
> - * @return 0 on success, <0 on error
> - */
> -static int asf_get_packet(AVFormatContext *s, AVIOContext *pb)
> +#define read_length(flag, name, len) \
Macro names should be IN ALL CAPS
> + do { \
> + if ((flag) == name ## IS_BYTE) \
> + len = avio_r8(pb); \
> + else if ((flag) == name ## IS_WORD) \
> + len = avio_rl16(pb); \
> + else if ((flag) == name ## IS_DWORD)\
> + len = avio_rl32(pb); \
> + else \
> + len = 0; \
> + } while(0)
> +
> +static int read_subpayload(AVFormatContext *s, AVPacket *pkt, int is_header)
> {
> ASFContext *asf = s->priv_data;
> - uint32_t packet_length, padsize;
> - int rsize = 8;
> - int c, d, e, off;
> -
> - // if we do not know packet size, allow skipping up to 32 kB
> - 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)
> - break;
> - }
> + AVIOContext *pb = s->pb;
> + uint8_t sub_len;
> + int ret, i;
>
> - if (c != 0x82) {
> - /* 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. */
> - 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));
> + if (is_header) {
> + asf->dts_delta = avio_r8(pb);
> + if (asf->nb_mult_left) {
> + asf->mult_sub_len = avio_rl16(pb); // total
> + }
> + asf->sub_header_offset = avio_tell(pb);
> + asf->nb_sub = 0;
> + asf->sub_left = 1;
> }
> - if ((c & 0x8f) == 0x82) {
> - if (d || e) {
> - if (!pb->eof_reached)
> - av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n");
> - return -1;
> + sub_len = avio_r8(pb);
> + if ((ret = av_get_packet(pb, pkt, sub_len)) < 0) // each subpayload is
> entire frame
> + return ret;
> + for (i = 0; i < asf->nb_streams; i++) {
> + if (asf->stream_index == asf->asf_st[i]->stream_index) {
> + pkt->stream_index = asf->asf_st[i]->index;
> + break;
> }
> - c = avio_r8(pb);
> - d = avio_r8(pb);
> - rsize += 3;
> - } else if (!pb->eof_reached) {
> - avio_seek(pb, -1, SEEK_CUR); // FIXME
> }
> -
> - asf->packet_flags = c;
> - asf->packet_property = d;
> -
> - DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size);
> - 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 %"PRIu32" at:%"PRId64"\n",
> - packet_length, avio_tell(pb));
> - return -1;
> + asf->return_subpayload = 1;
> + if (!sub_len)
> + asf->return_subpayload = 0;
> +
> + if (sub_len)
> + asf->nb_sub++;
> + pkt->dts = asf->sub_dts + (asf->nb_sub - 1) * asf->dts_delta -
> asf->preroll;
> + if (asf->nb_mult_left && (avio_tell(pb) >= (asf->sub_header_offset +
> asf->mult_sub_len))) {
> + asf->sub_left = 0;
> + asf->nb_mult_left--;
> }
> - if (padsize >= packet_length) {
> - av_log(s, AV_LOG_ERROR,
> - "invalid padsize %"PRIu32" at:%"PRId64"\n", padsize,
> avio_tell(pb));
> - return -1;
> + if (avio_tell(pb) >= (asf->packet_offset + asf->packet_size -
> asf->pad_len)) {
> + asf->sub_left = 0;
> + if (!asf->nb_mult_left) {
> + avio_skip(pb, asf->pad_len);
> + if (avio_tell(pb) != asf->packet_offset + asf->packet_size) {
> + av_log(s, AV_LOG_WARNING, "Position %"PRId64" wrong, should
> be %"PRId64"\n",
> + avio_tell(pb), asf->packet_offset + asf->packet_size);
> + avio_seek(pb, asf->packet_offset + asf->packet_size,
> SEEK_SET);
> + }
> + }
> }
>
> - asf->packet_timestamp = avio_rl32(pb);
> - avio_rl16(pb); /* duration */
> - // 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_segments = asf->packet_segsizetype & 0x3f;
> - } else {
> - asf->packet_segments = 1;
> - asf->packet_segsizetype = 0x80;
> - }
> - if (rsize > packet_length - padsize) {
> - asf->packet_size_left = 0;
> - av_log(s, AV_LOG_ERROR,
> - "invalid packet header length %d for pktlen
> %"PRIu32"-%"PRIu32" at %"PRId64"\n",
> - rsize, packet_length, padsize, avio_tell(pb));
> - return -1;
> - }
> - asf->packet_size_left = packet_length - padsize - rsize;
> - 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);
> return 0;
> }
>
> -/**
> - *
> - * @return <0 if error
> - */
> -static int asf_read_frame_header(AVFormatContext *s, AVIOContext *pb)
> +static void reset_packet(ASFPacket *asf_pkt)
> +{
> + asf_pkt->size_left = 0;
> + asf_pkt->data_size = 0;
> + asf_pkt->duration = 0;
> + asf_pkt->flags = 0;
> + asf_pkt->dts = 0;
> + asf_pkt->duration = 0;
> + av_free_packet(asf_pkt->avpkt);
> + av_init_packet(asf_pkt->avpkt);
> +}
> +
> +static int read_multiple_payload(AVFormatContext *s, AVPacket *pkt,
> ASFPacket *asf_pkt)
> {
> ASFContext *asf = s->priv_data;
> - 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];
> - // 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);
> - DO_2BITS(asf->packet_property, asf->packet_replic_size, 0);
> - av_dlog(asf, "key:%d stream:%d seq:%d offset:%d replic_size:%d\n",
> - asf->packet_key_frame, asf->stream_index, asf->packet_seq,
> - 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) {
> - 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) {
> - avio_skip(pb, 10);
> - 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;
> + AVIOContext *pb = s->pb;
> + uint16_t pay_len;
> + unsigned char *p;
> + int ret;
> + int skip = 0;
> +
> + // if replicated lenght is 1, subpayloads are present
> + if (asf->rep_len == 1) {
> + asf->sub_left = 1;
> + asf->state = READ_MULTI_SUB;
> + pkt->flags = asf_pkt->flags;
> + if ((ret = read_subpayload(s, pkt, 1)) < 0)
> + return ret;
> + } else {
> + if (!asf_pkt->data_size) {
> + asf_pkt->data_size = asf_pkt->size_left = avio_rl32(pb); // read
> media object size
> + if (asf_pkt->data_size <= 0)
> + return AVERROR_EOF;
> + if ((ret = av_new_packet(asf_pkt->avpkt, asf_pkt->data_size)) <
> 0)
> + return ret;
> } else
> - avio_skip(pb, asf->packet_replic_size - 8);
> - rsize += asf->packet_replic_size; // FIXME - check validity
> - } 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_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);
> - return -1;
> - }
> - if (asf->packet_flags & 0x01) {
> - DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); //
> 0 is illegal
> - 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) {
> - 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);
> - return -1;
> - } else {
> - int diff = asf->packet_frag_size - (asf->packet_size_left -
> rsize);
> - asf->packet_size_left += diff;
> - asf->packet_padsize -= diff;
> - }
> + avio_skip(pb, 4); // reading of media object size is already done
> + asf_pkt->dts = avio_rl32(pb); // read presentation time
> + if ((asf->rep_len - 8) > 0)
> + avio_skip(pb, asf->rep_len - 8); // skip replicated data
> + pay_len = avio_rl16(pb); // payload length should be WORD
> + if (pay_len > asf->packet_size) {
> + av_log(s, AV_LOG_ERROR, "Error: invalid data packet size,
> pay_len %"PRIu16", asf->packet_size %"PRIu32", offset %"PRId64".\n",
> + pay_len, asf->packet_size, avio_tell(pb));
> + return AVERROR_INVALIDDATA;
> }
> - } else {
> - if (rsize > asf->packet_size_left) {
> - av_log(s, AV_LOG_ERROR, "packet_replic_size is invalid\n");
> - return -1;
> + p = asf_pkt->avpkt->data + asf_pkt->data_size - asf_pkt->size_left;
> + if ((p + pay_len) > (asf_pkt->avpkt->data + asf_pkt->data_size)) {
> + av_log(s, AV_LOG_ERROR, "Error: invalid buffer size, pay_len %d,
> data size left %d.\n",
> + pay_len, asf_pkt->size_left);
> + skip = pay_len - asf_pkt->size_left;
> + pay_len = asf_pkt->size_left;
> }
> - asf->packet_frag_size = asf->packet_size_left - rsize;
> - }
> - if (asf->packet_replic_size == 1) {
> - asf->packet_multi_size = asf->packet_frag_size;
> - if (asf->packet_multi_size > asf->packet_size_left)
> - return -1;
> + if ((ret = avio_read(pb, p, pay_len)) < 0)
> + return ret;
> + avio_skip(pb, skip);
> + asf_pkt->size_left -= pay_len;
> + asf->nb_mult_left--;
> }
> - asf->packet_size_left -= rsize;
>
> return 0;
> }
>
> -/**
> - * Parse data from individual ASF packets (which were previously loaded
> - * with asf_get_packet()).
> - * @param s demux context
> - * @param pb context to read data from
> - * @param pkt pointer to store packet data into
> - * @return 0 if data was stored in pkt, <0 on error or 1 if more ASF
> - * packets need to be loaded (through asf_get_packet())
> - */
> -static int asf_parse_packet(AVFormatContext *s, AVIOContext *pb, AVPacket
> *pkt)
> +static int read_single_payload(AVFormatContext *s, AVPacket *pkt, ASFPacket
> *asf_pkt)
> {
> - ASFContext *asf = s->priv_data;
> - ASFStream *asf_st = 0;
> - for (;;) {
> - int ret;
> -
> - if (pb->eof_reached)
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + int64_t offset;
> + uint64_t size;
> + unsigned char *p;
> + int ret;
> +
> + if (!asf_pkt->data_size) {
> + asf_pkt->data_size = asf_pkt->size_left = avio_rl32(pb); // read
> media object size
> + if (asf_pkt->data_size <= 0)
> return AVERROR_EOF;
> + if ((ret = av_new_packet(asf_pkt->avpkt, asf_pkt->data_size)) < 0)
> + return ret;
> + } else
> + avio_skip(pb, 4); // skip media object size
> + asf_pkt->dts = avio_rl32(pb); // read presentation time
> + if ((asf->rep_len - 8) > 0)
> + avio_skip(pb, asf->rep_len - 8); // skip replicated data
> + offset = avio_tell(pb);
> +
> + // size of the payload - size of the packet without header and padding
> + if (asf->packet_size_internal)
> + size = asf->packet_size_internal - offset + asf->packet_offset -
> asf->pad_len;
> + else
> + size = asf->packet_size - offset + asf->packet_offset - asf->pad_len;
> + if (size > asf->packet_size) {
> + av_log(s, AV_LOG_ERROR, "Error: invalid data packet size, offset
> %"PRId64".\n",
> + avio_tell(pb));
> + return AVERROR_INVALIDDATA;
> + }
> + p = asf_pkt->avpkt->data + asf_pkt->data_size - asf_pkt->size_left;
> + if (asf_pkt->size_left > size)
> + asf_pkt->size_left -= size;
> + else
> + asf_pkt->size_left = 0;
> + if ((ret = avio_read(pb, p, size)) < 0)
> + return ret;
> + if (asf->packet_size_internal)
> + avio_skip(pb, asf->packet_size - asf->packet_size_internal);
> + avio_skip(pb, asf->pad_len); // skip padding
>
> - if (asf->packet_size_left < FRAME_HEADER_SIZE ||
> - asf->packet_segments < 1) {
> - int ret = asf->packet_size_left + asf->packet_padsize;
> -
> - assert(ret >= 0);
> - /* fail safe */
> - avio_skip(pb, ret);
> + return 0;
> +}
>
> - 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 1;
> - }
> - if (asf->packet_time_start == 0) {
> - if (asf_read_frame_header(s, pb) < 0) {
> - asf->packet_segments = 0;
> - continue;
> - }
> - if (asf->stream_index < 0 ||
> - s->streams[asf->stream_index]->discard >= AVDISCARD_ALL ||
> - (!asf->packet_key_frame &&
> - s->streams[asf->stream_index]->discard >=
> AVDISCARD_NONKEY)) {
> - asf->packet_time_start = 0;
> - /* unhandled packet (should not happen) */
> - 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);
> - continue;
> +static int read_payload(AVFormatContext *s, AVPacket *pkt)
> +{
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + uint8_t stream_num;
> + uint32_t off_len, media_len;
> + int ret, i;
> + ASFPacket *asf_pkt = NULL;
> +
> + if (!asf->sub_left) {
> + stream_num = avio_r8(pb);
> + asf->stream_index = stream_num & ASF_STREAM_NUM;
> + for (i = 0; i < asf->nb_streams; i++) {
> + if (asf->stream_index == asf->asf_st[i]->stream_index) {
> + asf_pkt = asf->asf_st[i]->pkt;
> + asf_pkt->stream_index = asf->asf_st[i]->index;
> + asf_pkt->dts = asf->dts;
> + break;
> }
> - asf->asf_st = s->streams[asf->stream_index]->priv_data;
> - }
> - asf_st = asf->asf_st;
> - av_assert0(asf_st);
> -
> - if (!asf_st->frag_offset && asf->packet_frag_offset) {
> - av_dlog(s, "skipping asf data pkt with fragment offset for "
> - "stream:%d, expected:%d but got %d from pkt)\n",
> - asf->stream_index, asf_st->frag_offset,
> - asf->packet_frag_offset);
> - avio_skip(pb, asf->packet_frag_size);
> - asf->packet_size_left -= asf->packet_frag_size;
> - continue;
> }
> -
> - if (asf->packet_replic_size == 1) {
> - // frag_offset is here used as the beginning timestamp
> - asf->packet_frag_timestamp = asf->packet_time_start;
> - asf->packet_time_start += asf->packet_time_delta;
> - asf->packet_obj_size = asf->packet_frag_size = avio_r8(pb);
> - asf->packet_size_left--;
> - asf->packet_multi_size--;
> - if (asf->packet_multi_size < asf->packet_obj_size) {
> - asf->packet_time_start = 0;
> - avio_skip(pb, asf->packet_multi_size);
> - asf->packet_size_left -= asf->packet_multi_size;
> - continue;
> + if (!asf_pkt)
> + return AVERROR_INVALIDDATA;
> + if (stream_num >> 7)
> + asf_pkt->flags |= AV_PKT_FLAG_KEY;
> + read_length(asf->prop_flags &
> ASF_PL_MASK_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_SIZE,
> + ASF_PL_FLAG_MEDIA_OBJECT_NUMBER_LENGTH_FIELD_,
> media_len);
> + read_length(asf->prop_flags &
> ASF_PL_MASK_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_SIZE,
> + ASF_PL_FLAG_OFFSET_INTO_MEDIA_OBJECT_LENGTH_FIELD_,
> off_len);
> + read_length(asf->prop_flags &
> ASF_PL_MASK_REPLICATED_DATA_LENGTH_FIELD_SIZE,
> + ASF_PL_FLAG_REPLICATED_DATA_LENGTH_FIELD_, asf->rep_len);
> + if (asf_pkt) {
> + if (asf_pkt->size_left && (asf_pkt->frame_num != media_len)) {
> + av_log(s, AV_LOG_WARNING, "Unfinished frame will be
> ignored\n");
> + reset_packet(asf_pkt);
> }
> - asf->packet_multi_size -= asf->packet_obj_size;
> + asf_pkt->frame_num = media_len;
> }
> - if (asf_st->frag_offset + asf->packet_frag_size <= asf_st->pkt.size
> &&
> - asf_st->frag_offset + asf->packet_frag_size >
> asf->packet_obj_size) {
> - av_log(s, AV_LOG_INFO, "ignoring invalid packet_obj_size (%d %d
> %d %d)\n",
> - asf_st->frag_offset, asf->packet_frag_size,
> - asf->packet_obj_size, asf_st->pkt.size);
> - asf->packet_obj_size = asf_st->pkt.size;
> + asf->sub_dts = off_len;
> + if (asf->nb_mult_left) {
> + if ((ret = read_multiple_payload(s, pkt, asf_pkt)) < 0)
> + return ret;
> + } else if (asf->rep_len == 1) {
> + asf->sub_left = 1;
> + asf->state = READ_SUB;
> + pkt->flags = asf_pkt->flags;
> + if ((ret = read_subpayload(s, pkt, 1)) < 0)
> + return ret;
> + } else {
> + if ((ret = read_single_payload(s, pkt, asf_pkt)) < 0)
> + return ret;
> }
> -
> - if (asf_st->pkt.size != asf->packet_obj_size ||
> - // 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);
> - asf_st->frag_offset = 0;
> - av_free_packet(&asf_st->pkt);
> - }
> - /* new packet */
> - av_new_packet(&asf_st->pkt, asf->packet_obj_size);
> - asf_st->seq = asf->packet_seq;
> - asf_st->pkt.dts = asf->packet_frag_timestamp -
> asf->hdr.preroll;
> - asf_st->pkt.stream_index = asf->stream_index;
> - asf_st->pkt.pos = asf_st->packet_pos = asf->packet_pos;
> -
> - if (asf_st->pkt.data && asf_st->palette_changed) {
> - uint8_t *pal;
> - pal = av_packet_new_side_data(&asf_st->pkt,
> AV_PKT_DATA_PALETTE,
> - AVPALETTE_SIZE);
> - if (!pal) {
> - av_log(s, AV_LOG_ERROR, "Cannot append palette to
> packet\n");
> - } else {
> - memcpy(pal, asf_st->palette, AVPALETTE_SIZE);
> - asf_st->palette_changed = 0;
> - }
> + } else {
> + for (i = 0; i <= asf->nb_streams; i++) {
> + if (asf->stream_index == asf->asf_st[i]->stream_index) {
> + asf_pkt = asf->asf_st[i]->pkt;
> + break;
> }
> - av_dlog(asf, "new packet: stream:%d key:%d packet_key:%d
> audio:%d size:%d\n",
> - asf->stream_index, asf->packet_key_frame,
> - asf_st->pkt.flags & AV_PKT_FLAG_KEY,
> - s->streams[asf->stream_index]->codec->codec_type ==
> AVMEDIA_TYPE_AUDIO,
> - asf->packet_obj_size);
> - if (s->streams[asf->stream_index]->codec->codec_type ==
> AVMEDIA_TYPE_AUDIO)
> - asf->packet_key_frame = 1;
> - if (asf->packet_key_frame)
> - asf_st->pkt.flags |= AV_PKT_FLAG_KEY;
> }
> + if (!asf_pkt)
> + return AVERROR_INVALIDDATA;
> + pkt->flags = asf_pkt->flags;
> + pkt->dts = asf_pkt->dts;
> + pkt->stream_index = asf->asf_st[i]->index;
> + if ((ret = read_subpayload(s, pkt, 0)) < 0) // read subpayload
> without its header
> + return ret;
> + }
>
> - /* read data */
> - av_dlog(asf, "READ PACKET s:%d os:%d o:%d,%d l:%d DATA:%p\n",
> - s->packet_size, asf_st->pkt.size, asf->packet_frag_offset,
> - asf_st->frag_offset, asf->packet_frag_size,
> asf_st->pkt.data);
> - asf->packet_size_left -= asf->packet_frag_size;
> - if (asf->packet_size_left < 0)
> - continue;
> -
> - 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);
> - continue;
> - }
> + return 0;
> +}
>
> - ret = avio_read(pb, asf_st->pkt.data + asf->packet_frag_offset,
> - asf->packet_frag_size);
> - if (ret != asf->packet_frag_size) {
> - if (ret < 0 || asf->packet_frag_offset + ret == 0)
> - return ret < 0 ? ret : AVERROR_EOF;
> -
> - if (asf_st->ds_span > 1) {
> - // scrambling, we can either drop it completely or fill the
> remainder
> - // TODO: should we fill the whole packet instead of just the
> current
> - // fragment?
> - memset(asf_st->pkt.data + asf->packet_frag_offset + ret, 0,
> - asf->packet_frag_size - ret);
> - ret = asf->packet_frag_size;
> - } else {
> - // no scrambling, so we can return partial packets
> - av_shrink_packet(&asf_st->pkt, asf->packet_frag_offset +
> ret);
> - }
> +static int read_packet_header(AVFormatContext *s)
> +{
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + uint64_t size;
> + uint32_t av_unused seq;
> + unsigned char error_flags, len_flags, pay_flags;
> +
> + asf->packet_offset = avio_tell(pb);
> + error_flags = avio_r8(pb); // read Error Correction Flags
> + if (error_flags & ASF_PACKET_FLAG_ERROR_CORRECTION_PRESENT)
> + if (!(error_flags & ASF_ERROR_CORRECTION_LENGTH_TYPE)) {
> + size = error_flags & ASF_PACKET_ERROR_CORRECTION_DATA_SIZE;
> + avio_skip(pb, size);
> }
> - if (s->key && s->keylen == 20)
> - ff_asfcrypt_dec(s->key, asf_st->pkt.data +
> asf->packet_frag_offset,
> - ret);
> - 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
> - 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++)
> - ;
> - if (i == asf_st->pkt.size) {
> - av_log(s, AV_LOG_DEBUG, "discarding ms fart\n");
> - asf_st->frag_offset = 0;
> - av_free_packet(&asf_st->pkt);
> - continue;
> - }
> - }
> + len_flags = avio_r8(pb);
> + asf->prop_flags = avio_r8(pb);
> + read_length(len_flags & ASF_PPI_MASK_PACKET_LENGTH_FIELD_SIZE,
> + ASF_PPI_FLAG_PACKET_LENGTH_FIELD_,
> asf->packet_size_internal);
> + read_length(len_flags & ASF_PPI_MASK_SEQUENCE_FIELD_SIZE,
> + ASF_PPI_FLAG_SEQUENCE_FIELD_, seq);
> + read_length(len_flags & ASF_PPI_MASK_PADDING_LENGTH_FIELD_SIZE,
> + ASF_PPI_FLAG_PADDING_LENGTH_FIELD_, asf->pad_len );
> + asf->send_time = avio_rl32(pb); // send time
> + avio_skip(pb, 2); // skip duration
> + if (len_flags & ASF_PPI_FLAG_MULTIPLE_PAYLOADS_PRESENT) { // Multiple
> Payloads present
> + pay_flags = avio_r8(pb);
> + asf->nb_mult_left = (pay_flags & ASF_NUM_OF_PAYLOADS);
> + }
>
> - /* 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);
> - } else {
> - /* packet descrambling */
> - AVBufferRef *buf = av_buffer_alloc(asf_st->pkt.size +
> -
> FF_INPUT_BUFFER_PADDING_SIZE);
> - if (buf) {
> - uint8_t *newdata = buf->data;
> - int offset = 0;
> - 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);
> - memcpy(newdata + offset,
> - asf_st->pkt.data + idx *
> asf_st->ds_chunk_size,
> - asf_st->ds_chunk_size);
> - offset += asf_st->ds_chunk_size;
> - }
> - av_buffer_unref(&asf_st->pkt.buf);
> - asf_st->pkt.buf = buf;
> - asf_st->pkt.data = buf->data;
> - }
> - }
> + return 0;
> +}
> +
> +static int do_deinterleaving(AVFormatContext *s, ASFPacket *asf_pkt, int i)
> +{
> + ASFContext *asf = s->priv_data;
> + int pos = 0, j, l, ret;
> + unsigned char *p = asf_pkt->avpkt->data;
> + uint16_t pkt_len = asf->asf_st[i]->virtual_pkt_len;
> + uint16_t chunk_len = asf->asf_st[i]->virtual_chunk_len;
> + int nchunks = pkt_len/chunk_len;
> + AVPacket *buf = av_mallocz(sizeof(AVPacket));
buf is a rather bad name here.
> +
> + if (!buf)
> + return AVERROR(ENOMEM);
> + if ((ret = av_new_packet(buf, asf_pkt->data_size)) < 0) {
> + av_free(buf);
> + return ret;
> + }
> + while (asf_pkt->data_size >= asf->asf_st[i]->span * pkt_len + pos) {
> + for (l = 0; l < pkt_len; l++) {
> + if (pos >= asf_pkt->data_size)
> + break;
> + for (j = 0; j < asf->asf_st[i]->span; j++) {
> + memcpy(buf->data + pos,
> + p + (j * nchunks + l) * chunk_len,
> + chunk_len);
> + pos += chunk_len;
> }
> - asf_st->frag_offset = 0;
> - *pkt = asf_st->pkt;
> -#if FF_API_DESTRUCT_PACKET
> -FF_DISABLE_DEPRECATION_WARNINGS
> - asf_st->pkt.destruct = NULL;
> -FF_ENABLE_DEPRECATION_WARNINGS
> -#endif
> - asf_st->pkt.buf = 0;
> - asf_st->pkt.size = 0;
> - asf_st->pkt.data = 0;
> - asf_st->pkt.side_data_elems = 0;
> - asf_st->pkt.side_data = NULL;
> - break; // packet completed
> }
> + p += asf->asf_st[i]->span * pkt_len;
> + if (p > asf_pkt->avpkt->data + asf_pkt->data_size)
> + break;
> }
> + av_free_packet(asf_pkt->avpkt);
> + av_free(asf_pkt->avpkt);
> + asf_pkt->avpkt = buf;
> +
> return 0;
> }
>
> static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
> {
> ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + int ret, i;
>
> - for (;;) {
> - int ret;
> -
> - /* parse cached packets, if any */
> - if ((ret = asf_parse_packet(s, s->pb, pkt)) <= 0)
> - return ret;
> - if ((ret = asf_get_packet(s, s->pb)) < 0)
> - assert(asf->packet_size_left < FRAME_HEADER_SIZE ||
> - asf->packet_segments < 1);
> - asf->packet_time_start = 0;
> + if ((avio_tell(pb) >= asf->data_offset + asf->data_size) &&
> !(asf->b_flags & 1))
> + return AVERROR_EOF;
> + while (!pb->eof_reached) {
> + if (asf->state == PARSE_PACKET_HEADER) {
> + read_packet_header(s);
> + if (!asf->nb_mult_left)
> + asf->state = READ_SINGLE;
> + else
> + asf->state = READ_MULTI;
> + }
> + switch (asf->state) {
> + case READ_SINGLE:
> + if ((ret = read_payload(s, pkt)) < 0)
> + return ret;
> + if (!asf->sub_left)
> + asf->state = PARSE_PACKET_HEADER;
> + break;
> + case READ_SUB:
> + if ((ret = read_payload(s, pkt)) < 0)
> + return ret;
> + if (!asf->sub_left) {
> + asf->state = PARSE_PACKET_HEADER;
> + }
> + break;
Those two cases look exactly the same to me.
Also, the very first thing in every one of those is the call to
read_payload(), so you can factor it out of the switch.
> + case READ_MULTI_SUB:
> + if ((ret = read_payload(s, pkt)) < 0)
> + return ret;
> + if (!asf->sub_left && !asf->nb_mult_left) {
> + asf->state = PARSE_PACKET_HEADER;
> + if (!asf->return_subpayload) {
> + avio_skip(pb, asf->pad_len); // skip padding
> + }
> + if (asf->packet_offset + asf->packet_size > avio_tell(pb)) {
> + avio_seek(pb, asf->packet_offset + asf->packet_size,
> SEEK_SET);
> + }
> + } else if (!asf->sub_left)
> + asf->state = READ_MULTI;
> + break;
> + case READ_MULTI:
> + if ((ret = read_payload(s, pkt)) < 0)
> + return ret;
> + if (!asf->nb_mult_left) {
> + asf->state = PARSE_PACKET_HEADER;
> + if (!asf->return_subpayload) {
> + avio_skip(pb, asf->pad_len); // skip padding
> + }
> + if (asf->packet_offset + asf->packet_size > avio_tell(pb))
> + avio_seek(pb, asf->packet_offset + asf->packet_size,
> SEEK_SET);
> + }
> + break;
> + }
> + if (asf->return_subpayload) {
> + asf->return_subpayload = 0;
> + return 0;
> + }
> + for (i = 0; i < s->nb_streams; i++) {
> + ASFPacket *asf_pkt = asf->asf_st[i]->pkt;
> + if (!asf_pkt->size_left && asf_pkt->data_size) {
> + if (asf->asf_st[i]->span > 1 && asf->asf_st[i]->type ==
> AVMEDIA_TYPE_AUDIO)
> + if ((ret = do_deinterleaving(s, asf_pkt, i)) < 0)
> + return ret;
> + av_packet_move_ref(pkt, asf_pkt->avpkt);
> + pkt->stream_index = asf->asf_st[i]->index;
> + pkt->flags = asf_pkt->flags;
> + pkt->dts = asf_pkt->dts - asf->preroll;
> + asf_pkt->data_size = 0;
> + asf_pkt->frame_num = 0;
> + return 0;
> + }
> + }
> }
> +
> + if (pb->eof_reached)
> + return AVERROR_EOF;
> +
> + return 0;
> }
>
> -// Added to support seeking after packets have been read
> -// If information is not reset, read_packet fails due to
> -// leftover information from previous reads
> -static void asf_reset_header(AVFormatContext *s)
> +static int asf_read_close(AVFormatContext *s)
> {
> ASFContext *asf = s->priv_data;
> - 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_frag_timestamp = 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;
> - if (!asf_st)
> - continue;
> - av_free_packet(&asf_st->pkt);
> - asf_st->frag_offset = 0;
> - asf_st->seq = 0;
> + for (i = 0; i < asf->nb_streams; i++) {
> + av_free_packet(asf->asf_st[i]->pkt->avpkt);
> + av_free(asf->asf_st[i]->pkt->avpkt);
> + av_free(asf->asf_st[i]->pkt);
> + av_free(asf->asf_st[i]);
> }
> - asf->asf_st = NULL;
> -}
> -
> -static int asf_read_close(AVFormatContext *s)
> -{
> - asf_reset_header(s);
>
> return 0;
> }
>
> -static int64_t asf_read_pts(AVFormatContext *s, int stream_index,
> - int64_t *ppos, int64_t pos_limit)
> +static void reset_packet_state(AVFormatContext *s)
> {
> - AVPacket pkt1, *pkt = &pkt1;
> - ASFStream *asf_st;
> - int64_t pts;
> - int64_t pos = *ppos;
> + ASFContext *asf = s->priv_data;
> int i;
> - int64_t start_pos[ASF_MAX_STREAMS];
> -
> - 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;
> - avio_seek(s->pb, pos, SEEK_SET);
> -
> - asf_reset_header(s);
> - for (;;) {
> - if (asf_read_packet(s, pkt) < 0) {
> - av_log(s, AV_LOG_INFO, "asf_read_pts failed\n");
> - return AV_NOPTS_VALUE;
> - }
> -
> - pts = pkt->dts;
>
> - av_free_packet(pkt);
> - if (pkt->flags & AV_PKT_FLAG_KEY) {
> - i = pkt->stream_index;
> + asf->state = PARSE_PACKET_HEADER;
> + asf->offset = 0;
> + asf->return_subpayload = 0;
> + asf->sub_left = 0;
> + asf->sub_header_offset = 0;
> + asf->packet_offset = asf->first_packet_offset;
> + asf->pad_len = 0;
> + asf->rep_len = 0;
> + asf->dts_delta = 0;
> + asf->mult_sub_len = 0;
> + asf->nb_mult_left = 0;
> + asf->nb_sub = 0;
> + asf->prop_flags = 0;
> + asf->sub_dts = 0;
> + asf->dts = 0;
> + for (i = 0; i < asf->nb_streams; i++) {
> + ASFPacket *pkt = asf->asf_st[i]->pkt;
> + pkt->size_left = 0;
> + pkt->data_size = 0;
> + pkt->duration = 0;
> + pkt->flags = 0;
> + pkt->dts = 0;
> + pkt->duration = 0;
> + av_free_packet(pkt->avpkt);
> + av_init_packet(pkt->avpkt);
> + }
> +}
>
> - asf_st = s->streams[i]->priv_data;
> - av_assert0(asf_st);
> +static int64_t asf_read_timestamp(AVFormatContext *s, int stream_index,
> + int64_t *pos, int64_t pos_limit)
> +{
> + ASFContext *asf = s->priv_data;
> + AVPacket *pkt = av_mallocz(sizeof(*pkt));
> + int64_t pkt_pos = *pos, pkt_offset, dts = 0, data_end;
> + int n;
>
> -// assert((asf_st->packet_pos - s->data_offset) % s->packet_size
> == 0);
> - pos = asf_st->packet_pos;
> + if (!pkt)
> + return AVERROR(ENOMEM);
> + data_end = asf->data_offset + asf->data_size;
> + if (pkt_pos > (asf->first_packet_offset + asf->packet_size) &&
> + pkt_pos < data_end) {
> + n = (pkt_pos - asf->first_packet_offset + asf->packet_size - 1) /
> asf->packet_size;
> + pkt_pos = ((pkt_pos - asf->first_packet_offset) % asf->packet_size) ?
> + asf->first_packet_offset + (n + 1) * asf->packet_size :
> + asf->first_packet_offset + n * asf->packet_size;
> + } else if (pkt_pos < (asf->first_packet_offset + asf->packet_size))
> + pkt_pos = asf->first_packet_offset;
> + else
> + pkt_pos = data_end - asf->packet_size; // last packet offset
> + avio_seek(s->pb, pkt_pos, SEEK_SET);
> + pkt_offset = pkt_pos;
> +
> + reset_packet_state(s);
> + while (avio_tell(s->pb) < data_end) {
> + int i, ret, st_found;
> +
> + av_init_packet(pkt);
> + pkt_offset = avio_tell(s->pb);
> + if ((ret = asf_read_packet(s, pkt)) < 0) {
> + dts = AV_NOPTS_VALUE;
> + av_packet_unref(pkt);
> + av_free_packet(pkt);
> + av_free(pkt);
> + return ret;
> + }
> + // ASFPacket may contain fragments of packets belonging to different
> streams,
> + // pkt_offset is the offset of the first fragment within it
> + if (pkt_offset >= (pkt_pos + asf->packet_size))
> + pkt_pos += asf->packet_size;
> + for (i = 0; i < asf->nb_streams; i++) {
> + ASFStreamDemux *st = asf->asf_st[i];
> +
> + st_found = 0;
> + if (pkt->flags & AV_PKT_FLAG_KEY) {
> + dts = pkt->dts;
> + if (dts) {
> + av_add_index_entry(s->streams[pkt->stream_index],
> pkt_pos, dts,
> + pkt->size, 0, AVINDEX_KEYFRAME);
> + if (stream_index == st->index) {
> + st_found = 1;
> + break;
> + }
> + }
> + }
> + }
> + if (st_found)
> + break;
> + av_free_packet(pkt);
> + }
> + *pos = pkt_pos;
> +
> + av_packet_unref(pkt);
> + av_free_packet(pkt);
> + av_free(pkt);
> + if (!dts)
> + dts = AV_NOPTS_VALUE;
> + return dts;
> +}
>
> - 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;
> +static int asf_read_seek(AVFormatContext *s, int stream_index, int64_t
> timestamp, int flags)
> +{
> + ASFContext *asf = s->priv_data;
> + int idx;
>
> - if (pkt->stream_index == stream_index)
> - break;
> + if (!timestamp) {
> + reset_packet_state(s);
> + avio_seek(s->pb, asf->first_packet_offset, SEEK_SET);
> + return 0;
> + }
> + if (s->streams[stream_index]->nb_index_entries && asf->is_simple_index) {
> + idx = av_index_search_timestamp(s->streams[stream_index], timestamp,
> flags);
> + if (idx < 0 || idx > s->streams[stream_index]->nb_index_entries) {
> + return AVERROR_INVALIDDATA;
> + }
> + avio_seek(s->pb, s->streams[stream_index]->index_entries[idx].pos,
> SEEK_SET);
> + } else {
> + if (ff_seek_frame_binary(s, stream_index, timestamp, flags) < 0) {
> + return AVERROR_INVALIDDATA;
> }
> + // read_timestamp is called inside ff_seek_frame_binary and leaves
> state dirty,
> + // so reset_packet_state have to be called after it
> + reset_packet_state(s);
> }
>
> - *ppos = pos;
> - return pts;
> + return 0;
> }
>
> -static int asf_build_simple_index(AVFormatContext *s, int stream_index)
> +const static GUIDParseTable *find_guid(ff_asf_guid guid)
> {
> - ff_asf_guid g;
> - ASFContext *asf = s->priv_data;
> - int64_t current_pos = avio_tell(s->pb);
> - int i, ret = 0;
> -
> - avio_seek(s->pb, asf->data_object_offset + asf->data_object_size,
> SEEK_SET);
> - if ((ret = ff_get_guid(s->pb, &g)) < 0)
> - goto end;
> -
> - /* the data object can be followed by other top-level objects,
> - * skip them until the simple index object is reached */
> - while (ff_guidcmp(&g, &index_guid)) {
> - int64_t gsize = avio_rl64(s->pb);
> - if (gsize < 24 || s->pb->eof_reached) {
> - goto end;
> - }
> - avio_skip(s->pb, gsize - 24);
> - if ((ret = ff_get_guid(s->pb, &g)) < 0)
> - goto end;
> - }
> + int j, ret;
> + const GUIDParseTable *g;
>
> - {
> - int64_t itime, last_pos = -1;
> - int pct, ict;
> - int64_t av_unused gsize = avio_rl64(s->pb);
> - if ((ret = ff_get_guid(s->pb, &g)) < 0)
> - goto end;
> - 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;
> + g = gdef;
> + for (j = 0; j < FF_ARRAY_ELEMS(gdef); j++) {
> + if (!(ret = memcmp(guid, g->guid, sizeof(g->guid))))
> + return g;
> + g++;
> }
> -end:
> - if (s->pb->eof_reached)
> - ret = 0;
> - avio_seek(s->pb, current_pos, SEEK_SET);
> - return ret;
> +
> + return NULL;
> }
>
> -static int asf_read_seek(AVFormatContext *s, int stream_index,
> - int64_t pts, int flags)
> +static int detect_unknown_subobject(AVFormatContext *s, int64_t offset,
> int64_t size)
> {
> ASFContext *asf = s->priv_data;
> - AVStream *st = s->streams[stream_index];
> - int64_t pos;
> - int index, ret = 0;
> -
> - if (s->packet_size <= 0)
> - return -1;
> -
> - /* Try using the protocol's read_seek if available */
> - if (s->pb) {
> - int ret = avio_seek_time(s->pb, stream_index, pts, flags);
> - if (ret >= 0)
> - asf_reset_header(s);
> - if (ret != AVERROR(ENOSYS))
> - return ret;
> - }
> + AVIOContext *pb = s->pb;
> + const GUIDParseTable *g = NULL;
> + ff_asf_guid guid;
> + int ret;
>
> - /* explicitly handle the case of seeking to 0 */
> - if (!pts) {
> - asf_reset_header(s);
> - avio_seek(s->pb, s->data_offset, SEEK_SET);
> - return 0;
> + while (avio_tell(pb) <= offset + size) {
> + asf->offset = avio_tell(pb);
> + if ((ret = ff_get_guid(pb, &guid)) < 0)
> + return ret;
> + swap_guid(guid);
> + g = find_guid(guid);
> + if (g) {
> + if ((ret = g->read_object(s, g)) < 0)
> + return ret;
> + } else {
> + GUIDParseTable *g2 = av_mallocz(sizeof(GUIDParseTable));
There does not seem to be any need to allocate this dynamically, it can
be a static const object.
> + if (!g2)
> + return AVERROR(ENOMEM);
> + g2->name = "Unknown";
> + g2->is_subobject = 1;
> + read_unknown(s, g2);
> + av_free(g2);
> + }
> }
> + align_position(pb, offset, size);
>
> - if (!asf->index_read)
> - ret = asf_build_simple_index(s, stream_index);
> -
> - if (!ret && 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;
> + return 0;
> +}
>
> - /* do the seek */
> - av_log(s, AV_LOG_DEBUG, "SEEKTO: %"PRId64"\n", pos);
> - avio_seek(s->pb, pos, SEEK_SET);
> - asf_reset_header(s);
> - return 0;
> +static int asf_read_header(AVFormatContext *s)
> +{
> + ASFContext *asf = s->priv_data;
> + AVIOContext *pb = s->pb;
> + const GUIDParseTable *g = NULL;
> + ff_asf_guid guid;
> + int i, ret, is_seek = 0;
> +
> + asf->preroll = 0;
> + asf->seekable = 1;
> + asf->is_simple_index = 0;
> + ff_get_guid(pb, &guid);
> + if (ff_guidcmp(&guid, &ff_asf_header))
> + return AVERROR_INVALIDDATA;
> + asf->header_obj_size = avio_rl64(pb);
This field does not seem to be needed outside of this function, no
reason for it to be in the context.
> + avio_skip(pb, 6); // skip number of header objects and 2 reserved bytes
> + asf->data_reached = 0;
> + // 1 is here instead of pb->eof_reached because I skip Data for the
> first time,
> + // read Indexes and get eof and then I seek back to the Data
> + while (1) {
> + asf->offset = avio_tell(pb);
> + if (asf->offset > asf->header_obj_size && !asf->data_reached) {
> + avio_seek(pb, asf->header_obj_size, SEEK_SET);
> + asf->offset = asf->header_obj_size;
> + }
Won't this result in an infinite loop if the header object is followed
by some stuff that's not the data object?
> + if ((ret = ff_get_guid(pb, &guid)) < 0) {
> + if (ret == AVERROR_EOF && asf->data_reached) {
> + avio_seek(pb, asf->data_offset, SEEK_SET);
> + is_seek = 1;
Why not break immediately here?
> + continue;
> + } else
> + return ret;
> }
> + swap_guid(guid);
Why not integrate this swapping with reading the guid? It's always done
together.
> + g = find_guid(guid);
> + if (g) {
> + asf->unknown_offset = asf->offset;
> + asf->is_header = 1;
> + if ((ret = g->read_object(s, g)) < 0)
> + return ret;
> + }
> + if (is_seek || !asf->seekable)
> + break;
> }
> - /* no index or seeking by index failed */
> - if (ff_seek_frame_binary(s, stream_index, pts, flags) < 0)
> - return -1;
> - asf_reset_header(s);
> +
> + for (i = 0; i < asf->nb_streams; i++) {
> + const char * rfc1766 = asf->langs[asf->asf_st[i]->lan_idx];
Extra space
> + set_language(s, rfc1766);
This does not look correct. The language is a per-stream property, so it
should be set on the stream metadata, not global.
--
Anton Khirnov
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
