Skip to content

OutputFile: copy channel_layout for each audio stream added #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 19, 2015
Merged

OutputFile: copy channel_layout for each audio stream added #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4f2d8f
OutputFile: copy channel_layout for each audio stream added
Oct 19, 2015
2d06c07
pyTest: check channel_layout when rewrap an audio stream
Oct 19, 2015
e947d9e
pyTest: check video bitrate when transcode to dnxhd
Oct 19, 2015
15c22fd
pyTest: check bitrate with a relative delta when rewrap
Oct 19, 2015
e71368c
pyTest: do not check channel_layout when transcode audio
Oct 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/AvTranscoder/file/OutputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ IOutputStream& OutputFile::addAudioStream( const AudioCodec& audioDesc )

stream.codec->sample_rate = audioDesc.getAVCodecContext().sample_rate;
stream.codec->channels = audioDesc.getAVCodecContext().channels;
stream.codec->channel_layout = audioDesc.getAVCodecContext().channel_layout;
stream.codec->sample_fmt = audioDesc.getAVCodecContext().sample_fmt;
stream.codec->frame_size = audioDesc.getAVCodecContext().frame_size;

Expand Down
11 changes: 4 additions & 7 deletions test/pyTest/testTranscoderRewrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def testRewrapAudioStream():
ouputFile = av.OutputFile( outputFileName )

transcoder = av.Transcoder( ouputFile )
transcoder.add( inputFileName, 0, "" )
transcoder.add( inputFileName, 0 )
transcoder.process( progress )

# get dst file of wrap
Expand All @@ -44,17 +44,14 @@ def testRewrapAudioStream():
assert_equals( src_properties.getFormatLongName(), dst_properties.getFormatLongName() )
assert_equals( src_properties.getStartTime(), dst_properties.getStartTime() )
assert_equals( src_properties.getDuration(), dst_properties.getDuration() )
deltaBitRateAudio = 10
deltaBitRateAudio = dst_properties.getBitRate() * 0.01
assert_almost_equals( src_properties.getBitRate(), dst_properties.getBitRate(), delta=deltaBitRateAudio )
assert_equals( src_properties.getPacketSize(), dst_properties.getPacketSize() )

# check audio properties
src_propertiesMap = src_audioStream.getPropertiesAsMap()
dst_propertiesMap = dst_audioStream.getPropertiesAsMap()
for key in src_propertiesMap:
# @todo: don't skip channel layout
if key == "channelLayout":
continue
assert_equals( src_propertiesMap[key], dst_propertiesMap[key] )

def testRewrapVideoStream():
Expand All @@ -74,7 +71,7 @@ def testRewrapVideoStream():
ouputFile = av.OutputFile( outputFileName )

transcoder = av.Transcoder( ouputFile )
transcoder.add( inputFileName, 0, "" )
transcoder.add( inputFileName, 0 )
transcoder.process( progress )

# get dst file of wrap
Expand All @@ -88,7 +85,7 @@ def testRewrapVideoStream():
assert_equals( src_properties.getFormatLongName(), dst_properties.getFormatLongName() )
assert_equals( src_properties.getStartTime(), dst_properties.getStartTime() )
assert_equals( src_properties.getDuration(), dst_properties.getDuration() )
deltaBitRateVideo = 500000
deltaBitRateVideo = dst_properties.getBitRate() * 0.15
assert_almost_equals( src_properties.getBitRate(), dst_properties.getBitRate(), delta=deltaBitRateVideo )
assert_equals( src_properties.getPacketSize(), dst_properties.getPacketSize() )

Expand Down
4 changes: 0 additions & 4 deletions test/pyTest/testTranscoderTranscodeAudioWave.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ def testTranscodeWave24b48k5_1():
assert_equals( "s32", dst_audioStream.getSampleFormatName() )
assert_equals( "signed 32 bits", dst_audioStream.getSampleFormatLongName() )
assert_equals( 48000, dst_audioStream.getSampleRate() )
# assert_equals( "1 channels", dst_audioStream.getChannelLayout() ) # '1 channels' != '0 channels'
assert_equals( 6, dst_audioStream.getChannels() )

def testTranscodeWave24b48kstereo():
Expand Down Expand Up @@ -68,7 +67,6 @@ def testTranscodeWave24b48kstereo():
assert_equals( "s32", dst_audioStream.getSampleFormatName() )
assert_equals( "signed 32 bits", dst_audioStream.getSampleFormatLongName() )
assert_equals( 48000, dst_audioStream.getSampleRate() )
# assert_equals( "1 channels", dst_audioStream.getChannelLayout() ) # '1 channels' != '0 channels'
assert_equals( 2, dst_audioStream.getChannels() )

def testTranscodeWave24b48kmono():
Expand Down Expand Up @@ -97,7 +95,6 @@ def testTranscodeWave24b48kmono():
assert_equals( "s32", dst_audioStream.getSampleFormatName() )
assert_equals( "signed 32 bits", dst_audioStream.getSampleFormatLongName() )
assert_equals( 48000, dst_audioStream.getSampleRate() )
# assert_equals( "1 channels", dst_audioStream.getChannelLayout() ) # '1 channels' != '0 channels'
assert_equals( 1, dst_audioStream.getChannels() )

def testTranscodeWave16b48kmono():
Expand Down Expand Up @@ -126,5 +123,4 @@ def testTranscodeWave16b48kmono():
assert_equals( "s16", dst_audioStream.getSampleFormatName() )
assert_equals( "signed 16 bits", dst_audioStream.getSampleFormatLongName() )
assert_equals( 48000, dst_audioStream.getSampleRate() )
# assert_equals( "1 channels", dst_audioStream.getChannelLayout() ) # '1 channels' != '0 channels'
assert_equals( 1, dst_audioStream.getChannels() )
13 changes: 9 additions & 4 deletions test/pyTest/testTranscoderTranscodeVideo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ def testTranscodeDnxhd120():

assert_equals( "dnxhd", dst_videoStream.getCodecName() )
assert_equals( "VC3/DNxHD", dst_videoStream.getCodecLongName() )
# assert_equals( 120000000, dst_videoStream.getBitRate() ) # 120000000 != 0L
expectedBitRate = 120000000
deltaBitRate = expectedBitRate * 0.05
assert_almost_equals( expectedBitRate, dst_videoStream.getBitRate(), delta=deltaBitRate )
assert_equals( "yuv422p", dst_videoStream.getPixelProperties().getPixelName() )
# assert_equals( 1, dst_videoStream.getGopSize() ) # 1 != 12L

Expand All @@ -63,7 +65,9 @@ def testTranscodeDnxhd185():

assert_equals( "dnxhd", dst_videoStream.getCodecName() )
assert_equals( "VC3/DNxHD", dst_videoStream.getCodecLongName() )
# assert_equals( 185000000, dst_videoStream.getBitRate() ) # 185000000 != 0L
expectedBitRate = 185000000
deltaBitRate = expectedBitRate * 0.05
assert_almost_equals( expectedBitRate, dst_videoStream.getBitRate(), delta=deltaBitRate )
assert_equals( "yuv422p", dst_videoStream.getPixelProperties().getPixelName() )
# assert_equals( 1, dst_videoStream.getGopSize() ) # 1 != 12L

Expand All @@ -90,7 +94,9 @@ def testTranscodeDnxhd185x():

assert_equals( "dnxhd", dst_videoStream.getCodecName() )
assert_equals( "VC3/DNxHD", dst_videoStream.getCodecLongName() )
# assert_equals( 185000000, dst_videoStream.getBitRate() ) # 185000000 != 0L
expectedBitRate = 185000000
deltaBitRate = expectedBitRate * 0.05
assert_almost_equals( expectedBitRate, dst_videoStream.getBitRate(), delta=deltaBitRate )
assert_equals( "yuv422p10le", dst_videoStream.getPixelProperties().getPixelName() )
# assert_equals( 1, dst_videoStream.getGopSize() ) # 1 != 12L

Expand Down Expand Up @@ -125,4 +131,3 @@ def testTranscodeYUV420():

assert_equals( "mpeg2video", dst_videoStream.getCodecName() )
assert_equals( "yuv420p", dst_videoStream.getPixelProperties().getPixelName() )