libavformat.hg: asf.c comparison

comparison asf.c @ 820:feca73904e67 libavformat

changing AVCodecContext codec -> *codec in AVStream so additions to AVCodecContext dont randomize AVStream and break binary compatibility

author	michael
date	Sun, 17 Jul 2005 22:24:36 +0000
parents	2680c3d05ca8
children	a5af9ba25343

comparison

equal deleted inserted replaced

-:a6c035e7f429
+:feca73904e67
 	    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);
+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);
 		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) {
+switch (st->codec->codec_id) {
 case CODEC_ID_MP3:
-st->codec.frame_size = MPA_FRAME_SIZE;
+st->codec->frame_size = MPA_FRAME_SIZE;
 break;
 case CODEC_ID_PCM_S16LE:
 case CODEC_ID_PCM_S16BE:
 case CODEC_ID_PCM_U16LE:
 case CODEC_ID_PCM_U16BE:
 case CODEC_ID_PCM_S8:
 case CODEC_ID_PCM_U8:
 case CODEC_ID_PCM_ALAW:
 case CODEC_ID_PCM_MULAW:
-st->codec.frame_size = 1;
+st->codec->frame_size = 1;
 break;
 default:
 /* This is probably wrong, but it prevents a crash later */
-st->codec.frame_size = 1;
+st->codec->frame_size = 1;
 break;
 }
 } else {
 		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->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);
 //                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_size = size - 40;
-		    st->codec.extradata = av_mallocz(st->codec.extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+		    st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-		    get_buffer(pb, st->codec.extradata, st->codec.extradata_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 */
 /* This is true for all paletted codecs implemented in ffmpeg */
-if (st->codec.extradata_size && (st->codec.bits_per_sample <= 8)) {
+if (st->codec->extradata_size && (st->codec->bits_per_sample <= 8)) {
-st->codec.palctrl = av_mallocz(sizeof(AVPaletteControl));
+st->codec->palctrl = av_mallocz(sizeof(AVPaletteControl));
 #ifdef WORDS_BIGENDIAN
-for (i = 0; i < FFMIN(st->codec.extradata_size, AVPALETTE_SIZE)/4; i++)
+for (i = 0; i < FFMIN(st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
-st->codec.palctrl->palette[i] = bswap_32(((uint32_t*)st->codec.extradata)[i]);
+st->codec->palctrl->palette[i] = bswap_32(((uint32_t*)st->codec->extradata)[i]);
 #else
-memcpy(st->codec.palctrl->palette, st->codec.extradata,
+memcpy(st->codec->palctrl->palette, st->codec->extradata,
-FFMIN(st->codec.extradata_size, AVPALETTE_SIZE));
+FFMIN(st->codec->extradata_size, AVPALETTE_SIZE));
 #endif
-st->codec.palctrl->palette_changed = 1;
+st->codec->palctrl->palette_changed = 1;
 }
-st->codec.codec_tag = tag1;
+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;
 }
 pos2 = url_ftell(pb);
 url_fskip(pb, gsize - (pos2 - pos1 + 24));
 fail:
 for(i=0;i<s->nb_streams;i++) {
 AVStream *st = s->streams[i];
 	if (st) {
 	    av_free(st->priv_data);
-av_free(st->codec.extradata);
+av_free(st->codec->extradata);
 	}
 av_free(st);
 }
 return -1;
 }
 	    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);
+//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)
+	    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;
 	}
 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);
+	av_free(st->codec->extradata);
-av_free(st->codec.palctrl);
+av_free(st->codec->palctrl);
 }
 return 0;
 }
 // Added to support seeking after packets have been read

Mercurial > libavformat.hg

comparison asf.c @ 820:feca73904e67 libavformat