add h265 file for test

mpromonet · Jan 18, 2025 · 0c5f098 · 0c5f098
1 parent b634616
commit 0c5f098
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,7 +9,7 @@
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/webrtc-streamer",
-            "args": ["-C", "config.json", "-a"],
+            "args": ["-C", "config.json", "-o"],
             "stopAtEntry": false,
             "cwd": "${workspaceFolder}",
             "environment": [],

diff --git a/config.json b/config.json
@@ -24,7 +24,8 @@
         "Vaison-La-Romaine": {"video":"rtsp://176.139.87.16/axis-media/media.amp", "position":"44.238960,5.074610" },
 
         "BigSky": {"video":"rtsp://76.75.8.120/axis-media/media.amp", "position":"45.284650,-111.368290"},
-        "Orlando": {"video":"rtsp://97.68.104.34/axis-media/media.amp", "position":"28.538340,-81.379240"}
+        "Orlando": {"video":"rtsp://97.68.104.34/axis-media/media.amp", "position":"28.538340,-81.379240"},
+	"H265": {"video":"file://h265.mkv"}
 
     }
 }
diff --git a/h265.mkv b/h265.mkv
diff --git a/inc/NullDecoder.h b/inc/NullDecoder.h
@@ -13,11 +13,12 @@
 #pragma once
 
 class NullDecoder : public webrtc::VideoDecoder {
-   public:
+public:
  	NullDecoder(const webrtc::SdpVideoFormat& format) : m_format(format) {}
     virtual ~NullDecoder() override {}
 
 	bool Configure(const webrtc::VideoDecoder::Settings& settings) override { 
+		RTC_LOG(LS_ERROR) << "Configure format:" << m_format.name;
 		m_settings = settings;
 		return true; 
 	}
@@ -56,6 +57,7 @@ class NullDecoder : public webrtc::VideoDecoder {
 
     const char* ImplementationName() const override { return "NullDecoder"; }
 
+private:
 	webrtc::DecodedImageCallback* m_decoded_image_callback;
 	webrtc::VideoDecoder::Settings m_settings;
 	webrtc::SdpVideoFormat m_format;	

diff --git a/inc/NullEncoder.h b/inc/NullEncoder.h
@@ -22,7 +22,7 @@ class NullEncoder : public webrtc::VideoEncoder {
     virtual ~NullEncoder() override {}
 
     int32_t InitEncode(const webrtc::VideoCodec* codec_settings, const webrtc::VideoEncoder::Settings& settings) override {
-		RTC_LOG(LS_WARNING) << "InitEncode";
+		RTC_LOG(LS_ERROR) << "InitEncode format:" << m_format.name;
 		return WEBRTC_VIDEO_CODEC_OK;
 	}
     int32_t Release() override {