mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-23 00:47:31 +09:00
Actually enable DirectShow :meef:
This commit is contained in:
parent
96bc206271
commit
6fd97529b5
2 changed files with 14 additions and 4 deletions
|
|
@ -98,10 +98,7 @@ DirectShowReader::ReadMetadata(MediaInfo* aInfo,
|
||||||
reinterpret_cast<void**>(static_cast<IGraphBuilder**>(getter_AddRefs(mGraph))));
|
reinterpret_cast<void**>(static_cast<IGraphBuilder**>(getter_AddRefs(mGraph))));
|
||||||
NS_ENSURE_TRUE(SUCCEEDED(hr) && mGraph, NS_ERROR_FAILURE);
|
NS_ENSURE_TRUE(SUCCEEDED(hr) && mGraph, NS_ERROR_FAILURE);
|
||||||
|
|
||||||
rv = ParseMP3Headers(&mMP3FrameParser, mDecoder->GetResource());
|
#ifdef DIRECTSHOW_REGISTER_GRAPH
|
||||||
NS_ENSURE_SUCCESS(rv, rv);
|
|
||||||
|
|
||||||
#ifdef DIRECTSHOW_REGISTER_GRAPH
|
|
||||||
hr = AddGraphToRunningObjectTable(mGraph, &mRotRegister);
|
hr = AddGraphToRunningObjectTable(mGraph, &mRotRegister);
|
||||||
NS_ENSURE_TRUE(SUCCEEDED(hr), NS_ERROR_FAILURE);
|
NS_ENSURE_TRUE(SUCCEEDED(hr), NS_ERROR_FAILURE);
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -117,6 +114,9 @@ DirectShowReader::ReadMetadata(MediaInfo* aInfo,
|
||||||
return ReadH264Metadata(aInfo, aTags);
|
return ReadH264Metadata(aInfo, aTags);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rv = ParseMP3Headers(&mMP3FrameParser, mDecoder->GetResource());
|
||||||
|
NS_ENSURE_SUCCESS(rv, rv);
|
||||||
|
|
||||||
// Build the graph. Create the filters we need, and connect them. We
|
// Build the graph. Create the filters we need, and connect them. We
|
||||||
// build the entire graph ourselves to prevent other decoders installed
|
// build the entire graph ourselves to prevent other decoders installed
|
||||||
// on the system being created and used.
|
// on the system being created and used.
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,16 @@
|
||||||
|
|
||||||
include('build/moz.configure/init.configure')
|
include('build/moz.configure/init.configure')
|
||||||
|
|
||||||
|
# DirectShow is the legacy Windows media backend. Keep this independent of
|
||||||
|
# the old configure scripts so the backend is actually compiled on Windows.
|
||||||
|
@depends(target)
|
||||||
|
def directshow_enabled(target):
|
||||||
|
if target.kernel == 'WINNT':
|
||||||
|
return True
|
||||||
|
|
||||||
|
set_config('MOZ_DIRECTSHOW', directshow_enabled)
|
||||||
|
set_define('MOZ_DIRECTSHOW', directshow_enabled)
|
||||||
|
|
||||||
# Note:
|
# Note:
|
||||||
# - Gecko-specific options and rules should go in toolkit/moz.configure.
|
# - Gecko-specific options and rules should go in toolkit/moz.configure.
|
||||||
# - Firefox-specific options and rules should go in browser/moz.configure.
|
# - Firefox-specific options and rules should go in browser/moz.configure.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue