Skip to content

Commit 557e087

Browse files
author
Clement Champetier
committed
pyTests: fit to new way to get media properties
Fix FileProperties for binding: need to add 'avtranscoder' namespace when return vector of properties (Video, Audio, ...). This enables SWIG to understand that results of these functions are templates it has already instanciated in the interface.
1 parent dd174c0 commit 557e087

File tree

4 files changed

+141
-141
lines changed

4 files changed

+141
-141
lines changed

‎src/AvTranscoder/mediaProperty/FileProperties.hpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,18 +45,18 @@ class AvExport FileProperties
4545
size_t getNbAttachementStreams() const { return _attachementStreams.size(); }
4646
size_t getNbUnknownStreams() const { return _unknownStreams.size(); }
4747

48-
std::vector< VideoProperties >& getVideoProperties() { return _videoStreams; }
49-
const std::vector< VideoProperties >& getVideoProperties() const { return _videoStreams; }
50-
std::vector< AudioProperties >& getAudioProperties() { return _audioStreams; }
51-
const std::vector< AudioProperties >& getAudioProperties() const { return _audioStreams; }
52-
std::vector< DataProperties >& getDataProperties() { return _dataStreams; }
53-
const std::vector< DataProperties >& getDataProperties() const { return _dataStreams; }
54-
std::vector< SubtitleProperties >& getSubtitleProperties() { return _subtitleStreams; }
55-
const std::vector< SubtitleProperties >& getSubtitleProperties() const { return _subtitleStreams; }
56-
std::vector< AttachementProperties >& getAttachementProperties() { return _attachementStreams; }
57-
const std::vector< AttachementProperties >& getAttachementProperties() const { return _attachementStreams; }
58-
std::vector< UnknownProperties >& getUnknownPropertiesProperties() { return _unknownStreams; }
59-
const std::vector< UnknownProperties >& getUnknownPropertiesProperties() const { return _unknownStreams; }
48+
std::vector< avtranscoder::VideoProperties >& getVideoProperties() { return _videoStreams; }
49+
const std::vector< avtranscoder::VideoProperties >& getVideoProperties() const { return _videoStreams; }
50+
std::vector< avtranscoder::AudioProperties >& getAudioProperties() { return _audioStreams; }
51+
const std::vector< avtranscoder::AudioProperties >& getAudioProperties() const { return _audioStreams; }
52+
std::vector< avtranscoder::DataProperties >& getDataProperties() { return _dataStreams; }
53+
const std::vector< avtranscoder::DataProperties >& getDataProperties() const { return _dataStreams; }
54+
std::vector< avtranscoder::SubtitleProperties >& getSubtitleProperties() { return _subtitleStreams; }
55+
const std::vector< avtranscoder::SubtitleProperties >& getSubtitleProperties() const { return _subtitleStreams; }
56+
std::vector< avtranscoder::AttachementProperties >& getAttachementProperties() { return _attachementStreams; }
57+
const std::vector< avtranscoder::AttachementProperties >& getAttachementProperties() const { return _attachementStreams; }
58+
std::vector< avtranscoder::UnknownProperties >& getUnknownPropertiesProperties() { return _unknownStreams; }
59+
const std::vector< avtranscoder::UnknownProperties >& getUnknownPropertiesProperties() const { return _unknownStreams; }
6060

6161
const AVFormatContext& getAVFormatContext() { return *_formatContext; }
6262

‎test/pyTest/testProperties.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ def testAddMetadataDate():
2525
transcoder.process( progress )
2626

2727
inputFile = av.InputFile( outputFileName )
28-
inputFile.analyse( progress, av.InputFile.eAnalyseLevelFast )
28+
inputFile.analyse( progress, av.eAnalyseLevelHeader )
2929
properties = inputFile.getProperties()
3030

31-
assert_in( metadata_to_check, properties.metadatas )
31+
assert_in( metadata_to_check, properties.getMetadatas() )
3232

3333
def testAddImpossibleMetadata():
3434
"""
@@ -50,7 +50,7 @@ def testAddImpossibleMetadata():
5050
transcoder.process( progress )
5151

5252
inputFile = av.InputFile( outputFileName )
53-
inputFile.analyse( progress, av.InputFile.eAnalyseLevelFast )
53+
inputFile.analyse( progress, av.eAnalyseLevelHeader )
5454
properties = inputFile.getProperties()
5555

56-
assert_not_in( metadata_to_check, properties.metadatas )
56+
assert_not_in( metadata_to_check, properties.getMetadatas() )

‎test/pyTest/testTranscoderRewrap.py

Lines changed: 97 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -21,43 +21,43 @@ def testRewrapAudioStream():
2121

2222
# get src file of wrap
2323
src_inputFile = av.InputFile( inputFileName )
24-
src_inputFile.analyse( progress, av.InputFile.eAnalyseLevelFast )
24+
src_inputFile.analyse( progress )
2525
src_properties = src_inputFile.getProperties()
26-
src_audioStream = src_properties.audioStreams[0]
26+
src_audioStream = src_properties.getAudioProperties()[0]
2727

2828
# get dst file of wrap
2929
dst_inputFile = av.InputFile( outputFileName )
30-
dst_inputFile.analyse( progress, av.InputFile.eAnalyseLevelFast )
30+
dst_inputFile.analyse( progress, av.eAnalyseLevelHeader )
3131
dst_properties = dst_inputFile.getProperties()
32-
dst_audioStream = dst_properties.audioStreams[0]
32+
dst_audioStream = dst_properties.getAudioProperties()[0]
3333

3434
# check format
35-
assert_equals( src_properties.formatName, dst_properties.formatName )
36-
assert_equals( src_properties.formatLongName, dst_properties.formatLongName )
37-
assert_equals( src_properties.startTime, dst_properties.startTime )
38-
assert_equals( src_properties.duration, dst_properties.duration )
35+
assert_equals( src_properties.getFormatName(), dst_properties.getFormatName() )
36+
assert_equals( src_properties.getFormatLongName(), dst_properties.getFormatLongName() )
37+
assert_equals( src_properties.getStartTime(), dst_properties.getStartTime() )
38+
assert_equals( src_properties.getDuration(), dst_properties.getDuration() )
3939
deltaBitRateAudio = 10
40-
assert_almost_equals( src_properties.bitRate, dst_properties.bitRate, delta=deltaBitRateAudio )
41-
assert_equals( src_properties.packetSize, dst_properties.packetSize )
40+
assert_almost_equals( src_properties.getBitRate(), dst_properties.getBitRate(), delta=deltaBitRateAudio )
41+
assert_equals( src_properties.getPacketSize(), dst_properties.getPacketSize() )
4242

4343
# check audio stream
44-
assert_equals( src_audioStream.codecName, dst_audioStream.codecName )
45-
assert_equals( src_audioStream.codecLongName, dst_audioStream.codecLongName )
46-
assert_equals( src_audioStream.sampleFormatName, dst_audioStream.sampleFormatName )
47-
assert_equals( src_audioStream.sampleFormatLongName, dst_audioStream.sampleFormatLongName )
48-
# assert_equals( src_audioStream.channelLayout, dst_audioStream.channelLayout ) # '5.1' != '0 channels'
49-
assert_equals( src_audioStream.channelName, dst_audioStream.channelName )
50-
assert_equals( src_audioStream.channelDescription, dst_audioStream.channelDescription )
51-
assert_equals( src_audioStream.streamId, dst_audioStream.streamId )
52-
assert_equals( src_audioStream.codecId, dst_audioStream.codecId )
53-
assert_equals( src_audioStream.sampleRate, dst_audioStream.sampleRate )
54-
assert_equals( src_audioStream.channels, dst_audioStream.channels )
55-
assert_equals( src_audioStream.bit_rate, dst_audioStream.bit_rate )
56-
57-
assert_equals( len( src_audioStream.metadatas ), len( dst_audioStream.metadatas ) )
58-
for metadata in range( 0, len( src_audioStream.metadatas ) ):
59-
src_metadata = src_audioStream.metadatas[metadata]
60-
dst_metadata = dst_audioStream.metadatas[metadata]
44+
assert_equals( src_audioStream.getCodecName(), dst_audioStream.getCodecName() )
45+
assert_equals( src_audioStream.getCodecLongName(), dst_audioStream.getCodecLongName() )
46+
assert_equals( src_audioStream.getSampleFormatName(), dst_audioStream.getSampleFormatName() )
47+
assert_equals( src_audioStream.getSampleFormatLongName(), dst_audioStream.getSampleFormatLongName() )
48+
# assert_equals( src_audioStream.getChannelLayout(), dst_audioStream.getChannelLayout() ) # '5.1' != '0 channels'
49+
assert_equals( src_audioStream.getChannelName(), dst_audioStream.getChannelName() )
50+
assert_equals( src_audioStream.getChannelDescription(), dst_audioStream.getChannelDescription() )
51+
assert_equals( src_audioStream.getStreamId(), dst_audioStream.getStreamId() )
52+
assert_equals( src_audioStream.getCodecId(), dst_audioStream.getCodecId() )
53+
assert_equals( src_audioStream.getSampleRate(), dst_audioStream.getSampleRate() )
54+
assert_equals( src_audioStream.getChannels(), dst_audioStream.getChannels() )
55+
assert_equals( src_audioStream.getBitRate(), dst_audioStream.getBitRate() )
56+
57+
assert_equals( len( src_audioStream.getMetadatas() ), len( dst_audioStream.getMetadatas() ) )
58+
for metadata in range( 0, len( src_audioStream.getMetadatas() ) ):
59+
src_metadata = src_audioStream.getMetadatas()[metadata]
60+
dst_metadata = dst_audioStream.getMetadatas()[metadata]
6161

6262
assert_equals( src_metadata, dst_metadata )
6363

@@ -78,93 +78,93 @@ def testRewrapVideoStream():
7878

7979
# get src file of wrap
8080
src_inputFile = av.InputFile( inputFileName )
81-
src_inputFile.analyse( progress, av.InputFile.eAnalyseLevelFull )
82-
src_properties = src_inputFile.getProperties()
83-
src_videoStream = src_properties.videoStreams[0]
81+
src_inputFile.analyse( progress )
82+
src_properties = src_inputFile.getProperties()
83+
src_videoStream = src_properties.getVideoProperties()[0]
8484

8585
# get dst file of wrap
8686
dst_inputFile = av.InputFile( outputFileName )
87-
dst_inputFile.analyse( progress, av.InputFile.eAnalyseLevelFast )
87+
dst_inputFile.analyse( progress )
8888
dst_properties = dst_inputFile.getProperties()
89-
dst_videoStream = dst_properties.videoStreams[0]
89+
dst_videoStream = dst_properties.getVideoProperties()[0]
9090

9191
# check format
92-
assert_equals( src_properties.formatName, dst_properties.formatName )
93-
assert_equals( src_properties.formatLongName, dst_properties.formatLongName )
94-
assert_equals( src_properties.startTime, dst_properties.startTime )
95-
assert_equals( src_properties.duration, dst_properties.duration )
92+
assert_equals( src_properties.getFormatName(), dst_properties.getFormatName() )
93+
assert_equals( src_properties.getFormatLongName(), dst_properties.getFormatLongName() )
94+
assert_equals( src_properties.getStartTime(), dst_properties.getStartTime() )
95+
assert_equals( src_properties.getDuration(), dst_properties.getDuration() )
9696
deltaBitRateVideo = 500000
97-
assert_almost_equals( src_properties.bitRate, dst_properties.bitRate, delta=deltaBitRateVideo )
98-
assert_equals( src_properties.packetSize, dst_properties.packetSize )
97+
assert_almost_equals( src_properties.getBitRate(), dst_properties.getBitRate(), delta=deltaBitRateVideo )
98+
assert_equals( src_properties.getPacketSize(), dst_properties.getPacketSize() )
9999

100100
# check video stream
101-
assert_equals( src_videoStream.codecName, dst_videoStream.codecName )
102-
assert_equals( src_videoStream.codecLongName, dst_videoStream.codecLongName )
103-
assert_equals( src_videoStream.profileName, dst_videoStream.profileName )
104-
assert_equals( src_videoStream.colorTransfert, dst_videoStream.colorTransfert )
105-
assert_equals( src_videoStream.colorspace, dst_videoStream.colorspace )
106-
assert_equals( src_videoStream.colorRange, dst_videoStream.colorRange )
107-
assert_equals( src_videoStream.colorPrimaries, dst_videoStream.colorPrimaries )
108-
assert_equals( src_videoStream.chromaSampleLocation, dst_videoStream.chromaSampleLocation )
109-
assert_equals( src_videoStream.fieldOrder, dst_videoStream.fieldOrder )
110-
assert_equals( src_videoStream.pixelName, dst_videoStream.pixelName )
111-
assert_equals( src_videoStream.endianess, dst_videoStream.endianess )
112-
assert_equals( src_videoStream.startTimecode, dst_videoStream.startTimecode )
113-
114-
assert_equals( src_videoStream.timeBase.num, dst_videoStream.timeBase.num )
115-
assert_equals( src_videoStream.timeBase.den, dst_videoStream.timeBase.den )
116-
assert_equals( src_videoStream.sar.num, dst_videoStream.sar.num )
117-
assert_equals( src_videoStream.sar.den, dst_videoStream.sar.den )
118-
assert_equals( src_videoStream.dar.num, dst_videoStream.dar.num )
119-
assert_equals( src_videoStream.dar.den, dst_videoStream.dar.den )
101+
assert_equals( src_videoStream.getCodecName(), dst_videoStream.getCodecName() )
102+
assert_equals( src_videoStream.getCodecLongName(), dst_videoStream.getCodecLongName() )
103+
assert_equals( src_videoStream.getProfileName(), dst_videoStream.getProfileName() )
104+
assert_equals( src_videoStream.getColorTransfert(), dst_videoStream.getColorTransfert() )
105+
assert_equals( src_videoStream.getColorspace(), dst_videoStream.getColorspace() )
106+
assert_equals( src_videoStream.getColorRange(), dst_videoStream.getColorRange() )
107+
assert_equals( src_videoStream.getColorPrimaries(), dst_videoStream.getColorPrimaries() )
108+
assert_equals( src_videoStream.getChromaSampleLocation(), dst_videoStream.getChromaSampleLocation() )
109+
assert_equals( src_videoStream.getFieldOrder(), dst_videoStream.getFieldOrder() )
110+
assert_equals( src_videoStream.getPixelName(), dst_videoStream.getPixelName() )
111+
assert_equals( src_videoStream.getEndianess(), dst_videoStream.getEndianess() )
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 )
120120

121-
assert_equals( src_videoStream.streamId, dst_videoStream.streamId )
122-
assert_equals( src_videoStream.codecId, dst_videoStream.codecId )
123-
assert_equals( src_videoStream.bitRate, dst_videoStream.bitRate )
124-
assert_equals( src_videoStream.maxBitRate, dst_videoStream.maxBitRate )
125-
assert_equals( src_videoStream.minBitRate, dst_videoStream.minBitRate )
126-
assert_equals( src_videoStream.ticksPerFrame, dst_videoStream.ticksPerFrame )
127-
assert_equals( src_videoStream.width, dst_videoStream.width )
128-
assert_equals( src_videoStream.height, dst_videoStream.height )
129-
assert_equals( src_videoStream.gopSize, dst_videoStream.gopSize )
130-
assert_equals( src_videoStream.dtgActiveFormat, dst_videoStream.dtgActiveFormat )
131-
assert_equals( src_videoStream.referencesFrames, dst_videoStream.referencesFrames )
132-
assert_equals( src_videoStream.profile, dst_videoStream.profile )
133-
assert_equals( src_videoStream.level, dst_videoStream.level )
134-
assert_equals( src_videoStream.componentsCount, dst_videoStream.componentsCount )
135-
assert_equals( src_videoStream.chromaWidth, dst_videoStream.chromaWidth )
136-
assert_equals( src_videoStream.chromaHeight, dst_videoStream.chromaHeight )
137-
assert_equals( src_videoStream.fps, dst_videoStream.fps )
138-
assert_equals( src_videoStream.hasBFrames, dst_videoStream.hasBFrames )
139-
assert_equals( src_videoStream.indexedColors, dst_videoStream.indexedColors )
140-
assert_equals( src_videoStream.bitWisePacked, dst_videoStream.bitWisePacked )
141-
assert_equals( src_videoStream.hardwareAcceleration, dst_videoStream.hardwareAcceleration )
142-
assert_equals( src_videoStream.notFirstPlane, dst_videoStream.notFirstPlane )
143-
assert_equals( src_videoStream.rgbPixelData, dst_videoStream.rgbPixelData )
144-
assert_equals( src_videoStream.pseudoPaletted, dst_videoStream.pseudoPaletted )
145-
assert_equals( src_videoStream.asAlpha, dst_videoStream.asAlpha )
146-
assert_equals( src_videoStream.isInterlaced, dst_videoStream.isInterlaced )
147-
assert_equals( src_videoStream.topFieldFirst, dst_videoStream.topFieldFirst )
148-
149-
assert_equals( len( src_videoStream.gopStructure ), len( dst_videoStream.gopStructure ) )
150-
for gop in range( 0, len( src_videoStream.gopStructure ) ):
151-
src_gop = src_videoStream.gopStructure[gop]
152-
dst_gop = dst_videoStream.gopStructure[gop]
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+
assert_equals( src_videoStream.getComponentsCount(), dst_videoStream.getComponentsCount() )
135+
assert_equals( src_videoStream.getChromaWidth(), dst_videoStream.getChromaWidth() )
136+
assert_equals( src_videoStream.getChromaHeight(), dst_videoStream.getChromaHeight() )
137+
assert_equals( src_videoStream.getFps(), dst_videoStream.getFps() )
138+
assert_equals( src_videoStream.hasBFrames(), dst_videoStream.hasBFrames() )
139+
assert_equals( src_videoStream.isIndexedColors(), dst_videoStream.isIndexedColors() )
140+
assert_equals( src_videoStream.isBitWisePacked(), dst_videoStream.isBitWisePacked() )
141+
assert_equals( src_videoStream.isHardwareAccelerated(), dst_videoStream.isHardwareAccelerated() )
142+
assert_equals( src_videoStream.isPlanar(), dst_videoStream.isPlanar() )
143+
assert_equals( src_videoStream.isRgbPixelData(), dst_videoStream.isRgbPixelData() )
144+
assert_equals( src_videoStream.isPseudoPaletted(), dst_videoStream.isPseudoPaletted() )
145+
assert_equals( src_videoStream.hasAlpha(), dst_videoStream.hasAlpha() )
146+
assert_equals( src_videoStream.isInterlaced(), dst_videoStream.isInterlaced() )
147+
assert_equals( src_videoStream.isTopFieldFirst(), dst_videoStream.isTopFieldFirst() )
148+
149+
assert_equals( len( src_videoStream.getGopStructure() ), len( dst_videoStream.getGopStructure() ) )
150+
for gop in range( 0, len( src_videoStream.getGopStructure() ) ):
151+
src_gop = src_videoStream.getGopStructure()[gop]
152+
dst_gop = dst_videoStream.getGopStructure()[gop]
153153

154154
assert_equals( src_gop, dst_gop )
155155

156-
assert_equals( len( src_videoStream.channels ), len( dst_videoStream.channels ) )
157-
for channel in range( 0, len( src_videoStream.channels ) ):
158-
src_channel = src_videoStream.channels[channel]
159-
dst_channel = dst_videoStream.channels[channel]
156+
assert_equals( len( src_videoStream.getChannels() ), len( dst_videoStream.getChannels() ) )
157+
for channel in range( 0, len( src_videoStream.getChannels() ) ):
158+
src_channel = src_videoStream.getChannels()[channel]
159+
dst_channel = dst_videoStream.getChannels()[channel]
160160

161161
assert_equals( src_channel.id, dst_channel.id )
162162
assert_equals( src_channel.chromaHeight, dst_channel.chromaHeight )
163163
assert_equals( src_channel.bitStep, dst_channel.bitStep )
164164

165-
assert_equals( len( src_videoStream.metadatas ), len( dst_videoStream.metadatas ) )
166-
for metadata in range( 0, len( src_videoStream.metadatas ) ):
167-
src_metadata = src_videoStream.metadatas[metadata]
168-
dst_metadata = dst_videoStream.metadatas[metadata]
165+
assert_equals( len( src_videoStream.getMetadatas() ), len( dst_videoStream.getMetadatas() ) )
166+
for metadata in range( 0, len( src_videoStream.getMetadatas() ) ):
167+
src_metadata = src_videoStream.getMetadatas()[metadata]
168+
dst_metadata = dst_videoStream.getMetadatas()[metadata]
169169

170170
assert_equals( src_metadata, dst_metadata )

0 commit comments

Comments
 (0)