COSMETICS: tabs --> spaces, some prettyprinting

Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk

1 files changed, 204 insertions, 204 deletions

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 5822e5e123..412525b3f1 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -169,18 +169,18 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             goto fail;
         if (!memcmp(&g, &file_header, sizeof(GUID))) {
             get_guid(pb, &asf->hdr.guid);
-	    asf->hdr.file_size		= get_le64(pb);
-	    asf->hdr.create_time	= get_le64(pb);
-	    asf->hdr.packets_count	= get_le64(pb);
-	    asf->hdr.send_time		= get_le64(pb);
-	    asf->hdr.play_time		= get_le64(pb);
-	    asf->hdr.preroll		= get_le32(pb);
-	    asf->hdr.ignore		= get_le32(pb);
-	    asf->hdr.flags		= get_le32(pb);
-	    asf->hdr.min_pktsize	= get_le32(pb);
-	    asf->hdr.max_pktsize	= get_le32(pb);
-	    asf->hdr.max_bitrate	= get_le32(pb);
-	    asf->packet_size = asf->hdr.max_pktsize;
+            asf->hdr.file_size          = get_le64(pb);
+            asf->hdr.create_time        = get_le64(pb);
+            asf->hdr.packets_count      = get_le64(pb);
+            asf->hdr.send_time          = get_le64(pb);
+            asf->hdr.play_time          = get_le64(pb);
+            asf->hdr.preroll            = get_le32(pb);
+            asf->hdr.ignore             = get_le32(pb);
+            asf->hdr.flags              = get_le32(pb);
+            asf->hdr.min_pktsize        = get_le32(pb);
+            asf->hdr.max_pktsize        = get_le32(pb);
+            asf->hdr.max_bitrate        = get_le32(pb);
+            asf->packet_size = asf->hdr.max_pktsize;
             asf->nb_packets = asf->hdr.packets_count;
         } else if (!memcmp(&g, &stream_header, sizeof(GUID))) {
             int type, total_size, type_specific_size, sizeX;
@@ -214,32 +214,32 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             total_size = get_le64(pb);
             type_specific_size = get_le32(pb);
             get_le32(pb);
-	    st->id = get_le16(pb) & 0x7f; /* stream id */
+            st->id = get_le16(pb) & 0x7f; /* stream id */
             // mapping of asf ID to AV stream ID;
             asf->asfid2avid[st->id] = s->nb_streams - 1;
 
             get_le32(pb);
-	    st->codec->codec_type = type;
+            st->codec->codec_type = type;
             if (type == CODEC_TYPE_AUDIO) {
                 get_wav_header(pb, st->codec, type_specific_size);
                 st->need_parsing = 1;
-		/* We have to init the frame size at some point .... */
-		pos2 = url_ftell(pb);
-		if (gsize > (pos2 + 8 - pos1 + 24)) {
-		    asf_st->ds_span = get_byte(pb);
-		    asf_st->ds_packet_size = get_le16(pb);
-		    asf_st->ds_chunk_size = get_le16(pb);
-		    asf_st->ds_data_size = get_le16(pb);
-		    asf_st->ds_silence_data = get_byte(pb);
-		}
-		//printf("Descrambling: ps:%d cs:%d ds:%d s:%d  sd:%d\n",
-		//       asf_st->ds_packet_size, asf_st->ds_chunk_size,
-		//       asf_st->ds_data_size, asf_st->ds_span, asf_st->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_span = 0; // disable descrambling
-		}
+                /* We have to init the frame size at some point .... */
+                pos2 = url_ftell(pb);
+                if (gsize > (pos2 + 8 - pos1 + 24)) {
+                    asf_st->ds_span = get_byte(pb);
+                    asf_st->ds_packet_size = get_le16(pb);
+                    asf_st->ds_chunk_size = get_le16(pb);
+                    asf_st->ds_data_size = get_le16(pb);
+                    asf_st->ds_silence_data = get_byte(pb);
+                }
+                //printf("Descrambling: ps:%d cs:%d ds:%d s:%d  sd:%d\n",
+                //       asf_st->ds_packet_size, asf_st->ds_chunk_size,
+                //       asf_st->ds_data_size, asf_st->ds_span, asf_st->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_span = 0; // disable descrambling
+                }
                 switch (st->codec->codec_id) {
                 case CODEC_ID_MP3:
                     st->codec->frame_size = MPA_FRAME_SIZE;
@@ -260,25 +260,25 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
                     break;
                 }
             } else {
-		get_le32(pb);
+                get_le32(pb);
                 get_le32(pb);
                 get_byte(pb);
                 size = get_le16(pb); /* size */
                 sizeX= get_le32(pb); /* size */
                 st->codec->width = get_le32(pb);
-		st->codec->height = get_le32(pb);
+                st->codec->height = get_le32(pb);
                 /* not available for asf */
                 get_le16(pb); /* panes */
-		st->codec->bits_per_sample = get_le16(pb); /* depth */
+                st->codec->bits_per_sample = get_le16(pb); /* depth */
                 tag1 = get_le32(pb);
-		url_fskip(pb, 20);
+                url_fskip(pb, 20);
 //                av_log(NULL, AV_LOG_DEBUG, "size:%d tsize:%d sizeX:%d\n", size, total_size, sizeX);
                 size= sizeX;
-		if (size > 40) {
-		    st->codec->extradata_size = size - 40;
-		    st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-		    get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
-		}
+                if (size > 40) {
+                    st->codec->extradata_size = size - 40;
+                    st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+                    get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
+                }
 
         /* Extract palette from extradata if bpp <= 8 */
         /* This code assumes that extradata contains only palette */
@@ -296,7 +296,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
         }
 
                 st->codec->codec_tag = tag1;
-		st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1);
+                st->codec->codec_id = codec_get_id(codec_bmp_tags, tag1);
                 if(tag1 == MKTAG('D', 'V', 'R', ' '))
                     st->need_parsing = 1;
             }
@@ -316,7 +316,7 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
             get_str16_nolen(pb, len2, s->author, sizeof(s->author));
             get_str16_nolen(pb, len3, s->copyright, sizeof(s->copyright));
             get_str16_nolen(pb, len4, s->comment, sizeof(s->comment));
-	    url_fskip(pb, len5);
+            url_fskip(pb, len5);
        } else if (!memcmp(&g, &extended_content_header, sizeof(GUID))) {
                 int desc_count, i;
 
@@ -399,10 +399,10 @@ static int asf_read_header(AVFormatContext *s, AVFormatParameters *ap)
  fail:
      for(i=0;i<s->nb_streams;i++) {
         AVStream *st = s->streams[i];
-	if (st) {
-	    av_free(st->priv_data);
+        if (st) {
+            av_free(st->priv_data);
             av_free(st->codec->extradata);
-	}
+        }
         av_free(st);
     }
     return -1;
@@ -430,19 +430,19 @@ static int asf_get_packet(AVFormatContext *s)
     c = get_byte(pb);
     if (c != 0x82) {
         if (!url_feof(pb))
-	    av_log(s, AV_LOG_ERROR, "ff asf bad header %x  at:%"PRId64"\n", c, url_ftell(pb));
+            av_log(s, AV_LOG_ERROR, "ff asf bad header %x  at:%"PRId64"\n", c, url_ftell(pb));
     }
     if ((c & 0x0f) == 2) { // always true for now
-	if (get_le16(pb) != 0) {
+        if (get_le16(pb) != 0) {
             if (!url_feof(pb))
-		av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n");
-	    return AVERROR_IO;
-	}
+                av_log(s, AV_LOG_ERROR, "ff asf bad non zero\n");
+            return AVERROR_IO;
+        }
         rsize+=2;
 /*    }else{
         if (!url_feof(pb))
-	    printf("ff asf bad header %x  at:%lld\n", c, url_ftell(pb));
-	return AVERROR_IO;*/
+            printf("ff asf bad header %x  at:%lld\n", c, url_ftell(pb));
+        return AVERROR_IO;*/
     }
 
     asf->packet_flags = get_byte(pb);
@@ -457,10 +457,10 @@ static int asf_get_packet(AVFormatContext *s)
     // rsize has at least 11 bytes which have to be present
 
     if (asf->packet_flags & 0x01) {
-	asf->packet_segsizetype = get_byte(pb); rsize++;
+        asf->packet_segsizetype = get_byte(pb); rsize++;
         asf->packet_segments = asf->packet_segsizetype & 0x3f;
     } else {
-	asf->packet_segments = 1;
+        asf->packet_segments = 1;
         asf->packet_segsizetype = 0x80;
     }
     asf->packet_size_left = packet_length - padsize - rsize;
@@ -480,184 +480,184 @@ static int asf_read_packet(AVFormatContext *s, AVPacket *pkt)
     ByteIOContext *pb = &s->pb;
     //static int pc = 0;
     for (;;) {
-	int rsize = 0;
-	if (asf->packet_size_left < FRAME_HEADER_SIZE
-	    || asf->packet_segments < 1) {
-	    //asf->packet_size_left <= asf->packet_padsize) {
-	    int ret = asf->packet_size_left + asf->packet_padsize;
-	    //printf("PacketLeftSize:%d  Pad:%d Pos:%Ld\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb));
+        int rsize = 0;
+        if (asf->packet_size_left < FRAME_HEADER_SIZE
+            || asf->packet_segments < 1) {
+            //asf->packet_size_left <= asf->packet_padsize) {
+            int ret = asf->packet_size_left + asf->packet_padsize;
+            //printf("PacketLeftSize:%d  Pad:%d Pos:%Ld\n", asf->packet_size_left, asf->packet_padsize, url_ftell(pb));
             if((url_ftell(&s->pb) + ret - s->data_offset) % asf->packet_size)
                 ret += asf->packet_size - ((url_ftell(&s->pb) + ret - s->data_offset) % asf->packet_size);
-	    /* fail safe */
-	    url_fskip(pb, ret);
+            /* fail safe */
+            url_fskip(pb, ret);
             asf->packet_pos= url_ftell(&s->pb);
-	    ret = asf_get_packet(s);
-	    //printf("READ ASF PACKET  %d   r:%d   c:%d\n", ret, asf->packet_size_left, pc++);
-	    if (ret < 0 || url_feof(pb))
-		return AVERROR_IO;
+            ret = asf_get_packet(s);
+            //printf("READ ASF PACKET  %d   r:%d   c:%d\n", ret, asf->packet_size_left, pc++);
+            if (ret < 0 || url_feof(pb))
+                return AVERROR_IO;
             asf->packet_time_start = 0;
             continue;
-	}
-	if (asf->packet_time_start == 0) {
-	    /* read frame header */
+        }
+        if (asf->packet_time_start == 0) {
+            /* read frame header */
             int num = get_byte(pb);
-	    asf->packet_segments--;
-	    rsize++;
-	    asf->packet_key_frame = (num & 0x80) >> 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);
+            asf->packet_segments--;
+            rsize++;
+            asf->packet_key_frame = (num & 0x80) >> 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);
 //printf("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 > 1) {
+            if (asf->packet_replic_size > 1) {
                 assert(asf->packet_replic_size >= 8);
                 // it should be always at least 8 bytes - FIXME validate
-		asf->packet_obj_size = get_le32(pb);
-		asf->packet_frag_timestamp = get_le32(pb); // timestamp
-		if (asf->packet_replic_size > 8)
-		    url_fskip(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 begining timestamp
-		asf->packet_time_start = asf->packet_frag_offset;
+                asf->packet_obj_size = get_le32(pb);
+                asf->packet_frag_timestamp = get_le32(pb); // timestamp
+                if (asf->packet_replic_size > 8)
+                    url_fskip(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 begining timestamp
+                asf->packet_time_start = asf->packet_frag_offset;
                 asf->packet_frag_offset = 0;
-		asf->packet_frag_timestamp = asf->packet_timestamp;
+                asf->packet_frag_timestamp = asf->packet_timestamp;
 
                 asf->packet_time_delta = get_byte(pb);
-		rsize++;
-	    }else{
+                rsize++;
+            }else{
                 assert(asf->packet_replic_size==0);
             }
-	    if (asf->packet_flags & 0x01) {
-		DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal
+            if (asf->packet_flags & 0x01) {
+                DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal
 #undef DO_2BITS
-		//printf("Fragsize %d\n", asf->packet_frag_size);
-	    } else {
-		asf->packet_frag_size = asf->packet_size_left - rsize;
-		//printf("Using rest  %d %d %d\n", 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) {
-		    asf->packet_segments = 0;
+                //printf("Fragsize %d\n", asf->packet_frag_size);
+            } else {
+                asf->packet_frag_size = asf->packet_size_left - rsize;
+                //printf("Using rest  %d %d %d\n", 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) {
+                    asf->packet_segments = 0;
                     continue;
-		}
-	    }
-	    asf->packet_size_left -= rsize;
-	    //printf("___objsize____  %d   %d    rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize);
+                }
+            }
+            asf->packet_size_left -= rsize;
+            //printf("___objsize____  %d   %d    rs:%d\n", asf->packet_obj_size, asf->packet_frag_offset, rsize);
 
-	    if (asf->stream_index < 0
+            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) */
-		url_fskip(pb, asf->packet_frag_size);
-		asf->packet_size_left -= asf->packet_frag_size;
+                /* unhandled packet (should not happen) */
+                url_fskip(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  %d\n", asf->packet_frag_size, num & 0x7f);
                 continue;
-	    }
-	    asf->asf_st = s->streams[asf->stream_index]->priv_data;
-	}
-	asf_st = asf->asf_st;
-
-	if ((asf->packet_frag_offset != asf_st->frag_offset
-	     || (asf->packet_frag_offset
-		 && asf->packet_seq != asf_st->seq)) // seq should be ignored
-	   ) {
-	    /* cannot continue current packet: free it */
-	    // FIXME better check if packet was already allocated
-	    av_log(s, AV_LOG_INFO, "ff asf parser skips: %d - %d     o:%d - %d    %d %d   fl:%d\n",
-		   asf_st->pkt.size,
-		   asf->packet_obj_size,
-		   asf->packet_frag_offset, asf_st->frag_offset,
-		   asf->packet_seq, asf_st->seq, asf->packet_frag_size);
-	    if (asf_st->pkt.size)
-		av_free_packet(&asf_st->pkt);
-	    asf_st->frag_offset = 0;
-	    if (asf->packet_frag_offset != 0) {
-		url_fskip(pb, asf->packet_frag_size);
-		av_log(s, AV_LOG_INFO, "ff asf parser skipping %db\n", 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 begining 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 = get_byte(pb);
-	    asf->packet_size_left--;
+            }
+            asf->asf_st = s->streams[asf->stream_index]->priv_data;
+        }
+        asf_st = asf->asf_st;
+
+        if ((asf->packet_frag_offset != asf_st->frag_offset
+             || (asf->packet_frag_offset
+                 && asf->packet_seq != asf_st->seq)) // seq should be ignored
+           ) {
+            /* cannot continue current packet: free it */
+            // FIXME better check if packet was already allocated
+            av_log(s, AV_LOG_INFO, "ff asf parser skips: %d - %d     o:%d - %d    %d %d   fl:%d\n",
+                   asf_st->pkt.size,
+                   asf->packet_obj_size,
+                   asf->packet_frag_offset, asf_st->frag_offset,
+                   asf->packet_seq, asf_st->seq, asf->packet_frag_size);
+            if (asf_st->pkt.size)
+                av_free_packet(&asf_st->pkt);
+            asf_st->frag_offset = 0;
+            if (asf->packet_frag_offset != 0) {
+                url_fskip(pb, asf->packet_frag_size);
+                av_log(s, AV_LOG_INFO, "ff asf parser skipping %db\n", 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 begining 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 = get_byte(pb);
+            asf->packet_size_left--;
             asf->packet_multi_size--;
-	    if (asf->packet_multi_size < asf->packet_obj_size)
-	    {
-		asf->packet_time_start = 0;
-		url_fskip(pb, asf->packet_multi_size);
-		asf->packet_size_left -= asf->packet_multi_size;
+            if (asf->packet_multi_size < asf->packet_obj_size)
+            {
+                asf->packet_time_start = 0;
+                url_fskip(pb, asf->packet_multi_size);
+                asf->packet_size_left -= asf->packet_multi_size;
                 continue;
-	    }
-	    asf->packet_multi_size -= asf->packet_obj_size;
-	    //printf("COMPRESS size  %d  %d  %d   ms:%d\n", asf->packet_obj_size, asf->packet_frag_timestamp, asf->packet_size_left, asf->packet_multi_size);
-	}
-	if (asf_st->frag_offset == 0) {
-	    /* new packet */
-	    av_new_packet(&asf_st->pkt, asf->packet_obj_size);
-	    asf_st->seq = asf->packet_seq;
-	    asf_st->pkt.pts = asf->packet_frag_timestamp;
-	    asf_st->pkt.stream_index = asf->stream_index;
+            }
+            asf->packet_multi_size -= asf->packet_obj_size;
+            //printf("COMPRESS size  %d  %d  %d   ms:%d\n", asf->packet_obj_size, asf->packet_frag_timestamp, asf->packet_size_left, asf->packet_multi_size);
+        }
+        if (asf_st->frag_offset == 0) {
+            /* new packet */
+            av_new_packet(&asf_st->pkt, asf->packet_obj_size);
+            asf_st->seq = asf->packet_seq;
+            asf_st->pkt.pts = asf->packet_frag_timestamp;
+            asf_st->pkt.stream_index = asf->stream_index;
             asf_st->pkt.pos =
             asf_st->packet_pos= asf->packet_pos;
 //printf("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 & PKT_FLAG_KEY,
 //s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO, asf->packet_obj_size);
-	    if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO)
-		asf->packet_key_frame = 1;
-	    if (asf->packet_key_frame)
-		asf_st->pkt.flags |= PKT_FLAG_KEY;
-	}
-
-	/* read data */
-	//printf("READ PACKET s:%d  os:%d  o:%d,%d  l:%d   DATA:%p\n",
-	//       asf->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)
+            if (s->streams[asf->stream_index]->codec->codec_type == CODEC_TYPE_AUDIO)
+                asf->packet_key_frame = 1;
+            if (asf->packet_key_frame)
+                asf_st->pkt.flags |= PKT_FLAG_KEY;
+        }
+
+        /* read data */
+        //printf("READ PACKET s:%d  os:%d  o:%d,%d  l:%d   DATA:%p\n",
+        //       asf->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;
-	get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset,
-		   asf->packet_frag_size);
-	asf_st->frag_offset += asf->packet_frag_size;
-	/* test if whole packet is read */
-	if (asf_st->frag_offset == asf_st->pkt.size) {
-	    /* return packet */
-	    if (asf_st->ds_span > 1) {
-		/* packet descrambling */
-		char* newdata = av_malloc(asf_st->pkt.size);
-		if (newdata) {
-		    int offset = 0;
-		    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;
-			//printf("off:%d  row:%d  col:%d  idx:%d\n", off, row, col, idx);
-			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_free(asf_st->pkt.data);
-		    asf_st->pkt.data = newdata;
-		}
-	    }
-	    asf_st->frag_offset = 0;
-	    memcpy(pkt, &asf_st->pkt, sizeof(AVPacket));
-	    //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size);
-	    asf_st->pkt.size = 0;
-	    asf_st->pkt.data = 0;
-	    break; // packet completed
-	}
+        get_buffer(pb, asf_st->pkt.data + asf->packet_frag_offset,
+                   asf->packet_frag_size);
+        asf_st->frag_offset += asf->packet_frag_size;
+        /* test if whole packet is read */
+        if (asf_st->frag_offset == asf_st->pkt.size) {
+            /* return packet */
+            if (asf_st->ds_span > 1) {
+                /* packet descrambling */
+                char* newdata = av_malloc(asf_st->pkt.size);
+                if (newdata) {
+                    int offset = 0;
+                    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;
+                        //printf("off:%d  row:%d  col:%d  idx:%d\n", off, row, col, idx);
+                        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_free(asf_st->pkt.data);
+                    asf_st->pkt.data = newdata;
+                }
+            }
+            asf_st->frag_offset = 0;
+            memcpy(pkt, &asf_st->pkt, sizeof(AVPacket));
+            //printf("packet %d %d\n", asf_st->pkt.size, asf->packet_frag_size);
+            asf_st->pkt.size = 0;
+            asf_st->pkt.data = 0;
+            break; // packet completed
+        }
     }
     return 0;
 }
@@ -667,9 +667,9 @@ static int asf_read_close(AVFormatContext *s)
     int i;
 
     for(i=0;i<s->nb_streams;i++) {
-	AVStream *st = s->streams[i];
-	av_free(st->priv_data);
-	av_free(st->codec->extradata);
+        AVStream *st = s->streams[i];
+        av_free(st->priv_data);
+        av_free(st->codec->extradata);
     av_free(st->codec->palctrl);
     }
     return 0;
@@ -738,7 +738,7 @@ static int64_t asf_read_pts(AVFormatContext *s, int stream_index, int64_t *ppos,
     for(;;){
         if (av_read_frame(s, pkt) < 0){
             av_log(s, AV_LOG_INFO, "seek failed\n");
-    	    return AV_NOPTS_VALUE;
+            return AV_NOPTS_VALUE;
         }
 
         pts= pkt->pts * 1000 / AV_TIME_BASE;