[Ffmpeg-cvslog] r8539 - trunk/libavformat/asf.c
bcoudurier
subversion
Wed Mar 28 16:48:43 CEST 2007
Author: bcoudurier
Date: Wed Mar 28 16:48:42 2007
New Revision: 8539
Modified:
trunk/libavformat/asf.c
Log:
revert r8538 (set bit rate for asf format) until regression tests issue is stated
Modified: trunk/libavformat/asf.c
==============================================================================
--- trunk/libavformat/asf.c (original)
+++ trunk/libavformat/asf.c Wed Mar 28 16:48:42 2007
@@ -148,10 +148,8 @@ static int asf_read_header(AVFormatConte
int size, i;
int64_t gsize;
AVRational dar[128];
- uint32_t bitrate[128];
memset(dar, 0, sizeof(dar));
- memset(bitrate, 0, sizeof(bitrate));
get_guid(pb, &g);
if (memcmp(&g, &asf_header, sizeof(GUID)))
@@ -419,13 +417,13 @@ static int asf_read_header(AVFormatConte
}
} else if (!memcmp(&g, &ext_stream_header, sizeof(GUID))) {
int ext_len, payload_ext_ct, stream_ct;
- uint32_t ext_d, leak_rate, stream_num;
+ uint32_t ext_d;
int64_t pos_ex_st;
pos_ex_st = url_ftell(pb);
get_le64(pb); // starttime
get_le64(pb); // endtime
- leak_rate = get_le32(pb); // leak-datarate
+ get_le32(pb); // leak-datarate
get_le32(pb); // bucket-datasize
get_le32(pb); // init-bucket-fullness
get_le32(pb); // alt-leak-datarate
@@ -433,15 +431,12 @@ static int asf_read_header(AVFormatConte
get_le32(pb); // alt-init-bucket-fullness
get_le32(pb); // max-object-size
get_le32(pb); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved)
- stream_num = get_le16(pb); // stream-num
+ get_le16(pb); // stream-num
get_le16(pb); // stream-language-id-index
get_le64(pb); // avg frametime in 100ns units
stream_ct = get_le16(pb); //stream-name-count
payload_ext_ct = get_le16(pb); //payload-extension-system-count
- if (stream_num < 128)
- bitrate[stream_num] = leak_rate;
-
for (i=0; i<stream_ct; i++){
get_le16(pb);
ext_len = get_le16(pb);
@@ -505,13 +500,11 @@ static int asf_read_header(AVFormatConte
for(i=0; i<128; i++){
int stream_num= asf->asfid2avid[i];
- if(stream_num>=0){
+ if(stream_num>=0 && dar[i].num>0 && dar[i].den>0){
AVCodecContext *codec= s->streams[stream_num]->codec;
- codec->bit_rate = bitrate[i];
- if (dar[i].num > 0 && dar[i].den > 0)
- av_reduce(&codec->sample_aspect_ratio.num,
- &codec->sample_aspect_ratio.den,
- dar[i].num, dar[i].den, INT_MAX);
+ av_reduce(&codec->sample_aspect_ratio.num,
+ &codec->sample_aspect_ratio.den,
+ dar[i].num, dar[i].den, INT_MAX);
//av_log(NULL, AV_LOG_ERROR, "dar %d:%d sar=%d:%d\n", dar[i].num, dar[i].den, codec->sample_aspect_ratio.num, codec->sample_aspect_ratio.den);
}
}
More information about the ffmpeg-cvslog
mailing list