Sophie

Sophie

distrib > Mageia > 3 > i586 > media > core-release-src > by-pkgid > f4399398f501a3590162800f2a663473 > files > 2

gnac-0.2.4.1-5.mga3.src.rpm

diff -p -up gnac-0.2.4.1/configure.ac.nofaac gnac-0.2.4.1/configure.ac
--- gnac-0.2.4.1/configure.ac.nofaac	2012-04-22 14:09:01.000000000 +0200
+++ gnac-0.2.4.1/configure.ac	2012-12-06 00:08:36.198952786 +0100
@@ -103,7 +103,7 @@ AC_SUBST(GSTREAMER_CFLAGS)
 AC_SUBST(GSTREAMER_LIBS)
 
 dnl Find the GStreamer elements we use, and warn if they are not present
-AM_GST_ELEMENT_CHECK(faac, , AC_MSG_WARN([The 'faac' element was not found. This will cause encoding to AAC to fail.]))
+AM_GST_ELEMENT_CHECK(voaacenc, , AC_MSG_WARN([The 'voaacenc' element was not found. This will cause encoding to AAC to fail.]))
 AM_GST_ELEMENT_CHECK(flacenc, , AC_MSG_WARN([The 'flacenc' element was not found. This will cause encoding to FLAC to fail.]))
 AM_GST_ELEMENT_CHECK(lame, , AC_MSG_WARN([The 'lame' element was not found. This will cause encoding to MP3 to fail.]))
 AM_GST_ELEMENT_CHECK(wavenc, , AC_MSG_WARN([The 'wavenc' element was not found. This will cause encoding to WAV to fail.]))
diff -p -up gnac-0.2.4.1/data/profiles/default/CD_Quality,_AAC.xml.in.nofaac gnac-0.2.4.1/data/profiles/default/CD_Quality,_AAC.xml.in
--- gnac-0.2.4.1/data/profiles/default/CD_Quality,_AAC.xml.in.nofaac	2012-01-25 17:27:37.000000000 +0100
+++ gnac-0.2.4.1/data/profiles/default/CD_Quality,_AAC.xml.in	2012-12-06 00:07:28.777381777 +0100
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audio-profile>
   <base>
-    <format-id>faac-aac</format-id>
+    <format-id>voaacenc-aac</format-id>
     <format-name>MP4/AAC</format-name>
     <format-extension>m4a</format-extension>
     <_name>CD Quality, AAC</_name>
     <_description>Used for converting to CD-quality audio, but with the lossy AAC codec. Use this for preparing files for copying to devices that only support the AAC codec. Note that using this format may be illegal in your jurisdiction; contact your lawyer for advice.</_description>
     <channels>2</channels>
     <sample-rate>44100</sample-rate>
-    <pipeline>audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert ! faac bitrate=128000 outputformat=1</pipeline>
+    <pipeline>audioconvert ! audio/x-raw-float, rate=44100, channels=2 ! audioconvert ! voaacenc bitrate=128000 ! mp4mux</pipeline>
   </base>
   <format-specific>
     <bitrate>128000</bitrate>
diff -p -up gnac-0.2.4.1/data/profiles/aac.xml.in.nofaac gnac-0.2.4.1/data/profiles/aac.xml.in
--- gnac-0.2.4.1/data/profiles/aac.xml.in.nofaac	2012-01-26 01:28:46.000000000 +0100
+++ gnac-0.2.4.1/data/profiles/aac.xml.in	2012-12-06 01:56:42.683853101 +0100
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <audio-profiles>
   <profiles>
-    <profile id="faac-aac">
+    <profile id="voaacenc-aac">
       <name>MP4/AAC</name>
       <_description>A codec designed to be the successor of the MP3 format, providing greater sound quality and transparency than MP3 files coded at the same bit rate.</_description>
-      <gst-plugin-name>faac</gst-plugin-name>
+      <gst-plugin-name>voaacenc</gst-plugin-name>
       <output-file-extension>m4a</output-file-extension>
       <mimetype>audio/x-m4a</mimetype>
       <mimetype>audio/mp4</mimetype>
       <pipeline>
-        <process id="gstreamer-audio">faac</process>
+        <process id="gstreamer-audio">voaacenc</process>
         <process id="multiplexer">
-          <value value="ffmux_mp4">...</value>
+          <value value="mp4mux">ISO MP4 container</value>
 		    </process>
         <variable id="bitrate" type="combo">
           <name>Bitrate</name>
@@ -37,31 +37,13 @@
             <value value="320000">320 Kbps</value>
           </possible-values>
         </variable>
-       <variable id="profile" type="combo">
-          <name>Profile</name>
-          <_description>AAC takes a modular approach to encoding. There are four default profiles using different tools: (LC) -> the simplest and most widely used and supported; (MAIN) -> like the LC profile, with the addition of backwards prediction; (SRS) -> a.k.a. Scalable Sample Rate (MPEG-4 AAC-SSR); (LTP) -> an improvement of the MAIN profile using a forward predictor with lower computational complexity.</_description>
-          <variable-name>profile</variable-name>
-          <default-value>1</default-value>
-          <possible-values>
-            <value value="1">Main (MAIN)</value>
-            <value value="2">Low complexity (LC)</value>
-            <value value="3">Scalable sampling rate (SSR)</value>
-            <value value="4">Long term prediction (LTP)</value>
-          </possible-values>
-        </variable>
-       <variable id="tns" type="check">
-          <name>Temporal noise shaping</name>
-          <_description>Conventional transform coding schemes often encounter problems with signals that vary heavily over time, especially speech signals. Temporal noise shaping can be viewed as a postprocessing step which goal is to overcome this limitation.</_description>
-          <variable-name>tns</variable-name>
-          <default-value>false</default-value>
-        </variable>
-        <variable id="outputformat" type="combo">
+        <variable id="stream-format" type="combo">
           <name>Output format</name>
-          <variable-name>outputformat</variable-name>
+          <variable-name>stream-format</variable-name>
           <default-value>1</default-value>
           <possible-values>
-            <_value value="1">ADTS headers</_value>
-            <_value value="0">Raw AAC</_value>
+            <_value value="adts">ADTS headers</_value>
+            <_value value="raw">Raw AAC</_value>
           </possible-values>
         </variable>
       </pipeline>
diff -p -up gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c.nofaac gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c
--- gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c.nofaac	2012-02-28 12:26:06.000000000 +0100
+++ gnac-0.2.4.1/src/profiles/formats/gnac-profiles-aac.c	2012-12-06 02:34:48.788850618 +0100
@@ -34,9 +34,6 @@
   AudioProfileGeneric *generic;
 
   gchar *bitrate;
-  gchar *outputformat;
-  gchar *profile;
-  gchar *tns;
 }
 AudioProfileAAC;
 
@@ -68,23 +65,6 @@
   gnac_profiles_utils_init_widget(&aac_bfi, "combo-bitrate",
       "//variable[@id='bitrate']");
 
-  // Profile
-  widget = gnac_profiles_utils_init_widget(&aac_bfi, "combo-profile",
-      "//variable[@id='profile']");
-  widget2 = gnac_profiles_utils_get_widget(&aac_bfi, "label-profile"),
-  gnac_profiles_utils_add_description_tooltip(&aac_bfi,
-      "//variable[@id='profile']/description", widget, widget2, NULL);
-  
-  // Tns
-  widget = gnac_profiles_utils_init_widget(&aac_bfi, "checkbutton-tns",
-      "//variable[@id='tns']");
-  gnac_profiles_utils_add_description_tooltip(&aac_bfi,
-      "//variable[@id='tns']/description", widget, NULL);
-  
-  // Outputformat
-  gnac_profiles_utils_init_widget(&aac_bfi, "combo-outputformat",
-      "//variable[@id='outputformat']");
-
   gnac_profiles_xml_engine_free_doc_xpath(aac_bfi.doc);
   aac_bfi.doc = NULL;
 
@@ -97,9 +77,11 @@
 {
   gchar *pipeline = gnac_profiles_default_generate_pipeline(&aac_bfi);
   pipeline = gnac_profiles_utils_add_properties(pipeline, &aac_bfi,
-      "combo-bitrate", "combo-outputformat",
-      "combo-profile", "checkbutton-tns", NULL);
+      "combo-bitrate", NULL);
   
+  pipeline = gnac_profiles_utils_add_pipe(pipeline,
+      aac_bfi.pipeline_multiplexers);
+
   gnac_profiles_properties_update_textbuffer(pipeline);
 
   g_free(aac_bfi.pipeline);
@@ -113,8 +92,7 @@
 {
   gnac_profiles_default_reset_ui(&aac_bfi);
   gnac_profiles_utils_reset_values(&aac_bfi,
-      "combo-bitrate", "combo-outputformat",
-      "combo-profile", "checkbutton-tns", NULL);
+      "combo-bitrate", NULL);
 }
 
 
@@ -129,9 +107,6 @@
   AudioProfileAAC *profile = (AudioProfileAAC *) data;
   gnac_profiles_utils_set_values(&aac_bfi,
       "combo-bitrate", profile->bitrate,
-      "combo-outputformat", profile->outputformat,
-      "combo-profile", profile->profile,
-      "checkbutton-tns", profile->tns,
       NULL);
 }
 
@@ -153,9 +128,6 @@
   gnac_profiles_utils_free_audio_profile_generic(profile->generic); 
 
   g_free(profile->bitrate);
-  g_free(profile->outputformat);
-  g_free(profile->profile);
-  g_free(profile->tns);
   g_free(profile);
 }
 
@@ -171,9 +143,6 @@
 
   gnac_profiles_utils_get_values_and_set(&aac_bfi,
       "combo-bitrate", &profile->bitrate,
-      "combo-outputformat", &profile->outputformat,
-      "combo-profile", &profile->profile,
-      "checkbutton-tns", &profile->tns,
       NULL);
 
   return profile;
@@ -196,9 +165,6 @@
   XMLDoc *doc = gnac_profiles_default_save_profile(profile->generic, &aac_bfi);
   gnac_profiles_xml_engine_add_values(doc,
       "bitrate", profile->bitrate,
-      "outputformat", profile->outputformat,
-      "profile", profile->profile,
-      "tns", profile->tns,
       NULL);
   gnac_profiles_xml_engine_save_doc(doc, profile->generic->name);
 
@@ -216,9 +182,6 @@
   gnac_profiles_utils_load_saved_profile(doc,
       "/audio-profile/format-specific/",
       "bitrate", &profile->bitrate,
-      "outputformat", &profile->outputformat,
-      "profile", &profile->profile,
-      "tns", &profile->tns,
       NULL);
   
   return profile;
@@ -230,8 +193,7 @@
 {
   gnac_profiles_default_clean_up(&aac_bfi);
   gnac_profiles_utils_free_values(&aac_bfi,
-      "combo-bitrate", "combo-outputformat",
-      "combo-profile", "checkbutton-tns", NULL);
+      "combo-bitrate", NULL);
   gnac_profiles_utils_free_basic_format_info(&aac_bfi);
 }
 
diff -p -up gnac-0.2.4.1/data/profiles/ui/gnac-profiles-aac.xml.nofaac gnac-0.2.4.1/data/profiles/ui/gnac-profiles-aac.xml
--- gnac-0.2.4.1/data/profiles/ui/gnac-profiles-aac.xml.nofaac	2012-04-22 14:09:01.000000000 +0200
+++ gnac-0.2.4.1/data/profiles/ui/gnac-profiles-aac.xml	2012-12-06 02:36:25.814720841 +0100
@@ -26,104 +26,6 @@
                     <property name="row_spacing">5</property>
                     <property name="column_spacing">10</property>
                     <child>
-                      <object class="GtkLabel" id="label-outputformat">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Output format</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox-outputformat">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkComboBoxText" id="combo-outputformat">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <signal name="changed" handler="gnac_profiles_aac_generate_pipeline" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="pack_type">end</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">3</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label-profile">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Profile</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox-profile">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkComboBoxText" id="combo-profile">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <signal name="changed" handler="gnac_profiles_aac_generate_pipeline" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="pack_type">end</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">1</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton-tns">
-                        <property name="label" translatable="yes">Temporal noise shaping</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="use_action_appearance">False</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="gnac_profiles_aac_generate_pipeline" swapped="no"/>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">2</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
                       <placeholder/>
                     </child>
                     <child>

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional