Skip to content

Commit 08f233a

Browse files
committed
updated video/audio codec support check
1 parent 25ab4ff commit 08f233a

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

src/main/java/de/bitzeche/video/transcoding/zencoder/job/ZencoderOutput.java

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,17 +456,20 @@ public void setBufferSize(int size) {
456456
}
457457

458458
public void setAudioCodec(ZencoderAudioCodec codec) {
459-
if ((videoCodec.equals(ZencoderVideoCodec.h264) || videoCodec
460-
.equals(ZencoderVideoCodec.vp6))
461-
&& !(codec.equals(ZencoderAudioCodec.mp3) || codec
462-
.equals(ZencoderAudioCodec.aac))) {
459+
if ((videoCodec.equals(ZencoderVideoCodec.h264) || videoCodec.equals(ZencoderVideoCodec.vp6)
460+
|| videoCodec.equals(ZencoderVideoCodec.mpeg4))
461+
&& !(codec.equals(ZencoderAudioCodec.mp3) || codec.equals(ZencoderAudioCodec.aac))) {
463462
throw new IllegalArgumentException(
464-
"H264 and VP6 only support MP3 or AAC");
463+
"H264, MPEG-4 and VP6 only support MP3 or AAC");
465464
} else if ((videoCodec.equals(ZencoderVideoCodec.theora) || videoCodec
466465
.equals(ZencoderVideoCodec.vp8))
467466
&& !codec.equals(ZencoderAudioCodec.vorbis)) {
468467
throw new IllegalArgumentException(
469-
"H264 and VP8 only support MP3 or AAC");
468+
"Theora and VP8 only support Vorbis");
469+
} else if (videoCodec.equals(ZencoderVideoCodec.wmv)
470+
&& !(codec.equals(ZencoderAudioCodec.wma) || codec.equals(ZencoderAudioCodec.mp3))) {
471+
throw new IllegalArgumentException(
472+
"WMV only support WMA and MP3");
470473
}
471474
this.audioCodec = codec;
472475
}

0 commit comments

Comments
 (0)