From 9940ae090edd7fc0c67af3a099b6c4d8ed2d8b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.net>
Date: Thu, 28 Feb 2013 20:09:29 +0000
Subject: [PATCH] tests: update some element names for 1.0

---
 tests/check/elements/mxfmux.c | 18 +++++++++---------
 tests/check/pipelines/mxf.c   | 18 +++++++++---------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/tests/check/elements/mxfmux.c b/tests/check/elements/mxfmux.c
index 974c68251e..b12dd91977 100644
--- a/tests/check/elements/mxfmux.c
+++ b/tests/check/elements/mxfmux.c
@@ -31,9 +31,9 @@ get_mpeg2enc_element_name (void)
   if ((factory = gst_element_factory_find ("mpeg2enc"))) {
     gst_object_unref (factory);
     return "mpeg2enc";
-  } else if ((factory = gst_element_factory_find ("ffenc_mpeg2video"))) {
+  } else if ((factory = gst_element_factory_find ("avenc_mpeg2video"))) {
     gst_object_unref (factory);
-    return "ffenc_mpeg2video";
+    return "avenc_mpeg2video";
   } else {
     return NULL;
   }
@@ -161,7 +161,7 @@ GST_START_TEST (test_jpeg2000_alaw)
   gchar *pipeline;
   GstElementFactory *factory = NULL;
 
-  if ((factory = gst_element_factory_find ("jp2kenc")) == NULL)
+  if ((factory = gst_element_factory_find ("openjpegenc")) == NULL)
     return;
   gst_object_unref (factory);
   if ((factory = gst_element_factory_find ("alawenc")) == NULL)
@@ -170,7 +170,7 @@ GST_START_TEST (test_jpeg2000_alaw)
 
   pipeline = g_strdup_printf ("videotestsrc num-buffers=250 ! "
       "video/x-raw,framerate=25/1 ! "
-      "jp2kenc ! "
+      "openjpegenc ! "
       "mxfmux name=mux ! "
       "fakesink  "
       "audiotestsrc num-buffers=250 ! " "audioconvert ! " "alawenc ! " "mux. ");
@@ -186,24 +186,24 @@ GST_START_TEST (test_dnxhd_mp3)
   gchar *pipeline;
   GstElementFactory *factory = NULL;
 
-  if ((factory = gst_element_factory_find ("ffenc_dnxhd")) == NULL)
+  if ((factory = gst_element_factory_find ("avenc_dnxhd")) == NULL)
     return;
   gst_object_unref (factory);
-  if ((factory = gst_element_factory_find ("lame")) == NULL)
+  if ((factory = gst_element_factory_find ("lamemp3enc")) == NULL)
     return;
   gst_object_unref (factory);
-  if ((factory = gst_element_factory_find ("mp3parse")) == NULL)
+  if ((factory = gst_element_factory_find ("mpegaudioparse")) == NULL)
     return;
   gst_object_unref (factory);
 
   pipeline = g_strdup_printf ("videotestsrc num-buffers=250 ! "
       "video/x-raw,format=(string)Y42B,width=1920,height=1080,framerate=25/1 ! "
-      "ffenc_dnxhd bitrate=36000000 ! "
+      "avenc_dnxhd bitrate=36000000 ! "
       "mxfmux name=mux ! "
       "fakesink  "
       "audiotestsrc num-buffers=250 ! "
       "audioconvert ! "
-      "audio/x-raw,channels=2 ! " "lame ! " "mp3parse ! " "mux. ");
+      "audio/x-raw,channels=2 ! lamemp3enc ! mpegaudioparse ! mux. ");
 
   run_test (pipeline);
   g_free (pipeline);
diff --git a/tests/check/pipelines/mxf.c b/tests/check/pipelines/mxf.c
index ade034390e..5ab3a50200 100644
--- a/tests/check/pipelines/mxf.c
+++ b/tests/check/pipelines/mxf.c
@@ -31,9 +31,9 @@ get_mpeg2enc_element_name (void)
   if ((factory = gst_element_factory_find ("mpeg2enc"))) {
     gst_object_unref (factory);
     return "mpeg2enc";
-  } else if ((factory = gst_element_factory_find ("ffenc_mpeg2video"))) {
+  } else if ((factory = gst_element_factory_find ("avenc_mpeg2video"))) {
     gst_object_unref (factory);
-    return "ffenc_mpeg2video";
+    return "avenc_mpeg2video";
   } else {
     return NULL;
   }
@@ -179,7 +179,7 @@ GST_START_TEST (test_jpeg2000_alaw)
   gchar *pipeline;
   GstElementFactory *factory = NULL;
 
-  if ((factory = gst_element_factory_find ("jp2kenc")) == NULL)
+  if ((factory = gst_element_factory_find ("openjpegenc")) == NULL)
     return;
   gst_object_unref (factory);
   if ((factory = gst_element_factory_find ("alawenc")) == NULL)
@@ -188,7 +188,7 @@ GST_START_TEST (test_jpeg2000_alaw)
 
   pipeline = g_strdup_printf ("videotestsrc num-buffers=250 ! "
       "video/x-raw,framerate=25/1 ! "
-      "jp2kenc ! "
+      "openjpegenc ! "
       "mxfmux name=mux ! "
       "mxfdemux name=demux ! "
       "fakesink  "
@@ -205,25 +205,25 @@ GST_START_TEST (test_dnxhd_mp3)
   gchar *pipeline;
   GstElementFactory *factory = NULL;
 
-  if ((factory = gst_element_factory_find ("ffenc_dnxhd")) == NULL)
+  if ((factory = gst_element_factory_find ("avenc_dnxhd")) == NULL)
     return;
   gst_object_unref (factory);
-  if ((factory = gst_element_factory_find ("lame")) == NULL)
+  if ((factory = gst_element_factory_find ("lamemp3enc")) == NULL)
     return;
   gst_object_unref (factory);
-  if ((factory = gst_element_factory_find ("mp3parse")) == NULL)
+  if ((factory = gst_element_factory_find ("mpegaudioparse")) == NULL)
     return;
   gst_object_unref (factory);
 
   pipeline = g_strdup_printf ("videotestsrc num-buffers=250 ! "
       "video/x-raw,format=(string)Y42B,width=1920,height=1080,framerate=25/1 ! "
-      "ffenc_dnxhd bitrate=36000000 ! "
+      "avenc_dnxhd bitrate=36000000 ! "
       "mxfmux name=mux ! "
       "mxfdemux name=demux ! "
       "fakesink  "
       "audiotestsrc num-buffers=250 ! "
       "audioconvert ! "
-      "audio/x-raw,channels=2 ! " "lame ! " "mp3parse ! " "mux. ");
+      "audio/x-raw,channels=2 ! lamemp3enc ! mpegaudioparse ! mux. ");
 
   run_test (pipeline, 2);
   g_free (pipeline);