Attachment 108465 Details for Bug 149305 – mediatomb-0.12.1.new.diff.txt

mediatomb-0.12.1.new.diff.txt

mediatomb-0.12.1.new.diff.txt (text/plain; x-unix-mode=0644), 5.86 KB, created by Douglas Carmichael on 2010-08-05 08:05:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Douglas Carmichael

Created: 2010-08-05 08:05:05 UTC

Size: 5.86 KB

patch

obsolete

>diff -ruN mediatomb.orig/Makefile mediatomb/Makefile
>--- mediatomb.orig/Makefile	2010-08-04 20:02:43.000000000 -0500
>+++ mediatomb/Makefile	2010-08-04 19:48:57.000000000 -0500
>@@ -185,6 +185,9 @@
> 	@if [ ! -f ${PREFIX}/etc/mediatomb/config.xml ]; then \
> 		${CP} -p ${PREFIX}/etc/mediatomb/config.xml.dist ${PREFIX}/etc/mediatomb/config.xml ; \
> 	fi
>+	@${CHGRP} ${MEDIATOMB_GROUP} ${PREFIX}/bin/mediatomb
>+	@${CHMOD} a-x ${PREFIX}/bin/mediatomb
>+	@${CHMOD} g+x ${PREFIX}/bin/mediatomb
> 	@${MKDIR} -m ${MEDIATOMB_MASK} -p ${MEDIATOMB_DIR}
> 	@${CHOWN} ${MEDIATOMB_USER}:${MEDIATOMB_GROUP} ${MEDIATOMB_DIR}
> 
>diff -ruN mediatomb.orig/files/config.xml.dist.in mediatomb/files/config.xml.dist.in
>--- mediatomb.orig/files/config.xml.dist.in	2010-08-04 20:02:43.000000000 -0500
>+++ mediatomb/files/config.xml.dist.in	2010-08-05 02:02:27.000000000 -0500
>@@ -67,6 +67,16 @@
>         <map from="m3u" to="audio/x-mpegurl"/>
>         <map from="pls" to="audio/x-scpls"/>
>         <map from="flv" to="video/x-flv"/>
>+	
>+	
>+	
>+	
>+	
>+	
>+	
>+	
>+	
>+	
>         
>         
>         
>@@ -91,27 +101,61 @@
>   </import>
>   <transcoding enabled="no">
>     <mimetype-profile-mappings>
>-      <transcode mimetype="video/x-flv" using="vlcmpeg"/>
>-      <transcode mimetype="application/ogg" using="vlcmpeg"/>
>-      <transcode mimetype="application/ogg" using="oggflac2raw"/>
>-      <transcode mimetype="audio/x-flac" using="oggflac2raw"/>
>+      <transcode mimetype="video/x-flv" using="video-common"/>
>+      <transcode mimetype="application/ogg" using="video-common"/>
>+      <transcode mimetype="application/ogg" using="audio-ffmpeg-wav"/>
>+      <transcode mimetype="audio/x-flac" using="audio-ffmpeg-wav"/>
>+      
>+      
>+      
>     </mimetype-profile-mappings>
>-    <profiles>
>-      <profile name="oggflac2raw" enabled="no" type="external">
>+    <profiles> 
>+      
>+      <profile name="audio-mod-xmp-wav" enabled="no" type="external">
>+        <mimetype>audio/x-wav</mimetype>
>+        <accept-url>no</accept-url>
>+        <first-resource>no</first-resource>
>+        <hide-original-resource>yes</hide-original-resource>
>+        <agent command="/usr/local/bin/xmp" arguments="-d wav -o %out %in"/>
>+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
>+      </profile>
>+      
>+      <profile name="audio-mod-xmp-raw" enabled="no" type="external">
>         <mimetype>audio/L16</mimetype>
>         <accept-url>no</accept-url>
>+        <first-resource>no</first-resource>
>+        <hide-original-resource>yes</hide-original-resource>
>+        <sample-frequency>44100</sample-frequency>
>+        <channels>2</channels>
>+        <agent command="/usr/local/bin/xmp" arguments="-d file -Dbig-endian -b 16 -f 44100 -o %out %in"/>
>+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
>+      </profile>      
>+      <profile name="audio-ffmpeg-wav" enabled="yes" type="external">
>+        <mimetype>audio/x-wav</mimetype>
>+        <accept-url>no</accept-url>
>+        <first-resource>no</first-resource>        
>+	<hide-original-resource>yes</hide-original-resource>
>+        <agent command="/usr/local/bin/ffmpeg" arguments="-i %in -f wav -y %out"/>
>+        <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
>+      </profile>
>+      <profile name="audio-ffmpeg-raw" enabled="no" type="external">
>+        <mimetype>audio/L16</mimetype>
>         <first-resource>yes</first-resource>
>-        <accept-ogg-theora>no</accept-ogg-theora>
>-        <agent command="ogg123" arguments="-d raw -f %out %in"/>
>+        <accept-url>no</accept-url>
>+        <sample-frequency>44100</sample-frequency>
>+        <audio-channels>2</audio-channels>
>+        <hide-original-resource>yes</hide-original-resource>
>+        <agent command="/usr/local/bin/ffmpeg" arguments="-i %in -ac 2 -ar 44100 -y -f s16be %out"/>
>         <buffer size="1048576" chunk-size="131072" fill-size="262144"/>
>       </profile>
>-      <profile name="vlcmpeg" enabled="no" type="external">
>+      <profile name="video-common" enabled="yes" type="external">
>         <mimetype>video/mpeg</mimetype>
>-        <accept-url>yes</accept-url>
>+        <accept-url>no</accept-url>
>         <first-resource>yes</first-resource>
>+        <hide-original-resource>yes</hide-original-resource>
>         <accept-ogg-theora>yes</accept-ogg-theora>
>-        <agent command="vlc" arguments="-I dummy %in --sout #transcode{venc=ffmpeg,vcodec=mp2v,vb=4096,fps=25,aenc=ffmpeg,acodec=mpga,ab=192,samplerate=44100,channels=2}:standard{access=file,mux=ps,dst=%out} vlc:quit"/>
>-        <buffer size="14400000" chunk-size="512000" fill-size="120000"/>
>+        <agent command="/usr/local/bin/ffmpeg" arguments="-i %in -f mpegts -sameq -vb 4096k -r 25 -ac 2 -ar 48000 -ab 192k -async 2 -threads 2 -y %out"/>
>+        <buffer size="10485760" chunk-size="262144" fill-size="524288"/>
>       </profile>
>     </profiles>
>   </transcoding>

Actions: View

Attachments on bug 149305: 108464 | 108465