@@ -3,7 +3,7 @@ use crate::ebml::element_reader::{
3
3
ChildElementDescriptor , ElementChildIterator , ElementIdent , ElementReaderYield ,
4
4
} ;
5
5
use crate :: ebml:: properties:: EbmlProperties ;
6
- use crate :: ebml:: { AudioTrackDescriptor , VInt } ;
6
+ use crate :: ebml:: VInt ;
7
7
use crate :: error:: Result ;
8
8
9
9
use std:: io:: { Read , Seek } ;
69
69
continue ;
70
70
}
71
71
72
- total_audio_data_size += ( size. value ( ) - header_size as u64 ) ;
72
+ total_audio_data_size += ( size. value ( ) - u64:: from ( header_size ) ) ;
73
73
} ,
74
74
ElementIdent :: BlockGroup => read_block_group (
75
75
& mut children_reader. children ( ) ,
@@ -87,15 +87,15 @@ where
87
87
return Ok ( ( ) ) ;
88
88
}
89
89
90
- let duration_millis = properties. duration ( ) . as_secs ( ) as u128 ;
90
+ let duration_millis = u128 :: from ( properties. duration ( ) . as_secs ( ) ) ;
91
91
if duration_millis == 0 {
92
92
log:: warn!( "Duration is zero, cannot calculate bitrate" ) ;
93
93
return Ok ( ( ) ) ;
94
94
}
95
95
96
96
let default_audio_track = & mut properties. audio_tracks [ default_audio_track_position] ; // TODO
97
97
98
- let bitrate_bps = ( ( ( total_audio_data_size as u128 ) * 8 ) / duration_millis) as u32 ;
98
+ let bitrate_bps = ( ( u128 :: from ( total_audio_data_size) * 8 ) / duration_millis) as u32 ;
99
99
default_audio_track. settings . bitrate = Some ( bitrate_bps / 1000 ) ;
100
100
101
101
Ok ( ( ) )
@@ -144,7 +144,7 @@ where
144
144
continue ;
145
145
}
146
146
147
- * total_audio_data_size += ( size. value ( ) - header_size as u64 ) ;
147
+ * total_audio_data_size += ( size. value ( ) - u64:: from ( header_size ) ) ;
148
148
}
149
149
150
150
Ok ( ( ) )
@@ -166,7 +166,7 @@ where
166
166
let track_number = VInt :: < u64 > :: parse ( children_reader, max_size_length) ?;
167
167
let track_number_octets = track_number. octet_length ( ) ;
168
168
169
- children_reader. skip ( block_size - track_number_octets as u64 ) ?;
169
+ children_reader. skip ( block_size - u64:: from ( track_number_octets ) ) ?;
170
170
if track_number != target_track_number {
171
171
return Ok ( ( false , track_number_octets + NON_VARIABLE_BLOCK_HEADER_SIZE ) ) ;
172
172
}
0 commit comments