Skip to content

Commit

Permalink
Remove the DirectShow backend
Browse files Browse the repository at this point in the history
It's been deprecated by Microsoft since quite some time.
We should only have one backend on Windows, and then WMF
seems to be the correct one. WMF is missing features
like Camera, so some additional implementation work on
WMF will be required.

Change-Id: I5c3db4020b130efa78575c9da116a8ae6c34f7a1
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
  • Loading branch information
laknoll committed Jan 20, 2021
1 parent 5acdceb commit aa441d6
Show file tree
Hide file tree
Showing 88 changed files with 1 addition and 14,929 deletions.
4 changes: 0 additions & 4 deletions config.tests/directshow/directshow.pro

This file was deleted.

36 changes: 0 additions & 36 deletions config.tests/directshow/main.cpp

This file was deleted.

37 changes: 0 additions & 37 deletions config.tests/wshellitem/main.cpp

This file was deleted.

4 changes: 0 additions & 4 deletions config.tests/wshellitem/wshellitem.pro

This file was deleted.

2 changes: 1 addition & 1 deletion config_help.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Multimedia options:
-no-gstreamer ........ Disable support for GStreamer
-gstreamer [version] . Enable GStreamer support [auto]
With no parameter, 1.0 is tried first, then 0.10.
-evr ................. Enables EVR in DirectShow and WMF [auto]
-evr ................. Enables EVR in WMF [auto]
24 changes: 0 additions & 24 deletions src/multimedia/configure.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
"options": {
"alsa": "boolean",
"evr": { "type": "boolean" },
"directshow": { "type": "boolean" },
"wmf": { "type": "boolean" },
"gstreamer": { "type": "optionalString", "values": [ "no", "yes" ] },
"pulseaudio": "boolean"
Expand All @@ -32,13 +31,6 @@
{ "libs": "-framework AVFoundation -framework Foundation" }
]
},
"directshow": {
"label": "DirectShow",
"test": "directshow",
"sources": [
{ "libs": "-lstrmiids -ldmoguids -luuid -lmsdmo -lole32 -loleaut32" }
]
},
"gstreamer_1_0": {
"label": "GStreamer 1.0",
"export": "gstreamer",
Expand Down Expand Up @@ -131,11 +123,6 @@
"label": "wmsdk.h",
"type": "compile",
"test": "wmsdk"
},
"wshellitem": {
"label": "WShellItem",
"type": "compile",
"test": "wshellitem"
}
},

Expand All @@ -151,11 +138,6 @@
"condition": "libs.avfoundation",
"output": [ "feature", "privateFeature" ]
},
"directshow": {
"label": "DirectShow",
"condition": "config.win32 && libs.directshow",
"output": [ "feature", "privateFeature" ]
},
"evr": {
"label": "evr.h",
"condition": "config.win32 && tests.evr",
Expand Down Expand Up @@ -219,11 +201,6 @@
"condition": "config.win32 && tests.wmsdk",
"output": [ "privateFeature" ]
},
"wshellitem": {
"label": "WShellItem",
"condition": "config.win32 && features.directshow && tests.wshellitem",
"output": [ "feature", "privateFeature" ]
},
"wmf": {
"label": "Windows Media Foundation",
"condition": "config.win32 && libs.wmf",
Expand All @@ -244,7 +221,6 @@
"pulseaudio",
"mmrenderer",
"avfoundation",
"directshow",
"wmf"
]
}
Expand Down
37 changes: 0 additions & 37 deletions src/plugins/directshow/camera/camera.pri

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit aa441d6

Please sign in to comment.