Revert "Fix H264 decoder on Jetpac 5.1.1."

This reverts commit 32bb09c.
introlab · Sep 12, 2023 · e9ae608 · e9ae608
1 parent 32bb09c
commit e9ae608
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 15 deletions.
diff --git a/...tiveGStreamer/include/OpenteraWebrtcNativeGStreamer/Decoders/H264GStreamerVideoDecoders.h b/...tiveGStreamer/include/OpenteraWebrtcNativeGStreamer/Decoders/H264GStreamerVideoDecoders.h
@@ -25,10 +25,7 @@ namespace opentera
     class H264GStreamerVideoDecoder : public GStreamerVideoDecoder
     {
     public:
-        explicit H264GStreamerVideoDecoder(
-            std::string decoderPipeline,
-            const char* mediaTypeCapsParameters = "",
-            bool resetPipelineOnSizeChanges = false);
+        explicit H264GStreamerVideoDecoder(std::string decoderPipeline, bool resetPipelineOnSizeChanges = false);
         ~H264GStreamerVideoDecoder() override = default;
 
         static const char* mediaTypeCaps();

diff --git a/...c-native-client/OpenteraWebrtcNativeGStreamer/src/Decoders/H264GStreamerVideoDecoders.cpp b/...c-native-client/OpenteraWebrtcNativeGStreamer/src/Decoders/H264GStreamerVideoDecoders.cpp
@@ -21,14 +21,8 @@
 using namespace opentera;
 using namespace std;
 
-H264GStreamerVideoDecoder::H264GStreamerVideoDecoder(
-    string decoderPipeline,
-    const char* mediaTypeCapsParameters,
-    bool resetPipelineOnSizeChanges)
-    : GStreamerVideoDecoder(
-          string(mediaTypeCaps()) + mediaTypeCapsParameters,
-          move(decoderPipeline),
-          resetPipelineOnSizeChanges)
+H264GStreamerVideoDecoder::H264GStreamerVideoDecoder(string decoderPipeline, bool resetPipelineOnSizeChanges)
+    : GStreamerVideoDecoder(mediaTypeCaps(), move(decoderPipeline), resetPipelineOnSizeChanges)
 {
 }
 
@@ -92,7 +86,7 @@ bool VaapiH264GStreamerVideoDecoder::isHardwareAccelerated()
 
 
 TegraH264GStreamerVideoDecoder::TegraH264GStreamerVideoDecoder()
-    : H264GStreamerVideoDecoder("nvv4l2decoder ! nvvidconv", ",alignment=au,stream-format=byte-stream", true)
+    : H264GStreamerVideoDecoder("h264parse ! nvv4l2decoder ! nvvidconv", true)
 {
 }
 
@@ -106,8 +100,8 @@ webrtc::VideoDecoder::DecoderInfo TegraH264GStreamerVideoDecoder::GetDecoderInfo
 
 bool TegraH264GStreamerVideoDecoder::isSupported()
 {
-    return gst::elementFactoryExists("x264enc") && gst::elementFactoryExists("nvv4l2decoder") &&
-           gst::elementFactoryExists("nvvidconv") &&
+    return gst::elementFactoryExists("x264enc") && gst::elementFactoryExists("h264parse") &&
+           gst::elementFactoryExists("nvv4l2decoder") && gst::elementFactoryExists("nvvidconv") &&
            gst::testEncoderDecoderPipeline("x264enc ! nvv4l2decoder ! nvvidconv");
 }