@@ -42,26 +42,14 @@ def testRewrapAudioStream():
42
42
assert_almost_equals ( src_properties .getBitRate (), dst_properties .getBitRate (), delta = deltaBitRateAudio )
43
43
assert_equals ( src_properties .getPacketSize (), dst_properties .getPacketSize () )
44
44
45
- # check audio stream
46
- assert_equals ( src_audioStream .getCodecName (), dst_audioStream .getCodecName () )
47
- assert_equals ( src_audioStream .getCodecLongName (), dst_audioStream .getCodecLongName () )
48
- assert_equals ( src_audioStream .getSampleFormatName (), dst_audioStream .getSampleFormatName () )
49
- assert_equals ( src_audioStream .getSampleFormatLongName (), dst_audioStream .getSampleFormatLongName () )
50
- # assert_equals( src_audioStream.getChannelLayout(), dst_audioStream.getChannelLayout() ) # '5.1' != '0 channels'
51
- assert_equals ( src_audioStream .getChannelName (), dst_audioStream .getChannelName () )
52
- assert_equals ( src_audioStream .getChannelDescription (), dst_audioStream .getChannelDescription () )
53
- assert_equals ( src_audioStream .getStreamId (), dst_audioStream .getStreamId () )
54
- assert_equals ( src_audioStream .getCodecId (), dst_audioStream .getCodecId () )
55
- assert_equals ( src_audioStream .getSampleRate (), dst_audioStream .getSampleRate () )
56
- assert_equals ( src_audioStream .getChannels (), dst_audioStream .getChannels () )
57
- assert_equals ( src_audioStream .getBitRate (), dst_audioStream .getBitRate () )
58
-
59
- assert_equals ( len ( src_audioStream .getMetadatas () ), len ( dst_audioStream .getMetadatas () ) )
60
- for metadata in range ( 0 , len ( src_audioStream .getMetadatas () ) ):
61
- src_metadata = src_audioStream .getMetadatas ()[metadata ]
62
- dst_metadata = dst_audioStream .getMetadatas ()[metadata ]
63
-
64
- assert_equals ( src_metadata , dst_metadata )
45
+ # check audio properties
46
+ src_propertiesMap = src_audioStream .getPropertiesAsMap ()
47
+ dst_propertiesMap = dst_audioStream .getPropertiesAsMap ()
48
+ for i in range (0 , len (src_propertiesMap )):
49
+ # @todo: don't skip channel layout
50
+ if src_propertiesMap [i ][0 ] == "channelLayout" :
51
+ continue
52
+ assert_equals ( src_propertiesMap [i ], dst_propertiesMap [i ] )
65
53
66
54
def testRewrapVideoStream ():
67
55
"""
@@ -98,81 +86,8 @@ def testRewrapVideoStream():
98
86
assert_almost_equals ( src_properties .getBitRate (), dst_properties .getBitRate (), delta = deltaBitRateVideo )
99
87
assert_equals ( src_properties .getPacketSize (), dst_properties .getPacketSize () )
100
88
101
- # check video stream
102
- assert_equals ( src_videoStream .getCodecName (), dst_videoStream .getCodecName () )
103
- assert_equals ( src_videoStream .getCodecLongName (), dst_videoStream .getCodecLongName () )
104
- assert_equals ( src_videoStream .getProfileName (), dst_videoStream .getProfileName () )
105
- assert_equals ( src_videoStream .getColorTransfert (), dst_videoStream .getColorTransfert () )
106
- assert_equals ( src_videoStream .getColorspace (), dst_videoStream .getColorspace () )
107
- assert_equals ( src_videoStream .getColorRange (), dst_videoStream .getColorRange () )
108
- assert_equals ( src_videoStream .getColorPrimaries (), dst_videoStream .getColorPrimaries () )
109
- assert_equals ( src_videoStream .getChromaSampleLocation (), dst_videoStream .getChromaSampleLocation () )
110
- assert_equals ( src_videoStream .getFieldOrder (), dst_videoStream .getFieldOrder () )
111
-
112
- assert_equals ( src_videoStream .getStartTimecodeString (), dst_videoStream .getStartTimecodeString () )
113
-
114
- assert_equals ( src_videoStream .getTimeBase ().num , dst_videoStream .getTimeBase ().num )
115
- assert_equals ( src_videoStream .getTimeBase ().den , dst_videoStream .getTimeBase ().den )
116
- assert_equals ( src_videoStream .getSar ().num , dst_videoStream .getSar ().num )
117
- assert_equals ( src_videoStream .getSar ().den , dst_videoStream .getSar ().den )
118
- assert_equals ( src_videoStream .getDar ().num , dst_videoStream .getDar ().num )
119
- assert_equals ( src_videoStream .getDar ().den , dst_videoStream .getDar ().den )
120
-
121
- assert_equals ( src_videoStream .getStreamId (), dst_videoStream .getStreamId () )
122
- assert_equals ( src_videoStream .getCodecId (), dst_videoStream .getCodecId () )
123
- assert_equals ( src_videoStream .getBitRate (), dst_videoStream .getBitRate () )
124
- assert_equals ( src_videoStream .getMaxBitRate (), dst_videoStream .getMaxBitRate () )
125
- assert_equals ( src_videoStream .getMinBitRate (), dst_videoStream .getMinBitRate () )
126
- assert_equals ( src_videoStream .getTicksPerFrame (), dst_videoStream .getTicksPerFrame () )
127
- assert_equals ( src_videoStream .getWidth (), dst_videoStream .getWidth () )
128
- assert_equals ( src_videoStream .getHeight (), dst_videoStream .getHeight () )
129
- assert_equals ( src_videoStream .getGopSize (), dst_videoStream .getGopSize () )
130
- assert_equals ( src_videoStream .getDtgActiveFormat (), dst_videoStream .getDtgActiveFormat () )
131
- assert_equals ( src_videoStream .getReferencesFrames (), dst_videoStream .getReferencesFrames () )
132
- assert_equals ( src_videoStream .getProfile (), dst_videoStream .getProfile () )
133
- assert_equals ( src_videoStream .getLevel (), dst_videoStream .getLevel () )
134
-
135
- assert_equals ( src_videoStream .getFps (), dst_videoStream .getFps () )
136
- assert_equals ( src_videoStream .hasBFrames (), dst_videoStream .hasBFrames () )
137
- assert_equals ( src_videoStream .isTopFieldFirst (), dst_videoStream .isTopFieldFirst () )
138
- assert_equals ( src_videoStream .isInterlaced (), dst_videoStream .isInterlaced () )
139
-
140
- assert_equals ( len ( src_videoStream .getGopStructure () ), len ( dst_videoStream .getGopStructure () ) )
141
- for gop in range ( 0 , len ( src_videoStream .getGopStructure () ) ):
142
- src_gop = src_videoStream .getGopStructure ()[gop ]
143
- dst_gop = dst_videoStream .getGopStructure ()[gop ]
144
-
145
- assert_equals ( src_gop , dst_gop )
146
-
147
- assert_equals ( len ( src_videoStream .getMetadatas () ), len ( dst_videoStream .getMetadatas () ) )
148
- for metadata in range ( 0 , len ( src_videoStream .getMetadatas () ) ):
149
- src_metadata = src_videoStream .getMetadatas ()[metadata ]
150
- dst_metadata = dst_videoStream .getMetadatas ()[metadata ]
151
-
152
- assert_equals ( src_metadata , dst_metadata )
153
-
154
- # check pixel
155
- assert_equals ( src_videoStream .getPixelProperties ().getPixelName (), dst_videoStream .getPixelProperties ().getPixelName () )
156
- assert_equals ( src_videoStream .getPixelProperties ().getBitsPerPixel (), dst_videoStream .getPixelProperties ().getBitsPerPixel () )
157
- assert_equals ( src_videoStream .getPixelProperties ().getNbComponents (), dst_videoStream .getPixelProperties ().getNbComponents () )
158
- assert_equals ( src_videoStream .getPixelProperties ().getChromaWidth (), dst_videoStream .getPixelProperties ().getChromaWidth () )
159
- assert_equals ( src_videoStream .getPixelProperties ().getChromaHeight (), dst_videoStream .getPixelProperties ().getChromaHeight () )
160
- assert_equals ( src_videoStream .getPixelProperties ().getColorComponents (), dst_videoStream .getPixelProperties ().getColorComponents () )
161
- assert_equals ( src_videoStream .getPixelProperties ().getSubsampling (), dst_videoStream .getPixelProperties ().getSubsampling () )
162
- assert_equals ( src_videoStream .getPixelProperties ().isBigEndian (), dst_videoStream .getPixelProperties ().isBigEndian () )
163
- assert_equals ( src_videoStream .getPixelProperties ().isIndexedColors (), dst_videoStream .getPixelProperties ().isIndexedColors () )
164
- assert_equals ( src_videoStream .getPixelProperties ().isBitWisePacked (), dst_videoStream .getPixelProperties ().isBitWisePacked () )
165
- assert_equals ( src_videoStream .getPixelProperties ().isHardwareAccelerated (), dst_videoStream .getPixelProperties ().isHardwareAccelerated () )
166
- assert_equals ( src_videoStream .getPixelProperties ().isPlanar (), dst_videoStream .getPixelProperties ().isPlanar () )
167
- assert_equals ( src_videoStream .getPixelProperties ().isRgbPixelData (), dst_videoStream .getPixelProperties ().isRgbPixelData () )
168
- assert_equals ( src_videoStream .getPixelProperties ().isPseudoPaletted (), dst_videoStream .getPixelProperties ().isPseudoPaletted () )
169
- assert_equals ( src_videoStream .getPixelProperties ().hasAlpha (), dst_videoStream .getPixelProperties ().hasAlpha () )
170
-
171
- assert_equals ( len ( src_videoStream .getPixelProperties ().getChannels () ), len ( dst_videoStream .getPixelProperties ().getChannels () ) )
172
- for channel in range ( 0 , len ( src_videoStream .getPixelProperties ().getChannels () ) ):
173
- src_channel = src_videoStream .getPixelProperties ().getChannels ()[channel ]
174
- dst_channel = dst_videoStream .getPixelProperties ().getChannels ()[channel ]
175
-
176
- assert_equals ( src_channel .id , dst_channel .id )
177
- assert_equals ( src_channel .chromaHeight , dst_channel .chromaHeight )
178
- assert_equals ( src_channel .bitStep , dst_channel .bitStep )
89
+ # check audio properties
90
+ src_propertiesMap = src_videoStream .getPropertiesAsMap ()
91
+ dst_propertiesMap = dst_videoStream .getPropertiesAsMap ()
92
+ for i in range (0 , len (src_propertiesMap )):
93
+ assert_equals ( src_propertiesMap [i ], dst_propertiesMap [i ] )
0 commit comments