[MediaWiki-commits] [Gerrit] Allow to upload WAV files with 32 bit float uncmopressed audio - change (mediawiki...TimedMediaHandler)

2014-01-18 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Allow to upload WAV files with 32 bit float uncmopressed audio
..


Allow to upload WAV files with 32 bit float uncmopressed audio

This is also an uncompressed audio, but the name that getID3 returns
is different.

When playing such a file mplayer shows:

Opening audio decoder: [pcm] Uncompressed PCM audio decoderAUDIO: 44100
Hz, 2 ch, floatle, 2822.4 kbit/100.00% (ratio: 352800->352800)
Selected audio codec: [pcm] afm: pcm (Uncompressed PCM)

Bug: 60015
Change-Id: I93dc2a3fe87067411d2719a9f981024c074d0cbc
---
M handlers/WAVHandler/WAVHandler.php
1 file changed, 7 insertions(+), 2 deletions(-)

Approvals:
  Gilles: Looks good to me, but someone else must approve
  Brian Wolff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/handlers/WAVHandler/WAVHandler.php 
b/handlers/WAVHandler/WAVHandler.php
index 8e1c2c7..9fae12b 100755
--- a/handlers/WAVHandler/WAVHandler.php
+++ b/handlers/WAVHandler/WAVHandler.php
@@ -22,11 +22,16 @@
 
function verifyUpload( $filename ) {
$metadata = $this->getID3( $filename );
-   if( isset( $metadata['audio'] ) && 
$metadata['audio']['dataformat'] == 'wav' && $metadata['audio']['codec'] == 
'Pulse Code Modulation (PCM)') {
+
+   if(
+   isset( $metadata['audio'] )
+   && $metadata['audio']['dataformat'] == 'wav'
+   && ( $metadata['audio']['codec'] == 'Pulse Code 
Modulation (PCM)' || $metadata['audio']['codec'] == 'IEEE Float' )
+   ){
return Status::newGood();
}
-   return Status::newFatal( 'timedmedia-wav-pcm-required' );
 
+   return Status::newFatal( 'timedmedia-wav-pcm-required' );
}
/**
 * @param $file File

-- 
To view, visit https://gerrit.wikimedia.org/r/103402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I93dc2a3fe87067411d2719a9f981024c074d0cbc
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Michał Łazowik 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: Gilles 
Gerrit-Reviewer: J 
Gerrit-Reviewer: Mdale 
Gerrit-Reviewer: Rahul21 
Gerrit-Reviewer: TheDJ 
Gerrit-Reviewer: Tim Starling 
Gerrit-Reviewer: jenkins-bot

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Allow to upload WAV files with 32 bit float uncmopressed audio - change (mediawiki...TimedMediaHandler)

2013-12-23 Thread Code Review 
Michał Łazowik has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/103402


Change subject: Allow to upload WAV files with 32 bit float uncmopressed audio
..

Allow to upload WAV files with 32 bit float uncmopressed audio

This is also an uncompressed audio, but the name that getID3 returns
is different.

When playing such a file mplayer shows:

Opening audio decoder: [pcm] Uncompressed PCM audio decoderAUDIO: 44100
Hz, 2 ch, floatle, 2822.4 kbit/100.00% (ratio: 352800->352800)
Selected audio codec: [pcm] afm: pcm (Uncompressed PCM)

Change-Id: I93dc2a3fe87067411d2719a9f981024c074d0cbc
---
M handlers/WAVHandler/WAVHandler.php
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler 
refs/changes/02/103402/1

diff --git a/handlers/WAVHandler/WAVHandler.php 
b/handlers/WAVHandler/WAVHandler.php
index 8e1c2c7..9fae12b 100755
--- a/handlers/WAVHandler/WAVHandler.php
+++ b/handlers/WAVHandler/WAVHandler.php
@@ -22,11 +22,16 @@
 
function verifyUpload( $filename ) {
$metadata = $this->getID3( $filename );
-   if( isset( $metadata['audio'] ) && 
$metadata['audio']['dataformat'] == 'wav' && $metadata['audio']['codec'] == 
'Pulse Code Modulation (PCM)') {
+
+   if(
+   isset( $metadata['audio'] )
+   && $metadata['audio']['dataformat'] == 'wav'
+   && ( $metadata['audio']['codec'] == 'Pulse Code 
Modulation (PCM)' || $metadata['audio']['codec'] == 'IEEE Float' )
+   ){
return Status::newGood();
}
-   return Status::newFatal( 'timedmedia-wav-pcm-required' );
 
+   return Status::newFatal( 'timedmedia-wav-pcm-required' );
}
/**
 * @param $file File

-- 
To view, visit https://gerrit.wikimedia.org/r/103402
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I93dc2a3fe87067411d2719a9f981024c074d0cbc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Michał Łazowik 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits